Changeset 4050 for LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.F90

Timestamp:

Dec 23, 2021, 6:54:17 PM (2 years ago)

Author:

dcugnet

Message:

Second commit for new tracers.

• include most of the keys in the tracers descriptor vector "tracers(:)".
• fix in phylmdiso/cv3_routines: fq_* variables were used where their fxt_* counterparts were expected.
• multiple IF(nqdesc(iq)>0) and IF(nqfils(iq)>0) tests suppressed, because they are not needed: "do ... enddo" loops with 0 upper bound are not executed.
• remove French accents from comments (encoding problem) in phylmdiso/cv3_routines and phylmdiso/cv30_routines.
• modifications in "isotopes_verif_mod", where the call to function "iso_verif_tag17_q_deltad_chn" in "iso_verif_tag17_q_deltad_chn" was not detected at linking stage, although defined in the same module (?).

File:

• LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.F90

@@ -7 +7 @@
 !-------------------------------------------------------------------------------
   USE parallel_lmdz
-  USE infotrac
+  USE infotrac,    ONLY: nqtot, tracers, iqiso, iso_indnum, tnat, alpha_ideal, ok_isotopes, maxlen
   USE netcdf, ONLY: NF90_OPEN,  NF90_INQUIRE_DIMENSION, NF90_INQ_VARID,        &
       NF90_NOWRITE, NF90_CLOSE, NF90_INQUIRE_VARIABLE,  NF90_GET_VAR, NF90_NoErr
   USE control_mod, ONLY: planet_type
-  USE strings_mod, ONLY: maxlen
   USE assert_eq_m, ONLY: assert_eq
   USE comvert_mod, ONLY: pa,preff
@@ -42 +41 @@
   CHARACTER(LEN=maxlen) :: msg, var, modname
   INTEGER, PARAMETER :: length=100
-  INTEGER :: iq, fID, vID, idecal, ierr
+  INTEGER :: iq, fID, vID, idecal, ierr, iqParent, iName, iZone, iPhase
   REAL    :: time, tab_cntrl(length)               !--- RUN PARAMS TABLE
   REAL,             ALLOCATABLE :: vcov_glo(:,:),masse_glo(:,:),   ps_glo(:)
@@ -174 +173 @@
    !--- CRisi: for isotops, theoretical initialization using very simplified
    !           Rayleigh distillation las.
-    IF(ok_isotopes.AND.iso_num(iq)>0) THEN
-      IF(zone_num(iq)==0) q(:,:,iq)=q(:,:,iqpere(iq))*tnat(iso_num(iq))        &
-     &           *(q(:,:,iqpere(iq))/30.e-3)**(alpha_ideal(iso_num(iq))-1)
-      IF(zone_num(iq)==1) q(:,:,iq)=q(:,:,iqiso(iso_indnum(iq),phase_num(iq)))
+    iName = tracers(iq)%iso_iName
+    iZone = tracers(iq)%iso_iZone
+    iPhase= tracers(iq)%iso_iPhase
+    iqParent = tracers(iq)%iqParent
+    IF(ok_isotopes .AND. iName>0) THEN
+      IF(iZone==0) q(:,:,iq) = q(:,:,iqParent)*tnat(iName)    &
+     &           *(q(:,:,iqParent)/30.e-3)**(alpha_ideal(iName)-1.)
+      IF(iZone==1) q(:,:,iq) = q(:,:,iqiso(iso_indnum(iq),iPhase))
     END IF
   END DO