Changeset 4143 for LMDZ6/trunk/libf/dyn3d/vlsplt.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/dyn3d/vlsplt.F (modified) (7 diffs)

LMDZ6/trunk/libf/dyn3d/vlsplt.F

@@ -125 +125 @@
       RECURSIVE SUBROUTINE vlx(q,pente_max,masse,u_m,iq)
       USE infotrac, ONLY : nqtot,tracers, ! CRisi
-     &                     qperemin,masseqmin,ratiomin ! MVals et CRisi
+     &                     min_qParent,min_qMass,min_ratio ! MVals et CRisi
 
 c     Auteurs:   P.Le Van, F.Hourdin, F.Forget 
@@ -428 +428 @@
             !Ratio(ij,l,iq2)=q(ij,l,iq2)/q(ij,l,iq)
             !Mvals: veiller a ce qu'on n'ait pas de denominateur nul
-            masseq(ij,l,iq2)=max(masse(ij,l,iq)*q(ij,l,iq),masseqmin)
-            if (q(ij,l,iq).gt.qperemin) then
+            masseq(ij,l,iq2)=max(masse(ij,l,iq)*q(ij,l,iq),min_qMass)
+            if (q(ij,l,iq).gt.min_qParent) then
               Ratio(ij,l,iq2)=q(ij,l,iq2)/q(ij,l,iq)
             else
-              Ratio(ij,l,iq2)=ratiomin
+              Ratio(ij,l,iq2)=min_ratio
             endif
           enddo   
@@ -449 +449 @@
          DO ij=iip2+1,ip1jm
             !MVals: veiller a ce qu'on ait pas de denominateur nul
-            new_m=max(masse(ij,l,iq)+u_m(ij-1,l)-u_m(ij,l),masseqmin)
+            new_m=max(masse(ij,l,iq)+u_m(ij-1,l)-u_m(ij,l),min_qMass)
             q(ij,l,iq)=(q(ij,l,iq)*masse(ij,l,iq)+
      &      u_mq(ij-1,l)-u_mq(ij,l))
@@ -485 +485 @@
       RECURSIVE SUBROUTINE vly(q,pente_max,masse,masse_adv_v,iq)
       USE infotrac, ONLY : nqtot,tracers, ! CRisi
-     &                     qperemin,masseqmin,ratiomin ! MVals et CRisi
+     &                     min_qParent,min_qMass,min_ratio ! MVals et CRisi
 c
 c     Auteurs:   P.Le Van, F.Hourdin, F.Forget 
@@ -752 +752 @@
             !Ratio(ij,l,iq2)=q(ij,l,iq2)/q(ij,l,iq)     
             !MVals: veiller a ce qu'on n'ait pas de denominateur nul
-            masseq(ij,l,iq2)=max(masse(ij,l,iq)*q(ij,l,iq),masseqmin)
-            if (q(ij,l,iq).gt.qperemin) then
+            masseq(ij,l,iq2)=max(masse(ij,l,iq)*q(ij,l,iq),min_qMass)
+            if (q(ij,l,iq).gt.min_qParent) then
               Ratio(ij,l,iq2)=q(ij,l,iq2)/q(ij,l,iq)
             else
-              Ratio(ij,l,iq2)=ratiomin
+              Ratio(ij,l,iq2)=min_ratio
             endif 
           enddo   
@@ -848 +848 @@
       RECURSIVE SUBROUTINE vlz(q,pente_max,masse,w,iq)
       USE infotrac, ONLY : nqtot,tracers, ! CRisi 
-     &                     qperemin,masseqmin,ratiomin ! MVals et CRisi
+     &                     min_qParent,min_qMass,min_ratio ! MVals et CRisi
 c
 c     Auteurs:   P.Le Van, F.Hourdin, F.Forget 
@@ -977 +977 @@
             !Ratio(ij,l,iq2)=q(ij,l,iq2)/q(ij,l,iq)        
             !MVals: veiller a ce qu'on n'ait pas de denominateur nul
-            masseq(ij,l,iq2)=max(masse(ij,l,iq)*q(ij,l,iq),masseqmin)
-            if (q(ij,l,iq).gt.qperemin) then
+            masseq(ij,l,iq2)=max(masse(ij,l,iq)*q(ij,l,iq),min_qMass)
+            if (q(ij,l,iq).gt.min_qParent) then
               Ratio(ij,l,iq2)=q(ij,l,iq2)/q(ij,l,iq)
             else
-              Ratio(ij,l,iq2)=ratiomin
+              Ratio(ij,l,iq2)=min_ratio
             endif      
           enddo