Changeset 4143 for LMDZ6/trunk/libf/dyn3d/dynetat0.F90

Timestamp:

May 9, 2022, 12:35:40 PM (2 years ago)

Author:

dcugnet

Message:

• Some variables are renamed or replaced by direct equivalents:
  • iso_indnum -> tracers(:)%iso_iName
  • niso_possibles -> niso
  • iqiso -> iqIsoPha ; index_trac -> itZonIso
  • ok_iso_verif -> isoCheck
  • ntraceurs_zone -> nzone ; ntraciso -> ntiso
  • qperemin -> min_qparent ; masseqmin -> min_qmass ; ratiomin -> min_ratio
• Some renamed variables are only aliased with the older name (using USE <module>, ONLY: <oldName> => <newName>) in routines where they are repeated many times.
• Few hard-coded indexes are now computed (examples: ilic, iso, ivap, irneb, iq_vap, iq_liq, iso_H2O, iso_HDO, iso_HTO, iso_O17, iso_O18).
• The IF(isoCheck) test is now embedded in the check_isotopes_seq and check_isotopes_loc routines (lighter calling).

File:

• LMDZ6/trunk/libf/dyn3d/dynetat0.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/dyn3d/dynetat0.F90

@@ -6 +6 @@
 ! Purpose: Initial state reading.
 !-------------------------------------------------------------------------------
-  USE infotrac,    ONLY: nqtot, tracers, niso, iqiso, iso_indnum, iso_num, tnat, alpha_ideal, iH2O
+  USE infotrac,    ONLY: nqtot, tracers, niso, iqIsoPha, tnat, alpha_ideal, iH2O
   USE strings_mod, ONLY: maxlen, msg, strStack, real2str
   USE netcdf,      ONLY: NF90_OPEN,  NF90_NOWRITE, NF90_INQ_VARID, &
@@ -145 +145 @@
 #endif
     ELSE IF(tracers(iq)%iso_iGroup == iH2O .AND. niso > 0) THEN                          !=== WATER ISOTOPES
-!     iName    = tracers(iq)%iso_iName  ! (next commit)
-      iName    = iso_num(iq)
+      iName    = tracers(iq)%iso_iName
       iPhase   = tracers(iq)%iso_iPhase
       iqParent = tracers(iq)%iqParent
@@ -154 +153 @@
       ELSE
          CALL msg('Tracer <'//TRIM(var)//'> is missing => initialized to its parent isotope concentration.', modname)
-         q(:,:,:,iq) = q(:,:,:,iqiso(iso_indnum(iq),iPhase))
+         q(:,:,:,iq) = q(:,:,:,iqIsoPha(iName,iPhase))
       END IF
     !--------------------------------------------------------------------------------------------------------------------------