Changeset 4143 for LMDZ6/trunk/libf/phylmd/infotrac_phy.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/phylmd/infotrac_phy.F90 (modified) (7 diffs)

LMDZ6/trunk/libf/phylmd/infotrac_phy.F90

@@ -27 +27 @@
    PUBLIC :: niso,    nzone,   nphas,   ntiso              !---  " " numbers + isotopes & tagging tracers number
    PUBLIC :: itZonIso                                      !--- iq = function(tagging zone idx, isotope idx)
-   PUBLIC :: iqTraPha                                      !--- idx of tagging tracer in iName = function(isotope idx, phase idx)
+   PUBLIC :: iqIsoPha                                      !--- idx of tagging tracer in iName = function(isotope idx, phase idx)
    PUBLIC :: isoCheck                                      !--- Run isotopes checking routines
    !=== FOR BOTH TRACERS AND ISOTOPES
    PUBLIC :: getKey                                        !--- Get a key from "tracers" or "isotope"
-
-   PUBLIC :: ntraciso, ntraceurs_zone, indnum_fn_num, use_iso, index_trac, iqiso
-   PUBLIC :: niso_possibles, ok_iso_verif
 
    INTERFACE isoSelect; MODULE PROCEDURE isoSelectByIndex, isoSelectByName; END INTERFACE isoSelect
@@ -96 +93 @@
 !  | zone   | nzone  | Geographic tagging zones   list + number         | / | ntraceurs_zone |                 |
 !  | phase  | nphas  | Phases                     list + number         |                    | [g][l][s], 1:3  |
-!  | iqTraPha        | Index in "qx"           = f(name(1:ntiso)),phas) | iqiso              | 1:nqtot         |
+!  | iqIsoPha        | Index in "qx"           = f(name(1:ntiso)),phas) | iqiso              | 1:nqtot         |
 !  | itZonIso        | Index in "trac(1:ntiso)"= f(zone, name(1:niso))  | index_trac         | 1:ntiso         |
 !  +-----------------+--------------------------------------------------+--------------------+-----------------+
@@ -126 +123 @@
                                              nphas, ntiso, &    !--- NUMBER OF PHASES AND ISOTOPES + ISOTOPIC TAGGING TRACERS
                                             itZonIso(:,:), &    !--- INDEX IN "isoTrac" AS f(tagging zone idx,  isotope idx)
-                                            iqTraPha(:,:)       !--- INDEX IN "qx"      AS f(isotopic tracer idx, phase idx)
-!$OMP THREADPRIVATE(isotope, ixIso,iH2O, isoCheck, isoKeys, isoName,isoZone,isoPhas, niso,nzone,nphas,ntiso, itZonIso,iqTraPha)
+                                            iqIsoPha(:,:)       !--- INDEX IN "qx"      AS f(isotopic tracer idx, phase idx)
+!$OMP THREADPRIVATE(isotope, ixIso,iH2O, isoCheck, isoKeys, isoName,isoZone,isoPhas, niso,nzone,nphas,ntiso, itZonIso,iqIsoPha)
 
    !=== VARIABLES FOR ISOTOPES INITIALIZATION AND FOR INCA
@@ -133 +130 @@
                                              pbl_flg(:)         !--- Boundary layer activation ; needed for INCA        (nbtr)
 !$OMP THREADPRIVATE(conv_flg, pbl_flg)
-
-   !--- Aliases for older names + quantities to be removed             (will be replaced by:)
-   INTEGER, POINTER, SAVE :: ntraciso, ntraceurs_zone           !--- -> ntiso, nzone
-!$OMP THREADPRIVATE         (ntraciso, ntraceurs_zone)   
-   INTEGER, POINTER, SAVE :: index_trac(:,:), iqiso(:,:)        !--- -> itZonIso, iqTraPha
-!$OMP THREADPRIVATE         (index_trac,      iqiso)
-   INTEGER, SAVE :: niso_possibles                              !--- suppressed (use effective niso instead)
-!$OMP THREADPRIVATE(niso_possibles)
-   LOGICAL, SAVE :: ok_iso_verif                                !--- -> isoCheck
-!$OMP THREADPRIVATE(ok_iso_verif)
-   LOGICAL, SAVE, ALLOCATABLE :: use_iso(:)                     !--- suppressed
-!$OMP THREADPRIVATE             (use_iso)
-   INTEGER, SAVE, ALLOCATABLE :: indnum_fn_num(:)
-!$OMP THREADPRIVATE             (indnum_fn_num)
 
 #ifdef CPP_StratAer
@@ -190 +173 @@
 
    !=== Determine selected isotopes class related quantities:
-   !    ixIso, isotope, niso,isoKeys, ntiso,isoName, nzone,isoZone, nphas,isoPhas, itZonIso, iqTraPha, isoCheck
+   !    ixIso, isotope, niso,isoKeys, ntiso,isoName, nzone,isoZone, nphas,isoPhas, itZonIso, iqIsoPha, isoCheck
    IF(.NOT.isoSelect('H2O')) iH2O = ixIso
    IF(prt_level > 1) THEN
@@ -221 +204 @@
    END IF
 #endif
-
-   !--- Isotopic quantities (to be removed soon)
-   ntraciso       => ntiso
-   ntraceurs_zone => nzone
-   iqiso          => iqTraPha
-   index_trac     => itZonIso
-   ok_iso_verif   = isoCheck
-   niso_possibles = SIZE(tnom_iso)
-   indnum_fn_num  = [(strIdx(isotope%keys(:)%name, tnom_iso(ixt)), ixt=1, niso_possibles)]
-   use_iso        = indnum_fn_num /= 0
 #ifdef ISOVERIF
    CALL msg('iso_iName = '//strStack(int2str(PACK(tracers(:)%iso_iName, MASK=tracers(:)%iso_iGroup==iH2O))), modname)
@@ -275 +248 @@
    isoPhas  => isotope%phase;    nphas    => isotope%nphas
    itZonIso => isotope%itZonIso; isoCheck => isotope%check
-   iqTraPha => isotope%iqTraPha
+   iqIsoPha => isotope%iqIsoPha
 END FUNCTION isoSelectByIndex
 !==============================================================================================================================