Changeset 1363 for LMDZ4/branches/LMDZ4V5.0-dev/libf/dyn3d/calfis.F

Timestamp:

Apr 16, 2010, 11:50:10 AM (14 years ago)

Author:

Ehouarn Millour

Message:

Added possibility to run in "Shallow Water" mode. SW mode is automatically set if the number of atmospheric layers is 1.
To use SW mode, the model should be compiled without physics (makelmdz_fcm -p nophys) and/or without calls to the physics (i.e. set iflag_phys=0 in gcm.def).

-Updated some definitions and comments in run.def & gcm.def

-Fixed misplaced #ifdef CPP_EARTH in calfis.F + some write(lunout,*)

-Specific initialisation of fields for SW are done in sw_case_williamson91_6 (called by iniacademic, when read_start=.false.)

• Checked (on Vargas & Brodie) that these changes don't alter usual bench GCM outputs.

EM

File:

• LMDZ4/branches/LMDZ4V5.0-dev/libf/dyn3d/calfis.F (modified) (7 diffs)

LMDZ4/branches/LMDZ4V5.0-dev/libf/dyn3d/calfis.F

@@ -98 +98 @@
 #include "comvert.h"
 #include "comgeom2.h"
+#include "iniprint.h"
 
 c    Arguments :
@@ -188 +189 @@
         debut = .TRUE.
         IF (ngridmx.NE.2+(jjm-1)*iim) THEN
-         PRINT*,'STOP dans calfis'
-         PRINT*,'La dimension ngridmx doit etre egale a 2 + (jjm-1)*iim'
-         PRINT*,'  ngridmx  jjm   iim   '
-         PRINT*,ngridmx,jjm,iim
+         write(lunout,*) 'STOP dans calfis'
+         write(lunout,*)
+     &   'La dimension ngridmx doit etre egale a 2 + (jjm-1)*iim'
+         write(lunout,*) '  ngridmx  jjm   iim   '
+         write(lunout,*) ngridmx,jjm,iim
          STOP
         ENDIF
@@ -315 +317 @@
       CALL gr_dyn_fi(1,iip1,jjp1,ngridmx,pphis,zphis)
       DO l=1,llm
-         DO ig=1,ngridmx
-           zphi(ig,l)=zphi(ig,l)-zphis(ig)
-         ENDDO
+         DO ig=1,ngridmx
+           zphi(ig,l)=zphi(ig,l)-zphis(ig)
+         ENDDO
       ENDDO
 
@@ -415 +417 @@
             z1(i)   =(rlonu(i)-rlonu(i-1))*pvcov(i,jjm,l)/cv(i,jjm)
             z1bis(i)=(rlonu(i)-rlonu(i-1))*pdvcov(i,jjm,l)/cv(i,jjm)
-         ENDDO
+         ENDDO
 
          DO i=1,iim
@@ -422 +424 @@
             zsin(i)    = SIN(rlonv(i))*z1(i)
             zsinbis(i) = SIN(rlonv(i))*z1bis(i)
-         ENDDO
+         ENDDO
 
          zufi(ngridmx,l)  = SSUM(iim,zcos,1)/pi
@@ -449 +451 @@
 
       if (planet_type=="earth") then
-
-      print*,'PHYSIQUE AVEC NSPLIT_PHYS=',nsplit_phys
+#ifdef CPP_EARTH
+
+      write(lunout,*) 'PHYSIQUE AVEC NSPLIT_PHYS=',nsplit_phys
       zdt_split=dtphys/nsplit_phys
       zdufic(:,:)=0.
@@ -463 +466 @@
          lafin_split=lafin.and.isplit==nsplit_phys
 
-#ifdef CPP_EARTH
          CALL physiq (ngridmx,
      .             llm,