Changeset 4143 for LMDZ6/trunk/libf/phylmd

Timestamp:

May 9, 2022, 12:35:40 PM (3 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).

Location:

LMDZ6/trunk/libf/phylmd

Files:

• calltherm.F90 (modified) (8 diffs)
• infotrac_phy.F90 (modified) (7 diffs)
• phys_output_mod.F90 (modified) (1 diff)
• phys_output_write_mod.F90 (modified) (3 diffs)
• phys_state_var_mod.F90 (modified) (1 diff)
• physiq_mod.F90 (modified) (2 diffs)
• thermcell_main.F90 (modified) (6 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

LMDZ6/trunk/libf/phylmd/infotrac_phy.F90

@@ -27 +27 @@
    PUBLIC :: niso,    nzone,   nphas,   ntiso              !---  " " numbers + isotopes & tagging tracers number
    PUBLIC :: itZonIso                                      !--- iq = function(tagging zone idx, isotope idx)
-   PUBLIC :: iqTraPha                                      !--- idx of tagging tracer in iName = function(isotope idx, phase idx)
+   PUBLIC :: iqIsoPha                                      !--- idx of tagging tracer in iName = function(isotope idx, phase idx)
    PUBLIC :: isoCheck                                      !--- Run isotopes checking routines
    !=== FOR BOTH TRACERS AND ISOTOPES
    PUBLIC :: getKey                                        !--- Get a key from "tracers" or "isotope"
-
-   PUBLIC :: ntraciso, ntraceurs_zone, indnum_fn_num, use_iso, index_trac, iqiso
-   PUBLIC :: niso_possibles, ok_iso_verif
 
    INTERFACE isoSelect; MODULE PROCEDURE isoSelectByIndex, isoSelectByName; END INTERFACE isoSelect
@@ -96 +93 @@
 !  | zone   | nzone  | Geographic tagging zones   list + number         | / | ntraceurs_zone |                 |
 !  | phase  | nphas  | Phases                     list + number         |                    | [g][l][s], 1:3  |
-!  | iqTraPha        | Index in "qx"           = f(name(1:ntiso)),phas) | iqiso              | 1:nqtot         |
+!  | iqIsoPha        | Index in "qx"           = f(name(1:ntiso)),phas) | iqiso              | 1:nqtot         |
 !  | itZonIso        | Index in "trac(1:ntiso)"= f(zone, name(1:niso))  | index_trac         | 1:ntiso         |
 !  +-----------------+--------------------------------------------------+--------------------+-----------------+
@@ -126 +123 @@
                                              nphas, ntiso, &    !--- NUMBER OF PHASES AND ISOTOPES + ISOTOPIC TAGGING TRACERS
                                             itZonIso(:,:), &    !--- INDEX IN "isoTrac" AS f(tagging zone idx,  isotope idx)
-                                            iqTraPha(:,:)       !--- INDEX IN "qx"      AS f(isotopic tracer idx, phase idx)
-!$OMP THREADPRIVATE(isotope, ixIso,iH2O, isoCheck, isoKeys, isoName,isoZone,isoPhas, niso,nzone,nphas,ntiso, itZonIso,iqTraPha)
+                                            iqIsoPha(:,:)       !--- INDEX IN "qx"      AS f(isotopic tracer idx, phase idx)
+!$OMP THREADPRIVATE(isotope, ixIso,iH2O, isoCheck, isoKeys, isoName,isoZone,isoPhas, niso,nzone,nphas,ntiso, itZonIso,iqIsoPha)
 
    !=== VARIABLES FOR ISOTOPES INITIALIZATION AND FOR INCA
@@ -133 +130 @@
                                              pbl_flg(:)         !--- Boundary layer activation ; needed for INCA        (nbtr)
 !$OMP THREADPRIVATE(conv_flg, pbl_flg)
-
-   !--- Aliases for older names + quantities to be removed             (will be replaced by:)
-   INTEGER, POINTER, SAVE :: ntraciso, ntraceurs_zone           !--- -> ntiso, nzone
-!$OMP THREADPRIVATE         (ntraciso, ntraceurs_zone)   
-   INTEGER, POINTER, SAVE :: index_trac(:,:), iqiso(:,:)        !--- -> itZonIso, iqTraPha
-!$OMP THREADPRIVATE         (index_trac,      iqiso)
-   INTEGER, SAVE :: niso_possibles                              !--- suppressed (use effective niso instead)
-!$OMP THREADPRIVATE(niso_possibles)
-   LOGICAL, SAVE :: ok_iso_verif                                !--- -> isoCheck
-!$OMP THREADPRIVATE(ok_iso_verif)
-   LOGICAL, SAVE, ALLOCATABLE :: use_iso(:)                     !--- suppressed
-!$OMP THREADPRIVATE             (use_iso)
-   INTEGER, SAVE, ALLOCATABLE :: indnum_fn_num(:)
-!$OMP THREADPRIVATE             (indnum_fn_num)
 
 #ifdef CPP_StratAer
@@ -190 +173 @@
 
    !=== Determine selected isotopes class related quantities:
-   !    ixIso, isotope, niso,isoKeys, ntiso,isoName, nzone,isoZone, nphas,isoPhas, itZonIso, iqTraPha, isoCheck
+   !    ixIso, isotope, niso,isoKeys, ntiso,isoName, nzone,isoZone, nphas,isoPhas, itZonIso, iqIsoPha, isoCheck
    IF(.NOT.isoSelect('H2O')) iH2O = ixIso
    IF(prt_level > 1) THEN
@@ -221 +204 @@
    END IF
 #endif
-
-   !--- Isotopic quantities (to be removed soon)
-   ntraciso       => ntiso
-   ntraceurs_zone => nzone
-   iqiso          => iqTraPha
-   index_trac     => itZonIso
-   ok_iso_verif   = isoCheck
-   niso_possibles = SIZE(tnom_iso)
-   indnum_fn_num  = [(strIdx(isotope%keys(:)%name, tnom_iso(ixt)), ixt=1, niso_possibles)]
-   use_iso        = indnum_fn_num /= 0
 #ifdef ISOVERIF
    CALL msg('iso_iName = '//strStack(int2str(PACK(tracers(:)%iso_iName, MASK=tracers(:)%iso_iGroup==iH2O))), modname)
@@ -275 +248 @@
    isoPhas  => isotope%phase;    nphas    => isotope%nphas
    itZonIso => isotope%itZonIso; isoCheck => isotope%check
-   iqTraPha => isotope%iqTraPha
+   iqIsoPha => isotope%iqIsoPha
 END FUNCTION isoSelectByIndex
 !==============================================================================================================================

LMDZ6/trunk/libf/phylmd/phys_output_mod.F90

@@ -35 +35 @@
     USE iophy 
     USE dimphy
-    USE infotrac_phy, ONLY: nqtot, tracers, type_trac, niso, ntraciso
+    USE infotrac_phy, ONLY: nqtot, tracers, type_trac, niso
     USE strings_mod,  ONLY: maxlen
     USE ioipsl

LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90

@@ -25 +25 @@
 
     USE dimphy, ONLY: klon, klev, klevp1
-    USE infotrac_phy, ONLY: nbtr, nqtot, nqo, type_trac, tracers, niso, ntraciso
+    USE infotrac_phy, ONLY: nbtr, nqtot, nqo, type_trac, tracers, niso, ntiso
     USE strings_mod,  ONLY: maxlen
     USE mod_phys_lmdz_para, ONLY: is_north_pole_phy,is_south_pole_phy
@@ -2598 +2598 @@
 
 #ifdef ISO
-    do ixt=1,ntraciso
+    do ixt=1,ntiso
 !        write(*,*) 'ixt'
         IF (vars_defined) zx_tmp_fi2d(:) = xtrain_fall(ixt,:) + xtsnow_fall(ixt,:)
@@ -2652 +2652 @@
 
     !write(*,*) 'phys_output_write_mod 2531'
-    enddo !do ixt=1,ntraciso    
+    enddo
 #endif
 

LMDZ6/trunk/libf/phylmd/phys_state_var_mod.F90

@@ -499 +499 @@
 USE infotrac_phy, ONLY : nbtr
 #ifdef ISO
-USE infotrac_phy, ONLY : ntraciso,niso
+USE infotrac_phy, ONLY : ntraciso=>ntiso,niso
 #endif
 USE indice_sol_mod

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -444 +444 @@
     !======================================================================
     !
-    INTEGER ivap          ! indice de traceurs pour vapeur d'eau
-    PARAMETER (ivap=1)
-    INTEGER iliq          ! indice de traceurs pour eau liquide
-    PARAMETER (iliq=2)
-    INTEGER isol          ! indice de traceurs pour eau glace
-    PARAMETER (isol=3)
-    INTEGER irneb         ! indice de traceurs pour fraction nuageuse LS (optional)
-    PARAMETER (irneb=4)   
+    ! indices de traceurs eau vapeur, liquide, glace, fraction nuageuse LS (optional)
+    INTEGER,SAVE :: ivap, iliq, isol, irneb
+!$OMP THREADPRIVATE(ivap, iliq, isol, irneb)
     !
     !
@@ -1255 +1250 @@
 
     IF (first) THEN 
+       ivap = strIdx(tracers(:)%name, addPhase('H2O', 'g'))
+       iliq = strIdx(tracers(:)%name, addPhase('H2O', 'l'))
+       isol = strIdx(tracers(:)%name, addPhase('H2O', 's'))
+       irneb= strIdx(tracers(:)%name, addPhase('H2O', 'r'))
        CALL init_etat0_limit_unstruct
        IF (.NOT. create_etat0_limit) CALL init_limit_read(days_elapsed)

LMDZ6/trunk/libf/phylmd/thermcell_main.F90

@@ -22 +22 @@
 
 #ifdef ISO
-  USE infotrac_phy, ONLY : ntraciso
+  USE infotrac_phy, ONLY : ntiso
 #ifdef ISOVERIF
   USE isotopes_mod, ONLY : iso_eau,iso_HDO
@@ -140 +140 @@
 
 #ifdef ISO
-      REAL xtpo(ntraciso,ngrid,nlay),xtpdoadj(ntraciso,ngrid,nlay)
-      REAL xtzo(ntraciso,ngrid,nlay)
+      REAL xtpo(ntiso,ngrid,nlay),xtpdoadj(ntiso,ngrid,nlay)
+      REAL xtzo(ntiso,ngrid,nlay)
       REAL xtpdoadj_tmp(ngrid,nlay)
       REAL xtpo_tmp(ngrid,nlay)
@@ -368 +368 @@
      &           zlev,lmax,zmax,zmax0,zmix,wmax)
 ! Attention, w2 est transforme en sa racine carree dans cette routine
-! Le probleme vient du fait que linter et lmix sont souvent égaux à 1.
+! Le probleme vient du fait que linter et lmix sont souvent egaux a 1.
       wmax_tmp=0.
       do  l=1,nlay
@@ -488 +488 @@
 
 #ifdef ISO
-        ! C Risi: on utilise directement la même routine
-        do ixt=1,ntraciso
+        ! C Risi: on utilise directement la meme routine
+        do ixt=1,ntiso
           do ll=1,nlay
             DO ig=1,ngrid
@@ -503 +503 @@
             enddo
           enddo
-        enddo !do ixt=1,ntraciso
+        enddo
 #endif
 
@@ -749 +749 @@
 ! nrlmd le 10/04/2012   Transport de la TKE par le thermique moyen pour la fermeture en ALP 
 !                       On transporte pbl_tke pour donner therm_tke
-!                       Copie conforme de la subroutine DTKE dans physiq.F écrite par Frederic Hourdin
+!                       Copie conforme de la subroutine DTKE dans physiq.F ecrite par Frederic Hourdin
 
 !=======================================================================