Changeset 3239 for LMDZ6/trunk
- Timestamp:
- Mar 5, 2018, 5:24:06 PM (7 years ago)
- Location:
- LMDZ6/trunk
- Files:
-
- 2 edited
-
DefLists/file_def_histmth_lmdz.xml (modified) (3 diffs)
-
libf/phylmd/physiq_mod.F90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
LMDZ6/trunk/DefLists/file_def_histmth_lmdz.xml
r3221 r3239 367 367 <field field_ref="z0m" level="10" /> 368 368 <field field_ref="z0h" level="10" /> 369 <field field_ref="topswad" level=" 5" />370 <field field_ref="topswad0" level=" 5" />371 <field field_ref="topswai" level=" 5" />372 <field field_ref="solswad" level=" 5" />373 <field field_ref="solswad0" level=" 5" />374 <field field_ref="solswai" level=" 5" />375 <field field_ref="toplwad" level=" 5" />376 <field field_ref="toplwad0" level=" 5" />377 <field field_ref="toplwai" level=" 5" />378 <field field_ref="sollwad" level=" 5" />379 <field field_ref="sollwad0" level=" 5" />380 <field field_ref="sollwai" level=" 5" />381 <field field_ref="od550_ASBCM" level=" 2" />382 <field field_ref="od550_ASPOMM" level=" 2" />383 <field field_ref="od550_ASSO4M" level=" 2" />384 <field field_ref="od550_CSSO4M" level=" 2" />385 <field field_ref="od550_SSSSM" level=" 2" />386 <field field_ref="od550_ASSSM" level=" 2" />387 <field field_ref="od550_CSSSM" level=" 2" />388 <field field_ref="od550_CIDUSTM" level=" 2" />389 <field field_ref="od550_AIBCM" level=" 2" />390 <field field_ref="od550_AIPOMM" level=" 2" />391 <field field_ref="od550_ASNO3M" level=" 2" />392 <field field_ref="od550_CSNO3M" level=" 2" />393 <field field_ref="od550_CINO3M" level=" 2" />394 <field field_ref="od550_STRAT" level=" 2" />395 <field field_ref="dryod550_ASBCM" level=" 2" />396 <field field_ref="dryod550_ASPOMM" level=" 2" />397 <field field_ref="dryod550_ASSO4M" level=" 2" />398 <field field_ref="dryod550_CSSO4M" level=" 2" />399 <field field_ref="dryod550_SSSSM" level=" 2" />400 <field field_ref="dryod550_ASSSM" level=" 2" />401 <field field_ref="dryod550_CSSSM" level=" 2" />402 <field field_ref="dryod550_CIDUSTM" level=" 2" />403 <field field_ref="dryod550_AIBCM" level=" 2" />404 <field field_ref="dryod550_AIPOMM" level=" 2" />405 <field field_ref="dryod550_ASNO3M" level=" 2" />406 <field field_ref="dryod550_CSNO3M" level=" 2" />407 <field field_ref="dryod550_CINO3M" level=" 2" />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" /> 408 408 <field field_ref="od550aer" level="2" /> 409 409 <field field_ref="dryod550aer" level="2" /> … … 481 481 <field field_ref="f0_th" level="4" /> 482 482 <field field_ref="zmax_th" level="4" /> 483 <field field_ref="rsut4co2" level=" 5" />484 <field field_ref="rlut4co2" level=" 5" />485 <field field_ref="rsutcs4co2" level=" 5" />486 <field field_ref="rlutcs4co2" level=" 5" />483 <field field_ref="rsut4co2" level="10" /> 484 <field field_ref="rlut4co2" level="10" /> 485 <field field_ref="rsutcs4co2" level="10" /> 486 <field field_ref="rlutcs4co2" level="10" /> 487 487 <field field_ref="dqphy2d" level="2" /> 488 488 <field field_ref="dqlphy2d" level="2" /> … … 663 663 <field field_ref="ref_liq" level="4" /> 664 664 <field field_ref="ref_ice" level="4" /> 665 <field field_ref="rsu4co2" level=" 5" />666 <field field_ref="rlu4co2" level=" 5" />667 <field field_ref="rsucs4co2" level=" 5" />668 <field field_ref="rlucs4co2" level=" 5" />669 <field field_ref="rsd4co2" level=" 5" />670 <field field_ref="rld4co2" level=" 5" />671 <field field_ref="rsdcs4co2" level=" 5" />672 <field field_ref="rldcs4co2" level=" 5" />665 <field field_ref="rsu4co2" level="10" /> 666 <field field_ref="rlu4co2" level="10" /> 667 <field field_ref="rsucs4co2" level="10" /> 668 <field field_ref="rlucs4co2" level="10" /> 669 <field field_ref="rsd4co2" level="10" /> 670 <field field_ref="rld4co2" level="10" /> 671 <field field_ref="rsdcs4co2" level="10" /> 672 <field field_ref="rldcs4co2" level="10" /> 673 673 </field_group> 674 674 -
LMDZ6/trunk/libf/phylmd/physiq_mod.F90
r3208 r3239 1657 1657 1658 1658 #ifdef CPP_XIOS 1659 !--setting up swaero_diag to TRUE in XIOS case1660 IF (xios_field_is_active("topswad").OR.xios_field_is_active("topswad0").OR. &1661 xios_field_is_active("solswad").OR.xios_field_is_active("solswad0").OR. &1662 xios_field_is_active("topswai").OR.xios_field_is_active("solswai").OR. &1663 (iflag_rrtm==1.AND.(xios_field_is_active("toplwad").OR.xios_field_is_active("toplwad0").OR. &1664 xios_field_is_active("sollwad").OR.xios_field_is_active("sollwad0")))) &1665 !!!--for now these fields are not in the XML files so they are omitted1666 !!! xios_field_is_active("toplwai").OR.xios_field_is_active("sollwai") !))) &1667 swaero_diag=.TRUE.1668 1669 !--setting up swaerofree_diag to TRUE in XIOS case1670 IF (xios_field_is_active("SWdnSFCcleanclr").OR.xios_field_is_active("SWupSFCcleanclr").OR. &1671 xios_field_is_active("SWupTOAcleanclr").OR.xios_field_is_active("rsucsaf").OR. &1672 xios_field_is_active("rsdcsaf") .OR. xios_field_is_active("LWdnSFCcleanclr").OR. &1673 xios_field_is_active("LWupTOAcleanclr")) &1674 swaerofree_diag=.TRUE.1675 1676 !--setting up dryaod_diag to TRUE in XIOS case1677 DO naero = 1, naero_tot-11678 IF (xios_field_is_active("dryod550_"//name_aero_tau(naero))) dryaod_diag=.TRUE.1679 ENDDO1680 !1681 !--setting up ok_4xCO2atm to TRUE in XIOS case1682 IF (xios_field_is_active("rsut4co2").OR.xios_field_is_active("rlut4co2").OR. &1683 xios_field_is_active("rsutcs4co2").OR.xios_field_is_active("rlutcs4co2").OR. &1684 xios_field_is_active("rsu4co2").OR.xios_field_is_active("rsucs4co2").OR. &1685 xios_field_is_active("rsd4co2").OR.xios_field_is_active("rsdcs4co2").OR. &1686 xios_field_is_active("rlu4co2").OR.xios_field_is_active("rlucs4co2").OR. &1687 xios_field_is_active("rld4co2").OR.xios_field_is_active("rldcs4co2")) &1688 ok_4xCO2atm=.TRUE.1689 1659 ! Need to put this initialisation after phyetat0 as in the coupled model the XIOS context is only 1690 1660 ! initialised at that moment … … 4848 4818 #endif 4849 4819 4820 ! On remet des variables a .false. apres un premier appel 4821 if (debut) then 4822 #ifdef CPP_XIOS 4823 swaero_diag=.FALSE. 4824 swaerofree_diag=.FALSE. 4825 dryaod_diag=.FALSE. 4826 ok_4xCO2atm= .FALSE. 4827 if (is_master) write (lunout,*)'ok_4xCO2atm= ',swaero_diag, swaerofree_diag, dryaod_diag, ok_4xCO2atm 4828 4829 !--setting up swaero_diag to TRUE in XIOS case 4830 IF (xios_field_is_active("topswad").OR.xios_field_is_active("topswad0").OR. & 4831 xios_field_is_active("solswad").OR.xios_field_is_active("solswad0").OR. & 4832 xios_field_is_active("topswai").OR.xios_field_is_active("solswai").OR. & 4833 (iflag_rrtm==1.AND.(xios_field_is_active("toplwad").OR.xios_field_is_active("toplwad0").OR. & 4834 xios_field_is_active("sollwad").OR.xios_field_is_active("sollwad0")))) & 4835 !!!--for now these fields are not in the XML files so they are omitted 4836 !!! xios_field_is_active("toplwai").OR.xios_field_is_active("sollwai") !))) & 4837 swaero_diag=.TRUE. 4838 4839 !--setting up swaerofree_diag to TRUE in XIOS case 4840 IF (xios_field_is_active("SWdnSFCcleanclr").OR.xios_field_is_active("SWupSFCcleanclr").OR. & 4841 xios_field_is_active("SWupTOAcleanclr").OR.xios_field_is_active("rsucsaf").OR. & 4842 xios_field_is_active("rsdcsaf") .OR. xios_field_is_active("LWdnSFCcleanclr").OR. & 4843 xios_field_is_active("LWupTOAcleanclr")) & 4844 swaerofree_diag=.TRUE. 4845 4846 !--setting up dryaod_diag to TRUE in XIOS case 4847 DO naero = 1, naero_tot-1 4848 IF (xios_field_is_active("dryod550_"//name_aero_tau(naero))) dryaod_diag=.TRUE. 4849 ENDDO 4850 ! 4851 !--setting up ok_4xCO2atm to TRUE in XIOS case 4852 IF (xios_field_is_active("rsut4co2").OR.xios_field_is_active("rlut4co2").OR. & 4853 xios_field_is_active("rsutcs4co2").OR.xios_field_is_active("rlutcs4co2").OR. & 4854 xios_field_is_active("rsu4co2").OR.xios_field_is_active("rsucs4co2").OR. & 4855 xios_field_is_active("rsd4co2").OR.xios_field_is_active("rsdcs4co2").OR. & 4856 xios_field_is_active("rlu4co2").OR.xios_field_is_active("rlucs4co2").OR. & 4857 xios_field_is_active("rld4co2").OR.xios_field_is_active("rldcs4co2")) & 4858 ok_4xCO2atm=.TRUE. 4859 if (is_master) write (lunout,*)'ok_4xCO2atm= ',swaero_diag, swaerofree_diag, dryaod_diag, ok_4xCO2atm 4860 #endif 4861 endif 4850 4862 4851 4863 !====================================================================
Note: See TracChangeset
for help on using the changeset viewer.
