Changeset 1615 for LMDZ5/trunk/libf/dyn3dpar/calfis_p.F

Timestamp:

Feb 10, 2012, 4:42:26 PM (13 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/dyn3dpar/calfis_p.F (modified) (7 diffs)

LMDZ5/trunk/libf/dyn3dpar/calfis_p.F

@@ -27 +27 @@
      $                  pdqfi,
      $                  pdpsfi)
-#ifdef CPP_EARTH
-! Ehouarn: For now, calfis_p needs Earth physics
-c
-c    Auteur :  P. Le Van, F. Hourdin 
-c   .........
+#ifdef CPP_PHYS
+! If using physics
       USE dimphy
       USE mod_phys_lmdz_para, mpi_root_xx=>mpi_root 
@@ -146 +143 @@
       REAL clesphy0( longcles )
 
-#ifdef CPP_EARTH
 c    Local variables :
 c    -----------------
@@ -489 +485 @@
 
 
-      IF (is_sequential) THEN
-c
+      IF (is_sequential.and.(planet_type=="earth")) THEN
 cIM calcul PV a teta=350, 380, 405K
         CALL PVtheta(ngridmx,llm,pucov,pvcov,pteta,
@@ -627 +622 @@
 c$OMP BARRIER
       
-      if (planet_type=="earth") then
-#ifdef CPP_EARTH
-
 !$OMP MASTER
 !      write(lunout,*) 'PHYSIQUE AVEC NSPLIT_PHYS=',nsplit_phys
@@ -639 +631 @@
       zdqfic_omp(:,:,:)=0.
 
+      if (planet_type=="earth") then
+#ifdef CPP_PHYS
       do isplit=1,nsplit_phys
 
@@ -687 +681 @@
       enddo
 
+#endif
+! of #ifdef CPP_PHYS
+      endif !of if (planet_type=="earth")
+
       zdufi_omp(:,:)=zdufic_omp(:,:)/nsplit_phys
       zdvfi_omp(:,:)=zdvfic_omp(:,:)/nsplit_phys
       zdtfi_omp(:,:)=zdtfic_omp(:,:)/nsplit_phys
       zdqfi_omp(:,:,:)=zdqfic_omp(:,:,:)/nsplit_phys
-
-#endif
-      endif !of if (planet_type=="earth")
 c$OMP BARRIER
 
@@ -1110 +1105 @@
       firstcal = .FALSE.
 
-#else
-      write(lunout,*)
-     & "calfis_p: for now can only work with parallel physics"
-      stop
-#endif
-! of #ifdef CPP_EARTH
       RETURN
       END