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

LMDZ6/trunk/libf/phylmdiso/cv3p_mixing.F90

@@ -21 +21 @@
   USE add_phys_tend_mod, ONLY: fl_cor_ebil
 #ifdef ISO
-  USE infotrac_phy, ONLY: ntraciso
+  USE infotrac_phy, ONLY: ntraciso=>ntiso
   USE isotopes_mod, ONLY: pxtmelt,pxtice
   USE isotopes_routines_mod, ONLY: condiso_liq_ice_vectall
@@ -1301 +1301 @@
             call iso_verif_egalite_choix(xtent(iso_eau,il,im,jm), &
               qent(il,im,jm),'cv3p_mixing 2112',errmax,errmaxrel)
-          endif !if (use_iso_eau) then
+          endif !if (iso_eau>0) then
 #ifdef ISOTRAC
         call iso_verif_traceur_justmass(xtelij(1,il,im,jm), &   
@@ -1353 +1353 @@
 !        call iso_verif_traceur(xtclw(1,il,im), &
 !               'cv3p_mixing 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) &
 !                ,'cv3p_mixing 909').eq.1) then
@@ -1361 +1361 @@
 !                  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