Ignore:
Timestamp:
Apr 3, 2016, 12:09:34 AM (9 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r2457:2487 into testing branch

Location:
LMDZ5/branches/testing
Files:
10 edited
4 copied

Legend:

Unmodified
Added
Removed
  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/DefLists/field_def_lmdz.xml

    r2471 r2488  
    311311        <field id="OD550_AIBCM"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
    312312        <field id="OD550_AIPOMM"    long_name="Aerosol Optical depth at 550 nm "    unit="1" />
    313         <field id="OD550_STRAT"    long_name="Aerosol Optical depth at 550 nm "    unit="1" enabled="FALSE" />
     313        <field id="OD550_STRAT"    long_name="Aerosol Optical depth at 550 nm "    unit="1" enabled="TRUE" />
    314314        <field id="OD550_SO4"     long_name="Aerosol Optical depth at 550 nm "    unit="1" />
    315315        <field id="OD550_ASNO3M"     long_name="Aerosol Optical depth at 550 nm "    unit="1" />
    316316        <field id="OD550_CSNO3M"     long_name="Aerosol Optical depth at 550 nm "    unit="1" />
    317317        <field id="OD550_CINO3M"     long_name="Aerosol Optical depth at 550 nm "    unit="1" />
     318        <field id="OD_10um_STRAT" long_name="Stratospheric Aerosol Optical depth at 10 um" unit="-" />
    318319        <field id="od550aer"    long_name="Total aerosol optical depth at 550nm"    unit="-" />
    319320        <field id="od865aer"    long_name="Total aerosol optical depth at 870nm"    unit="-" />
     
    379380        <field id="wake_h"    long_name="wake_h"    unit="-" />
    380381        <field id="wake_s"    long_name="wake_s"    unit="-" />
     382        <field id="epmax"    long_name="epmax en fn cape"    unit="su" />
    381383        <field id="plulth"    long_name="Rainfall therm."    unit="K/s" />
    382384        <field id="plulst"    long_name="Rainfall strat."    unit="K/s" />
     
    389391        <field id="rsutcs4co2"    long_name="TOA Out CS SW in 4xCO2 atmosphere"    unit="W/m2" />
    390392        <field id="rlutcs4co2"    long_name="TOA Out CS LW in 4xCO2 atmosphere"    unit="W/m2" />
     393        <field id="dqphy2d"    long_name="Physics dQ"    unit="(kg/m2)/s" />
     394        <field id="dqdyn2d"    long_name="Dynamics dQ"    unit="(kg/m2)/s" />
     395        <field id="dqcon2d"    long_name="Convection dQ"    unit="(kg/m2)/s" />
     396        <field id="dqwak2d"    long_name="Wake dQ"    unit="(kg/m2)/s" />
     397        <field id="dqlsc2d"    long_name="Condensation dQ"    unit="(kg/m2)/s" />
     398        <field id="dqvdf2d"    long_name="Boundary-layer dQ"    unit="(kg/m2)/s" />
     399        <field id="dqeva2d"    long_name="Reevaporation dQ"    unit="(kg/m2)/s" />
     400        <field id="dqlscth2d"    long_name="dQ therm."    unit="(kg/m2)/s" />
     401        <field id="dqlscst2d"    long_name="dQ strat."    unit="(kg/m2)/s" />
     402        <field id="dqthe2d"    long_name="Thermal dQ"    unit="(kg/m2)/s" />
     403        <field id="dqajs2d"    long_name="Dry ajdust dQ"    unit="(kg/m2)/s" />
    391404    </field_group>
    392405
     
    440453        <field id="ozone_daylight"    long_name="Daylight ozone mole fraction"    unit="-" />
    441454        <field id="upwd"    long_name="saturated updraft"    unit="kg/m2/s" />
     455        <field id="ep"    long_name="ep"    unit="su" />
    442456        <field id="dtphy"    long_name="Physics dT"    unit="K/s" />
    443457        <field id="dqphy"    long_name="Physics dQ"    unit="(kg/kg)/s" />
  • LMDZ5/branches/testing/DefLists/file_def_histLES_lmdz.xml

    r2408 r2488  
    371371                <field field_ref="wake_h" level="10" />
    372372                <field field_ref="wake_s" level="10" />
     373                <field field_ref="epmax" level="10" />
    373374                <field field_ref="plulth" level="10" />
    374375                <field field_ref="plulst" level="10" />
     
    381382                <field field_ref="rsutcs4co2" level="10" />
    382383                <field field_ref="rlutcs4co2" level="10" />
     384                <field field_ref="dqphy2d" level="10" />
     385                <field field_ref="dqdyn2d" level="10" />
     386                <field field_ref="dqcon2d" level="10" />
     387                <field field_ref="dqwak2d" level="10" />
     388                <field field_ref="dqlsc2d" level="10" />
     389                <field field_ref="dqvdf2d" level="10" />
     390                <field field_ref="dqeva2d" level="10" />
     391                <field field_ref="dqlscth2d" level="10" />
     392                <field field_ref="dqlscst2d" level="10" />
     393                <field field_ref="dqthe2d" level="10" />
     394                <field field_ref="dqajs2d" level="10" />
    383395            </field_group>
    384396
     
    418430                <field field_ref="ozone" level="10" />
    419431                <field field_ref="upwd" level="10" />
     432                <field field_ref="ep" level="10" />
    420433                <field field_ref="dtphy" level="10" />
    421434                <field field_ref="dqphy" level="10" />
  • LMDZ5/branches/testing/DefLists/file_def_histday_lmdz.xml

    r2408 r2488  
    371371                <field field_ref="wake_h" level="5" />
    372372                <field field_ref="wake_s" level="5" />
     373                <field field_ref="epmax" level="10" />
    373374                <field field_ref="plulth" level="10" />
    374375                <field field_ref="plulst" level="10" />
     
    381382                <field field_ref="rsutcs4co2" level="10" />
    382383                <field field_ref="rlutcs4co2" level="10" />
     384                <field field_ref="dqphy2d" level="10" />
     385                <field field_ref="dqdyn2d" level="10" />
     386                <field field_ref="dqcon2d" level="10" />
     387                <field field_ref="dqwak2d" level="10" />
     388                <field field_ref="dqlsc2d" level="10" />
     389                <field field_ref="dqvdf2d" level="10" />
     390                <field field_ref="dqeva2d" level="10" />
     391                <field field_ref="dqlscth2d" level="10" />
     392                <field field_ref="dqlscst2d" level="10" />
     393                <field field_ref="dqthe2d" level="10" />
     394                <field field_ref="dqajs2d" level="10" />
    383395            </field_group>
    384396
     
    418430                <field field_ref="ozone" level="10" />
    419431                <field field_ref="upwd" level="10" />
     432                <field field_ref="ep" level="10" />
    420433                <field field_ref="dtphy" level="10" />
    421434                <field field_ref="dqphy" level="10" />
  • LMDZ5/branches/testing/DefLists/file_def_histhf_lmdz.xml

    r2408 r2488  
    371371                <field field_ref="wake_h" level="10" />
    372372                <field field_ref="wake_s" level="10" />
     373                <field field_ref="epmax" level="10" />
    373374                <field field_ref="plulth" level="10" />
    374375                <field field_ref="plulst" level="10" />
     
    381382                <field field_ref="rsutcs4co2" level="10" />
    382383                <field field_ref="rlutcs4co2" level="10" />
     384                <field field_ref="dqphy2d" level="10" />
     385                <field field_ref="dqdyn2d" level="10" />
     386                <field field_ref="dqcon2d" level="10" />
     387                <field field_ref="dqwak2d" level="10" />
     388                <field field_ref="dqlsc2d" level="10" />
     389                <field field_ref="dqvdf2d" level="10" />
     390                <field field_ref="dqeva2d" level="10" />
     391                <field field_ref="dqlscth2d" level="10" />
     392                <field field_ref="dqlscst2d" level="10" />
     393                <field field_ref="dqthe2d" level="10" />
     394                <field field_ref="dqajs2d" level="10" />
    383395            </field_group>
    384396
     
    418430                <field field_ref="ozone" level="10" />
    419431                <field field_ref="upwd" level="10" />
     432                <field field_ref="ep" level="10" />
    420433                <field field_ref="dtphy" level="10" />
    421434                <field field_ref="dqphy" level="10" />
  • LMDZ5/branches/testing/DefLists/file_def_histins_lmdz.xml

    r2408 r2488  
    371371                <field field_ref="wake_h" level="10" />
    372372                <field field_ref="wake_s" level="10" />
     373                <field field_ref="epmax" level="10" />
    373374                <field field_ref="plulth" level="10" />
    374375                <field field_ref="plulst" level="10" />
     
    381382                <field field_ref="rsutcs4co2" level="10" />
    382383                <field field_ref="rlutcs4co2" level="10" />
     384                <field field_ref="dqphy2d" level="10" />
     385                <field field_ref="dqdyn2d" level="10" />
     386                <field field_ref="dqcon2d" level="10" />
     387                <field field_ref="dqwak2d" level="10" />
     388                <field field_ref="dqlsc2d" level="10" />
     389                <field field_ref="dqvdf2d" level="10" />
     390                <field field_ref="dqeva2d" level="10" />
     391                <field field_ref="dqlscth2d" level="10" />
     392                <field field_ref="dqlscst2d" level="10" />
     393                <field field_ref="dqthe2d" level="10" />
     394                <field field_ref="dqajs2d" level="10" />
    383395            </field_group>
    384396
     
    418430                <field field_ref="ozone" level="10" />
    419431                <field field_ref="upwd" level="10" />
     432                <field field_ref="ep" level="10" />
    420433                <field field_ref="dtphy" level="10" />
    421434                <field field_ref="dqphy" level="10" />
  • LMDZ5/branches/testing/DefLists/file_def_histmth_lmdz.xml

    r2435 r2488  
    371371                <field field_ref="wake_h" level="4" />
    372372                <field field_ref="wake_s" level="4" />
     373                <field field_ref="epmax" level="2" />
    373374                <field field_ref="plulth" level="10" />
    374375                <field field_ref="plulst" level="10" />
     
    381382                <field field_ref="rsutcs4co2" level="5" />
    382383                <field field_ref="rlutcs4co2" level="5" />
     384                <field field_ref="dqphy2d" level="2" />
     385                <field field_ref="dqdyn2d" level="4" />
     386                <field field_ref="dqcon2d" level="4" />
     387                <field field_ref="dqwak2d" level="4" />
     388                <field field_ref="dqlsc2d" level="4" />
     389                <field field_ref="dqvdf2d" level="4" />
     390                <field field_ref="dqeva2d" level="4" />
     391                <field field_ref="dqlscth2d" level="10" />
     392                <field field_ref="dqlscst2d" level="10" />
     393                <field field_ref="dqthe2d" level="4" />
     394                <field field_ref="dqajs2d" level="4" />
    383395            </field_group>
    384396
     
    418430                <field field_ref="ozone" level="2" />
    419431                <field field_ref="upwd" level="2" />
     432                <field field_ref="ep" level="2" />
    420433                <field field_ref="dtphy" level="2" />
    421434                <field field_ref="dqphy" level="2" />
  • LMDZ5/branches/testing/DefLists/file_def_histstn_lmdz.xml

    r2435 r2488  
    371371                <field field_ref="wake_h" level="10" />
    372372                <field field_ref="wake_s" level="10" />
     373                <field field_ref="epmax" level="10" />
    373374                <field field_ref="plulth" level="10" />
    374375                <field field_ref="plulst" level="10" />
     
    381382                <field field_ref="rsutcs4co2" level="10" />
    382383                <field field_ref="rlutcs4co2" level="10" />
     384                <field field_ref="dqphy2d" level="10" />
     385                <field field_ref="dqdyn2d" level="10" />
     386                <field field_ref="dqcon2d" level="10" />
     387                <field field_ref="dqwak2d" level="10" />
     388                <field field_ref="dqlsc2d" level="10" />
     389                <field field_ref="dqvdf2d" level="10" />
     390                <field field_ref="dqeva2d" level="10" />
     391                <field field_ref="dqlscth2d" level="10" />
     392                <field field_ref="dqlscst2d" level="10" />
     393                <field field_ref="dqthe2d" level="10" />
     394                <field field_ref="dqajs2d" level="10" />
    383395            </field_group>
    384396
     
    418430                <field field_ref="ozone" level="10" />
    419431                <field field_ref="upwd" level="10" />
     432                <field field_ref="ep" level="10" />
    420433                <field field_ref="dtphy" level="10" />
    421434                <field field_ref="dqphy" level="10" />
  • LMDZ5/branches/testing/DefLists/run.def

    r1910 r2488  
    33## Fichier de configuration general
    44##
     5INCLUDEDEF=gcm.def
     6INCLUDEDEF=vert.def
    57INCLUDEDEF=physiq.def
    6 INCLUDEDEF=gcm.def
     8INCLUDEDEF=convection.def
    79INCLUDEDEF=orchidee.def
    810INCLUDEDEF=output.def
  • LMDZ5/branches/testing/DefLists/vert_L79.def

    r2471 r2488  
    3333##  Avec ou sans strato
    3434ok_strato=y
    35 ok_hines=y
     35ok_hines=n
    3636#  Couche eponge dans les couches de pression plus faible que 100 fois la pression de la derniere couche
    3737iflag_top_bound=2
Note: See TracChangeset for help on using the changeset viewer.