Changeset 3991 for LMDZ6/branches

Timestamp:

Oct 13, 2021, 4:51:21 PM (3 years ago)

Author:

dcugnet

Message:

• fixed a bug in dynetat0[_loc].F90 for old style tracers description files having more water tracers than the initial state file.
• changes (mainly cosmetic) to make dynetat0 and dynetat0_loc more similar.
• fix a bug in readTracFiles_mod for tagging tracers.

Location:

LMDZ6/branches/LMDZ-tracers/libf

Files:

• dyn3d/dynetat0.F90 (modified) (4 diffs)
• dyn3dmem/dynetat0_loc.F90 (modified) (2 diffs)
• misc/readTracFiles_mod.f90 (modified) (1 diff)

LMDZ6/branches/LMDZ-tracers/libf/dyn3d/dynetat0.F90

@@ -6 +6 @@
 ! Purpose: Initial state reading.
 !-------------------------------------------------------------------------------
-  USE readTracFiles_mod, ONLY: known_phases, old_phases, nphases, phases_sep
   USE infotrac,    ONLY: nqtot, niso, tracers, iTraPha, tnat, alpha_ideal, tra
   USE netcdf,      ONLY: NF90_OPEN,  NF90_NOWRITE, NF90_INQ_VARID, NF90_NoErr, &
                          NF90_CLOSE, NF90_GET_VAR
-  USE strings_mod, ONLY: strIdx
   USE control_mod, ONLY: planet_type
   USE assert_eq_m, ONLY: assert_eq
@@ -19 +17 @@
   USE temps_mod, ONLY: annee_ref, day_ini, day_ref, itau_dyn, start_time
   USE ener_mod,  ONLY: etot0, ptot0, ztot0, stot0, ang0
+  USE strings_mod, ONLY: strIdx
+  USE readTracFiles_mod, ONLY: known_phases, old_phases, nphases, phases_sep
 
   IMPLICIT NONE
@@ -120 +120 @@
   END IF
   CALL err(NF90_GET_VAR(fID,vID,time),"get",var)
-  CALL get_var2("phisinit", phis)
+  CALL get_var3("vcov",     vcov)
   CALL get_var3("ucov",     ucov)
-  CALL get_var3("vcov",     vcov)
   CALL get_var3("teta",     teta)
   CALL get_var3("masse",   masse)
+  CALL get_var2("phisinit", phis)
   CALL get_var2("ps",         ps)
 
@@ -132 +132 @@
     var = tr%name
     ix = strIdx([('H2O'//phases_sep//known_phases(ip:ip), ip=1, nphases)], var)
-    IF(NF90_INQ_VARID(fID, var, vID) == NF90_NoErr) THEN
+    oldH2O = '***'; IF(ix/=0) oldH2O = 'H2O'//old_phases(ix:ix)
+    !------------------------------------------------------------------------------------------------------------------
+    IF(NF90_INQ_VARID(fID, var, vID) == NF90_NoErr) THEN                                 !=== REGULAR CASE
       CALL get_var3(var, q(:,:,:,iq))
+    !------------------------------------------------------------------------------------------------------------------
 #ifdef INCA
-    ELSE IF(NF90_INQ_VARID(fID, 'OX', vID) == NF90_NoErr .AND. var == 'O3') THEN
+    ELSE IF(NF90_INQ_VARID(fID, 'OX',   vID) == NF90_NoErr .AND. var == 'O3') THEN       !=== INCA: OX INSTEAD OF O3
       WRITE(lunout,*)TRIM(modname)//': Tracer <O3> is missing => initialized to OX'
       CALL get_var3('OX', q(:,:,:,iq))
 #endif
-    ELSE IF(ix /= 0) THEN              !--- Old file, water: H2Ov/l/i instead of H2O_g/_l/_s
-      oldH2O = 'H2O'//old_phases(ix:ix)
-      IF(NF90_INQ_VARID(fID, oldH2O, vID) == NF90_NoErr) THEN
-        WRITE(lunout,*)TRIM(modname)//': Tracer <'//TRIM(var)//'> is missing => initialized to '//TRIM(oldH2O)
-        CALL get_var3(oldH2O, q(:,:,:,iq))
+    !------------------------------------------------------------------------------------------------------------------
+    ELSE IF(NF90_INQ_VARID(fID, oldH2O, vID) == NF90_NoErr .AND. ix  /= 0   ) THEN       !=== OLD WATER PHASES
+      WRITE(lunout,*)TRIM(modname)//': Tracer <'//TRIM(var)//'> is missing => initialized to '//TRIM(oldH2O)
+      CALL get_var3(oldH2O, q(:,:,:,iq))
+    !------------------------------------------------------------------------------------------------------------------
+    ELSE IF(niso > 0 .AND. tr%iso_num > 0) THEN                                          !=== ISOTOPES, CRisi
+      IF(tr%iso_zon == 0) THEN
+        WRITE(lunout,*)TRIM(modname)//': Isotope <'//TRIM(var)//'> is missing => initialized with a' &
+          //' simplified Rayleigh distillation law'
+        q(:,:,:,iq) = q(:,:,:,tr%iprnt)         *        tnat(tr%iso_num) &
+                  *(q(:,:,:,tr%iprnt)/30.e-3)**(alpha_ideal(tr%iso_num)-1)
+      ELSE
+        WRITE(lunout,*)TRIM(modname)//': Isotope geographical tracer <'//TRIM(var)//'> is missing '  &
+          //'=> initialized its parent isotope concentration'
+        q(:,:,:,iq) = q(:,:,:,iTraPha(tr%iso_num,tr%iso_pha))
       END IF
-    ELSE
+    !------------------------------------------------------------------------------------------------------------------
+    ELSE                                                                                 !=== MISSING: SET TO 0
       WRITE(lunout,*)TRIM(modname)//': Tracer <'//TRIM(var)//'> is missing => initialized to zero'
       q(:,:,:,iq)=0.
-      !--- CRisi: for isotopes, theoretical initialization using very simplified Rayleigh distillation law
-      IF(niso > 0 .AND. tr%iso_num > 0) THEN
-        IF(tr%iso_zon == 0) q(:,:,:,iq) = q(:,:,:,tr%iprnt)         *        tnat(tr%iso_num)  &
-                                        *(q(:,:,:,tr%iprnt)/30.e-3)**(alpha_ideal(tr%iso_num)-1)
-        IF(tr%iso_zon == 1) q(:,:,:,iq) = q(:,:,:,iTraPha(tr%iso_num,tr%iso_pha))
-      END IF
     END IF
+    !------------------------------------------------------------------------------------------------------------------
   END DO
   CALL err(NF90_CLOSE(fID),"close",fichnom)

LMDZ6/branches/LMDZ-tracers/libf/dyn3dmem/dynetat0_loc.F90

@@ -14 +14 @@
   USE assert_eq_m, ONLY: assert_eq
   USE comvert_mod, ONLY: pa,preff
-  USE comconst_mod, ONLY: cpp, daysec, dtvr, g, im, jm, kappa, lllm, &
-                          omeg, rad
+  USE comconst_mod, ONLY: cpp, daysec, dtvr, g, im, jm, kappa, lllm, omeg, rad
   USE logic_mod, ONLY: fxyhypb, ysinus
   USE serre_mod, ONLY: clon, clat, grossismx, grossismy
-  USE temps_mod, ONLY: annee_ref,day_ref,itau_dyn, &
-                       start_time,day_ini
-  USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
+  USE temps_mod, ONLY: annee_ref, day_ini, day_ref, itau_dyn, start_time
+  USE ener_mod,  ONLY: etot0, ptot0, ztot0, stot0, ang0
   USE strings_mod, ONLY: strIdx
   USE readTracFiles_mod, ONLY: known_phases, old_phases, nphases, phases_sep
@@ -139 +137 @@
     var = tr%name
     ix = strIdx([('H2O'//phases_sep//known_phases(ip:ip), ip=1, nphases)], var)
-    IF(NF90_INQ_VARID(fID, var, vID) == NF90_NoErr) THEN
+    oldH2O = '***'; IF(ix/=0) oldH2O = 'H2O'//old_phases(ix:ix)
+    !------------------------------------------------------------------------------------------------------------------
+    IF(NF90_INQ_VARID(fID, var, vID) == NF90_NoErr) THEN                                 !=== REGULAR CASE
       CALL get_var2(var, q(ib:ie,:,iq), ib, ie, nglo)
+    !------------------------------------------------------------------------------------------------------------------
 #ifdef INCA
-    ELSE IF(NF90_INQ_VARID(fID, 'OX', vID) == NF90_NoErr .AND. var == 'O3') THEN
+    ELSE IF(NF90_INQ_VARID(fID, 'OX',   vID) == NF90_NoErr .AND. var == 'O3') THEN       !=== INCA: OX INSTEAD OF O3
       WRITE(lunout,*)TRIM(modname)//': Tracer <O3> is missing => initialized to OX'
       CALL get_var2('OX', q(ib:ie,:,iq), ib, ie, nglo)
 #endif
-    ELSE IF(ix /= 0) THEN              !--- Old file, water: H2Ov/l/i instead of H2O-g/-l/-s
-      oldH2O = 'H2O'//old_phases(ix:ix)
-      IF(NF90_INQ_VARID(fID, oldH2O, vID) == NF90_NoErr) THEN
-        WRITE(lunout,*)TRIM(modname)//': Tracer <'//TRIM(var)//'> is missing => initialized to '//TRIM(oldH2O)
-        CALL get_var2(oldH2O, q(ib:ie,:,iq), ib, ie, nglo)
+    !------------------------------------------------------------------------------------------------------------------
+    ELSE IF(NF90_INQ_VARID(fID, oldH2O, vID) == NF90_NoErr .AND. ix  /= 0   ) THEN       !=== OLD WATER PHASES
+      WRITE(lunout,*)TRIM(modname)//': Tracer <'//TRIM(var)//'> is missing => initialized to '//TRIM(oldH2O)
+      CALL get_var2(oldH2O, q(ib:ie,:,iq), ib, ie, nglo)
+    !------------------------------------------------------------------------------------------------------------------
+    ELSE IF(niso > 0 .AND. tr%iso_num > 0) THEN                                          !=== ISOTOPES, CRisi
+      IF(tr%iso_zon == 0) THEN
+        WRITE(lunout,*)TRIM(modname)//': Isotope <'//TRIM(var)//'> is missing => initialized with a' &
+          //' simplified Rayleigh distillation law'
+        q(:,:,iq) = q(:,:,tr%iprnt)         *        tnat(tr%iso_num) &
+                  *(q(:,:,tr%iprnt)/30.e-3)**(alpha_ideal(tr%iso_num)-1)
+      ELSE
+        WRITE(lunout,*)TRIM(modname)//': Isotope geographical tracer <'//TRIM(var)//'> is missing '  &
+          //'=> initialized its parent isotope concentration'
+        q(:,:,iq) = q(:,:,iTraPha(tr%iso_num,tr%iso_pha))
       END IF
-    ELSE
+    !------------------------------------------------------------------------------------------------------------------
+    ELSE                                                                                 !=== MISSING: SET TO 0
       WRITE(lunout,*)TRIM(modname)//': Tracer <'//TRIM(var)//'> is missing => initialized to zero'
       q(ib:ie,:,iq)=0.
-      !--- CRisi: for isotopes, theoretical initialization using very simplified Rayleigh distillation law
-      IF(niso > 0 .AND. tr%iso_num > 0) THEN
-        IF(tr%iso_zon == 0) q(:,:,iq) = q(:,:,tr%iprnt)         *        tnat(tr%iso_num) &
-                                      *(q(:,:,tr%iprnt)/30.e-3)**(alpha_ideal(tr%iso_num)-1)
-        IF(tr%iso_zon == 1) q(:,:,iq) = q(:,:,iTraPha(tr%iso_num,tr%iso_pha))
-      END IF
     END IF
+    !------------------------------------------------------------------------------------------------------------------
   END DO
   CALL err(NF90_CLOSE(fID),"close",fichnom)

LMDZ6/branches/LMDZ-tracers/libf/misc/readTracFiles_mod.f90

@@ -927 +927 @@
     !=== Geographic tagging tracers descending on tracer "iname": mask, names, number
     ll = t(:)%type=='tag'    .AND. delPhase(t(:)%nam1) == iname .AND. t(:)%igen == 3
-    s%zone = PACK(strTail(t(:)%name,'_'), MASK = ll)                 !--- Tagging zones names  for isotopes category "iname"
+    s%zone = PACK(strTail(t(:)%name,'_',lFirst=.TRUE.), MASK = ll)   !--- Tagging zones names  for isotopes category "iname"
     CALL strReduce(s%zone)
     s%nzon = SIZE(s%zone)                                            !--- Tagging zones number for isotopes category "iname"