Changeset 2311 for LMDZ5/trunk/libf/phylmd/cosp

Timestamp:

Jun 25, 2015, 9:45:24 AM (10 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

Location:

LMDZ5/trunk/libf/phylmd/cosp

Files:

• cosp_output_mod.F90 (modified) (2 diffs)
• cosp_output_write_mod.F90 (modified) (13 diffs)

LMDZ5/trunk/libf/phylmd/cosp/cosp_output_mod.F90

@@ -100 +100 @@
   USE ioipsl
   USE phys_cal_mod
+  USE print_control_mod, ONLY: lunout
 
 #ifdef CPP_XIOS
@@ -123 +124 @@
 !!! Variables d'entree
   include "temps.h"
-  INCLUDE 'iniprint.h'
 
 #ifdef CPP_XIOS

LMDZ5/trunk/libf/phylmd/cosp/cosp_output_write_mod.F90

@@ -22 +22 @@
     USE ioipsl
     USE control_mod
+    USE print_control_mod, ONLY: lunout,prt_level
 
 #ifdef CPP_XIOS
@@ -45 +46 @@
 
   include "temps.h"
-  include "iniprint.h"
 
   Nlevout = vgrid%Nlvgrid
@@ -268 +268 @@
     use iophy
     USE mod_phys_lmdz_para
+    USE print_control_mod, ONLY: lunout,prt_level
 #ifdef CPP_XIOS
   USE wxios
@@ -277 +278 @@
     INCLUDE "temps.h"
     INCLUDE "clesphys.h"
-    include "iniprint.h"
 
     INTEGER                          :: iff
@@ -332 +332 @@
     use iophy
     USE mod_phys_lmdz_para
+    USE print_control_mod, ONLY: lunout,prt_level
 
 #ifdef CPP_XIOS
@@ -343 +344 @@
     INCLUDE "temps.h"
     INCLUDE "clesphys.h"
-    include "iniprint.h"
 
     INTEGER                        :: iff, klevs
@@ -428 +428 @@
   USE ioipsl
   use iophy
+  USE print_control_mod, ONLY: lunout,prt_level
 
 #ifdef CPP_XIOS
@@ -435 +436 @@
   IMPLICIT NONE
   INCLUDE 'dimensions.h'
-  INCLUDE 'iniprint.h'
   INCLUDE 'clesphys.h'
 
@@ -467 +467 @@
     !Et sinon on.... écrit
     IF (SIZE(field)/=klon) &
-  CALL abort_gcm('iophy::histwrite2d_cosp','Field first DIMENSION not equal to klon',1) 
+  CALL abort_physic('iophy::histwrite2d_cosp','Field first DIMENSION not equal to klon',1) 
 
     CALL Gather_omp(field,buffer_omp)
@@ -517 +517 @@
   USE ioipsl
   use iophy
+  USE print_control_mod, ONLY: lunout,prt_level
 
 #ifdef CPP_XIOS
@@ -525 +526 @@
   IMPLICIT NONE
   INCLUDE 'dimensions.h'
-  INCLUDE 'iniprint.h'
   INCLUDE 'clesphys.h'
 
@@ -568 +568 @@
     !Et sinon on.... écrit
     IF (SIZE(field,1)/=klon) &
-   CALL abort_gcm('iophy::histwrite3d','Field first DIMENSION not equal to klon',1)                                  
+   CALL abort_physic('iophy::histwrite3d','Field first DIMENSION not equal to klon',1)                                  
     nlev=SIZE(field,2)
 
@@ -613 +613 @@
     !   en utilisant les routines getin de IOIPSL  
     use ioipsl
+    USE print_control_mod, ONLY: lunout,prt_level
 
     IMPLICIT NONE
-    include 'iniprint.h'
 
    CHARACTER(LEN=20)               :: nam_var, nnam_var