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

LMDZ6/trunk/libf/phylmdiso/cv30_routines.F90

@@ -165 +165 @@
     )
 #ifdef ISO
-    USE infotrac_phy, ONLY: ntraciso    
+    USE infotrac_phy, ONLY: ntraciso=>ntiso
 #endif
   IMPLICIT NONE
@@ -370 +370 @@
 
 #ifdef ISO
-USE infotrac_phy, ONLY: ntraciso
+USE infotrac_phy, ONLY: ntraciso=>ntiso
 USE isotopes_mod, ONLY: pxtmelt,pxtice,pxtmin,pxtmax,cond_temp_env, &
         iso_eau,iso_HDO, ridicule
@@ -947 +947 @@
   USE print_control_mod, ONLY: lunout
 #ifdef ISO
-    use infotrac_phy, ONLY: ntraciso
+    use infotrac_phy, ONLY: ntraciso=>ntiso
     use isotopes_mod, ONLY: essai_convergence, iso_eau,iso_HDO
 #ifdef ISOVERIF
@@ -1133 +1133 @@
     ! epmax_cape: ajout arguments
 #ifdef ISO
-use infotrac_phy, ONLY: ntraciso
+use infotrac_phy, ONLY: ntraciso=>ntiso
 USE isotopes_mod, ONLY: pxtmelt,pxtice,pxtmin,pxtmax,cond_temp_env, iso_eau,iso_HDO
 USE isotopes_routines_mod, ONLY: condiso_liq_ice_vectall
@@ -1828 +1828 @@
 
 #ifdef ISO
-use infotrac_phy, ONLY: ntraciso,niso,index_trac
+use infotrac_phy, ONLY: ntraciso=>ntiso,niso,itZonIso
 USE isotopes_mod, ONLY: pxtmelt,pxtice,pxtmin,pxtmax, iso_eau,iso_HDO, &
         ridicule
@@ -2616 +2616 @@
         call iso_verif_traceur(xtclw(1,il,im), &
      &          'condiso_liq_ice_vectiso_trac 358')
-        if (iso_verif_positif_nostop(xtclw(index_trac( &
+        if (iso_verif_positif_nostop(xtclw(itZonIso( &
      &           izone_cond,iso_eau),i,k)-xtclw(iso_eau,i,k) &
      &           ,'cv30_routines 909').eq.1) then
@@ -2624 +2624 @@
      &             niso,ntraciso,index_zone,izone_cond       
                stop
-         endif !if (iso_verif_positif_nostop(xtclw(index_trac(
+         endif !if (iso_verif_positif_nostop(xtclw(itZonIso(
 #endif             
          enddo !do il = 1, ncum   
@@ -2647 +2647 @@
      &          )
 #ifdef ISO
-    use infotrac_phy, ONLY: ntraciso
+    use infotrac_phy, ONLY: ntraciso=>ntiso
     use isotopes_mod, ONLY: essai_convergence, iso_eau,iso_HDO,ridicule
     use isotopes_routines_mod, ONLY: appel_stewart_vectall
@@ -2659 +2659 @@
 #ifdef ISOTRAC
     use isotrac_mod, only: option_cond,izone_cond
-    use infotrac_phy, ONLY: index_trac
+    use infotrac_phy, ONLY: itZonIso
 #ifdef ISOVERIF
     use isotopes_verif_mod, ONLY: iso_verif_traceur_justmass, &
@@ -2938 +2938 @@
            ! on verifie que tout le detrainement est tagge condensat
            if (iso_verif_positif_nostop( &
-     &          xtwdtrain(index_trac(izone_cond,iso_eau),il) &
+     &          xtwdtrain(itZonIso(izone_cond,iso_eau),il) &
      &          -xtwdtrain(iso_eau,il), &
      &          'cv30_routines 2795').eq.1) then
@@ -3200 +3200 @@
 !        if (option_tmin.ge.1) then
 !           call iso_verif_positif(xtwater(
-!     :           index_trac(izone_cond,iso_eau),il,i+1)
+!     :           itZonIso(izone_cond,iso_eau),il,i+1)
 !     :           -xtwater(iso_eau,il,i+1),
 !     :          'cv30_routines 3083')
@@ -3259 +3259 @@
 !        if (option_tmin.ge.1) then
 !         call iso_verif_positif(xtwater(
-!     :           index_trac(izone_cond,iso_eau),il,i)
+!     :           itZonIso(izone_cond,iso_eau),il,i)
 !     :           -xtwater(iso_eau,il,i),
 !     :          'cv30_routines 3143')
@@ -3369 +3369 @@
      &                    )
 #ifdef ISO
-    use infotrac_phy, ONLY: ntraciso,niso, &
-&       ntraceurs_zone,index_trac
+    use infotrac_phy, ONLY: ntraciso=>ntiso, niso, nzone, itZonIso
     use isotopes_mod, ONLY: essai_convergence,ridicule,iso_eau,iso_HDO,iso_O18
 #ifdef ISOVERIF
@@ -5003 +5002 @@
           do iiso = 1, niso
              
-             ixt_ddft=index_trac(izone_ddft,iiso)  
+             ixt_ddft=itZonIso(izone_ddft,iiso)  
              if (mp(il,i).gt.mp(il,i+1)) then
                 fxtYe(iiso)=0.01*grav*dpinv*mp(il,i) &
@@ -5016 +5015 @@
      &              -mp(il,i)*(xtp(iiso,il,i)-xt(iiso,il,i-1))) 
         
-             ixt_poubelle=index_trac(izone_poubelle,iiso)
+             ixt_poubelle=itZonIso(izone_poubelle,iiso)
              fxt(ixt_ddft,il,i)=fxt(ixt_ddft,il,i)+fxtYe(iiso)
              fxt(ixt_poubelle,il,i)=fxt(ixt_poubelle,il,i) &
@@ -5033 +5032 @@
      &              -mp(il,i)*(xtp(iiso,il,i)-xt(iiso,il,i-1)))
 
-                ixt_ddft=index_trac(izone_ddft,iiso) 
+                ixt_ddft=itZonIso(izone_ddft,iiso) 
                 fxtYe(iiso)=0.01*grav*dpinv*mp(il,i) &
      &           *(xt(ixt_ddft,il,i-1)-xt(ixt_ddft,il,i))
                 fxt(ixt_ddft,il,i)=fxt(ixt_ddft,il,i)+fxtYe(iiso)  
 
-               ixt_revap=index_trac(izone_revap,iiso)  
+               ixt_revap=itZonIso(izone_revap,iiso)  
                fxt_revap(iiso)=0.01*grav*dpinv*(mp(il,i+1)* &
      &                  (xtp(ixt_revap,il,i+1)-xt(ixt_revap,il,i)) &
@@ -5049 +5048 @@
      &                   -xt(ixt_ddft,il,i)-xt(ixt_revap,il,i)
                 if (Xe(iiso).gt.ridicule) then
-                  do izone=1,ntraceurs_zone
+                  do izone=1,nzone
                    if ((izone.ne.izone_revap).and. &
      &                   (izone.ne.izone_ddft)) then
-                    ixt=index_trac(izone,iiso) 
+                    ixt=itZonIso(izone,iiso) 
                     fxt(ixt,il,i)=fxt(ixt,il,i) &
      &                   +xt(ixt,il,i)/Xe(iiso)*fxtXe(iiso)
                    endif !if ((izone.ne.izone_revap).and.
-                  enddo !do izone=1,ntraceurs_zone   
+                  enddo !do izone=1,nzone   
 #ifdef ISOVERIF
 !                write(*,*) 'iiso=',iiso
@@ -5078 +5077 @@
                 endif
 #endif                   
-                do izone=1,ntraceurs_zone
+                do izone=1,nzone
                    if ((izone.ne.izone_revap).and. &
      &                   (izone.ne.izone_ddft)) then                    
-                    ixt=index_trac(izone,iiso) 
+                    ixt=itZonIso(izone,iiso) 
                     if (izone.eq.izone_poubelle) then
                       fxt(ixt,il,i)=fxt(ixt,il,i)+fxtXe(iiso)
@@ -5088 +5087 @@
                     endif !if (izone.eq.izone_poubelle) then
                    endif !if ((izone.ne.izone_revap).and.
-                enddo !do izone=1,ntraceurs_zone
+                enddo !do izone=1,nzone
 #ifdef ISOVERIF
                   call iso_verif_traceur_justmass(fxt(1,il,i), &
@@ -5237 +5236 @@
         enddo !do ixt = 1+niso,ntraciso
 !        write(*,*) 'tmp cv3_yield 4165: i,il=',i,il
-!        ixt_poubelle=index_trac(izone_poubelle,iso_eau)
-!        ixt_ddft=index_trac(izone_ddft,iso_eau)
+!        ixt_poubelle=itZonIso(izone_poubelle,iso_eau)
+!        ixt_ddft=itZonIso(izone_ddft,iso_eau)
 !        write(*,*) 'delt*fxt(ixt_poubelle,il,i)=',
 !     :           delt*fxt(ixt_poubelle,il,i)
@@ -5244 +5243 @@
 !        write(*,*) 'xt(iso_eau,il,i)=',xt(iso_eau,il,i)
           do iiso = 1, niso
-             ixt_poubelle=index_trac(izone_poubelle,iiso)
-             ixt_ddft=index_trac(izone_ddft,iiso)  
+             ixt_poubelle=itZonIso(izone_poubelle,iiso)
+             ixt_ddft=itZonIso(izone_ddft,iiso)  
              if (mp(il,i).gt.mp(il,i+1)) then
                 fxtYe(iiso)=0.01*grav*dpinv*mp(il,i) &
@@ -6111 +6110 @@
 
 #ifdef ISO
-    use infotrac_phy, ONLY: ntraciso
+    use infotrac_phy, ONLY: ntraciso=>ntiso
 #ifdef ISOVERIF
     use isotopes_verif_mod, ONLY: Tmin_verif,iso_verif_aberrant, &