Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/limit_slab.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/limit_slab.F90 (modified) (4 diffs)

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

@@ -4 +4 @@
 
   USE dimphy
-  USE mod_grid_phy_lmdz
+  USE mod_grid_phy_lmdz, ONLY: klon_glo
   USE mod_phys_lmdz_para
   USE netcdf 
@@ -11 +11 @@
   IMPLICIT NONE
 
-  INCLUDE "temps.h"
   INCLUDE "clesphys.h"
-  INCLUDE "dimensions.h"
 
 ! In- and ouput arguments
@@ -113 +111 @@
 !****************************************************************************************
         ierr = NF90_CLOSE(nid)
-        IF (ierr /= NF90_NOERR) CALL abort_gcm(modname,'Pb when closing file', 1)
+        IF (ierr /= NF90_NOERR) CALL abort_physic(modname,'Pb when closing file', 1)
         END IF ! Read File
         IF (read_sst) THEN
@@ -133 +131 @@
      IF (.NOT. ALLOCATED(bils_save)) THEN
         ALLOCATE(bils_save(klon), diff_sst_save(klon), diff_siv_save(klon), stat=ierr)
-        IF (ierr /= 0) CALL abort_gcm('limit_slab', 'pb in allocation',1)
+        IF (ierr /= 0) CALL abort_physic('limit_slab', 'pb in allocation',1)
      END IF