Changeset 4389 for LMDZ6/trunk/libf/phylmdiso

Timestamp:

Jan 23, 2023, 11:28:51 AM (3 years 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.

Location:

LMDZ6/trunk/libf/phylmdiso

Files:

• phyetat0_mod.F90 (modified) (2 diffs)
• phyredem.F90 (modified) (4 diffs)
• physiq_mod.F90 (modified) (12 diffs)

LMDZ6/trunk/libf/phylmdiso/phyetat0_mod.F90

@@ -40 +40 @@
   USE geometry_mod,     ONLY: longitude_deg, latitude_deg
   USE iostart,          ONLY: close_startphy, get_field, get_var, open_startphy
-  USE infotrac_phy,     ONLY: nqtot, nbtr, type_trac, types_trac, tracers
+  USE infotrac_phy,     ONLY: nqtot, nbtr, type_trac, tracers
   USE readTracFiles_mod,ONLY: maxlen, new2oldH2O
   USE traclmdz_mod,     ONLY: traclmdz_from_restart
@@ -492 +492 @@
 
 !--OB now this is for co2i - ThL: and therefore also for inco
-  IF (ANY(types_trac == 'co2i') .OR. ANY(types_trac == 'inco')) THEN
+  IF (ANY(type_trac == ['co2i','inco'])) THEN
      IF (carbon_cycle_cpl) THEN
         ALLOCATE(co2_send(klon), stat=ierr)

LMDZ6/trunk/libf/phylmdiso/phyredem.F90

@@ -39 +39 @@
   USE iostart, ONLY: open_restartphy, close_restartphy, enddef_restartphy, put_field, put_var
   USE traclmdz_mod, ONLY : traclmdz_to_restart
-  USE infotrac_phy, ONLY: types_trac, nqtot, tracers, nbtr, niso
+  USE infotrac_phy, ONLY: type_trac, nqtot, tracers, nbtr, niso
 #ifdef ISO
 #ifdef ISOVERIF
@@ -176 +176 @@
     CALL put_field(pass,"FSIC", "fraction glace mer", pctsrf(:, is_sic))
 
-    IF(nbsrf>99) THEN
-      PRINT*, "Trop de sous-mailles";  CALL abort_physic("phyredem", "", 1)
-    END IF
-    IF(nsoilmx>99) THEN
-      PRINT*, "Trop de sous-surfaces"; CALL abort_physic("phyredem", "", 1)
-    END IF
-    IF(nsw>99) THEN
-      PRINT*, "Trop de bandes"; CALL abort_physic("phyredem", "", 1)
-    END IF
+    IF(nbsrf  >99) CALL abort_physic("phyredem", "Trop de sous-mailles", 1)
+    IF(nsoilmx>99) CALL abort_physic("phyredem", "Trop de sous-mailles", 1)
+    IF(nsw    >99) CALL abort_physic("phyredem", "Trop de bandes", 1)
 
 !    Surface variables 
@@ -350 +344 @@
 
 
-    IF (ANY(types_trac == 'co2i') .OR. ANY(types_trac == 'inco')) THEN
+    IF (ANY(type_trac == ['co2i','inco'])) THEN
        IF (carbon_cycle_cpl) THEN
           IF (.NOT. ALLOCATED(co2_send)) THEN
@@ -361 +355 @@
 
     ! trs from traclmdz_mod
-    ELSE IF (ANY(types_trac == 'lmdz')) THEN
+    ELSE IF (type_trac == 'lmdz') THEN
        CALL traclmdz_to_restart(trs)
        it = 0

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -39 +39 @@
     USE ioipsl_getin_p_mod, ONLY : getin_p
     USE indice_sol_mod
-    USE infotrac_phy, ONLY: nqtot, nbtr, nqo, tracers, types_trac
+    USE infotrac_phy, ONLY: nqtot, nbtr, nqo, tracers, type_trac
     USE readTracFiles_mod, ONLY: addPhase
     USE strings_mod,  ONLY: strIdx
@@ -1570 +1570 @@
        tau_overturning_th(:)=0.
 
-       IF (ANY(types_trac == 'inca') .OR. ANY(types_trac == 'inco')) THEN
+       IF (ANY(type_trac == ['inca','inco'])) THEN
           ! jg : initialisation jusqu'au ces variables sont dans restart
           ccm(:,:,:) = 0.
@@ -2187 +2187 @@
        !c         ENDDO
        !
-       IF (ANY(types_trac == 'inca') .OR. ANY(types_trac == 'inco')) THEN ! ModThL
+       IF (ANY(type_trac == ['inca','inco'])) THEN ! ModThL
 #ifdef INCA
           CALL VTe(VTphysiq)
@@ -2269 +2269 @@
        ENDIF
        !
-       IF (ANY(types_trac == 'repr')) THEN
+       IF (type_trac == 'repr') THEN
 #ifdef REPROBUS
           CALL chemini_rep(  &
@@ -2386 +2386 @@
 
     ! Update time and other variables in Reprobus
-    IF (ANY(types_trac == 'repr')) THEN
+    IF (type_trac == 'repr') THEN
 #ifdef REPROBUS
        CALL Init_chem_rep_xjour(jD_cur-jD_ref+day_ref)
@@ -3654 +3654 @@
           !
           !>jyg
-          IF (ANY(types_trac == 'repr')) THEN
+          IF (type_trac == 'repr') THEN
              nbtr_tmp=ntra
           ELSE
@@ -5191 +5191 @@
     ENDDO
 
-    IF (ANY(types_trac == 'inca') .OR. ANY(types_trac == 'inco')) THEN ! ModThL
+    IF (ANY(type_trac == ['inca','inco'])) THEN ! ModThL
 #ifdef INCA
        CALL VTe(VTphysiq)
@@ -5247 +5247 @@
 #endif
     ENDIF !type_trac = inca or inco
-    IF (ANY(types_trac == 'repr')) THEN
+    IF (type_trac == 'repr') THEN
 #ifdef REPROBUS
     !CALL chemtime_rep(itap+itau_phy-1, date0, dtime, itap)
@@ -6336 +6336 @@
     !
 
-    IF (ANY(types_trac=='repr')) THEN
+    IF (type_trac=='repr') THEN
 !MM pas d'impact, car on recupere q_seri,tr_seri,t_seri via phys_local_var_mod
 !MM                               dans Reprobus
@@ -6501 +6501 @@
 #endif
     !
-    IF (ANY(types_trac == 'inca') .OR. ANY(types_trac == 'inco')) THEN
+    IF (ANY(type_trac == ['inca','inco'])) THEN
 #ifdef INCA
        CALL VTe(VTphysiq)
@@ -6525 +6525 @@
     ENDIF
 
-    IF (ANY(types_trac == 'repr')) THEN
+    IF (type_trac == 'repr') THEN
 #ifdef REPROBUS
         CALL coord_hyb_rep(paprs, pplay, aps, bps, ap, bp, cell_area)
@@ -6901 +6901 @@
 
 #ifdef INCA
-       if (ANY(types_trac == 'inca' )) then 
+       if (type_trac == 'inca') then 
           IF (is_omp_master .and. grid_type==unstructured) THEN 
              CALL finalize_inca