Changeset 1665 for LMDZ5/branches/testing/libf/dyn3d/calfis.F

Timestamp:

Oct 9, 2012, 3:35:26 PM (12 years ago)

Author:

Laurent Fairhead

Message:

Version testing basée sur la r1628

http://lmdz.lmd.jussieu.fr/utilisateurs/distribution-du-modele/versions-intermediaires

---

Testing release based on r1628

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3d/calfis.F (modified) (6 diffs)

LMDZ5/branches/testing/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_EARTH
+#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,
@@ -450 +451 @@
 
 
-      if (planet_type=="earth") then
-#ifdef CPP_EARTH
 
 !      write(lunout,*) 'PHYSIQUE AVEC NSPLIT_PHYS=',nsplit_phys
@@ -460 +459 @@
       zdqfic(:,:,:)=0.
 
-      do isplit=1,nsplit_phys
+      if (planet_type=="earth") then
+#ifdef CPP_PHYS
+
+       do isplit=1,nsplit_phys
 
          jH_cur_split=jH_cur+(isplit-1) * dtvr / (daysec *nsplit_phys)
@@ -503 +505 @@
          zdqfic(:,:,:)=zdqfic(:,:,:)+zdqfi(:,:,:)
 
-      enddo
+       enddo ! of do isplit=1,nsplit_phys
+
+#endif
+! of #ifdef CPP_PHYS
+      endif ! of if (planet_type=="earth")
+
       zdufi(:,:)=zdufic(:,:)/nsplit_phys
       zdvfi(:,:)=zdvfic(:,:)/nsplit_phys
@@ -509 +516 @@
       zdqfi(:,:,:)=zdqfic(:,:,:)/nsplit_phys
 
-#endif
-      endif !of if (planet_type=="earth")
 
 500   CONTINUE