Changeset 1140 for LMDZ4/branches/LMDZ4-dev/libf/dyn3d/diagedyn.F

Timestamp:

Mar 30, 2009, 4:46:54 PM (15 years ago)

Author:

Ehouarn Millour

Message:

Premiere vaque de modifications pour l'unification des dynamiques (planetes-Terre) et un peu de netoyage ...

• modified 'makegcm' and 'makegcm_fcm' to remove 'CPP_PHYS' key and add 'CPP_EARTH' preprocessing key instead
• updated 'diagedyn.F' (in dyn3d and dyn3dpar) to use 'CPP_EARTH' key
• added 'ioipsl_getincom.F90' and 'ioipsl_stringop.F90' to 'dyn3d' and 'dyn3dpar' for future possibility of running without IOIPSL library
• modified conf_gcm.F ( in d'yn3d' and 'dyn3dpar') to read in flag 'planet_type' (default=='earth') (flag added in 'control.h')
• modified 'gcm.F' (in 'dyn3d' and 'dyn3dpar') so that flags so that 'read_start' and 'iflag_phys' (known from conf_gcm.F) are used
• added flag 'output_grads_dyn' (read by conf_gcm.F, stored in 'control.h') to write grads outputs from 'leapfrog.F' and 'leapfrog_p.F'
• removed 'comdiss.h' from 'dyn3d' and 'dyn3dpar' (it is not used)
• removed variable 'lstardis' from 'comdissip.h' (it is also in

'comdissnew.h'), in dyn3d as well as in dyn3dpar

• adapted 'dyn3d/iniacademic.F' to not use 'inicons0.F' but 'iniconst.F'
• updated 'dyn3d/etat0_netcdf.F' to not use 'inicons0' but 'iniconst' (added prerequisite pa=50000 instruction) and added #ifdef CPP_EARTH keys
• removed 'inicons0.F' and 'disvert0.F' (not used any more)

File:

• LMDZ4/branches/LMDZ4-dev/libf/dyn3d/diagedyn.F (modified) (3 diffs)

LMDZ4/branches/LMDZ4-dev/libf/dyn3d/diagedyn.F

@@ -58 +58 @@
 #include "paramet.h"
 #include "comgeom.h"
-
-#ifdef CPP_PHYS
+#include "iniprint.h"
+
+#ifdef CPP_EARTH
 #include "../phylmd/YOMCST.h"
 #include "../phylmd/YOETHF.h"
@@ -139 +140 @@
 
 
-#ifdef CPP_PHYS
+#ifdef CPP_EARTH
 c======================================================================
 C     Compute Kinetic enrgy
@@ -314 +315 @@
 C
 #else
-      print*,'Pour l instant diagedyn a besoin de la physique'
+      write(lunout,*),'diagedyn: Needs Earth physics to function'
 #endif
+! #endif of #ifdef CPP_EARTH 
       RETURN 
       END