Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/ocean_slab_mod.F90

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/ocean_slab_mod.F90 (modified) (10 diffs)

LMDZ5/branches/testing/libf/phylmd/ocean_slab_mod.F90

@@ -88 +88 @@
     use IOIPSL
 
-    INCLUDE "iniprint.h"
     ! For ok_xxx vars (Ekman...)
     INCLUDE "clesphys.h"
@@ -110 +109 @@
     IF (error /= 0) THEN
        abort_message='Pb allocation tmp_pctsrf_slab'
-       CALL abort_gcm(modname,abort_message,1)
+       CALL abort_physic(modname,abort_message,1)
     ENDIF
     fsic(:)=0.
@@ -121 +120 @@
 !****************************************************************************************
     ALLOCATE(tslab(klon,nslay), stat=error)
-       IF (error /= 0) CALL abort_gcm &
+       IF (error /= 0) CALL abort_physic &
          (modname,'pb allocation tslab', 1)
 
@@ -127 +126 @@
     IF (error /= 0) THEN
        abort_message='Pb allocation slab_bils'
-       CALL abort_gcm(modname,abort_message,1)
+       CALL abort_physic(modname,abort_message,1)
     ENDIF
     slab_bils(:) = 0.0   
@@ -133 +132 @@
     IF (error /= 0) THEN
        abort_message='Pb allocation slab_bils_cum'
-       CALL abort_gcm(modname,abort_message,1)
+       CALL abort_physic(modname,abort_message,1)
     ENDIF
     bils_cum(:) = 0.0   
@@ -141 +140 @@
         IF (error /= 0) THEN
            abort_message='Pb allocation slab_bilg'
-           CALL abort_gcm(modname,abort_message,1)
+           CALL abort_physic(modname,abort_message,1)
         ENDIF
         slab_bilg(:) = 0.0   
@@ -147 +146 @@
         IF (error /= 0) THEN
            abort_message='Pb allocation slab_bilg_cum'
-           CALL abort_gcm(modname,abort_message,1)
+           CALL abort_physic(modname,abort_message,1)
         ENDIF
         bilg_cum(:) = 0.0   
@@ -153 +152 @@
         IF (error /= 0) THEN
            abort_message='Pb allocation slab_tice'
-           CALL abort_gcm(modname,abort_message,1)
+           CALL abort_physic(modname,abort_message,1)
         ENDIF
         ALLOCATE(seaice(klon), stat = error)
         IF (error /= 0) THEN
            abort_message='Pb allocation slab_seaice'
-           CALL abort_gcm(modname,abort_message,1)
+           CALL abort_physic(modname,abort_message,1)
         ENDIF
     END IF
@@ -169 +168 @@
     IF (error /= 0) THEN
        abort_message='Pb allocation slabh'
-       CALL abort_gcm(modname,abort_message,1)
+       CALL abort_physic(modname,abort_message,1)
     ENDIF
     slabh(1)=50.
@@ -226 +225 @@
     USE calcul_fluxs_mod
 
-    INCLUDE "iniprint.h"
     INCLUDE "clesphys.h"