Changeset 1617 for LMDZ5

Timestamp:

Feb 28, 2012, 12:35:00 PM (13 years ago)

Author:

Ehouarn Millour

Message:

Minor correction: with previous commits, compilation without physics was no longer possible (because PVtheta calls routine tetalevel, which is in the physics directory). Note also that the levels (hard coded in calfis and calfis_p) given as inputs to PVtheta are Earth-specific. This needs to be cleaned and improved...
EM

Location:

LMDZ5/trunk/libf

Files:

• dyn3d/calfis.F (modified) (2 diffs)
• dyn3dpar/calfis_p.F (modified) (5 diffs)

LMDZ5/trunk/libf/dyn3d/calfis.F

@@ -165 +165 @@
       PARAMETER(ntetaSTD=3)
       REAL rtetaSTD(ntetaSTD)
-      DATA rtetaSTD/350., 380., 405./
+      DATA rtetaSTD/350., 380., 405./ ! Earth-specific values, beware !!
       REAL PVteta(ngridmx,ntetaSTD)
 c
@@ -434 +434 @@
 c
       if (planet_type=="earth") then
+#ifdef CPP_PHYS
+! PVtheta calls tetalevel, which is in the physics
 cIM calcul PV a teta=350, 380, 405K
       CALL PVtheta(ngridmx,llm,pucov,pvcov,pteta,
      $           ztfi,zplay,zplev,
      $           ntetaSTD,rtetaSTD,PVteta)
+#endif
       endif
 c

LMDZ5/trunk/libf/dyn3dpar/calfis_p.F

@@ -143 +143 @@
       REAL clesphy0( longcles )
 
+#ifdef CPP_PHYS
+! Ehouarn: for now calfis_p needs some informations from physics to compile
 c    Local variables :
 c    -----------------
@@ -218 +220 @@
       PARAMETER(ntetaSTD=3)
       REAL rtetaSTD(ntetaSTD)
-      DATA rtetaSTD/350., 380., 405./
+      DATA rtetaSTD/350., 380., 405./ ! Earth-specific values, beware !!
       REAL PVteta(klon,ntetaSTD)
       
@@ -486 +488 @@
 
       IF (is_sequential.and.(planet_type=="earth")) THEN
+#ifdef CPP_PHYS
+! PVtheta calls tetalevel, which is in the physics
 cIM calcul PV a teta=350, 380, 405K
         CALL PVtheta(ngridmx,llm,pucov,pvcov,pteta,
@@ -491 +495 @@
      $           ntetaSTD,rtetaSTD,PVteta)
 c
+#endif
       ENDIF
 
@@ -1105 +1110 @@
       firstcal = .FALSE.
 
+#else 
+      write(lunout,*) 
+     & "calfis_p: for now can only work with parallel physics" 
+      stop 
+#endif 
+! of #ifdef CPP_PHYS
       RETURN
       END