Changeset 5217 for LMDZ6/trunk/libf/phylmdiso

Timestamp:

Sep 23, 2024, 2:14:55 PM (2 months ago)

Author:

Ehouarn Millour

Message:

Replace "abort_gcm" in physics with "abort_physic"
to ensure clean dynamics-physics separation.
EM

Location:

LMDZ6/trunk/libf/phylmdiso

Files:

• cv3_routines.F90 (modified) (3 diffs)
• limit_read_mod.F90 (modified) (1 diff)
• physiq_mod.F90 (modified) (3 diffs)

LMDZ6/trunk/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/trunk/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/trunk/libf/phylmdiso/physiq_mod.F90

@@ -1776 +1776 @@
 #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)
+    IF(niso  <= 0) CALL abort_physic('physiq 1756','options iso incompatibles',1)
 #ifdef ISOTRAC
-    IF(nzone <= 0) CALL abort_gcm('physiq 1758','options isotrac incompatibles',1)
+    IF(nzone <= 0) CALL abort_physic('physiq 1758','options isotrac incompatibles',1)
 #else
-    IF(nzone  > 0) CALL abort_gcm('physiq 1762','options isotrac incompatibles',1)
+    IF(nzone  > 0) CALL abort_physic('physiq 1762','options isotrac incompatibles',1)
 #endif
 #else
-    if(niso   > 0) CALL abort_gcm('physiq 1772','options iso incompatibles',1)
+    if(niso   > 0) CALL abort_physic('physiq 1772','options iso incompatibles',1)
 #endif
 
@@ -3675 +3675 @@
     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 +7012 @@
     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