Changeset 4124 for LMDZ6/trunk/libf/dyn3dmem

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/dyn3dmem

Files:

• check_isotopes_loc.F (modified) (4 diffs)
• dynetat0_loc.F90 (modified) (1 diff)
• iniacademic_loc.F90 (modified) (2 diffs)
• qminimum_loc.F (modified) (5 diffs)

LMDZ6/trunk/libf/dyn3dmem/check_isotopes_loc.F

@@ -1 +1 @@
         subroutine check_isotopes(q,ijb,ije,err_msg)
-        USE infotrac, ONLY: nqtot, nqo, niso, ntraciso, ntraceurs_zone, 
-     &                ok_isotopes, ok_isotrac, use_iso, 
+        USE infotrac, ONLY: nqtot, nqo, niso, ntraciso, nzone,
+     &                use_iso, 
      &                iqiso, indnum_fn_num, index_trac, tnat
         USE parallel_lmdz
@@ -30 +30 @@
         real deltaD
 
-        if (ok_isotopes) then
+        if (niso > 0) then
 
 !        write(*,*) 'check_isotopes 31: err_msg=',err_msg
@@ -139 +139 @@
 
 !        write(*,*) 'check_isotopes 129'
-        if (ok_isotrac) then
+        if (nzone > 0) then
 
           if (use_iso(2).and.use_iso(1)) then
@@ -208 +208 @@
           enddo !do iiso=1,niso
 
-        endif !if (ok_isotrac) then
-
-        endif ! if (ok_isotopes)
+        endif !if (nzone > 0)
+
+        endif ! if (niso > 0)
 !        write(*,*) 'check_isotopes 198'
         

LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.F90

@@ -7 +7 @@
 !-------------------------------------------------------------------------------
   USE parallel_lmdz
-  USE infotrac,    ONLY: nqtot, tracers, niso, iqiso, iso_indnum, iso_num, tnat, alpha_ideal, ok_isotopes, iH2O
+  USE infotrac,    ONLY: nqtot, tracers, niso, iqiso, iso_indnum, iso_num, tnat, alpha_ideal, iH2O
   USE strings_mod, ONLY: maxlen, msg, strStack, real2str
   USE netcdf,      ONLY: NF90_OPEN,  NF90_NOWRITE, NF90_INQUIRE_DIMENSION, NF90_INQ_VARID, &

LMDZ6/trunk/libf/dyn3dmem/iniacademic_loc.F90

@@ -5 +5 @@
 
   USE filtreg_mod, ONLY: inifilr
-  USE infotrac,    ONLY: nqtot, niso_possibles, ok_isotopes, ok_iso_verif, tnat, alpha_ideal, &
+  USE infotrac,    ONLY: nqtot, niso, niso_possibles, ok_iso_verif, tnat, alpha_ideal, &
                          iqiso, tracers, iso_indnum, iso_num
   USE control_mod, ONLY: day_step,planet_type
@@ -288 +288 @@
 !             iName    = tracers(iq)%iso_iName  ! (next commit)
               iName    = iso_num(iq)
-              if (.NOT.ok_isotopes .OR. iName <= 0) CYCLE
+              if (niso <= 0 .OR. iName <= 0) CYCLE
               iPhase   = tracers(iq)%iso_iPhase
               iqParent = tracers(iq)%iqParent

LMDZ6/trunk/libf/dyn3dmem/qminimum_loc.F

@@ -4 +4 @@
       SUBROUTINE qminimum_loc( q,nqtot,deltap )
       USE parallel_lmdz
-      USE infotrac, ONLY: ok_isotopes,ntraciso,iqiso,ok_iso_verif,             &
+      USE infotrac, ONLY: niso,ntraciso,iqiso,ok_iso_verif,             &
      &   ratiomin,qperemin ! CRisi 23nov2020
       IMPLICIT none
@@ -71 +71 @@
             if (seuil_liq - q(i,k,iq_liq) .gt. 0.d0 ) then
 
-              if (ok_isotopes) then
-                 zx_defau_diag(i,k,iq_liq)=AMAX1
+              if (niso > 0) zx_defau_diag(i,k,iq_liq)=AMAX1
      :               ( seuil_liq - q(i,k,iq_liq), 0.0 )
-              endif !if (ok_isotopes) then
 
                q(i,k,iq_vap) = q(i,k,iq_vap) + q(i,k,iq_liq) - seuil_liq
@@ -100 +98 @@
          if ( seuil_vap - q(i,k,iq) .gt. 0.d0 ) then
 
-            if (ok_isotopes) then
-              zx_defau_diag(i,k,iq)=AMAX1( seuil_vap - q(i,k,iq), 0.0 )
-            endif !if (ok_isotopes) then
+            if (niso > 0)
+     &        zx_defau_diag(i,k,iq)=AMAX1( seuil_vap - q(i,k,iq), 0.0 )
 
             q(i,k-1,iq) =  q(i,k-1,iq) - ( seuil_vap - q(i,k,iq) ) *
@@ -141 +138 @@
 
       !write(lunout,*) 'qminimum 128'
-      if (ok_isotopes) then
+      if (niso > 0) then
               !write(lunout,*) 'qminimum 140'
       ! CRisi: traiter de même les traceurs d'eau
@@ -277 +274 @@
         endif !if (ok_iso_verif) then
 
-      endif !if (ok_isotopes) then
+      endif !if (niso > 0) then
       !write(*,*) 'qminimum 188'
 c