Changeset 1363 for LMDZ4/branches/LMDZ4V5.0-dev/libf/dyn3dpar/calfis_p.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/dyn3dpar/calfis_p.F (modified) (4 diffs)

LMDZ4/branches/LMDZ4V5.0-dev/libf/dyn3dpar/calfis_p.F

@@ -108 +108 @@
 #include "comvert.h"
 #include "comgeom2.h"
+#include "iniprint.h"
 #ifdef CPP_MPI
       include 'mpif.h'
@@ -258 +259 @@
         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
@@ -628 +630 @@
 #ifdef CPP_EARTH
 
-      print*,'PHYSIQUE AVEC NSPLIT_PHYS=',nsplit_phys
+!$OMP MASTER
+      write(lunout,*) 'PHYSIQUE AVEC NSPLIT_PHYS=',nsplit_phys
+!$OMP END MASTER
       zdt_split=dtphys/nsplit_phys
       zdufic_omp(:,:)=0.
@@ -1107 +1111 @@
 
 #else
-      write(*,*) "calfis_p: for now can only work with parallel physics"
+      write(lunout,*)
+     & "calfis_p: for now can only work with parallel physics"
       stop
 #endif