Changeset 1592 for trunk

Timestamp:

Sep 1, 2016, 3:15:36 PM (9 years ago)

Author:

emillour

Message:

Dynamical core and miscellaneous additions to be fully compatible with LMDZ5 and the Earth physics package phylmd (at this point one can compile phylmd, from LMDZ5 revision 2602, with LMDZ.COMMON).

• dyn3d and dyn3dpar:
• removed ce0l.F90

• dyn3d_common:
• added conf_dat_m.F90 (for Earth model)
• modified diagedyn.F: hard coded constants for Earth and error message for other planets

• misc:
• added slopes_m.F90 and regr1_conserv_m.F90 used by Earth model

EM

Location:

trunk

Files:

• DOC/chantiers/commit_importants.log (modified) (1 diff)
• LMDZ.COMMON/libf/dyn3d/ce0l.F90 (deleted)
• LMDZ.COMMON/libf/dyn3d_common/conf_dat_m.F90 (added)
• LMDZ.COMMON/libf/dyn3d_common/diagedyn.F (modified) (4 diffs)
• LMDZ.COMMON/libf/dyn3dpar/ce0l.F90 (deleted)
• LMDZ.COMMON/libf/misc/regr1_conserv_m.F90 (added)
• LMDZ.COMMON/libf/misc/slopes_m.F90 (added)

trunk/DOC/chantiers/commit_importants.log

@@ -1867 +1867 @@
 models).
 
+**********************
+**** commit_v1592 ****
+**********************
+Ehouarn: Further adaptations to stick with LMDZ5 (at this point one can
+compile phylmd, from LMDZ5 revision 2602, with LMDZ.COMMON!)
+
+* dyn3d and dyn3dpar:
+- removed ce0l.F90
+
+* dyn3d_common:
+- added conf_dat_m.F90 (for Earth model)
+- modified diagedyn.F: hard coded constants for Earth and error message
+  for other planets
+
+* misc:
+- added slopes_m.F90 and regr1_conserv_m.F90 used by Earth model

trunk/LMDZ.COMMON/libf/dyn3d_common/diagedyn.F

@@ -53 +53 @@
 c======================================================================
  
+      USE control_mod, ONLY : planet_type
       USE cpdet_mod, ONLY: cpdet,tpot2t
 
@@ -66 +67 @@
 !#include "../phylmd/YOETHF.h"
 !#endif
+! Ehouarn: for now set these parameters to what is in Earth physics...
+!          (cf ../phylmd/suphel.h)
+!          this should be generalized...
+      REAL,PARAMETER :: RCPD=
+     &               3.5*(1000.*(6.0221367E+23*1.380658E-23)/28.9644)
+      REAL,PARAMETER :: RCPV=
+     &               4.*(1000.*(6.0221367E+23*1.380658E-23)/18.0153)
+      REAL,PARAMETER :: RCS=RCPV
+      REAL,PARAMETER :: RCW=RCPV
+      REAL,PARAMETER :: RLSTT=2.8345E+6
+      REAL,PARAMETER :: RLVTT=2.5008E+6
+!
 C
       INTEGER imjmp1
@@ -142 +155 @@
 
 
-#ifdef CPP_EARTH
+!#ifdef CPP_EARTH
+      IF (planet_type=="earth") THEN
+      
 c======================================================================
 C     Compute Kinetic enrgy
@@ -319 +334 @@
       ec_pre (idiag)    = ec_tot
 C
-#else
-      write(lunout,*)'diagedyn: Needs Earth physics to function'
-#endif
+!#else
+      ELSE
+      write(lunout,*)'diagedyn: set to function with Earth parameters'
+      ENDIF ! of if (planet_type=="earth")
+!#endif
 ! #endif of #ifdef CPP_EARTH 
       RETURN