Changeset 2311 for LMDZ5/trunk/libf/phylmd/limit_netcdf.F90

Timestamp:

Jun 25, 2015, 9:45:24 AM (9 years ago)

Author:

Ehouarn Millour

Message:

Further modifications to enforce physics/dynamics separation:

• moved iniprint.h and misc_mod back to dyn3d_common, as these should only be used by dynamics.
• created print_control_mod in the physics to store flags prt_level, lunout, debug to be local to physics (should be used rather than iniprint.h)
• created abort_physic.F90 , which does the same job as abort_gcm() did, but should be used instead when in physics.
• reactivated inifis (turned it into a module, inifis_mod.F90) to initialize physical constants and print_control_mod flags.

EM

File:

• LMDZ5/trunk/libf/phylmd/limit_netcdf.F90 (modified) (8 diffs)

LMDZ5/trunk/libf/phylmd/limit_netcdf.F90

@@ -29 +29 @@
   USE netcdf95,    ONLY: nf95_def_var, nf95_put_att, nf95_put_var
   USE grid_atob_m, ONLY: grille_m, rugosite, sea_ice
+  USE print_control_mod, ONLY: prt_level,lunout
   IMPLICIT NONE
 !-------------------------------------------------------------------------------
@@ -34 +35 @@
   include "dimensions.h"
   include "paramet.h"
-  include "iniprint.h"
   LOGICAL,                    INTENT(IN) :: interbar ! barycentric interpolation
   LOGICAL,                    INTENT(IN) :: extrap   ! SST extrapolation flag
@@ -104 +104 @@
      WRITE(lunout,*) 'One of following files must be available : '
      DO k=1,SIZE(fsic); WRITE(lunout,*) TRIM(fsic(k)); END DO
-     CALL abort_gcm('limit_netcdf','No sea-ice file was found',1)
+     CALL abort_physic('limit_netcdf','No sea-ice file was found',1)
   END IF
   CALL ncerr(NF90_CLOSE(nid),icefile)
@@ -163 +163 @@
      WRITE(lunout,*) 'One of following files must be available : '
      DO k=1,SIZE(fsst); WRITE(lunout,*) TRIM(fsst(k)); END DO
-     CALL abort_gcm('limit_netcdf','No sst file was found',1)
+     CALL abort_physic('limit_netcdf','No sst file was found',1)
   END IF
   CALL ncerr(NF90_CLOSE(nid),sstfile)
@@ -277 +277 @@
   include "paramet.h"
   include "comgeom2.h"
-  include "iniprint.h"
 !-----------------------------------------------------------------------------
 ! Arguments:
@@ -574 +573 @@
     WRITE(mess,'(a,i3,a,i3,a)')'Unconsistent calendar: ',nd,' days/year, but ',&
       nm,' months/year. Months number should divide days number.'
-    CALL abort_gcm('mid_months',TRIM(mess),1)
+    CALL abort_physic('mid_months',TRIM(mess),1)
 
   ELSE
@@ -626 +625 @@
 !-------------------------------------------------------------------------------
   USE netcdf, ONLY : NF90_NOERR, NF90_STRERROR
+  USE print_control_mod, ONLY: lunout
   IMPLICIT NONE
 !-------------------------------------------------------------------------------
@@ -632 +632 @@
   CHARACTER(LEN=*), INTENT(IN) :: fnam
 !-------------------------------------------------------------------------------
-#include "iniprint.h"
   IF(ncres/=NF90_NOERR) THEN
     WRITE(lunout,*)'Problem with file '//TRIM(fnam)//' in routine limit_netcdf.'
-    CALL abort_gcm('limit_netcdf',NF90_STRERROR(ncres),1)
+    CALL abort_physic('limit_netcdf',NF90_STRERROR(ncres),1)
   END IF