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

Timestamp:

May 27, 2010, 8:51:35 AM (15 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/dyn3dpar

Files:

• calfis_p.F (modified) (6 diffs)
• fluxstokenc_p.F (modified) (3 diffs)
• gcm.F (modified) (1 diff)

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

@@ -34 +34 @@
       USE dimphy
       USE mod_phys_lmdz_para, mpi_root_xx=>mpi_root 
+      USE mod_interface_dyn_phys
+      USE IOPHY
+#endif
       USE parallel, ONLY : omp_chunk, using_mpi
-      USE mod_interface_dyn_phys
       USE Write_Field
       Use Write_field_p
       USE Times
-      USE IOPHY
       USE infotrac
       USE control_mod
@@ -115 +116 @@
 c    -----------
       LOGICAL  lafin
-      REAL heure
-
+!      REAL heure
+      REAL, intent(in):: jD_cur, jH_cur
       REAL pvcov(iip1,jjm,llm)
       REAL pucov(iip1,jjp1,llm)
@@ -129 +130 @@
       REAL pdteta(iip1,jjp1,llm)
       REAL pdq(iip1,jjp1,llm,nqtot)
+      REAL flxw(iip1,jjp1,llm)  ! Flux de masse verticale sur la grille dynamique
 c
       REAL pps(iip1,jjp1)
@@ -144 +146 @@
       REAL clesphy0( longcles )
 
-
+#ifdef CPP_EARTH
 c    Local variables :
 c    -----------------
@@ -223 +225 @@
       REAL PVteta(klon,ntetaSTD)
       
-      REAL flxw(iip1,jjp1,llm)  ! Flux de masse verticale sur la grille dynamique
       
       REAL SSUM
@@ -231 +232 @@
       SAVE firstcal,debut
 c$OMP THREADPRIVATE(firstcal,debut)
-      REAL, intent(in):: jD_cur, jH_cur
       
       REAL,SAVE,dimension(1:iim,1:llm):: du_send,du_recv,dv_send,dv_recv

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

@@ -4 +4 @@
       SUBROUTINE fluxstokenc_p(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
@@ -202 +202 @@
       
          iadvtr=0
-        Print*,'ITAU auqel on stoke les fluxmasses',itau
+        write(lunout,*)'ITAU auquel on stoke les fluxmasses',itau
         
         ijb=ij_begin
@@ -244 +244 @@
 #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/dyn3dpar/gcm.F

@@ -401 +401 @@
       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-----------------------------------------------------------------------