Changeset 3240 for LMDZ6/branches
- Timestamp:
- Mar 6, 2018, 9:34:37 AM (7 years ago)
- Location:
- LMDZ6/branches/IPSLCM6.0.15
- Files:
-
- 2 edited
-
DefLists/file_def_histmth_lmdz.xml (modified) (2 diffs)
-
libf/phylmd/physiq_mod.F90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
LMDZ6/branches/IPSLCM6.0.15/DefLists/file_def_histmth_lmdz.xml
r3220 r3240 366 366 <field field_ref="z0m" level="10" /> 367 367 <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" /> 407 408 <field field_ref="od550aer" level="2" /> 408 409 <field field_ref="dryod550aer" level="2" /> … … 479 480 <field field_ref="f0_th" level="4" /> 480 481 <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" /> 485 486 <field field_ref="dqphy2d" level="2" /> 486 487 <field field_ref="dqlphy2d" level="2" /> -
LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/physiq_mod.F90
r3201 r3240 1652 1652 1653 1653 #ifdef CPP_XIOS 1654 !--setting up swaero_diag to TRUE in XIOS case1655 IF (xios_field_is_active("topswad").OR.xios_field_is_active("topswad0").OR. &1656 xios_field_is_active("solswad").OR.xios_field_is_active("solswad0").OR. &1657 xios_field_is_active("topswai").OR.xios_field_is_active("solswai").OR. &1658 (iflag_rrtm==1.AND.(xios_field_is_active("toplwad").OR.xios_field_is_active("toplwad0").OR. &1659 xios_field_is_active("sollwad").OR.xios_field_is_active("sollwad0")))) &1660 !!!--for now these fields are not in the XML files so they are omitted1661 !!! xios_field_is_active("toplwai").OR.xios_field_is_active("sollwai") !))) &1662 swaero_diag=.TRUE.1663 1664 !--setting up swaerofree_diag to TRUE in XIOS case1665 IF (xios_field_is_active("SWdnSFCcleanclr").OR.xios_field_is_active("SWupSFCcleanclr").OR. &1666 xios_field_is_active("SWupTOAcleanclr").OR.xios_field_is_active("rsucsaf").OR. &1667 xios_field_is_active("rsdcsaf") .OR. xios_field_is_active("LWdnSFCcleanclr").OR. &1668 xios_field_is_active("LWupTOAcleanclr")) &1669 swaerofree_diag=.TRUE.1670 1671 !--setting up dryaod_diag to TRUE in XIOS case1672 DO naero = 1, naero_tot-11673 IF (xios_field_is_active("dryod550_"//name_aero_tau(naero))) dryaod_diag=.TRUE.1674 ENDDO1675 !1676 !--setting up ok_4xCO2atm to TRUE in XIOS case1677 IF (xios_field_is_active("rsut4co2").OR.xios_field_is_active("rlut4co2").OR. &1678 xios_field_is_active("rsutcs4co2").OR.xios_field_is_active("rlutcs4co2").OR. &1679 xios_field_is_active("rsu4co2").OR.xios_field_is_active("rsucs4co2").OR. &1680 xios_field_is_active("rsd4co2").OR.xios_field_is_active("rsdcs4co2").OR. &1681 xios_field_is_active("rlu4co2").OR.xios_field_is_active("rlucs4co2").OR. &1682 xios_field_is_active("rld4co2").OR.xios_field_is_active("rldcs4co2")) &1683 ok_4xCO2atm=.TRUE.1684 1654 ! Need to put this initialisation after phyetat0 as in the coupled model the XIOS context is only 1685 1655 ! initialised at that moment … … 4830 4800 #endif 4831 4801 4802 ! On remet des variables a .false. apres un premier appel 4803 if (debut) then 4804 #ifdef CPP_XIOS 4805 swaero_diag=.FALSE. 4806 swaerofree_diag=.FALSE. 4807 dryaod_diag=.FALSE. 4808 ok_4xCO2atm= .FALSE. 4809 if (is_master) write (lunout,*)'ok_4xCO2atm= ',swaero_diag, swaerofree_diag, dryaod_diag, ok_4xCO2atm 4810 4811 !--setting up swaero_diag to TRUE in XIOS case 4812 IF (xios_field_is_active("topswad").OR.xios_field_is_active("topswad0").OR. & 4813 xios_field_is_active("solswad").OR.xios_field_is_active("solswad0").OR. & 4814 xios_field_is_active("topswai").OR.xios_field_is_active("solswai").OR. & 4815 (iflag_rrtm==1.AND.(xios_field_is_active("toplwad").OR.xios_field_is_active("toplwad0").OR. & 4816 xios_field_is_active("sollwad").OR.xios_field_is_active("sollwad0")))) & 4817 !!!--for now these fields are not in the XML files so they are omitted 4818 !!! xios_field_is_active("toplwai").OR.xios_field_is_active("sollwai") !))) & 4819 swaero_diag=.TRUE. 4820 4821 !--setting up swaerofree_diag to TRUE in XIOS case 4822 IF (xios_field_is_active("SWdnSFCcleanclr").OR.xios_field_is_active("SWupSFCcleanclr").OR. & 4823 xios_field_is_active("SWupTOAcleanclr").OR.xios_field_is_active("rsucsaf").OR. & 4824 xios_field_is_active("rsdcsaf") .OR. xios_field_is_active("LWdnSFCcleanclr").OR. & 4825 xios_field_is_active("LWupTOAcleanclr")) & 4826 swaerofree_diag=.TRUE. 4827 4828 !--setting up dryaod_diag to TRUE in XIOS case 4829 DO naero = 1, naero_tot-1 4830 IF (xios_field_is_active("dryod550_"//name_aero_tau(naero))) dryaod_diag=.TRUE. 4831 ENDDO 4832 ! 4833 !--setting up ok_4xCO2atm to TRUE in XIOS case 4834 IF (xios_field_is_active("rsut4co2").OR.xios_field_is_active("rlut4co2").OR. & 4835 xios_field_is_active("rsutcs4co2").OR.xios_field_is_active("rlutcs4co2").OR. & 4836 xios_field_is_active("rsu4co2").OR.xios_field_is_active("rsucs4co2").OR. & 4837 xios_field_is_active("rsd4co2").OR.xios_field_is_active("rsdcs4co2").OR. & 4838 xios_field_is_active("rlu4co2").OR.xios_field_is_active("rlucs4co2").OR. & 4839 xios_field_is_active("rld4co2").OR.xios_field_is_active("rldcs4co2")) & 4840 ok_4xCO2atm=.TRUE. 4841 if (is_master) write (lunout,*)'ok_4xCO2atm= ',swaero_diag, swaerofree_diag, dryaod_diag, ok_4xCO2atm 4842 #endif 4843 endif 4832 4844 4833 4845 !====================================================================
Note: See TracChangeset
for help on using the changeset viewer.
