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

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

@@ -6 +6 @@
   USE mod_grid_phy_lmdz
   USE mod_phys_lmdz_para
-
+  USE print_control_mod, ONLY: lunout
 
   IMPLICIT NONE
@@ -27 +27 @@
   REAL, DIMENSION(nbp_lon,nbp_lat) :: var_glo2D_tmp ! 2D global
   REAL, DIMENSION(klon_glo)        :: var_glo1D     ! 1D global
-  INCLUDE "iniprint.h"
 
 ! Read variable from file. Done by master process MPI and master thread OpenMP
@@ -66 +65 @@
   CONTAINS
     SUBROUTINE write_err_mess(err_mess)
-
+      USE print_control_mod, ONLY: lunout
+      IMPLICIT NONE
       CHARACTER(len=*), INTENT(IN) :: err_mess
-      INCLUDE "iniprint.h"
       
       WRITE(lunout,*) 'Error in read_map2D, filename = ', trim(filename)
@@ -74 +73 @@
       WRITE(lunout,*) 'Error in read_map2D, timestep = ', timestep
 
-      CALL abort_gcm(modname, err_mess, 1)
+      CALL abort_physic(modname, err_mess, 1)
 
     END SUBROUTINE write_err_mess