Changeset 1999 for trunk

Timestamp:

Sep 19, 2018, 10:15:06 AM (6 years ago)

Author:

emillour

Message:

Occigen arch files: remove recently introduced "-mcmodel=large" option because it causes issues when combined to Dynamico; make specific "OCCIGEN_large" files instead. Also update depreciated (since ifort 17) OpenMP options.
EM

Location:

trunk

Files:

• ICOSA_LMDZ/arch/arch-X64_OCCIGEN.fcm (modified) (1 diff)
• LMDZ.COMMON/arch/arch-X64_OCCIGEN.fcm (modified) (3 diffs)
• LMDZ.COMMON/arch/arch-X64_OCCIGEN_large.env (added)
• LMDZ.COMMON/arch/arch-X64_OCCIGEN_large.fcm (copied) (copied from trunk/LMDZ.COMMON/arch/arch-X64_OCCIGEN.fcm) (1 diff)
• LMDZ.COMMON/arch/arch-X64_OCCIGEN_large.path (added)

trunk/ICOSA_LMDZ/arch/arch-X64_OCCIGEN.fcm

@@ -7 +7 @@
 %FPP_DEF             KEY_NONE CPP_NETCDF4
 %BASE_FFLAGS         -i4 -r8 -auto -align all -I${MKLROOT}/include
-%PROD_FFLAGS         -g -traceback -O3 -vec-report2
+%PROD_FFLAGS         -g -traceback -O3
 %DEV_FFLAGS          -g -O1 -traceback
 %DEBUG_FFLAGS        -g  -check bounds -fp-model strict
 %MPI_FFLAGS
-%OMP_FFLAGS          -openmp -openmp-threadprivate=compat
+%OMP_FFLAGS          -qopenmp -qopenmp-threadprivate=compat
 %BASE_LD             -i4 -r8 -auto $MKL_LIBS
 %MPI_LD
-%OMP_LD              -openmp -openmp-threadprivate=compat
+%OMP_LD              -qopenmp -qopenmp-threadprivate=compat

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

@@ -1 +1 @@
 %COMPILER            mpif90
-%LINK                mpif90 -mcmodel=large -shared-intel
+%LINK                mpif90
 %AR                  ar
 %MAKE                gmake
@@ -7 +7 @@
 %FPP_DEF             NC_DOUBLE LAPACK BLAS SGEMV=DGEMV SGEMM=DGEMM FFT_MKL
 %CPP_DEF             LAPACK
-%BASE_FFLAGS         -i4 -r8 -auto -align all -fp-model strict -mcmodel=large -shared-intel
+%BASE_FFLAGS         -i4 -r8 -auto -align all -fp-model strict
 %PROD_FFLAGS         -O2 -ip -xCORE-AVX2
 %DEV_FFLAGS          -p -g -O1 -fpe0 -traceback
@@ -14 +14 @@
 %C_OPTIM             -O2 -ip -xCORE-AVX2
 %MPI_FFLAGS
-%OMP_FFLAGS          -openmp -openmp-threadprivate compat
+%OMP_FFLAGS          -qopenmp -qopenmp-threadprivate compat
 %BASE_LD             -i4 -r8 -auto -shared-intel $MKL_LIBS
 %MPI_LD
-%OMP_LD              -openmp
+%OMP_LD              -qopenmp

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

@@ -14 +14 @@
 %C_OPTIM             -O2 -ip -xCORE-AVX2
 %MPI_FFLAGS
-%OMP_FFLAGS          -openmp -openmp-threadprivate compat
+%OMP_FFLAGS          -qopenmp -qopenmp-threadprivate compat
 %BASE_LD             -i4 -r8 -auto -shared-intel $MKL_LIBS
 %MPI_LD
-%OMP_LD              -openmp
+%OMP_LD              -qopenmp