Changeset 2311 for LMDZ5/trunk/libf/phylmd/iophy.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/iophy.F90 (modified) (20 diffs)

LMDZ5/trunk/libf/phylmd/iophy.F90

@@ -54 +54 @@
   IMPLICIT NONE
   INCLUDE 'dimensions.h'
-  include 'iniprint.h'
     REAL,DIMENSION(klon),INTENT(IN) :: rlon
     REAL,DIMENSION(klon),INTENT(IN) :: rlat
@@ -571 +570 @@
     INCLUDE "temps.h"
     INCLUDE "clesphys.h"
-    INCLUDE "iniprint.h"
 
     INTEGER                          :: iff
@@ -650 +648 @@
                                    nid_files, nhorim, swaero_diag, levmin, &
                                    levmax, nvertm
+    USE print_control_mod, ONLY: prt_level,lunout
 #ifdef CPP_XIOS
     use wxios, only: wxios_add_field_to_file
@@ -658 +657 @@
     INCLUDE "temps.h"
     INCLUDE "clesphys.h"
-    INCLUDE "iniprint.h"
 
     INTEGER                          :: iff
@@ -728 +726 @@
     use ioipsl, only: getin
     use phys_output_var_mod, only: nfiles
+    USE print_control_mod, ONLY: prt_level,lunout
     IMPLICIT NONE
-
-    include 'iniprint.h'
 
     CHARACTER(LEN=20)                :: nam_var
@@ -750 +747 @@
                                 jj_nb, klon_mpi
   USE ioipsl, only: histwrite
+  USE print_control_mod, ONLY: prt_level,lunout
   IMPLICIT NONE
   include 'dimensions.h'
-  include 'iniprint.h'
     
     integer,INTENT(IN) :: nid
@@ -767 +764 @@
 
 
-    IF (size(field)/=klon) CALL abort_gcm('iophy::histwrite2d','Field first DIMENSION not equal to klon',1)
+    IF (size(field)/=klon) CALL abort_physic('iophy::histwrite2d','Field first DIMENSION not equal to klon',1)
     
     CALL Gather_omp(field,buffer_omp)    
@@ -815 +812 @@
                                 jj_nb, klon_mpi
   use ioipsl, only: histwrite
+  USE print_control_mod, ONLY: prt_level,lunout
   IMPLICIT NONE
   include 'dimensions.h'
-  include 'iniprint.h'
     
     integer,INTENT(IN) :: nid
@@ -831 +828 @@
 
 
-    IF (size(field,1)/=klon) CALL abort_gcm('iophy::histwrite3d','Field first DIMENSION not equal to klon',1)
+    IF (size(field,1)/=klon) CALL abort_physic('iophy::histwrite3d','Field first DIMENSION not equal to klon',1)
     nlev=size(field,2)
 
@@ -889 +886 @@
                                  nfiles, vars_defined, clef_stations, &
                                  nid_files
+  USE print_control_mod, ONLY: prt_level,lunout
 #ifdef CPP_XIOS
   USE xios, only: xios_send_field
@@ -896 +894 @@
   IMPLICIT NONE
   INCLUDE 'dimensions.h'
-  INCLUDE 'iniprint.h'
   include 'clesphys.h'
 
@@ -945 +942 @@
 
     !Et sinon on.... écrit
-    IF (SIZE(field)/=klon) CALL abort_gcm('iophy::histwrite2d_phy','Field first DIMENSION not equal to klon',1)
+    IF (SIZE(field)/=klon) CALL abort_physic('iophy::histwrite2d_phy','Field first DIMENSION not equal to klon',1)
     
     if (prt_level >= 10) then
@@ -971 +968 @@
           endif
 #else
-        CALL abort_gcm ('iophy','cannot have ok_all_xml = .T. without CPP_XIOS defined' ,1)
+        CALL abort_physic ('iophy','cannot have ok_all_xml = .T. without CPP_XIOS defined' ,1)
 #endif
       ELSE  
@@ -1052 +1049 @@
   USE xios, only: xios_send_field
 #endif
-
+  USE print_control_mod, ONLY: prt_level,lunout
 
   IMPLICIT NONE
   INCLUDE 'dimensions.h'
-  INCLUDE 'iniprint.h'
   include 'clesphys.h'
 
@@ -1095 +1091 @@
   ELSE
     !Et sinon on.... écrit
-    IF (SIZE(field,1)/=klon) CALL abort_gcm('iophy::histwrite3d','Field first DIMENSION not equal to klon',1)
+    IF (SIZE(field,1)/=klon) CALL abort_physic('iophy::histwrite3d','Field first DIMENSION not equal to klon',1)
     nlev=SIZE(field,2)
     if (nlev.eq.klev+1) then
@@ -1119 +1115 @@
           CALL xios_send_field(var%name, Field3d(:,:,1:nlevx))
 #else
-        CALL abort_gcm ('iophy','cannot have ok_all_xml = .T. without CPP_XIOS defined' ,1)
+        CALL abort_physic ('iophy','cannot have ok_all_xml = .T. without CPP_XIOS defined' ,1)
 #endif
       ELSE  
@@ -1197 +1193 @@
                                 jj_nb, klon_mpi
   USE xios, only: xios_send_field
-
+  USE print_control_mod, ONLY: prt_level,lunout
 
   IMPLICIT NONE
   INCLUDE 'dimensions.h'
-  INCLUDE 'iniprint.h'
 
     CHARACTER(LEN=*), INTENT(IN) :: field_name
@@ -1216 +1211 @@
 
     !Et sinon on.... écrit
-    IF (SIZE(field)/=klon) CALL abort_gcm('iophy::histwrite2d_xios','Field first DIMENSION not equal to klon',1)
+    IF (SIZE(field)/=klon) CALL abort_physic('iophy::histwrite2d_xios','Field first DIMENSION not equal to klon',1)
     
     CALL Gather_omp(field,buffer_omp)    
@@ -1268 +1263 @@
                                 jj_nb, klon_mpi
   USE xios, only: xios_send_field
-
+  USE print_control_mod, ONLY: prt_level,lunout
 
   IMPLICIT NONE
   INCLUDE 'dimensions.h'
-  INCLUDE 'iniprint.h'
 
     CHARACTER(LEN=*), INTENT(IN) :: field_name
@@ -1286 +1280 @@
 
     !Et on.... écrit
-    IF (SIZE(field,1)/=klon) CALL abort_gcm('iophy::histwrite3d','Field first DIMENSION not equal to klon',1)
+    IF (SIZE(field,1)/=klon) CALL abort_physic('iophy::histwrite3d','Field first DIMENSION not equal to klon',1)
     nlev=SIZE(field,2)