Changeset 4124 for LMDZ6/trunk/libf/dyn3d

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

Files:

• check_isotopes.F (modified) (7 diffs)
• dynetat0.F90 (modified) (1 diff)
• iniacademic.F90 (modified) (2 diffs)
• qminimum.F (modified) (5 diffs)

LMDZ6/trunk/libf/dyn3d/check_isotopes.F

@@ -1 +1 @@
         subroutine check_isotopes_seq(q,ip1jmp1,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, index_trac,indnum_fn_num, tnat
         implicit none
@@ -29 +29 @@
         real deltaD
 
-        if (ok_isotopes) then
+        if (niso > 0) then
 
         write(*,*) 'check_isotopes 31: err_msg=',err_msg
@@ -130 +130 @@
 
         !write(*,*) 'check_isotopes 129'
-        if (ok_isotrac) then
+        if (nzone > 0) then
 
           if (use_iso(2).and.use_iso(1)) then
-            do izone=1,ntraceurs_zone
+            do izone=1,nzone
              ixt=index_trac(izone,indnum_fn_num(2))
              ieau=index_trac(izone,indnum_fn_num(1))
@@ -157 +157 @@
                 enddo  ! do k=1,llm
               enddo ! do phase=1,nqo    
-            enddo !do izone=1,ntraceurs_zone
+            enddo !do izone=1,nzone
           endif !if (use_iso(2).and.use_iso(1)) then
 
@@ -167 +167 @@
                    xtractot=0.0
                    xiiso=q(i,k,iq)
-                   do izone=1,ntraceurs_zone
+                   do izone=1,nzone
                       iq=iqiso(index_trac(izone,iiso),phase)
                       xtractot=xtractot+ q(i,k,iq)
@@ -185 +185 @@
                  ! bidouille pour éviter divergence:
                  if (abs(xtractot).gt.ridicule) then
-                   do izone=1,ntraceurs_zone
+                   do izone=1,nzone
                      ixt=index_trac(izone,iiso) 
                      q(i,k,iq)=q(i,k,iq)/xtractot*xiiso
-                   enddo !do izone=1,ntraceurs_zone                
+                   enddo !do izone=1,nzone                
                   endif !if ((abs(xtractot).gt.ridicule) then
                 enddo !DO i = 1,ip1jmp1
@@ -195 +195 @@
           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/dyn3d/dynetat0.F90

@@ -6 +6 @@
 ! Purpose: Initial state reading.
 !-------------------------------------------------------------------------------
-  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_INQ_VARID, &

LMDZ6/trunk/libf/dyn3d/iniacademic.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
@@ -284 +284 @@
 !             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/dyn3d/qminimum.F

@@ -4 +4 @@
       SUBROUTINE qminimum( q,nqtot,deltap )
 
-      USE infotrac, ONLY: ok_isotopes,ntraciso,iqiso,ok_iso_verif
+      USE infotrac, ONLY: niso, ntraciso,iqiso,ok_iso_verif
       IMPLICIT none
 c
@@ -59 +59 @@
           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
@@ -80 +78 @@
           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) ) *
@@ -110 +107 @@
 
       !write(*,*) 'qminimum 128'
-      if (ok_isotopes) then
+      if (niso > 0) then
       ! CRisi: traiter de même les traceurs d'eau
       ! Mais il faut les prendre à l'envers pour essayer de conserver la
@@ -184 +181 @@
         endif !if (ok_iso_verif) then
 
-      endif !if (ok_isotopes) then
+      endif !if (niso > 0) then
       !write(*,*) 'qminimum 188'