Changeset 5592 for LMDZ6/branches/ICOLMDZISO/libf/phylmdiso

Timestamp:

Mar 26, 2025, 7:00:27 PM (8 months ago)

Author:

yann meurdesoif

Message:

Update ICOLMDZISO branch.
YM

Location:

LMDZ6/branches/ICOLMDZISO/libf/phylmdiso

Files:

• cv3_routines.F90 (modified) (3 diffs)
• isotopes_mod.F90 (modified) (2 diffs)
• isotopes_verif_mod.F90 (modified) (2 diffs)
• isotrac_mod.F90 (modified) (2 diffs)
• limit_read_mod.F90 (modified) (1 diff)
• physiq_mod.F90 (modified) (3 diffs)

LMDZ6/branches/ICOLMDZISO/libf/phylmdiso/cv3_routines.F90

@@ -1694 +1694 @@
   IF (icvflag_Tpa == 2) THEN
 #ifdef ISO
-        CALL abort_gcm('cv3_routines 1813','isos pas prevus ici',1)
+        CALL abort_physic('cv3_routines 1813','isos pas prevus ici',1)
 #endif
 !
@@ -1808 +1808 @@
 !
 #ifdef ISO
-        CALL abort_gcm('cv3_routines 1813','isos pas prevus ici',1)
+        CALL abort_physic('cv3_routines 1813','isos pas prevus ici',1)
 #endif
     DO k = minorig + 1, nl
@@ -3981 +3981 @@
     IF (cvflag_prec_eject) THEN
 #ifdef ISO
-      CALL abort_gcm('cv3_routines 4037','isos pas prevus ici',1)
+      CALL abort_physic('cv3_routines 4037','isos pas prevus ici',1)
 #endif
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

LMDZ6/branches/ICOLMDZISO/libf/phylmdiso/isotopes_mod.F90

@@ -143 +143 @@
 !$OMP THREADPRIVATE(lat_nucl, lon_nucl, zmin_nucl, zmax_nucl, HTO_nucl)
  
- 
+   LOGICAL, SAVE :: using_iso = .FALSE.   !--- TRUE isotope version is used
+!$OMP THREADPRIVATE(using_iso)
+   
 CONTAINS
 
@@ -165 +167 @@
    INTEGER :: iessai
 
+   using_iso=.TRUE.
+   
    modname = 'iso_init'
    CALL msg('219: entree', modname)

LMDZ6/branches/ICOLMDZISO/libf/phylmdiso/isotopes_verif_mod.F90

@@ -1 @@
-
-#ifdef ISOVERIF
 ! $Id: $
 
@@ -2779 +2777 @@
 END MODULE isotopes_verif_mod
 
-#endif         
-! endif ISOVERIF 
-

LMDZ6/branches/ICOLMDZISO/libf/phylmdiso/isotrac_mod.F90

@@ -1 @@
-#ifdef ISO
-#ifdef ISOTRAC
-
 MODULE isotrac_mod
   USE infotrac_phy, ONLY: niso, ntiso, nzone, delPhase
@@ -673 +670 @@
 
 END MODULE isotrac_mod
-#endif
-#endif

LMDZ6/branches/ICOLMDZISO/libf/phylmdiso/limit_read_mod.F90

@@ -517 +517 @@
              IF ((iso_HTO.gt.0).and.(ok_prod_nucl_tritium)) THEN
                ierr = NF90_INQ_VARID(nid, 'TUOCE', nvarid)
-               IF (ierr /= NF90_NOERR) CALL abort_gcm(modname,'Le champ <TUOCE> est absent',1)
+               IF (ierr /= NF90_NOERR) CALL abort_physic(modname,'Le champ <TUOCE> est absent',1)
 
                ierr = NF90_GET_VAR(nid,nvarid,tuoce_glo,start,epais)
-               IF (ierr /= NF90_NOERR) CALL abort_gcm(modname,'Lecture echouee pour <TUOCE>',1)
+               IF (ierr /= NF90_NOERR) CALL abort_physic(modname,'Lecture echouee pour <TUOCE>',1)
              END IF
 #ifdef ISOVERIF

LMDZ6/branches/ICOLMDZISO/libf/phylmdiso/physiq_mod.F90

@@ -1772 +1772 @@
        itapwk = 0
 
-! C Risi: vérifier compatibilité des options isotopiques entre 
-! dyn3dmem et physiq
-#ifdef ISO
-    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(nzone <= 0) CALL abort_gcm('physiq 1758','options isotrac incompatibles',1)
-#else
-    IF(nzone  > 0) CALL abort_gcm('physiq 1762','options isotrac incompatibles',1)
-#endif
-#else
-    if(niso   > 0) CALL abort_gcm('physiq 1772','options iso incompatibles',1)
-#endif
-
-#ifdef ISO
-        ! initialisations isotopiques
-#ifdef ISOVERIF
-           write(*,*) 'physiq 1366: call iso_init'
-           write(*,*) 'ok_isotopes=',niso > 0
-#endif
-        if (niso > 0) call iso_init()
-#ifdef ISOTRAC
-IF(nzone > 0) then
-        write(*,*) 'physiq 1416: call iso_traceurs_init'
-        call iso_traceurs_init()
-endif
-#endif
+
+!!ym for displaced in iniphysic for early initialization
+
+!! C Risi: vérifier compatibilité des options isotopiques entre 
+!! dyn3dmem et physiq
+!#ifdef ISO
+!    write(*,*) 'physiq 1846a: ok_isotopes,ntraciso,niso=',niso>0,ntraciso,niso
+!    IF(niso  <= 0) CALL abort_physic('physiq 1756','options iso incompatibles',1)
+!#ifdef ISOTRAC
+!    IF(nzone <= 0) CALL abort_physic('physiq 1758','options isotrac incompatibles',1)
+!#else
+!    IF(nzone  > 0) CALL abort_physic('physiq 1762','options isotrac incompatibles',1)
+!#endif
+!#else
+!    if(niso   > 0) CALL abort_physic('physiq 1772','options iso incompatibles',1)
+!#endif
+!
+!#ifdef ISO
+!        ! initialisations isotopiques
+!#ifdef ISOVERIF
+!           write(*,*) 'physiq 1366: call iso_init'
+!           write(*,*) 'ok_isotopes=',niso > 0
+!#endif
+!        if (niso > 0) call iso_init()
+!#ifdef ISOTRAC
+!IF(nzone > 0) then
+!        write(*,*) 'physiq 1416: call iso_traceurs_init'
+!        call iso_traceurs_init()
+!endif
+!#endif
 !write(*,*) 'gcm 265: ntraciso=',ntraciso
-#ifdef ISOVERIF
-        write(*,*) 'physiq 1421: call iso_verif_init'
-        call iso_verif_init()
-#endif
-#endif
+!#ifdef ISOVERIF
+!        write(*,*) 'physiq 1421: call iso_verif_init'
+!        call iso_verif_init()
+!#endif
+!#endif
 
 
@@ -3675 +3678 @@
     ELSE IF (iflag_con.EQ.2) THEN
 #ifdef ISO
-      CALL abort_gcm('physiq 2770','isos pas prevus ici',1)
+      CALL abort_physic('physiq 2770','isos pas prevus ici',1)
 #endif
        CALL conflx(phys_tstep, paprs, pplay, t_seri, q_seri, &
@@ -7012 +7015 @@
     IF (mass_fixer) THEN
 #ifdef ISO
-      CALL abort_gcm('physiq 6936','isos pas prevus dans le mass fixer',1)
+      CALL abort_physic('physiq 6936','isos pas prevus dans le mass fixer',1)
       ! Camille Risi mai 2024: on attend d'avoir la 4e dimension qui rendra tout plus simple.
 #endif