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

LMDZ6/trunk/libf/phylmdiso/cva_driver.F90

@@ -54 +54 @@
   USE add_phys_tend_mod, ONLY: fl_cor_ebil
 #ifdef ISO
-  USE infotrac_phy, ONLY: ntraciso,niso,niso,index_trac,ntraceurs_zone
+  USE infotrac_phy, ONLY: ntraciso=>ntiso,niso,niso,itZonIso,nzone
   USE isotopes_mod, ONLY: iso_eau,iso_HDO,iso_O18,ridicule,bidouille_anti_divergence
 #ifdef ISOVERIF
@@ -1388 +1388 @@
            call iso_verif_traceur(xt(1,i,k),'cva_driver 856')
            if (option_tmin.eq.1) then
-             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) &
      &           ,'cva_driver 909').eq.1) then
@@ -1394 +1394 @@
                write(*,*) 'xtclw=',xtclw(:,i,k)
                stop
-             endif !if (iso_verif_positif_nostop(xtclw(index_trac(
+             endif !if (iso_verif_positif_nostop(xtclw(itZonIso(
            endif !if ((option_traceurs.eq.17).or.
 #endif  
@@ -1509 +1509 @@
             do i = 1, ncum
                do iiso=1,niso
-                  ixt_ddft=index_trac(izone_ddft,iiso)
-                  ixt_poubelle=index_trac(izone_poubelle,iiso)
+                  ixt_ddft=itZonIso(izone_ddft,iiso)
+                  ixt_poubelle=itZonIso(izone_poubelle,iiso)
                   xtp(ixt_ddft,i,k)=xtp(ixt_ddft,i,k) &
      &                    +xtp(ixt_poubelle,i,k)
@@ -1524 +1524 @@
           do k=1,nd
             do i = 1, ncum
-               do izone=1,ntraceurs_zone
+               do izone=1,nzone
                  if (izone.eq.izone_ddft) then
                    do iiso=1,niso
-                     ixt_ddft=index_trac(izone,iiso)
-                     ixt_revap=index_trac(izone_revap,iiso)
+                     ixt_ddft=itZonIso(izone,iiso)
+                     ixt_revap=itZonIso(izone_revap,iiso)
                      xtp(ixt_ddft,i,k)=xtp(iiso,i,k)-xtp(ixt_revap,i,k)
                    enddo !do iiso=1,niso
@@ -1535 +1535 @@
                  else !if (izone.eq.izone_ddft) then
                    do iiso=1,niso
-                     ixt=index_trac(izone,iiso)
+                     ixt=itZonIso(izone,iiso)
                      xtp(ixt,i,k)=0.0
                    enddo !do iiso=1,niso
                  endif !if (izone.eq.izone_ddft) then
-               enddo !do izone=1,ntraceurs_zone
+               enddo !do izone=1,nzone
 #ifdef ISOVERIF
                call iso_verif_traceur(xtp(1,i,k),'cva_driver 1059')