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

LMDZ5/trunk/libf/phylmd/pbl_surface_mod.F90

@@ -49 +49 @@
 
     USE indice_sol_mod
+    USE print_control_mod, ONLY: lunout
 
     INCLUDE "dimsoil.h"
-    INCLUDE "iniprint.h"
  
 ! Input variables
@@ -73 +73 @@
 !****************************************************************************************    
     ALLOCATE(fder(klon), stat=ierr)
-    IF (ierr /= 0) CALL abort_gcm('pbl_surface_init', 'pb in allocation',1)
+    IF (ierr /= 0) CALL abort_physic('pbl_surface_init', 'pb in allocation',1)
 
     ALLOCATE(snow(klon,nbsrf), stat=ierr)
-    IF (ierr /= 0) CALL abort_gcm('pbl_surface_init', 'pb in allocation',1)
+    IF (ierr /= 0) CALL abort_physic('pbl_surface_init', 'pb in allocation',1)
 
     ALLOCATE(qsurf(klon,nbsrf), stat=ierr)
-    IF (ierr /= 0) CALL abort_gcm('pbl_surface_init', 'pb in allocation',1)
+    IF (ierr /= 0) CALL abort_physic('pbl_surface_init', 'pb in allocation',1)
 
     ALLOCATE(ftsoil(klon,nsoilmx,nbsrf), stat=ierr)
-    IF (ierr /= 0) CALL abort_gcm('pbl_surface_init', 'pb in allocation',1)
+    IF (ierr /= 0) CALL abort_physic('pbl_surface_init', 'pb in allocation',1)
 
 
@@ -100 +100 @@
       WRITE(lunout,*)"or on doit commencer par les surfaces continentales"
       abort_message="voir ci-dessus"
-      CALL abort_gcm(modname,abort_message,1)
+      CALL abort_physic(modname,abort_message,1)
     ENDIF
 
@@ -109 +109 @@
       WRITE(lunout,*)' or is_oce = ',is_oce, '> is_sic = ',is_sic
       abort_message='voir ci-dessus'
-      CALL abort_gcm(modname,abort_message,1)
+      CALL abort_physic(modname,abort_message,1)
     ENDIF
 
@@ -118 +118 @@
       WRITE(lunout,*)' or is_lic = ',is_lic, '> is_sic = ',is_sic
       abort_message='voir ci-dessus'
-      CALL abort_gcm(modname,abort_message,1)
+      CALL abort_physic(modname,abort_message,1)
     ENDIF
 
@@ -130 +130 @@
        WRITE(lunout,*)'Option couplage pour l''ocean = ', type_ocean
        abort_message='option pour l''ocean non valable'
-       CALL abort_gcm(modname,abort_message,1)
+       CALL abort_physic(modname,abort_message,1)
     ENDIF
 
@@ -261 +261 @@
     USE carbon_cycle_mod, ONLY : carbon_cycle_cpl, co2_send
     USE indice_sol_mod
+    USE print_control_mod, ONLY: prt_level,lunout
 
     IMPLICIT NONE
@@ -266 +267 @@
     INCLUDE "dimsoil.h"
     INCLUDE "YOMCST.h"
-    INCLUDE "iniprint.h"
     INCLUDE "YOETHF.h"
     INCLUDE "FCTTRE.h"
@@ -1871 +1871 @@
           WRITE(lunout,*) 'Surface index = ', nsrf
           abort_message = 'Surface index not valid'
-          CALL abort_gcm(modname,abort_message,1)
+          CALL abort_physic(modname,abort_message,1)
        END SELECT
 
@@ -3089 +3089 @@
                 ! Security abort. This option has never been tested. To test, comment the following line.
 !                abort_message='The fraction of the continents have changed!'
-!                CALL abort_gcm(modname,abort_message,1)
+!                CALL abort_physic(modname,abort_message,1)
                 nfois(nsrf) = nfois(nsrf) + 1
              END IF