Changeset 5231 for LMDZ6

Timestamp:

Sep 25, 2024, 1:34:49 PM (3 weeks ago)

Author:

abarral

Message:

Merge r5217

Location:

LMDZ6/branches/Amaury_dev

Files:

• . (modified) (1 prop)
• libf/phylmd/calltherm.F90 (modified) (1 diff)
• libf/phylmd/fonte_neige_mod.F90 (modified) (7 diffs)
• libf/phylmd/pbl_surface_mod.F90 (modified) (3 diffs)
• libf/phylmd/surf_land_mod.F90 (modified) (2 diffs)
• libf/phylmd/surf_landice_mod.F90 (modified) (1 diff)
• libf/phylmdiso/cv3_routines.F90 (modified) (3 diffs)
• libf/phylmdiso/limit_read_mod.F90 (modified) (1 diff)
• libf/phylmdiso/physiq_mod.F90 (modified) (3 diffs)

LMDZ6/branches/Amaury_dev/libf/phylmd/calltherm.F90

@@ -236 +236 @@
 #ifdef ISO
       IF (.NOT.new_thermcell) THEN
-           CALL abort_gcm('calltherm 234','isos pas prevus ici',1)
+           CALL abort_physic('calltherm 234','isos pas prevus ici',1)
       endif
 #ifdef ISOVERIF

LMDZ6/branches/Amaury_dev/libf/phylmd/fonte_neige_mod.F90

@@ -148 +148 @@
 
     USE infotrac_phy, ONLY: niso
+    USE lmdz_abort_physic, ONLY: abort_physic
 #ifdef ISOVERIF
     USE isotopes_mod, ONLY: iso_eau,iso_HDO
@@ -172 +173 @@
     IF (error /= 0) THEN
        abort_message='Pb allocation run_off_lic'
-       CALL abort_gcm(modname,abort_message,1)
+       CALL abort_physic(modname,abort_message,1)
     ENDIF    
     
@@ -193 +194 @@
     IF (error /= 0) THEN
        abort_message='Pb allocation xtrun_off_ter'
-       CALL abort_gcm(modname,abort_message,1)
+       CALL abort_physic(modname,abort_message,1)
     ENDIF
     xtrun_off_ter(:,:) = 0.
@@ -200 +201 @@
     IF (error /= 0) THEN
        abort_message='Pb allocation xtrun_off_lic'
-       CALL abort_gcm(modname,abort_message,1)
+       CALL abort_physic(modname,abort_message,1)
     ENDIF
     xtrun_off_lic(:,:) = 0.
@@ -207 +208 @@
     IF (error /= 0) THEN
        abort_message='Pb allocation fxtfonte_global'
-       CALL abort_gcm(modname,abort_message,1)
+       CALL abort_physic(modname,abort_message,1)
     ENDIF
     fxtfonte_global(:,:,:) = 0.0
@@ -214 +215 @@
     IF (error /= 0) THEN
        abort_message='Pb allocation fxtcalving_global'
-       CALL abort_gcm(modname,abort_message,1)
+       CALL abort_physic(modname,abort_message,1)
     ENDIF
     fxtcalving_global(:,:,:) = 0.0
@@ -221 +222 @@
     IF (error /= 0) THEN
        abort_message='Pb allocation xtrunofflic_global'
-       CALL abort_gcm(modname,abort_message,1)
+       CALL abort_physic(modname,abort_message,1)
     ENDIF
     xtrunofflic_global(:,:) = 0.0

LMDZ6/branches/Amaury_dev/libf/phylmd/pbl_surface_mod.F90

@@ -226 +226 @@
 
     ALLOCATE(xtsnow(niso,klon,nbsrf), stat=ierr)
-    IF (ierr /= 0) CALL abort_gcm('pbl_surface_init', 'pb in allocation',1)
+    IF (ierr /= 0) CALL abort_physic('pbl_surface_init', 'pb in allocation',1)
 
     ALLOCATE(Rland_ice(niso,klon), stat=ierr)
-    IF (ierr /= 0) CALL abort_gcm('pbl_surface_init', 'pb in allocation',1)
+    IF (ierr /= 0) CALL abort_physic('pbl_surface_init', 'pb in allocation',1)
 
     ALLOCATE(Roce(niso,klon), stat=ierr)
-    IF (ierr /= 0) CALL abort_gcm('pbl_surface_init', 'pb in allocation',1)
+    IF (ierr /= 0) CALL abort_physic('pbl_surface_init', 'pb in allocation',1)
 
     xtsnow(:,:,:)  = xtsnow_rst(:,:,:)
@@ -2252 +2252 @@
       ELSE IF (iflag_split >= 1) THEN
 #ifdef ISO
-        CALL abort_gcm('pbl_surface_mod 2149','isos pas encore dans iflag_split=1',1)
+        CALL abort_physic('pbl_surface_mod 2149','isos pas encore dans iflag_split=1',1)
 #endif
 
@@ -2735 +2735 @@
       IF (iflag_split >= 1) THEN
 #ifdef ISO
-        CALL abort_gcm('pbl_surface_mod 2607','isos pas encore dans iflag_split=1',1)
+        CALL abort_physic('pbl_surface_mod 2607','isos pas encore dans iflag_split=1',1)
 #endif
 

LMDZ6/branches/Amaury_dev/libf/phylmd/surf_land_mod.F90

@@ -73 +73 @@
 #endif
 
-    USE lmdz_print_control, ONLY: lunout
+  USE lmdz_print_control, ONLY: lunout
   USE lmdz_clesphys
   USE lmdz_dimpft, ONLY: nvm_lmdz
   USE lmdz_yomcst
+  USE lmdz_abort_physic, ONLY: abort_physic
 
     INCLUDE "dimsoil.h"
@@ -229 +230 @@
 
 #ifdef ISO
-      CALL abort_gcm('surf_land_mod 220','isos pas prevus dans orchidee',1)
+      CALL abort_physic('surf_land_mod 220','isos pas prevus dans orchidee',1)
 #endif
        ! temporary for keeping same results using lwdown_m instead of lwdown

LMDZ6/branches/Amaury_dev/libf/phylmd/surf_landice_mod.F90

@@ -265 +265 @@
 
 #ifdef ISO
-        CALL abort_gcm('surf_landice 235','isotopes pas dans INLANDSIS',1)
+        CALL abort_physic('surf_landice 235','isotopes pas dans INLANDSIS',1)
 #endif
 

LMDZ6/branches/Amaury_dev/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
@@ -3977 +3977 @@
     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/Amaury_dev/libf/phylmdiso/limit_read_mod.F90

@@ -518 +518 @@
              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/Amaury_dev/libf/phylmdiso/physiq_mod.F90

@@ -1745 +1745 @@
 #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
 
@@ -3631 +3631 @@
     ELSE IF (iflag_con==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, &
@@ -6951 +6951 @@
     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