Ignore:
Timestamp:
Mar 6, 2018, 9:34:37 AM (7 years ago)
Author:
Laurent Fairhead
Message:

Merging r3239 from trunk:
Moving some xios_field_is_active tests as they could not give the right
results at their previous location (the context was not closed yet).
Changing some variables levels in the histmth.xml file to prevent the unecessary
multiple calls to the radiation scheme

File:
1 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/branches/IPSLCM6.0.15/DefLists/file_def_histmth_lmdz.xml

    r3220 r3240  
    366366                <field field_ref="z0m" level="10" />
    367367                <field field_ref="z0h" level="10" />
    368                 <field field_ref="topswad" level="5" />
    369                 <field field_ref="topswad0" level="5" />
    370                 <field field_ref="topswai" level="5" />
    371                 <field field_ref="solswad" level="5" />
    372                 <field field_ref="solswad0" level="5" />
    373                 <field field_ref="solswai" level="5" />
    374                 <field field_ref="toplwad" level="5" />
    375                 <field field_ref="toplwad0" level="5" />
    376                 <field field_ref="toplwai" level="5" />
    377                 <field field_ref="sollwad" level="5" />
    378                 <field field_ref="sollwad0" level="5" />
    379                 <field field_ref="sollwai" level="5" />
    380                 <field field_ref="od550_ASBCM" level="5" />
    381                 <field field_ref="od550_ASPOMM" level="5" />
    382                 <field field_ref="od550_ASSO4M" level="5" />
    383                 <field field_ref="od550_CSSO4M" level="5" />
    384                 <field field_ref="od550_SSSSM" level="5" />
    385                 <field field_ref="od550_ASSSM" level="5" />
    386                 <field field_ref="od550_CSSSM" level="5" />
    387                 <field field_ref="od550_CIDUSTM" level="5" />
    388                 <field field_ref="od550_AIBCM" level="5" />
    389                 <field field_ref="od550_AIPOMM" level="5" />
    390                 <field field_ref="od550_ASNO3M" level="5" />
    391                 <field field_ref="od550_CSNO3M" level="5" />
    392                 <field field_ref="od550_CINO3M" level="5" />
    393                 <field field_ref="od550_STRAT" level="2" />
    394                 <field field_ref="dryod550_ASBCM" level="2" />
    395                 <field field_ref="dryod550_ASPOMM" level="2" />
    396                 <field field_ref="dryod550_ASSO4M" level="2" />
    397                 <field field_ref="dryod550_CSSO4M" level="2" />
    398                 <field field_ref="dryod550_SSSSM" level="2" />
    399                 <field field_ref="dryod550_ASSSM" level="2" />
    400                 <field field_ref="dryod550_CSSSM" level="2" />
    401                 <field field_ref="dryod550_CIDUSTM" level="2" />
    402                 <field field_ref="dryod550_AIBCM" level="2" />
    403                 <field field_ref="dryod550_AIPOMM" level="2" />
    404                 <field field_ref="dryod550_ASNO3M" level="2" />
    405                 <field field_ref="dryod550_CSNO3M" level="2" />
    406                 <field field_ref="dryod550_CINO3M" level="2" />
     368<<<<<<< .mine
     369                <field field_ref="topswad" level="10" />
     370                <field field_ref="topswad0" level="10" />
     371                <field field_ref="topswai" level="10" />
     372                <field field_ref="solswad" level="10" />
     373                <field field_ref="solswad0" level="10" />
     374                <field field_ref="solswai" level="10" />
     375                <field field_ref="toplwad" level="10" />
     376                <field field_ref="toplwad0" level="10" />
     377                <field field_ref="toplwai" level="10" />
     378                <field field_ref="sollwad" level="10" />
     379                <field field_ref="sollwad0" level="10" />
     380                <field field_ref="sollwai" level="10" />
     381                <field field_ref="od550_ASBCM" level="7" />
     382                <field field_ref="od550_ASPOMM" level="7" />
     383                <field field_ref="od550_ASSO4M" level="7" />
     384                <field field_ref="od550_CSSO4M" level="7" />
     385                <field field_ref="od550_SSSSM" level="7" />
     386                <field field_ref="od550_ASSSM" level="7" />
     387                <field field_ref="od550_CSSSM" level="7" />
     388                <field field_ref="od550_CIDUSTM" level="7" />
     389                <field field_ref="od550_AIBCM" level="7" />
     390                <field field_ref="od550_AIPOMM" level="7" />
     391                <field field_ref="od550_ASNO3M" level="7" />
     392                <field field_ref="od550_CSNO3M" level="7" />
     393                <field field_ref="od550_CINO3M" level="7" />
     394                <field field_ref="od550_STRAT" level="7" />
     395                <field field_ref="dryod550_ASBCM" level="7" />
     396                <field field_ref="dryod550_ASPOMM" level="7" />
     397                <field field_ref="dryod550_ASSO4M" level="7" />
     398                <field field_ref="dryod550_CSSO4M" level="7" />
     399                <field field_ref="dryod550_SSSSM" level="7" />
     400                <field field_ref="dryod550_ASSSM" level="7" />
     401                <field field_ref="dryod550_CSSSM" level="7" />
     402                <field field_ref="dryod550_CIDUSTM" level="7" />
     403                <field field_ref="dryod550_AIBCM" level="7" />
     404                <field field_ref="dryod550_AIPOMM" level="7" />
     405                <field field_ref="dryod550_ASNO3M" level="7" />
     406                <field field_ref="dryod550_CSNO3M" level="7" />
     407                <field field_ref="dryod550_CINO3M" level="7" />
    407408                <field field_ref="od550aer" level="2" />
    408409                <field field_ref="dryod550aer" level="2" />
    … …  
    479480                <field field_ref="f0_th" level="4" />
    480481                <field field_ref="zmax_th" level="4" />
    481                 <field field_ref="rsut4co2" level="5" />
    482                 <field field_ref="rlut4co2" level="5" />
    483                 <field field_ref="rsutcs4co2" level="5" />
    484                 <field field_ref="rlutcs4co2" level="5" />
     482                <field field_ref="rsut4co2" level="10" />
     483                <field field_ref="rlut4co2" level="10" />
     484                <field field_ref="rsutcs4co2" level="10" />
     485                <field field_ref="rlutcs4co2" level="10" />
    485486                <field field_ref="dqphy2d" level="2" />
    486487                <field field_ref="dqlphy2d" level="2" />
Note: See TracChangeset for help on using the changeset viewer.