Changeset 5231 for LMDZ6/branches/Amaury_dev/libf/phylmd

Timestamp:

Sep 25, 2024, 1:34:49 PM (9 months 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)

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