Changeset 4143 for LMDZ6/trunk/libf/dyn3dmem/integrd_loc.F

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/dyn3dmem/integrd_loc.F (modified) (4 diffs)

LMDZ6/trunk/libf/dyn3dmem/integrd_loc.F

@@ -11 +11 @@
       USE write_field
       USE integrd_mod
-      USE infotrac, ONLY: ok_iso_verif ! ajout CRisi
       USE comconst_mod, ONLY: pi
       USE logic_mod, ONLY: leapf
@@ -347 +346 @@
 c$OMP BARRIER
 
-        if (ok_iso_verif) then
-           call check_isotopes(q,ijb,ije,'integrd 342')
-        endif !if (ok_iso_verif) then
+        call check_isotopes(q,ijb,ije,'integrd 342')
 
         !write(*,*) 'integrd 341'
@@ -355 +352 @@
         !write(*,*) 'integrd 343'
 
-        if (ok_iso_verif) then
-           call check_isotopes(q,ijb,ije,'integrd 346')
-        endif !if (ok_iso_verif) then
+        call check_isotopes(q,ijb,ije,'integrd 346')
 c
 c    .....  Calcul de la valeur moyenne, unique  aux poles pour  q .....
@@ -408 +403 @@
       ENDIF
 
-        if (ok_iso_verif) then
-           call check_isotopes(q,ijb,ije,'integrd 409')
-        endif !if (ok_iso_verif) then
+      call check_isotopes(q,ijb,ije,'integrd 409')
       
 ! Ehouarn: forget about finvmaold