Changeset 1279 for LMDZ4/trunk/arch

Timestamp:

Dec 10, 2009, 10:02:56 AM (15 years ago)

Author:

Laurent Fairhead

Message:

Merged LMDZ4-dev branch changes r1241:1278 into the trunk
Running trunk and LMDZ4-dev in LMDZOR configuration on local
machine (sequential) and SX8 (4-proc) yields identical results
(restart and restartphy are identical binarily)
Log history from r1241 to r1278 is available by switching to
source:LMDZ4/branches/LMDZ4-dev-20091210

Location:

LMDZ4/trunk

Files:

• . (modified) (1 prop)
• arch/arch-AMD64_CICLAD.fcm (copied) (copied from LMDZ4/branches/LMDZ4-dev/arch/arch-AMD64_CICLAD.fcm)
• arch/arch-AMD64_CICLAD.path (copied) (copied from LMDZ4/branches/LMDZ4-dev/arch/arch-AMD64_CICLAD.path)
• arch/arch-ES_MOON.path (modified) (1 diff)
• arch/arch-IA64_PLATINE.fcm (modified) (1 diff)
• arch/arch-IA64_PLATINE.path (modified) (1 diff)
• arch/arch-PW6_VARGAS.fcm (modified) (1 diff)
• arch/arch-PW6_VARGAS.path (modified) (1 diff)
• arch/arch-SX8_BRODIE.fcm (modified) (1 diff)
• arch/arch-SX8_BRODIE.opt (copied) (copied from LMDZ4/branches/LMDZ4-dev/arch/arch-SX8_BRODIE.opt)
• arch/arch-SX8_BRODIE.path (modified) (1 diff)
• arch/arch-SX8_MERCURE.opt (copied) (copied from LMDZ4/branches/LMDZ4-dev/arch/arch-SX8_MERCURE.opt)
• arch/arch-SX8_MERCURE.path (modified) (1 diff)
• arch/arch-SX9_MERCURE.fcm (copied) (copied from LMDZ4/branches/LMDZ4-dev/arch/arch-SX9_MERCURE.fcm)
• arch/arch-SX9_MERCURE.opt (copied) (copied from LMDZ4/branches/LMDZ4-dev/arch/arch-SX9_MERCURE.opt)
• arch/arch-SX9_MERCURE.path (copied) (copied from LMDZ4/branches/LMDZ4-dev/arch/arch-SX9_MERCURE.path)
• arch/arch-X64_TITANE.fcm (copied) (copied from LMDZ4/branches/LMDZ4-dev/arch/arch-X64_TITANE.fcm)
• arch/arch-X64_TITANE.path (copied) (copied from LMDZ4/branches/LMDZ4-dev/arch/arch-X64_TITANE.path)
• arch/arch-linux-32bit.path (modified) (1 diff)

LMDZ4/trunk/arch/arch-ES_MOON.path

@@ -1 @@
-set NETCDF_LIBDIR=/S/home010/c0010/ES/lib
-set NETCDF_INCDIR=/S/home010/c0010/ES/include
-set IOIPSL_INCDIR=$LMDGCM/../../lib
-set IOIPSL_LIBDIR=$LMDGCM/../../lib
-set ORCH_INCDIR=$LMDGCM/../../lib
-set ORCH_LIBDIR=$LMDGCM/../../lib
-set OASIS_INCDIR=$LMDGCM/../../prism/ES/build/lib/psmile.$couple
-set OASIS_LIBDIR=$LMDGCM/../../prism/ES/lib
-set INCA_LIBDIR=$LMDGCM/../INCA3/config/lib
-set INCA_INCDIR=$LMDGCM/../INCA3/config/lib
-set LIBPREFIX=sx
+NETCDF_LIBDIR=/S/home010/c0010/ES/lib
+NETCDF_INCDIR=/S/home010/c0010/ES/include
+IOIPSL_INCDIR=$LMDGCM/../../lib
+IOIPSL_LIBDIR=$LMDGCM/../../lib
+ORCH_INCDIR=$LMDGCM/../../lib
+ORCH_LIBDIR=$LMDGCM/../../lib
+OASIS_INCDIR=$LMDGCM/../../prism/ES/build/lib/psmile.$couple
+OASIS_LIBDIR=$LMDGCM/../../prism/ES/lib
+INCA_LIBDIR=$LMDGCM/../INCA3/config/lib
+INCA_INCDIR=$LMDGCM/../INCA3/config/lib
+LIBPREFIX=sx

LMDZ4/trunk/arch/arch-IA64_PLATINE.fcm

@@ -5 +5 @@
 %FPP_FLAGS           -P -traditional
 %FPP_DEF             NC_DOUBLE BLAS SGEMV=DGEMV SGEMM=DGEMM FFT_MKL
-%BASE_FFLAGS         -i4 -r8 -automatic -align all -I/applications/intel/cmkl/10.0.1.014/include
+%BASE_FFLAGS         -i4 -r8 -automatic -align all -I/applications/intel/mkl/10.0.1.014/include
 %PROD_FFLAGS         -O3
-%DEV_FFLAGS          -O3 -traceback
-%DEBUG_FFLAGS        -g -traceback
+%DEV_FFLAGS          -p -g -O3 -traceback
+%DEBUG_FFLAGS        -p -g -traceback
 %MPI_FFLAGS
 %OMP_FFLAGS          -openmp
-%BASE_LD             -i4 -r8 -automatic -L/applications/intel/cmkl/10.0.1.014/lib/64 -lmkl_ipf -lguide
+%BASE_LD             -p -i4 -r8 -automatic -L/applications/intel/mkl/10.0.1.014/lib/64 -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lguide
 %MPI_LD
 %OMP_LD              -openmp

LMDZ4/trunk/arch/arch-IA64_PLATINE.path

@@ -1 @@
-set NETCDF_LIBDIR='/usr/lib -lnetcdff'
-set NETCDF_INCDIR=/usr/include
-set IOIPSL_INCDIR=$LMDGCM/../../lib
-set IOIPSL_LIBDIR=$LMDGCM/../../lib
-set ORCH_INCDIR=$LMDGCM/../../lib
-set ORCH_LIBDIR=$LMDGCM/../../lib
-set OASIS_INCDIR=$LMDGCM/../../prism/IA64/build/lib/psmile.$couple
-set OASIS_LIBDIR=$LMDGCM/../../prism/IA64/lib
-set INCA_LIBDIR=$LMDGCM/../INCA3/config/lib
-set INCA_INCDIR=$LMDGCM/../INCA3/config/lib
+NETCDF_LIBDIR='/usr/lib -lnetcdff'
+NETCDF_INCDIR=/usr/include
+IOIPSL_INCDIR=$LMDGCM/../../lib
+IOIPSL_LIBDIR=$LMDGCM/../../lib
+ORCH_INCDIR=$LMDGCM/../../lib
+ORCH_LIBDIR=$LMDGCM/../../lib
+OASIS_INCDIR=$LMDGCM/../../prism/IA64/build/lib/psmile.$couple
+OASIS_LIBDIR=$LMDGCM/../../prism/IA64/lib
+INCA_LIBDIR=$LMDGCM/../INCA3/config/lib
+INCA_INCDIR=$LMDGCM/../INCA3/config/lib
 

LMDZ4/trunk/arch/arch-PW6_VARGAS.fcm

@@ -5 +5 @@
 %FPP_FLAGS           -P
 %FPP_DEF             NC_DOUBLE BLAS SGEMV=DGEMV SGEMM=DGEMM
-%BASE_FFLAGS         -qautodbl=dbl4
+%BASE_FFLAGS         -qautodbl=dbl4 -qxlf90=autodealloc
 %PROD_FFLAGS         -O5
 %DEV_FFLAGS          -O2 -qfullpath -qinitauto=7FBFFFFF -qfloat=nans -qflttrap=overflow:zerodivide:invalid:enable -qsigtrap

LMDZ4/trunk/arch/arch-PW6_VARGAS.path

@@ -1 @@
-set NETCDF_LIBDIR=/usr/local/pub/NetCDF/3.6.3/include/lib
-set NETCDF_INCDIR=/usr/local/pub/NetCDF/3.6.3/include
-set IOIPSL_INCDIR=$LMDGCM/../../lib
-set IOIPSL_LIBDIR=$LMDGCM/../../lib
-set ORCH_INCDIR=$LMDGCM/../../lib
-set ORCH_LIBDIR=$LMDGCM/../../lib
-set OASIS_INCDIR=$LMDGCM/../../prism/SX/build/lib/psmile.$couple
-set OASIS_LIBDIR=$LMDGCM/../../prism/SX/lib
-set INCA_LIBDIR=$LMDGCM/../INCA3/config/lib
-set INCA_INCDIR=$LMDGCM/../INCA3/config/lib
+NETCDF_LIBDIR=/usr/local/pub/NetCDF/3.6.3/lib
+NETCDF_INCDIR=/usr/local/pub/NetCDF/3.6.3/include
+IOIPSL_INCDIR=$LMDGCM/../../lib
+IOIPSL_LIBDIR=$LMDGCM/../../lib
+ORCH_INCDIR=$LMDGCM/../../lib
+ORCH_LIBDIR=$LMDGCM/../../lib
+OASIS_INCDIR=$LMDGCM/../../prism/AIX6/build/lib/psmile.$couple
+OASIS_LIBDIR=$LMDGCM/../../prism/AIX6/lib
+INCA_LIBDIR=$LMDGCM/../INCA3/config/lib
+INCA_INCDIR=$LMDGCM/../INCA3/config/lib

LMDZ4/trunk/arch/arch-SX8_BRODIE.fcm

@@ -8 +8 @@
 %PROD_FFLAGS         -C vopt
 %DEV_FFLAGS          -C vsafe -gv -Wf,-init stack=nan,-init heap=nan
-%DEBUG_FFLAGS        -C debug -eC -Wf,-init stack=nan,-init heap=nan
+%DEBUG_FFLAGS        -C debug -eR -Wf,-init stack=nan,-init heap=nan
 %MPI_FFLAGS
 %OMP_FFLAGS          -P openmp

LMDZ4/trunk/arch/arch-SX8_BRODIE.path

@@ -1 @@
-set NETCDF_LIBDIR=/SXlocal/pub/netCDF/netCDF-3.6.1/lib
-set NETCDF_INCDIR=/SXlocal/pub/netCDF/netCDF-3.6.1/include
-set IOIPSL_INCDIR=$LMDGCM/../../lib
-set IOIPSL_LIBDIR=$LMDGCM/../../lib
-set ORCH_INCDIR=$LMDGCM/../../lib
-set ORCH_LIBDIR=$LMDGCM/../../lib
-set OASIS_INCDIR=$LMDGCM/../../prism/SX/build/lib/psmile.$couple
-set OASIS_LIBDIR=$LMDGCM/../../prism/SX/lib
-set INCA_LIBDIR=$LMDGCM/../INCA3/config/lib
-set INCA_INCDIR=$LMDGCM/../INCA3/config/lib
-
+NETCDF_LIBDIR=/SXlocal/pub/netCDF/3.6.1-openmp/lib
+NETCDF_INCDIR=/SXlocal/pub/netCDF/3.6.1-openmp/include
+IOIPSL_INCDIR=$LMDGCM/../../lib
+IOIPSL_LIBDIR=$LMDGCM/../../lib
+ORCH_INCDIR=$LMDGCM/../../lib
+ORCH_LIBDIR=$LMDGCM/../../lib
+OASIS_INCDIR=$LMDGCM/../../prism/SX/build/lib/psmile.$couple
+OASIS_LIBDIR=$LMDGCM/../../prism/SX/lib
+INCA_LIBDIR=$LMDGCM/../INCA3/config/lib
+INCA_INCDIR=$LMDGCM/../INCA3/config/lib

LMDZ4/trunk/arch/arch-SX8_MERCURE.path

@@ -1 @@
-set NETCDF_LIBDIR=/usr/local/SX8/soft/netcdf/lib
-set NETCDF_INCDIR=/usr/local/SX8/soft/netcdf/include
-set IOIPSL_INCDIR=$LMDGCM/../../lib
-set IOIPSL_LIBDIR=$LMDGCM/../../lib
-set ORCH_INCDIR=$LMDGCM/../../lib
-set ORCH_LIBDIR=$LMDGCM/../../lib
-set OASIS_INCDIR=$LMDGCM/../../prism/SX/build/lib/psmile.$couple
-set OASIS_LIBDIR=$LMDGCM/../../prism/SX/lib
-set INCA_LIBDIR=$LMDGCM/../INCA3/config/lib
-set INCA_INCDIR=$LMDGCM/../INCA3/config/lib
+NETCDF_LIBDIR=${NETCDF_SX_LIBDIR:-/usr/local/SX8/soft/netcdf/lib}
+NETCDF_INCDIR=${NETCDF_SX_INCLUDEDIR:-/usr/local/SX8/soft/netcdf/include}
+IOIPSL_INCDIR=$LMDGCM/../../lib
+IOIPSL_LIBDIR=$LMDGCM/../../lib
+ORCH_INCDIR=$LMDGCM/../../lib
+ORCH_LIBDIR=$LMDGCM/../../lib
+OASIS_INCDIR=$LMDGCM/../../prism/SX/build/lib/psmile.$couple
+OASIS_LIBDIR=$LMDGCM/../../prism/SX/lib
+INCA_LIBDIR=$LMDGCM/../INCA3/config/lib
+INCA_INCDIR=$LMDGCM/../INCA3/config/lib

LMDZ4/trunk/arch/arch-linux-32bit.path

@@ -1 @@
-set NETCDF_LIBDIR=/distrib/local/netcdf/pgi_32bits/lib/
-set NETCDF_INCDIR=/distrib/local/netcdf/pgi_32bits/include
-set IOIPSL_INCDIR=/u/fairhead/modipsl_ioipsl_3/lib
-set IOIPSL_LIBDIR=/u/fairhead/modipsl_ioipsl_3/lib
-set ORCH_INCDIR=/u/fairhead/modipsl_ioipsl_3/lib
-set ORCH_LIBDIR=/u/fairhead/modipsl_ioipsl_3/lib
+NETCDF_LIBDIR=/usr/local/netcdf-pgi/lib
+NETCDF_INCDIR=/usr/local/netcdf-pgi/include
+IOIPSL_INCDIR=/usr/local/guez/modipsl/lib
+IOIPSL_LIBDIR=/usr/local/guez/modipsl/lib
+ORCH_INCDIR=/u/fairhead/modipsl_ioipsl_3/lib
+ORCH_LIBDIR=/u/fairhead/modipsl_ioipsl_3/lib