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

LMDZ5/trunk/libf/phylmd/surf_land_orchidee_noopenmp_mod.F90

@@ -102 +102 @@
     INCLUDE "temps.h"
     INCLUDE "YOMCST.h"
-    INCLUDE "iniprint.h"
     INCLUDE "dimensions.h"
   
@@ -215 +214 @@
        IF (carbon_cycle_cpl) THEN
           abort_message='You must define preprossing key ORCH_NEW when running carbon_cycle_cpl=y'
-          CALL abort_gcm(modname,abort_message,1)
+          CALL abort_physic(modname,abort_message,1)
        END IF
 #endif
@@ -246 +245 @@
           IF (error /= 0) THEN
              abort_message='Pb allocation lalo'
-             CALL abort_gcm(modname,abort_message,1)
+             CALL abort_physic(modname,abort_message,1)
           ENDIF
        ENDIF
@@ -253 +252 @@
           IF (error /= 0) THEN
              abort_message='Pb allocation lon_scat'
-             CALL abort_gcm(modname,abort_message,1)
+             CALL abort_physic(modname,abort_message,1)
           ENDIF
        ENDIF
@@ -260 +259 @@
           IF (error /= 0) THEN
              abort_message='Pb allocation lat_scat'
-             CALL abort_gcm(modname,abort_message,1)
+             CALL abort_physic(modname,abort_message,1)
           ENDIF
        ENDIF
@@ -301 +300 @@
           IF (error /= 0) THEN
              abort_message='Pb allocation neighbours'
-             CALL abort_gcm(modname,abort_message,1)
+             CALL abort_physic(modname,abort_message,1)
           ENDIF
        ENDIF
@@ -309 +308 @@
           IF (error /= 0) THEN
              abort_message='Pb allocation contfrac'
-             CALL abort_gcm(modname,abort_message,1)
+             CALL abort_physic(modname,abort_message,1)
           ENDIF
        ENDIF
@@ -327 +326 @@
           IF (error /= 0) THEN
              abort_message='Pb allocation resolution'
-             CALL abort_gcm(modname,abort_message,1)
+             CALL abort_physic(modname,abort_message,1)
           ENDIF
        ENDIF
@@ -339 +338 @@
        IF (error /= 0) THEN
           abort_message='Pb allocation coastalflow'
-          CALL abort_gcm(modname,abort_message,1)
+          CALL abort_physic(modname,abort_message,1)
        ENDIF
        
@@ -345 +344 @@
        IF (error /= 0) THEN
           abort_message='Pb allocation riverflow'
-          CALL abort_gcm(modname,abort_message,1)
+          CALL abort_physic(modname,abort_message,1)
        ENDIF
 
@@ -359 +358 @@
        IF (carbon_cycle_cpl) THEN
           ALLOCATE(fco2_land_inst(klon),stat=error)
-          IF (error /= 0)  CALL abort_gcm(modname,'Pb in allocation fco2_land_inst',1)
+          IF (error /= 0)  CALL abort_physic(modname,'Pb in allocation fco2_land_inst',1)
           
           ALLOCATE(fco2_lu_inst(klon),stat=error)
-          IF(error /=0) CALL abort_gcm(modname,'Pb in allocation fco2_lu_inst',1)
+          IF(error /=0) CALL abort_physic(modname,'Pb in allocation fco2_lu_inst',1)
        END IF
 
        ALLOCATE(fields_cpl(klon,nb_fields_cpl), stat = error)
-       IF (error /= 0) CALL abort_gcm(modname,'Pb in allocation fields_cpl',1)
+       IF (error /= 0) CALL abort_physic(modname,'Pb in allocation fields_cpl',1)
 
     ENDIF                          ! (fin debut)