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

LMDZ6/trunk/libf/phylmdiso/isotrac_mod.F90

@@ -4 +4 @@
 
 MODULE isotrac_mod
-use infotrac_phy, ONLY: niso,ntraciso,ntraceurs_zone
+use infotrac_phy, ONLY: niso,ntiso,ntraceurs_zone=>nzone
 use isotopes_mod, only: ridicule
 
@@ -120 +120 @@
         ! ces variables sont initialisées dans traceurs_init
         
-!integer ntraciso
-!parameter (ntraciso=(ntraceurs_zone+1)*niso) 
-!integer ntracisoOR ! défini dans traceurs_init
 integer, ALLOCATABLE, DIMENSION(:), save :: index_iso
 !$OMP THREADPRIVATE(index_iso)
 integer, ALLOCATABLE, DIMENSION(:), save ::  index_zone
 !$OMP THREADPRIVATE(index_zone)
-integer, ALLOCATABLE, DIMENSION(:,:), save ::  index_trac_loc ! il y a déjà un index_trac dans infotrac: vérifier que c'est le même
-!$OMP THREADPRIVATE(index_trac_loc)
+integer, ALLOCATABLE, DIMENSION(:,:), save ::  itZonIso_loc ! il y a déjà un itZonIso dans infotrac: vérifier que c'est le même
+!$OMP THREADPRIVATE(itZonIso_loc)
 character*3, ALLOCATABLE, DIMENSION(:), save :: strtrac
 !$OMP THREADPRIVATE(strtrac)
@@ -211 +208 @@
 
       use IOIPSL ! getin
-      USE infotrac_phy, ONLY: ntraciso,niso,ntraceurs_zone,index_trac
-      USE isotopes_mod, ONLY: iso_eau,ntracisoOR,initialisation_iso, &
-&               iso_eau_possible
+      USE infotrac_phy, ONLY: itZonIso
+      USE isotopes_mod, ONLY: iso_eau,ntracisoOR,initialisation_iso
       USE dimphy, only: klon,klev
 
@@ -244 +240 @@
 
         ! allouer
-        allocate (index_iso(ntraciso))
-        allocate (index_zone(ntraciso))
-        allocate (index_trac_loc(ntraceurs_zone,niso))
+        allocate (index_iso(ntiso))
+        allocate (index_zone(ntiso))
+        allocate (itZonIso_loc(ntraceurs_zone,niso))
         allocate (strtrac(ntraceurs_zone))
         allocate (bassin_map(klon))
@@ -779 +775 @@
 
           ! dans ce cas particulier, il y a des traceurs dans ORCHIDEE
-          ntracisoOR=ntraciso
+          ntracisoOR=ntiso
 
         else if ((option_traceurs.eq.17).or. &
@@ -990 +986 @@
             index_zone(itrac)=izone
             index_iso(itrac)=ixt
-            index_trac_loc(izone,ixt)=itrac
-            if (index_trac(izone,ixt).ne.index_trac_loc(izone,ixt)) then
+            itZonIso_loc(izone,ixt)=itrac
+            if (itZonIso(izone,ixt).ne.itZonIso_loc(izone,ixt)) then
                 write(*,*) 'isotrac 989: izone,ixt,itrac=',izone,ixt,itrac
                 CALL abort_physic ('isotrac','isotrac 989',1)
@@ -998 +994 @@
         enddo
 #ifdef ISOVERIF
-!        call iso_verif_egalite(float(itrac),float(ntraciso), &
+!        call iso_verif_egalite(float(itrac),float(ntiso), &
 !     &           'traceurs_init 50')
-        if (itrac.ne.ntraciso) then
+        if (itrac.ne.ntiso) then
           write(*,*) 'traceurs_init 50'
           stop
@@ -1006 +1002 @@
      
         write(*,*) 'traceurs_init 65: bilan de l''init:'
-        write(*,*) 'index_zone=',index_zone(1:ntraciso)
-        write(*,*) 'index_iso=',index_iso(1:ntraciso)
-        write(*,*) 'index_trac=',index_trac(1:ntraceurs_zone,1:niso)
+        write(*,*) 'index_zone=',index_zone(1:ntiso)
+        write(*,*) 'index_iso=',index_iso(1:ntiso)
+        write(*,*) 'itZonIso=',itZonIso(1:ntraceurs_zone,1:niso)
         do izone=1,ntraceurs_zone
           write(*,*) 'strtrac(',izone,')=',strtrac(izone)