Changeset 2564

Timestamp:

Sep 21, 2021, 2:55:36 PM (3 years ago)

Author:

emillour

Message:

Common dynamics:
Check that there is indeed a run.def file to get options, flags, etc. from.
Stop if there isn't, as most likely the defaults won't do.
EM

Location:

trunk/LMDZ.COMMON/libf

Files:

• dyn3d/gcm.F90 (modified) (2 diffs)
• dyn3dpar/gcm.F (modified) (2 diffs)

trunk/LMDZ.COMMON/libf/dyn3d/gcm.F90

@@ -137 +137 @@
   REAL :: heure
   logical use_filtre_fft
+  logical :: present
 
 !-----------------------------------------------------------------------
@@ -151 +152 @@
 
 !----------------------------------------------------------------------
-!  lecture des fichiers gcm.def ou run.def
+!  Load flags and options from run.def
 !  ---------------------------------------
 !
+! Start by checking that there indeed is a run.def file
+  INQUIRE(file="run.def", EXIST=present)
+  IF(.not. present) then
+    CALL abort_gcm("gcm", "file run.def not found, Aborting!",1)
+  ENDIF
+
   CALL conf_gcm( 99, .TRUE. )
   if (mod(iphysiq, iperiod) /= 0) call abort_gcm("conf_gcm", &

trunk/LMDZ.COMMON/libf/dyn3dpar/gcm.F

@@ -138 +138 @@
       REAL :: heure
 
+      logical :: present
 
 c-----------------------------------------------------------------------
@@ -165 +166 @@
 
 c----------------------------------------------------------------------
-c  lecture des fichiers gcm.def ou run.def
+c  Load flags and options from run.def
 c  ---------------------------------------
 c
-! Ehouarn: dump possibility of using defrun
-!#ifdef CPP_IOIPSL
+      ! Start by checking that there indeed is a run.def file
+      INQUIRE(file="run.def", EXIST=present)
+      IF(.not. present) then
+        CALL abort_gcm("gcm", "file run.def not found, Aborting!",1)
+      ENDIF
+
       CALL conf_gcm( 99, .TRUE. )
       if (mod(iphysiq, iperiod) /= 0) call abort_gcm("conf_gcm",
      s "iphysiq must be a multiple of iperiod", 1)
-!#else
-!      CALL defrun( 99, .TRUE. , clesphy0 )
-!#endif
 c
 c