Changeset 1615 for LMDZ5/trunk/libf/dyn3d/calfis.F

Timestamp:

Feb 10, 2012, 4:42:26 PM (12 years ago)

Author:

Ehouarn Millour

Message:

Introducing "phydev", the minimal physics package.
makegcm and makelmdz_fcm script have been updated to add CPP_PHYS preprocessing key when building with physics and CPP_EARTH for Earth (LMD physics) related routines or instructions in the dynamics.
Checked (on Vargas) that "dev" physics package compiles and runs well in all (seq/mpi/omp/mpi_omp) modes and that introduced changes do not modify results when using the "lmd" physics package.
EM + FH

File:

• LMDZ5/trunk/libf/dyn3d/calfis.F (modified) (5 diffs)

LMDZ5/trunk/libf/dyn3d/calfis.F

@@ -434 +434 @@
 c
       if (planet_type=="earth") then
-#ifdef CPP_EARTH
 cIM calcul PV a teta=350, 380, 405K
       CALL PVtheta(ngridmx,llm,pucov,pvcov,pteta,
      $           ztfi,zplay,zplev,
      $           ntetaSTD,rtetaSTD,PVteta)
-#endif
       endif
 c
@@ -450 +448 @@
 
 
-      if (planet_type=="earth") then
-#ifdef CPP_EARTH
 
 !      write(lunout,*) 'PHYSIQUE AVEC NSPLIT_PHYS=',nsplit_phys
@@ -460 +456 @@
       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 +502 @@
          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 +513 @@
       zdqfi(:,:,:)=zdqfic(:,:,:)/nsplit_phys
 
-#endif
-      endif !of if (planet_type=="earth")
 
 500   CONTINUE