Changeset 2239 for LMDZ5/trunk/libf/dyn3d_common

Timestamp:

Mar 23, 2015, 8:27:30 AM (9 years ago)

Author:

Ehouarn Millour

Message:

Reorganizing physics/dynamics interface:

• what is related to dynamics-physics interface is now in a seperate directory: dynlmdz_phy* for physics in phy*
• 1d model and related dependencies (including a couple from "dynamics", set up as symbolic links) is now in subdirectory "dyn1d" of phy*.
• "bibio" directory is now "misc" and should only contain autonomous utilities.
• "cosp" is now a subdirectory of phylmd.

EM

Location:

LMDZ5/trunk/libf/dyn3d_common

Files:

• diagedyn.F (modified) (4 diffs)
• initdynav.F90 (copied) (copied from LMDZ5/trunk/libf/bibio/initdynav.F90)
• initfluxsto.F (copied) (copied from LMDZ5/trunk/libf/bibio/initfluxsto.F)
• inithist.F (copied) (copied from LMDZ5/trunk/libf/bibio/inithist.F)
• initial0.F (deleted)
• write_field.F90 (copied) (copied from LMDZ5/trunk/libf/bibio/write_field.F90)
• writedynav.F90 (copied) (copied from LMDZ5/trunk/libf/bibio/writedynav.F90)
• writehist.F (copied) (copied from LMDZ5/trunk/libf/bibio/writehist.F)

LMDZ5/trunk/libf/dyn3d_common/diagedyn.F

@@ -53 +53 @@
 c======================================================================
  
+      USE control_mod, ONLY : planet_type
+      
       IMPLICIT NONE
 C
@@ -60 +62 @@
 #include "iniprint.h"
 
-#ifdef CPP_EARTH
-#include "../phylmd/YOMCST.h"
-#include "../phylmd/YOETHF.h"
-#endif
+!#ifdef CPP_EARTH
+!#include "../phylmd/YOMCST.h"
+!#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
@@ -140 +154 @@
 
 
-#ifdef CPP_EARTH
+!#ifdef CPP_EARTH
+      IF (planet_type=="earth") THEN
+      
 c======================================================================
 C     Compute Kinetic enrgy
@@ -314 +330 @@
       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