Changeset 4124 for LMDZ6/trunk/libf/phylmd

Timestamp:

Apr 8, 2022, 4:47:04 PM (3 years ago)

Author:

dcugnet

Message:

Remove solsym, ok_isotopes (=niso>0), ok_isotrac (=nzone>0)

Location:

LMDZ6/trunk/libf/phylmd

Files:

• infotrac_phy.F90 (modified) (8 diffs)
• phytrac_mod.F90 (modified) (3 diffs)
• rrtm/readaerosol_optic_rrtm.F90 (modified) (3 diffs)
• traclmdz_mod.F90 (modified) (3 diffs)
• tracreprobus_mod.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/phylmd/infotrac_phy.F90

@@ -15 +15 @@
    PUBLIC :: tracers, type_trac                            !--- Full tracers database, tracers type keyword
    PUBLIC :: nqtot,   nbtr,   nqo,   nqCO2,   nqtottr      !--- Main dimensions
-   PUBLIC :: conv_flg, pbl_flg, solsym                     !--- Convection & boundary layer activation keys
+   PUBLIC :: conv_flg, pbl_flg                             !--- Convection & boundary layer activation keys
 
    !=== FOR ISOTOPES: General
@@ -33 +33 @@
 
    PUBLIC :: ntraciso, ntraceurs_zone, indnum_fn_num, use_iso, index_trac, iqiso
-   PUBLIC :: niso_possibles, ok_isotrac, ok_isotopes, ok_iso_verif
+   PUBLIC :: niso_possibles, ok_iso_verif
 
    INTERFACE isoSelect; MODULE PROCEDURE isoSelectByIndex, isoSelectByName; END INTERFACE isoSelect
@@ -132 +132 @@
    INTEGER,          SAVE,    ALLOCATABLE ::conv_flg(:),  &     !--- Convection     activation ; needed for INCA        (nbtr)
                                              pbl_flg(:)         !--- Boundary layer activation ; needed for INCA        (nbtr)
-   CHARACTER(LEN=8), SAVE,    ALLOCATABLE ::  solsym(:)
-!$OMP THREADPRIVATE(conv_flg, pbl_flg, solsym)
+!$OMP THREADPRIVATE(conv_flg, pbl_flg)
 
    !--- Aliases for older names + quantities to be removed             (will be replaced by:)
@@ -142 +141 @@
    INTEGER, SAVE :: niso_possibles                              !--- suppressed (use effective niso instead)
 !$OMP THREADPRIVATE(niso_possibles)
-   LOGICAL, SAVE :: ok_isotopes, ok_iso_verif, ok_isotrac       !--- -> niso>0, isoCheck, nzone>0
-!$OMP THREADPRIVATE(ok_isotopes, ok_iso_verif, ok_isotrac)
+   LOGICAL, SAVE :: ok_iso_verif                                !--- -> isoCheck
+!$OMP THREADPRIVATE(ok_iso_verif)
    LOGICAL, SAVE, ALLOCATABLE :: use_iso(:)                     !--- suppressed
 !$OMP THREADPRIVATE             (use_iso)
@@ -159 +158 @@
 CONTAINS
 
-SUBROUTINE init_infotrac_phy(type_trac_, tracers_, isotopes_, nqtottr_, nqCO2_, pbl_flg_, conv_flg_, solsym_)
+SUBROUTINE init_infotrac_phy(type_trac_, tracers_, isotopes_, nqtottr_, nqCO2_, pbl_flg_, conv_flg_)
 
    USE print_control_mod, ONLY: prt_level, lunout
@@ -171 +170 @@
    INTEGER,         INTENT(IN) :: conv_flg_(:)
    INTEGER,         INTENT(IN) ::  pbl_flg_(:)
-   CHARACTER(LEN=*),INTENT(IN) ::   solsym_(:)
 
    INTEGER :: iq, ixt
@@ -186 +184 @@
    pbl_flg   =  pbl_flg_
    conv_flg  = conv_flg_
-   solsym    = solsym_
    nqtot     = SIZE(tracers_)
    nqo       = COUNT(delPhase(tracers%name)=='H2O' .AND. tracers%iGeneration==0)
@@ -230 +227 @@
    iqiso          => iqTraPha
    index_trac     => itZonIso
-   ok_isotopes    = niso  > 0
-   ok_isotrac     = nzone > 0
    ok_iso_verif   = isoCheck
    niso_possibles = SIZE(tnom_iso)

LMDZ6/trunk/libf/phylmd/phytrac_mod.F90

@@ -124 +124 @@
     USE phys_cal_mod, only : hour
     USE dimphy
-    USE infotrac_phy, ONLY: nbtr, nqCO2, type_trac, conv_flg, solsym, pbl_flg
+    USE infotrac_phy, ONLY: nbtr, nqCO2, type_trac, conv_flg, pbl_flg
+    USE strings_mod,  ONLY: int2str
     USE mod_grid_phy_lmdz
     USE mod_phys_lmdz_para
@@ -753 +754 @@
           END DO
 
-          CALL minmaxqfi(tr_seri(:,:,it),0.,1.e33,'convection it = '//solsym(it))
+          CALL minmaxqfi(tr_seri(:,:,it),0.,1.e33,'convection it = '//TRIM(int2str(it)))
 
        END DO ! nbtr
@@ -955 +956 @@
                 ENDDO
              ENDDO
-             CALL minmaxqfi(tr_seri(:,:,it),0.,1.e33,'lsc scav it = '//solsym(it))
+             CALL minmaxqfi(tr_seri(:,:,it),0.,1.e33,'lsc scav it = '//TRIM(int2str(it)))
              ENDIF
 

LMDZ6/trunk/libf/phylmd/rrtm/readaerosol_optic_rrtm.F90

@@ -20 +20 @@
        load_tmp8,load_tmp9,load_tmp10
 
-  USE infotrac_phy
+  USE infotrac_phy, ONLY: tracers, nqtot, nbtr
   USE YOMCST
 
@@ -91 +91 @@
   integer :: id_ASBCM, id_ASPOMM, id_ASSO4M, id_ASMSAM, id_CSSO4M, id_CSMSAM, id_SSSSM
   integer :: id_CSSSM, id_ASSSM, id_CIDUSTM, id_AIBCM, id_AIPOMM, id_ASNO3M, id_CSNO3M, id_CINO3M
-  INTEGER :: k, i
+  INTEGER :: k, i, iq, itr
 
   !--air density
@@ -107 +107 @@
      !--convert to ug m-3 unit for consistency with offline fields
      !
-     DO i=1,nbtr
-        SELECT CASE(trim(solsym(i)))
-           CASE ("ASBCM")
-              id_ASBCM = i
-           CASE ("ASPOMM") 
-              id_ASPOMM = i 
-           CASE ("ASSO4M")
-              id_ASSO4M = i 
-           CASE ("ASMSAM")
-              id_ASMSAM = i 
-           CASE ("CSSO4M")
-              id_CSSO4M = i 
-           CASE ("CSMSAM")
-              id_CSMSAM = i 
-           CASE ("SSSSM")
-              id_SSSSM = i 
-           CASE ("CSSSM")
-              id_CSSSM = i 
-           CASE ("ASSSM")
-              id_ASSSM = i 
-           CASE ("CIDUSTM")
-              id_CIDUSTM = i 
-           CASE ("AIBCM")
-              id_AIBCM = i 
-           CASE ("AIPOMM")
-              id_AIPOMM = i 
-           CASE ("ASNO3M")
-              id_ASNO3M = i 
-           CASE ("CSNO3M")
-              id_CSNO3M = i 
-           CASE ("CINO3M")
-              id_CINO3M = i 
-           END SELECT
-     ENDDO
+     itr = 0
+     DO iq = 1,nqtot
+        IF(.NOT. tracers(iq)%isInPhysics) CYCLE
+        itr = itr+1
+        SELECT CASE(trim(tracers(iq)%name))
+           CASE ("ASBCM");  id_ASBCM  = itr
+           CASE ("ASPOMM"); id_ASPOMM = itr
+           CASE ("ASSO4M"); id_ASSO4M = itr
+           CASE ("ASMSAM"); id_ASMSAM = itr
+           CASE ("CSSO4M"); id_CSSO4M = itr
+           CASE ("CSMSAM"); id_CSMSAM = itr
+           CASE ("SSSSM");  id_SSSSM  = itr
+           CASE ("CSSSM");  id_CSSSM  = itr
+           CASE ("ASSSM");  id_ASSSM  = itr
+           CASE ("CIDUSTM");id_CIDUSTM= itr
+           CASE ("AIBCM");  id_AIBCM  = itr
+           CASE ("AIPOMM"); id_AIPOMM = itr
+           CASE ("ASNO3M"); id_ASNO3M = itr
+           CASE ("CSNO3M"); id_CSNO3M = itr
+           CASE ("CINO3M"); id_CINO3M = itr
+        END SELECT
+     END DO
 
      bcsol(:,:)        =   tr_seri(:,:,id_ASBCM)                         *zrho(:,:)*1.e9  ! ASBCM

LMDZ6/trunk/libf/phylmd/traclmdz_mod.F90

@@ -311 +311 @@
     
     USE dimphy
-    USE infotrac_phy, ONLY: nbtr, pbl_flg, solsym
+    USE infotrac_phy, ONLY: nbtr, pbl_flg
+    USE strings_mod,  ONLY: int2str
     USE regr_pr_comb_coefoz_m, ONLY: regr_pr_comb_coefoz
     USE o3_chem_m, ONLY: o3_chem
@@ -551 +552 @@
 
     DO it=1,nbtr
-       WRITE(solsym(it),'(i2)') it
-    END DO
-
-    DO it=1,nbtr
        IF(radio(it)) then     
           DO k = 1, klev
@@ -561 +558 @@
              END DO
           END DO
-          CALL minmaxqfi(tr_seri(:,:,it),0.,1.e33,'puits rn it='//solsym(it))
+          CALL minmaxqfi(tr_seri(:,:,it),0.,1.e33,'puits rn it='//TRIM(int2str(it)))
        END IF
     END DO

LMDZ6/trunk/libf/phylmd/tracreprobus_mod.F90

@@ -12 +12 @@
 
     USE dimphy
-    USE infotrac_phy, ONLY: nbtr, solsym
+    USE infotrac_phy, ONLY: nbtr
 #ifdef REPROBUS 
     USE CHEM_REP, ONLY : pdt_rep, &  ! pas de temps reprobus
@@ -119 +119 @@
        
     END DO
-    
-
-    ! 
-    DO it=1,nbtr
-       WRITE(solsym(it),'(i2)') it
-    END DO
 #endif
   END SUBROUTINE tracreprobus