Changeset 965 for trunk/LMDZ.COMMON

Timestamp:

May 22, 2013, 9:10:28 AM (12 years ago)

Author:

emillour

Message:

Common dynamics and generic/universal GCM:

• LMDZ.COMMON: minor bug fix on the computation of physics mesh area in gcm.F
• LMDZ.UNIVERSAL: missing clean initialization of tab_cntrl(:) array in phyredem.F90
• LMDZ.GENERIC: minor bug fix in hydrol.F90, only output runoff if it is used. Update output routines so that all outputs files (stats, diagfi.nc, diagsoil.nc, diagspecIR.nc and diagspecVI.nc) can be generated when running LMDZ.UNIVERSAL in MPI mode.

EM

Location:

trunk/LMDZ.COMMON

Files:

• arch/arch-X64_ADA.fcm (modified) (2 diffs)
• libf/dyn3d/gcm.F (modified) (1 diff)
• libf/dyn3dpar/gcm.F (modified) (1 diff)

trunk/LMDZ.COMMON/arch/arch-X64_ADA.fcm

@@ -3 +3 @@
 %AR                  ar
 %MAKE                gmake
-%FPP_FLAGS           -P -traditional -I/smplocal/pub/FFTW/3.3.3/include
+%FPP_FLAGS           -P -traditional -I/smplocal/pub/FFTW/3.3.3_dyn/include
 %FPP_DEF             NC_DOUBLE BLAS SGEMV=DGEMV SGEMM=DGEMM FFT_FFTW
-%BASE_FFLAGS         -integer-size 32 -real-size 64 -align all -shared-intel -mcmodel=large
+%BASE_FFLAGS         -integer-size 32 -real-size 64 -align all -mcmodel=large -auto
 %PROD_FFLAGS         -O2 -ip -fp-model strict -axAVX,SSE4.2
 %DEV_FFLAGS          -p -g -O1 -fpe0 -traceback
@@ -11 +11 @@
 %MPI_FFLAGS
 %OMP_FFLAGS          -openmp
-%BASE_LD             -shared-intel -mcmodel=large -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread -L/smplocal/pub/FFTW/3.3.3/lib -lfftw3 -lfftw3f -lfftw3f_mpi -lfftw3f_omp -lfftw3_mpi -lfftw3_omp -lm
+%BASE_LD             -shared-intel -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread -L/smplocal/pub/FFTW/3.3.3_dyn/lib -lfftw3 -Wl,-rpath=/smplocal/pub/NetCDF/4.1.3/lib:/smplocal/pub/HDF5/1.8.9/seq/lib:/smplocal/pub/FFTW/3.3.3_dyn/lib
 %MPI_LD
 %OMP_LD              -openmp

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

@@ -451 +451 @@
          zcufi(ngridmx) = cu(ip1jm+1)
          zcvfi(ngridmx) = cv(ip1jm-iim)
+
+         ! build airefi(), mesh area on physics grid
          CALL gr_dyn_fi(1,iip1,jjp1,ngridmx,aire,airefi)
+         ! Poles are single points on physics grid
+         airefi(1)=airefi(1)*iim
+         airefi(ngridmx)=airefi(ngridmx)*iim
 
 ! Initialisation de la physique: pose probleme quand on tourne 

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

@@ -466 +466 @@
          zcufi(ngridmx) = cu(ip1jm+1)
          zcvfi(ngridmx) = cv(ip1jm-iim)
+
+         ! build airefi(), mesh area on physics grid
          CALL gr_dyn_fi(1,iip1,jjp1,ngridmx,aire,airefi)
+         ! Poles are single points on physics grid
+         airefi(1)=airefi(1)*iim
+         airefi(ngridmx)=airefi(ngridmx)*iim
+
 ! Physics
 #ifdef CPP_PHYS