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

LMDZ6/trunk/libf/phylmd/calltherm.F90

@@ -30 +30 @@
       USE print_control_mod, ONLY: prt_level,lunout
 #ifdef ISO
-      use infotrac_phy, ONLY: ntraciso
+      use infotrac_phy, ONLY: ntiso
 #ifdef ISOVERIF
       USE isotopes_mod, ONLY: iso_eau,iso_HDO
@@ -145 +145 @@
 
 #ifdef ISO
-      REAL xt_seri(ntraciso,klon,klev),xtmemoire(ntraciso,klon,klev)
-      REAL d_xt_ajs(ntraciso,klon,klev)
-      real d_xt_the(ntraciso,klon,klev)
+      REAL xt_seri(ntiso,klon,klev),xtmemoire(ntiso,klon,klev)
+      REAL d_xt_ajs(ntiso,klon,klev)
+      real d_xt_the(ntiso,klon,klev)
 #ifdef DIAGISO
       real q_the(klon,klev)
-      real xt_the(ntraciso,klon,klev)
+      real xt_the(ntiso,klon,klev)
 #endif
       real qprec(klon,klev)
@@ -205 +205 @@
                 nbptspb=nbptspb+1
 #ifdef ISO
-                do ixt=1,ntraciso
+                do ixt=1,ntiso
                   xt_seri(ixt,i,k)=1.e-15*(xt_seri(ixt,i,k)/qprec(i,k))
                   ! xt_seri(ixt,i,k)=1.e-15*(Rdefault(index_iso(ixt)))
@@ -228 +228 @@
        call iso_verif_egalite_vect2D( &
      &           xt_seri,q_seri, &
-     &           'calltherm 174',ntraciso,klon,klev) 
+     &           'calltherm 174',ntiso,klon,klev) 
       endif !if (iso_eau.gt.0) then
 #endif    
@@ -360 +360 @@
      &       +zdetr_therm(:,k)*fact(:)
 #ifdef ISO
-            do ixt=1,ntraciso
+            do ixt=1,ntiso
               d_xt_the(ixt,:,k)=d_xt_the(ixt,:,k)*dtime*fact(:)
             enddo
@@ -398 +398 @@
       call iso_verif_aberrant_enc_vect2D( &
      &        xt_seri,q_seri, &
-     &        'calltherm 353, apres ajout d_xt_the',ntraciso,klon,klev)
+     &        'calltherm 353, apres ajout d_xt_the',ntiso,klon,klev)
       endif      
 #endif
@@ -424 +424 @@
                 nbptspb=nbptspb+1
 #ifdef ISO
-                do ixt=1,ntraciso
+                do ixt=1,ntiso
                   xt_seri(ixt,i,k)=1.e-15*(xtmemoire(ixt,i,k)/qmemoire(i,k))
                 enddo
@@ -440 +440 @@
       call iso_verif_aberrant_enc_vect2D( &
      &        xt_seri,q_seri, &
-     &        'calltherm 393, apres bidouille q<0',ntraciso,klon,klev)
+     &        'calltherm 393, apres bidouille q<0',ntiso,klon,klev)
       endif      
 #endif