Changeset 1251 for trunk/LMDZ.COMMON

Timestamp:

May 11, 2014, 5:41:20 PM (11 years ago)

Author:

aslmd

Message:

LMDZ.COMMON. correction to commit 1245 about zonal means. a correction to seq case. and modifications for parallel case (dyn3dpar)

Location:

trunk/LMDZ.COMMON/libf

Files:

• dyn3d/calfis.F (modified) (1 diff)
• dyn3dpar/calfis_p.F (modified) (2 diffs)
• dyn3dpar/moyzon_mod.F90 (modified) (2 diffs)

trunk/LMDZ.COMMON/libf/dyn3d/calfis.F

@@ -224 +224 @@
         endif
 
-        if (flag_moyzon) call moyzon_init(iim,llm,nqtot)
+        if (flag_moyzon) call moyzon_init(iip1,llm,nqtot)
 
 c----------------------------------------------

trunk/LMDZ.COMMON/libf/dyn3dpar/calfis_p.F

@@ -308 +308 @@
       ALLOCATE(zpk(klon,llm))
 
-      if (flag_moyzon) call moyzon_init
+      ! zonal means. horizontal dimension should be iip1
+      if (flag_moyzon) call moyzon_init(iip1,llm,nqtot)
 
 c------------------------------------------------------------------
@@ -735 +736 @@
         allocate(flxwfi_omp(klon,llm))
 
-        if (flag_moyzon) call moyzon_init_omp(klon)
+        if (flag_moyzon) call moyzon_init_omp(klon,llm,nqtot)
 
         first_omp=.false.

trunk/LMDZ.COMMON/libf/dyn3dpar/moyzon_mod.F90

@@ -31 +31 @@
 
 !======================================================================
-SUBROUTINE moyzon_init
+SUBROUTINE moyzon_init(klon,llm,nqtot)
 #ifdef CPP_PHYS
-! This routine needs physics
-USE dimphy
-USE infotrac, only: nqtot
+!! This routine needs physics
 IMPLICIT NONE
-    INCLUDE "dimensions.h"
+       INTEGER :: klon,llm,nqtot
 
       ALLOCATE(zplevbar_mpi(klon,llm+1),zplaybar_mpi(klon,llm))
@@ -47 +45 @@
 
 !======================================================================
-SUBROUTINE moyzon_init_omp(nlon)
+SUBROUTINE moyzon_init_omp(nlon,llm,nqtot)
 #ifdef CPP_PHYS
-! This routine needs physics
-USE dimphy
-USE infotrac, only: nqtot
 IMPLICIT NONE
-    INCLUDE "dimensions.h"
 
-      INTEGER :: nlon
+      INTEGER :: nlon,llm,nqtot
 
       ALLOCATE(zplevbar(nlon,llm+1),zplaybar(nlon,llm))