Changeset 4124 for LMDZ6/trunk/libf/phylmdiso

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

Files:

• climb_hq_mod.F90 (modified) (3 diffs)
• isotopes_mod.F90 (modified) (3 diffs)
• physiq_mod.F90 (modified) (8 diffs)

LMDZ6/trunk/libf/phylmdiso/climb_hq_mod.F90

@@ -502 +502 @@
 
 #ifdef ISOVERIF
-USE infotrac_phy, ONLY: ok_isotrac
+USE infotrac_phy, ONLY: nzone
 USE isotopes_mod, ONLY: iso_eau,iso_HDO,iso_O18, ridicule
 USE isotopes_verif_mod
@@ -578 +578 @@
          endif
 #ifdef ISOTRAC
-         if (ok_isotrac) then
-           call iso_verif_traceur(xt_old(1,i,k),'climb_hq_mod 422')
-         endif
+         IF(nzone > 0) CALL iso_verif_traceur(xt_old(1,i,k),'climb_hq_mod 422')
 #endif
         enddo
@@ -781 +779 @@
         endif
 #ifdef ISOTRAC
-        if (ok_isotrac) then
-           call iso_verif_traceur(xt_old(1,i,k),'climb_hq_mod 526')
-        endif 
+        IF(nzone > 0) CALL iso_verif_traceur(xt_old(1,i,k),'climb_hq_mod 526')
 #endif       
 #endif        

LMDZ6/trunk/libf/phylmdiso/isotopes_mod.F90

@@ -3 +3 @@
 
 MODULE isotopes_mod
-USE infotrac_phy, ONLY: ntraciso,niso,indnum_fn_num,ok_isotrac,use_iso, &
+USE infotrac_phy, ONLY: ntraciso,niso,indnum_fn_num,use_iso, &
 &       niso_possibles
 IMPLICIT NONE
@@ -245 +245 @@
       write(*,*) 'iso_init 64: niso=',niso
 
-! init de ntracisoOR: on écrasera en cas de ok_isotrac si complications avec
+! init de ntracisoOR: on écrasera en cas de nzone>0 si complications avec
 ! ORCHIDEE
       ntracisoOR=ntraciso  
@@ -327 +327 @@
 call getin_p('essai_convergence',essai_convergence)
 call getin_p('initialisation_iso',initialisation_iso)
-!if (ok_isotrac) then      
+!if (nzone>0) then      
 !if (initialisation_iso.eq.0) then
 !  call getin_p('initialisation_isotrac',initialisation_isotrac)
 !endif !if (initialisation_iso.eq.0) then
-!endif !if (ok_isotrac) then      
+!endif !if (nzone>0)
 call getin_p('modif_sst',modif_sst)
 if (modif_sst.ge.1) then

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -40 +40 @@
     USE indice_sol_mod
     USE infotrac, ONLY: iso_num, iso_indnum
-    USE infotrac_phy, ONLY: nqtot, nbtr, nqo, tracers, type_trac, nqCO2, ok_isotopes, indnum_fn_num
+    USE infotrac_phy, ONLY: nqtot, nbtr, nqo, tracers, type_trac, nqCO2, indnum_fn_num
     USE readTracFiles_mod, ONLY: addPhase
     USE strings_mod,  ONLY: strIdx, strStack, int2str
@@ -126 +126 @@
 
 #ifdef ISO
-    USE infotrac_phy, ONLY:  &
-        iqiso,ok_isotrac,niso, ntraciso
-     USE isotopes_mod, ONLY: iso_eau,iso_HDO,iso_O18,iso_O17,iso_HTO, &
+    USE infotrac_phy, ONLY: iqiso,niso, ntraciso, nzone
+    USE isotopes_mod, ONLY: iso_eau,iso_HDO,iso_O18,iso_O17,iso_HTO, &
         & bidouille_anti_divergence,ok_bidouille_wake, &
         & modif_ratqs,essai_convergence,iso_init,ridicule_rain,tnat, &
         & ridicule,ridicule_snow
-     USE isotopes_routines_mod, ONLY: iso_tritium
+    USE isotopes_routines_mod, ONLY: iso_tritium
 #ifdef ISOVERIF
     USE isotopes_verif_mod, ONLY: errmax,errmaxrel, &
@@ -1595 +1594 @@
 ! dyn3dmem et physiq
 #ifdef ISO
-    write(*,*) 'physiq 1846a: ok_isotopes,ntraciso,niso=',ok_isotopes,ntraciso,niso
-    if (.not.ok_isotopes) then
-      CALL abort_gcm('physiq 1756','options iso incompatibles',1)
-    endif
+    write(*,*) 'physiq 1846a: ok_isotopes,ntraciso,niso=',niso>0,ntraciso,niso
+    IF(niso  <= 0) CALL abort_gcm('physiq 1756','options iso incompatibles',1)
 #ifdef ISOTRAC
-    if (.not.ok_isotrac) then
-      CALL abort_gcm('physiq 1758','options isotrac incompatibles',1)
-    endif    
+    IF(nzone <= 0) CALL abort_gcm('physiq 1758','options isotrac incompatibles',1)
 #else
-! #ifdef ISOTRAC
-    if (ok_isotrac) then
-      CALL abort_gcm('physiq 1762','options isotrac incompatibles',1)
-    endif
-#endif
-!! #ifdef ISOTRAC
-! -> on supprime opion ISOTRAC, tout passe par ok_isotrac
+    IF(nzone  > 0) CALL abort_gcm('physiq 1762','options isotrac incompatibles',1)
+#endif
 #else
-! #ifdef ISO
-    if (ok_isotopes) then
-      CALL abort_gcm('physiq 1772','options iso incompatibles',1)
-    endif
-#endif
-! #ifdef ISO
+    if(niso   > 0) CALL abort_gcm('physiq 1772','options iso incompatibles',1)
+#endif
 
 #ifdef ISO
@@ -1623 +1609 @@
 #ifdef ISOVERIF
            write(*,*) 'physiq 1366: call iso_init'
-           write(*,*) 'ok_isotopes=',ok_isotopes
-#endif
-        if (ok_isotopes) then
-           call iso_init()
-        endif
+           write(*,*) 'ok_isotopes=',niso > 0
+#endif
+        if (niso > 0) call iso_init()
 #ifdef ISOTRAC
-if (ok_isotrac) then
+IF(nzone > 0) then
         write(*,*) 'physiq 1416: call iso_traceurs_init'
         call iso_traceurs_init()
@@ -2424 +2408 @@
 #ifdef ISOVERIF
 !    write(*,*) 'physiq 1847: qx(1,1,:)=',qx(1,1,:)
-    write(*,*) 'physiq 1846b: ok_isotopes,ntraciso,niso=',ok_isotopes,ntraciso,niso
+    write(*,*) 'physiq 1846b: ok_isotopes,ntraciso,niso=',niso>0,ntraciso,niso
 #endif
     do ixt=1,ntraciso
@@ -2451 +2435 @@
 #endif
 ! #ifdef ISO
-
     !
     !--OB mass fixer 
@@ -2521 +2504 @@
     ! Diagnostiquer la tendance dynamique
 #ifdef ISOVERIF
-      !write(*,*) 'physiq tmp 2010: ancien_ok=',ancien_ok       
       if ((iso_HDO.gt.0).and.(iso_O18.gt.0)) then  
         do i=1,klon 
@@ -6821 +6803 @@
             endif ! if (iso_eau.gt.0) then
 #ifdef ISOTRAC
-            if (ok_isotrac) then      
-            call iso_verif_traceur(xt_ancien(1,i,k),'physiq 4802')
-            endif !if (ok_isotrac) then 
+            IF(nzone > 0) CALL iso_verif_traceur(xt_ancien(1,i,k),'physiq 4802')
 #endif          
           enddo