Changeset 1393 for LMDZ4/branches/LMDZ4V5.0-dev/libf/dyn3d

Timestamp:

May 27, 2010, 8:51:35 AM (14 years ago)

Author:

Ehouarn Millour

Message:

Some minor fixes for the Newtonian and Shallow Water cases:
-Some initializations were done twice, causing problems with the FFT filter.
-Some CPP_EARTH preprocessing keys should in fact be CPP_IOIPSL.

Also added some useful debugging options to 'debug' mode in arch-PW6_VARGAS.fcm

EM

Location:

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

Files:

• fluxstokenc.F (modified) (3 diffs)
• gcm.F (modified) (1 diff)

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

@@ -4 +4 @@
       SUBROUTINE fluxstokenc(pbaru,pbarv,masse,teta,phi,phis,
      . time_step,itau )
-#ifdef CPP_EARTH
-! This routine is designed to work for Earth and with ioipsl
+#ifdef CPP_IOIPSL
+! This routine is designed to work with ioipsl
 
        USE IOIPSL
@@ -141 +141 @@
 
          iadvtr=0
-        Print*,'ITAU auqel on stoke les fluxmasses',itau
+        write(lunout,*)'ITAU auquel on stoke les fluxmasses',itau
         
         call histwrite(fluxid, 'masse', itau, massem,
@@ -167 +167 @@
 #else
       write(lunout,*)
-     & 'fluxstokenc: Needs Earth physics (and ioipsl) to function'
+     & 'fluxstokenc: Needs IOIPSL to function'
 #endif
-! of #ifdef CPP_EARTH
+! of #ifdef CPP_IOIPSL
       RETURN
       END

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

@@ -386 +386 @@
       nbetatmoy = nday / periodav + 1
 
+      if (iflag_phys.eq.1) then
+      ! these initialisations have already been done (via iniacademic)
+      ! if running in SW or Newtonian mode
 c-----------------------------------------------------------------------
 c   Initialisation des constantes dynamiques :
 c   ------------------------------------------
-      dtvr = zdtvr
-      CALL iniconst
+        dtvr = zdtvr
+        CALL iniconst
 
 c-----------------------------------------------------------------------
 c   Initialisation de la geometrie :
 c   --------------------------------
-      CALL inigeom
+        CALL inigeom
 
 c-----------------------------------------------------------------------
 c   Initialisation du filtre :
 c   --------------------------
-      CALL inifilr
+        CALL inifilr
+      endif ! of if (iflag_phys.eq.1)
 c
 c-----------------------------------------------------------------------