Changeset 4389 for LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90

Timestamp:

Jan 23, 2023, 11:28:51 AM (17 months ago)

Author:

dcugnet

Message:

• revert to original "type_trac" management:
  • 4 characters keyword (lmdz, Inca, repr, co2i, into, aeNP, coag
  • no longer a list of component with "|" separator
  • the parsed (with "|" separator) version "types_trac" is no longer used
  • the sole routine using a list of component is readTracFiles
• fix for INCA and CO2Aer modes: setGeneration is now a function, index corrections for had/vadv.

File:

• LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90 (modified) (15 diffs)

LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90

@@ -25 +25 @@
 
     USE dimphy, ONLY: klon, klev, klevp1
-    USE infotrac_phy, ONLY: nbtr, nqtot, nqo, type_trac, types_trac, tracers, niso, ntiso
+    USE infotrac_phy, ONLY: nbtr, nqtot, nqo, type_trac, tracers, niso, ntiso
     USE strings_mod,  ONLY: maxlen
     USE mod_phys_lmdz_para, ONLY: is_north_pole_phy,is_south_pole_phy
@@ -943 +943 @@
        CALL histwrite_phy(o_SWupTOAclr, zx_tmp_fi2d)
 
-       IF (ALL(types_trac/='inca') .OR. config_inca=='aeNP') THEN 
+       IF (type_trac/='inca' .OR. config_inca=='aeNP') THEN 
           IF (vars_defined) THEN
              zx_tmp_fi2d(:) = swupc0(:,klevp1)*swradcorr(:)
@@ -1015 +1015 @@
        CALL histwrite_phy(o_SWupSFCclr, zx_tmp_fi2d)
 
-       IF (ALL(types_trac/='inca') .OR. config_inca=='aeNP') THEN 
+       IF (type_trac/='inca' .OR. config_inca=='aeNP') THEN 
           IF (vars_defined) THEN
              zx_tmp_fi2d(:) = swupc0(:,1)*swradcorr(:)
@@ -1032 +1032 @@
        CALL histwrite_phy(o_SWdnSFCclr, zx_tmp_fi2d)
 
-       IF (ALL(types_trac/='inca') .OR. config_inca=='aeNP') THEN 
+       IF (type_trac/='inca' .OR. config_inca=='aeNP') THEN 
           IF (vars_defined) THEN
              zx_tmp_fi2d(:) = swdnc0(:,1)*swradcorr(:)
@@ -1054 +1054 @@
        CALL histwrite_phy(o_LWdnSFCclr, sollwdownclr)
 
-       IF (ALL(types_trac/='inca') .OR. config_inca=='aeNP') THEN 
+       IF (type_trac/='inca' .OR. config_inca=='aeNP') THEN 
           IF (vars_defined) THEN
              zx_tmp_fi2d(:) = lwupc0(:,klevp1)
@@ -1061 +1061 @@
        ENDIF
 
-       IF (ALL(types_trac/='inca') .OR. config_inca=='aeNP') THEN 
+       IF (type_trac/='inca' .OR. config_inca=='aeNP') THEN 
           IF (vars_defined) THEN
              zx_tmp_fi2d(:) = -1.*lwdnc0(:,1)
@@ -1570 +1570 @@
 !This is warranted by treating INCA aerosols as offline aerosols
        IF (flag_aerosol.GT.0) THEN
-          IF (ALL(types_trac/='inca') .OR. config_inca=='aeNP') THEN 
+          IF (type_trac/='inca' .OR. config_inca=='aeNP') THEN 
 
              CALL histwrite_phy(o_od443aer, od443aer)
@@ -1634 +1634 @@
 
 #ifdef CPP_StratAer
-       IF (ANY(types_trac=='coag')) THEN
+       IF (type_trac=='coag') THEN
           CALL histwrite_phy(o_R2SO4, R2SO4)
           CALL histwrite_phy(o_OCS_lifetime, OCS_lifetime)
@@ -1693 +1693 @@
           CALL histwrite_phy(o_solswad0, zx_tmp_fi2d)
           
-          IF (ALL(types_trac/='inca') .OR. config_inca=='aeNP') THEN 
+          IF (type_trac/='inca' .OR. config_inca=='aeNP') THEN 
 
              CALL histwrite_phy(o_toplwad, toplwad_aero)
@@ -1770 +1770 @@
        ! Champs 3D:
        IF (ok_ade .OR. ok_aie) then
-          IF (ALL(types_trac/='inca') .OR. config_inca=='aeNP') THEN 
+          IF (type_trac/='inca' .OR. config_inca=='aeNP') THEN 
              CALL histwrite_phy(o_ec550aer, ec550aer)
           ENDIF
@@ -2229 +2229 @@
        CALL histwrite_phy(o_rsucs, zx_tmp_fi3d1)
 
-       IF (ALL(types_trac/='inca') .OR. config_inca=='aeNP') THEN 
+       IF (type_trac/='inca' .OR. config_inca=='aeNP') THEN 
           IF (vars_defined) THEN
              DO k=1, klevp1
@@ -2245 +2245 @@
        CALL histwrite_phy(o_rsdcs, zx_tmp_fi3d1)
 
-       IF (ALL(types_trac/='inca') .OR. config_inca=='aeNP') THEN 
+       IF (type_trac/='inca' .OR. config_inca=='aeNP') THEN 
           IF (vars_defined) THEN
              DO k=1, klevp1
@@ -2491 +2491 @@
        IF (iflag_phytrac == 1 ) then
 !
-         IF (ANY(types_trac == 'co2i')) THEN
+         IF (type_trac == 'co2i') THEN
            itr = 0
            DO iq = 1, nqtot
@@ -2520 +2520 @@
            CALL histwrite_phy(o_flx_co2_bb,    fco2_bb)
 
-         ELSE IF (ANY(types_trac == 'inco')) THEN
+         ELSE IF (type_trac == 'inco') THEN
            itr = 0
            DO iq = 1, nqtot
@@ -2549 +2549 @@
            CALL histwrite_phy(o_flx_co2_bb,    fco2_bb)
 
-         ELSE IF (ANY(type_trac==['lmdz|coag','lmdz     ','coag     '])) THEN
+         ELSE IF (ANY(type_trac==['lmdz','coag'])) THEN
            itr = 0
            DO iq = 1, nqtot