arch/MERCATOR/arch-X64_BELENOS_INTEL_OMPI.env

+if ! grep -qi xios <<< $(module list 2>&1); then
+  module purge
+  module use /home/ext/mr/smer/samsong/modules
+  module load git/2.27.0 gcc/9.2.0 intel/2018.5.274 openmpi/intel/4.0.2.2 hdf5/1.8.18-ompi netcdf/4.7.1-ompi_V2 xios/trunk/r2515_intel-ompi &> /dev/null
+  export OMPI_CC=icc
+  export OMPI_CXX=icpc
+  export OMPI_FC=ifort
+  export OMPI_F77=ifort
+  export OMPI_F90=ifort
+  if ! grep -qi xios <<< $(module list 2>&1); then echo 'module error'; exit 1; fi
+else
+  echo 'xios module already loaded'
+fi
+module list

arch/MERCATOR/arch-X64_BELENOS_INTEL_OMPI.fcm

-# compiler options for BELENOS/TARANIS (using INTEL compiler)
-#
-# INTEL_OMPI (XIOS-2.5)
-# intel/2018.5.274 openmpi/intel/4.0.2.2 hdf5-1.8.18-ompi netcdf-4.7.1-ompi_V2 xios-2.5_rev1903-ompi
-#
-# INTEL_MVAPICH2 (XIOS-2.5)
-# intel/2018.5.274 mvapich2-2.3.5 hdf5-1.8.18-mvapich2 netcdf-4.7.1-mvapich2 xios-2.5_rev1903-mvapich2
-#
+# compiler options for BELENOS/TARANIS (using INTEL compiler + Open MPI)
 #
 # NCDF_INC    netcdf4 include file
 # NCDF_LIB    netcdf4 library
@@ -44,12 +37,15 @@
 %NCDF_LIB            -L${NETCDF_LIB} -lnetcdff -lnetcdf -L${PHDF5_LIB_DIR} -lhdf5_hl -lhdf5
 %XIOS_INC            -I${XIOS_INC}
 %XIOS_LIB            -L${XIOS_LIB} -lxios -lstdc++
-%OASIS_INC           -I${OASIS_DIR}/build/lib/mct -I${OASIS_DIR}/build/lib/psmile.MPI1
+#%OASIS_INC           -I${OASIS_DIR}/build/lib/mct -I${OASIS_DIR}/build/lib/psmile.MPI1
+%OASIS_INC           -I${OASIS_DIR}/build-static/mct -I${OASIS_DIR}/build-static/lib/psmile.MPI1
 %OASIS_LIB           -L${OASIS_DIR}/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip
 
 %CPP                 cpp
 %FC                  mpifort -c -cpp
-%FCFLAGS             -march=core-avx2 -i4 -r8 -O3 -fp-model strict -fno-alias -align array64byte
+%BASE_FCFLAGS        -march=core-avx2 -i4 -r8 -fp-model strict -fno-alias -align array64byte
+%PROD_FCFLAGS        %BASE_FCFLAGS -O3
+%DEBUG_FCFLAGS       %BASE_FCFLAGS -O0 -g -debug all -traceback -ftrapuv -check all,noarg_temp_created -fpe-all0 -ftz -init=arrays,snan,huge
 %FFLAGS              %FCFLAGS
 %LD                  mpifort
 %LDFLAGS             
@@ -60,5 +56,5 @@
 %USER_INC            %XIOS_INC %OASIS_INC %NCDF_INC
 %USER_LIB            %XIOS_LIB %OASIS_LIB %NCDF_LIB
 
-%CC                  mpicc
-%CFLAGS              -O0
+%CC                  gcc
+%CFLAGS              -O0 -fcommon

arch/MERCATOR/arch-X64_KARA_GCC_OMPI.fcm

@@ -49,8 +49,9 @@
 
 %CPP                 cpp -Dkey_nosignedzero
 %FC                  mpif90 -c -cpp
-#%FCFLAGS             -fdefault-real-8 -O2 -ftree-vectorize -funroll-all-loops -march=skylake-avx512 -ffree-line-length-none -Wno-missing-include-dirs
-%FCFLAGS             -fdefault-real-8 -O1 -march=skylake-avx512 -ffree-line-length-none -Wno-missing-include-dirs
+#%PROD_FCFLAGS       -fdefault-real-8 -O2 -ftree-vectorize -funroll-all-loops -march=skylake-avx512 -ffree-line-length-none -Wno-missing-include-dirs
+%PROD_FCFLAGS        -fdefault-real-8 -O1 -march=skylake-avx512 -ffree-line-length-none -Wno-missing-include-dirs
+%DEBUG_FCFLAGS       -fdefault-real-8 -O0 -g -fbacktrace -ftree-vectorize -funroll-all-loops -march=skylake-avx512 -ffree-line-length-none -fcheck=all -finit-real=snan -Wno-missing-include-dirs -ffpe-trap=invalid,zero,overflow
 %FFLAGS              %FCFLAGS
 %LD                  mpif90
 %LDFLAGS             -lstdc++

arch/NOC/arch-ANEMONE-ifort-xios3.fcm

+# generic ifort compiler options for linux
+#
+# NCDF_HOME   root directory containing lib and include subdirectories for netcdf4
+# HDF5_HOME   root directory containing lib and include subdirectories for HDF5
+# XIOS_HOME   root directory containing lib for XIOS
+# OASIS_HOME  root directory containing lib for OASIS
+#
+# NCDF_INC    netcdf4 include file
+# NCDF_LIB    netcdf4 library
+# XIOS_INC    xios include file    (taken into accound only if key_xios is activated)
+# XIOS_LIB    xios library         (taken into accound only if key_xios is activated)
+# OASIS_INC   oasis include file   (taken into accound only if key_oasis3 is activated)
+# OASIS_LIB   oasis library        (taken into accound only if key_oasis3 is activated)
+#
+# FC          Fortran compiler command
+# FCFLAGS     Fortran compiler flags
+# FFLAGS      Fortran 77 compiler flags
+# LD          linker
+# LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries
+# FPPFLAGS    pre-processing flags
+# AR          assembler
+# ARFLAGS     assembler flags
+# MK          make
+# USER_INC    complete list of include files
+# USER_LIB    complete list of libraries to pass to the linker
+# CC          C compiler used to compile conv for AGRIF
+# CFLAGS      compiler flags used with CC
+#
+# Note that:
+#  - unix variables "$..." are accpeted and will be evaluated before calling fcm.
+#  - fcm variables are starting with a % (and not a $)
+#
+%NCDF_HOME           $EBROOTNETCDF
+%HDF5_HOME           $EBROOTHDF5
+%XIOS_HOME           /home/acc/xios3-trunk
+#%OASIS_HOME          /not/defined
+
+%NCDF_INC            -I%NCDF_HOME/include 
+%NCDF_LIB            -L%NCDF_HOME/lib -lnetcdff -lnetcdf -L%HDF5_HOME/lib -lhdf5_hl -lhdf5 -lhdf5
+%XIOS_INC            -I%XIOS_HOME/inc 
+%XIOS_LIB            -L%XIOS_HOME/lib -lxios -lstdc++
+#%OASIS_INC           -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1
+%OASIS_LIB           
+%OASIS_INC           
+#%OASIS_LIB           -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip
+
+%CPP	             cpp -Dkey_xios3
+%FC                  mpiifort -c -fpp -fpp-name:/opt/software/eb/software/GCCcore/11.2.0/bin/cpp -Wp,-P,-traditional
+%PROD_FCFLAGS        -i4 -r8 -O3 -fp-model precise -fno-alias
+%DEBUG_FCFLAGS       -i4 -r8 -g -fp-trap=common -traceback  -fp-model precise -fno-alias
+%FFLAGS              %FCFLAGS
+%LD                  mpiifort 
+%LDFLAGS             
+%FPPFLAGS            -P -traditional
+%AR                  ar
+%ARFLAGS             rs
+%MK                  gmake
+%USER_INC            %XIOS_INC %OASIS_INC %NCDF_INC
+%USER_LIB            %XIOS_LIB %OASIS_LIB %NCDF_LIB
+
+%CC                  cc -Wl,--allow-multiple-definition
+%CFLAGS              -O0
+

arch/NOC/arch-ANEMONE-ifort.fcm

+# generic ifort compiler options for linux
+#
+# NCDF_HOME   root directory containing lib and include subdirectories for netcdf4
+# HDF5_HOME   root directory containing lib and include subdirectories for HDF5
+# XIOS_HOME   root directory containing lib for XIOS
+# OASIS_HOME  root directory containing lib for OASIS
+#
+# NCDF_INC    netcdf4 include file
+# NCDF_LIB    netcdf4 library
+# XIOS_INC    xios include file    (taken into accound only if key_xios is activated)
+# XIOS_LIB    xios library         (taken into accound only if key_xios is activated)
+# OASIS_INC   oasis include file   (taken into accound only if key_oasis3 is activated)
+# OASIS_LIB   oasis library        (taken into accound only if key_oasis3 is activated)
+#
+# FC          Fortran compiler command
+# FCFLAGS     Fortran compiler flags
+# FFLAGS      Fortran 77 compiler flags
+# LD          linker
+# LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries
+# FPPFLAGS    pre-processing flags
+# AR          assembler
+# ARFLAGS     assembler flags
+# MK          make
+# USER_INC    complete list of include files
+# USER_LIB    complete list of libraries to pass to the linker
+# CC          C compiler used to compile conv for AGRIF
+# CFLAGS      compiler flags used with CC
+#
+# Note that:
+#  - unix variables "$..." are accpeted and will be evaluated before calling fcm.
+#  - fcm variables are starting with a % (and not a $)
+#
+%NCDF_HOME           $EBROOTNETCDF
+%HDF5_HOME           $EBROOTHDF5
+%XIOS_HOME           /home/acc/xios-trunk
+#%OASIS_HOME          /not/defined
+
+%NCDF_INC            -I%NCDF_HOME/include 
+%NCDF_LIB            -L%NCDF_HOME/lib -lnetcdff -lnetcdf -L%HDF5_HOME/lib -lhdf5_hl -lhdf5 -lhdf5
+%XIOS_INC            -I%XIOS_HOME/inc 
+%XIOS_LIB            -L%XIOS_HOME/lib -lxios -lstdc++
+#%OASIS_INC           -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1
+%OASIS_LIB           
+%OASIS_INC           
+#%OASIS_LIB           -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip
+
+%CPP	             cpp 
+%FC                  mpiifort -c -fpp -fpp-name:/opt/software/eb/software/GCCcore/11.2.0/bin/cpp -Wp,-P,-traditional
+%PROD_FCFLAGS        -i4 -r8 -O3 -fp-model precise -fno-alias
+%DEBUG_FCFLAGS       -i4 -r8 -g -fp-trap=common -traceback  -fp-model precise -fno-alias
+%FFLAGS              %FCFLAGS
+%LD                  mpiifort 
+%LDFLAGS             
+%FPPFLAGS            -P -traditional
+%AR                  ar
+%ARFLAGS             rs
+%MK                  gmake
+%USER_INC            %XIOS_INC %OASIS_INC %NCDF_INC
+%USER_LIB            %XIOS_LIB %OASIS_LIB %NCDF_LIB
+
+%CC                  cc -Wl,--allow-multiple-definition
+%CFLAGS              -O0
+

arch/NOC/arch-X86_ARCHER2-Cray.fcm

@@ -44,8 +44,9 @@
 
 %CPP	             cpp -Dkey_nosignedzero
 %FC                  ftn
-%FCFLAGS             -em -s integer32 -s real64 -O0 -hflex_mp=intolerant -N1023
-%FFLAGS              -em -s integer32 -s real64 -O0 -hflex_mp=intolerant -N1023
+%PROD_FCFLAGS        -em -s integer32 -s real64 -O2 -hvector_classic -hflex_mp=intolerant -N1023 -M878
+%DEBUG_FCFLAGS       -em -s integer32 -s real64 -O0 -hvector_classic -hflex_mp=intolerant -N1023 -M878 -hfp0 -e mCI -G0 -m2 -rl -Rcdsp
+%FFLAGS              %FCFLAGS
 %LD                  CC -Wl,"--allow-multiple-definition"
 %FPPFLAGS            -P -traditional
 %LDFLAGS             -lmpifort_cray

arch/NOC/arch-X86_ARCHER2-Cray_DEBUG.fcm → arch/NOC/arch-X86_ARCHER2-Gnu_DEBUG.fcm

-# compiler options for Archer CRAY XC-30 (using crayftn compiler)
+# compiler options for Archer2 CRAY XC-30 (using GNU compiler)
 #
 # NCDF_HOME   root directory containing lib and include subdirectories for netcdf4
 # HDF5_HOME   root directory containing lib and include subdirectories for HDF5
@@ -32,7 +32,7 @@
 #
 %NCDF_HOME           $NETCDF_DIR
 %HDF5_HOME           $HDF5_DIR
-%XIOS_HOME           /work/n01/shared/nemo/xios-trunk
+%XIOS_HOME           /work/n01/shared/nemo/xios-trunk-gnu
 #OASIS_HOME          
 
 %NCDF_INC            -I%NCDF_HOME/include -I%HDF5_HOME/include
@@ -44,13 +44,13 @@
 
 %CPP	             cpp -Dkey_nosignedzero
 %FC                  ftn
-%FCFLAGS             -s real64 -s integer32 -Ovector0 -hfp0 -O0 -hflex_mp=intolerant -e mCI -G0 -m2 -rl -Rcdsp -N1023
-%FFLAGS              -s real64 -s integer32 -Ovector0 -hfp0 -O0 -hflex_mp=intolerant -e mCI -G0 -m2 -rl -Rcdsp -N1023
-%LD                  CC -Wl,"--allow-multiple-definition"
+%FCFLAGS             -fdefault-real-8 -O0 -g -fallow-argument-mismatch -fbacktrace -funroll-all-loops -fcray-pointer -ffree-line-length-none -fcheck=all -finit-real=nan
+%FFLAGS              %FCFLAGS
+%LD                  CC 
 %FPPFLAGS            -P -traditional
-%LDFLAGS             -lmpifort_cray
+%LDFLAGS             -lmpichf90
 %AR                  ar 
-%ARFLAGS             -r
+%ARFLAGS             rs
 %MK                  gmake
 %USER_INC            %XIOS_INC %NCDF_INC
 %USER_LIB            %XIOS_LIB %NCDF_LIB

arch/UKMO/arch-XC40_METO_IFORT_debug.fcm

+# compiler options for Archer CRAY XC-40 (using crayftn compiler)
+#
+# NCDF_HOME   root directory containing lib and include subdirectories for netcdf4
+# HDF5_HOME   root directory containing lib and include subdirectories for HDF5
+# XIOS_HOME   root directory containing lib for XIOS
+# OASIS_HOME  root directory containing lib for OASIS
+#
+# NCDF_INC    netcdf4 include file
+# NCDF_LIB    netcdf4 library
+# XIOS_INC    xios include file    (taken into accound only if key_xios is activated)
+# XIOS_LIB    xios library         (taken into accound only if key_xios is activated)
+# OASIS_INC   oasis include file   (taken into accound only if key_oasis3 is activated)
+# OASIS_LIB   oasis library        (taken into accound only if key_oasis3 is activated)
+#
+# FC          Fortran compiler command
+# FCFLAGS     Fortran compiler flags
+# FFLAGS      Fortran 77 compiler flags
+# LD          linker
+# LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries
+# FPPFLAGS    pre-processing flags
+# AR          assembler
+# ARFLAGS     assembler flags
+# MK          make
+# USER_INC    complete list of include files
+# USER_LIB    complete list of libraries to pass to the linker
+# CC          C compiler used to compile conv for AGRIF
+# CFLAGS      compiler flags used with CC
+#
+# Note that:
+#  - unix variables "$..." are accpeted and will be evaluated before calling fcm.
+#  - fcm variables are starting with a % (and not a $)
+#
+# This arch file depends on loading XIOS-PrgEnv/2.0/24708
+
+%NCDF_HOME           $NETCDF_DIR
+%HDF5_HOME           $HDF5_DIR
+%XIOS_HOME           $xios_path
+%OASIS_HOME          $prism_path
+
+%NCDF_INC            -I%NCDF_HOME/include -I%HDF5_HOME/include
+%NCDF_LIB            -L%HDF5_HOME/lib -L%NCDF_HOME/lib -lnetcdff -lnetcdf -lhdf5_hl -lhdf5 -lz
+
+%XIOS_INC            -I%XIOS_HOME/inc
+%XIOS_LIB            -L%XIOS_HOME/lib -lxios -lstdc++
+
+%OASIS_INC           -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1
+%OASIS_LIBDIR        -L%OASIS_HOME/lib
+%OASIS_LIB           -lpsmile.MPI1 -lmct -lmpeu -lscrip
+
+%CPP                 cpp
+%FC                  ftn
+
+%FCFLAGS             -r8 -i4 -init=arrays,snan,huge -traceback -debug all -debug inline-debug-info -g -O0 -fp-model strict -check all,noarg_temp_created -fpe-all0 -ftz -ftrapuv
+%FFLAGS              %FCFLAGS
+%LD                  ftn
+%FPPFLAGS            -P -E -traditional-cpp
+%LDFLAGS             -hbyteswapio
+%AR                  ar
+%ARFLAGS             -r
+%MK                  gmake
+
+%USER_INC            %NCDF_INC %XIOS_INC
+%USER_LIB            %NCDF_LIB %XIOS_LIB 
+
+%CC                  cc
+%CFLAGS              -O0
+

arch/UKMO/arch-vdi_gfortran.fcm

+# generic gfortran compiler options for linux
+#
+# NCDF_HOME   root directory containing lib and include subdirectories for netcdf4
+# HDF5_HOME   root directory containing lib and include subdirectories for HDF5
+# XIOS_HOME   root directory containing lib for XIOS
+# OASIS_HOME  root directory containing lib for OASIS
+#
+# NCDF_INC    netcdf4 include file
+# NCDF_LIB    netcdf4 library
+# XIOS_INC    xios include file    (taken into accound only if key_xios is activated)
+# XIOS_LIB    xios library         (taken into accound only if key_xios is activated)
+# OASIS_INC   oasis include file   (taken into accound only if key_oasis3 is activated)
+# OASIS_LIB   oasis library        (taken into accound only if key_oasis3 is activated)
+#
+# FC          Fortran compiler command
+# FCFLAGS     Fortran compiler flags
+# FFLAGS      Fortran 77 compiler flags
+# LD          linker
+# LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries
+# FPPFLAGS    pre-processing flags
+# AR          assembler
+# ARFLAGS     assembler flags
+# MK          make
+# USER_INC    complete list of include files
+# USER_LIB    complete list of libraries to pass to the linker
+# CC          C compiler used to compile conv for AGRIF
+# CFLAGS      compiler flags used with CC
+#
+# Note that:
+#  - unix variables "$..." are accpeted and will be evaluated before calling fcm.
+#  - fcm variables are starting with a % (and not a $)
+#
+# =======================================================================================
+# The following envirnment was used to compile NEMO with this arch file on a UKMO VDI:
+#
+# module purge
+# module load libraries/gcc/6.4.0
+# module load gcc/6.4.0
+# module load mpi/mpich/3.2.1/gnu/6.4.0
+# module load hdf5/1.8.20/gnu/6.4.0
+# module load netcdf/4.6.1/gnu/6.4.0
+# module load xios/r1063/gnu/6.4.0
+# module list
+# export xios_path=/project/ukmo/rhel7/fortran/opt/gfortran/packages/gnu/6.4.0/xios/r1063
+# =======================================================================================
+
+%NCDF_HOME           $NETCDF_DIR
+%HDF5_HOME           $HDF5_DIR
+%XIOS_HOME           $xios_path
+
+%NCDF_INC            -I%NCDF_HOME/include -I%HDF5_HOME/include
+%NCDF_LIB            -L%NCDF_HOME/lib -lnetcdff -lnetcdf
+%XIOS_INC            -I%XIOS_HOME/inc 
+%XIOS_LIB            -L%XIOS_HOME/lib -lxios -lstdc++ 
+
+%OASIS_INC           -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1
+%OASIS_LIB           -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip
+
+%CPP	             cpp -Dkey_nosignedzero 
+%FC	                 mpif90 -c -cpp
+%FCFLAGS             -fdefault-real-8 -O3 -funroll-all-loops -fcray-pointer -ffree-line-length-none
+%FFLAGS              %FCFLAGS
+%LD                  mpif90
+%LDFLAGS             
+%FPPFLAGS            -P -traditional
+%AR                  ar
+%ARFLAGS             rs
+%MK                  make
+%USER_INC            %XIOS_INC %NCDF_INC
+%USER_LIB            %XIOS_LIB %NCDF_LIB
+
+%CC                  cc
+%CFLAGS              -O0

arch/arch-linux_gfortran.fcm

@@ -30,32 +30,31 @@
 #  - unix variables "$..." are accpeted and will be evaluated before calling fcm.
 #  - fcm variables are starting with a % (and not a $)
 #
-%NCDF_HOME           /usr/local/netcdf
-%HDF5_HOME           /usr/local/hdf5
-%XIOS_HOME           $HOME/xios-2.5
-%OASIS_HOME          /not/defined
+#%HDF5_HOME           $HOME/MODNUM/util/hdf5-1.8.13
+#%NCDF_C_HOME         $HOME/MODNUM/util/netcdf-c-4.3.3.1
+#%NCDF_F_HOME         $HOME/MODNUM/util/netcdf-fortran-4.4.2
+#%XIOS_HOME           $HOME/MODNUM/xios-trunk
 
-%NCDF_INC            -I%NCDF_HOME/include -I%HDF5_HOME/include
-%NCDF_LIB            -L%NCDF_HOME/lib -lnetcdff -lnetcdf
+%NCDF_INC            -I%NCDF_F_HOME/include -I%NCDF_C_HOME/include -I%HDF5_HOME/include
+%NCDF_LIB            -L%NCDF_F_HOME/lib -lnetcdff -L%NCDF_C_HOME/lib -lnetcdf
 %XIOS_INC            -I%XIOS_HOME/inc 
-%XIOS_LIB            -L%XIOS_HOME/lib -lxios -L/usr/lib/gcc/x86_64-linux-gnu/5 -lstdc++
+%XIOS_LIB            -L%XIOS_HOME/lib -lxios -lstdc++ 
 
 %OASIS_INC           -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1
 %OASIS_LIB           -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip
 
 %CPP	             cpp -Dkey_nosignedzero 
-%FC	             /usr/bin/mpif90 -c -cpp 
+%FC	             mpif90 -c -cpp
 %FCFLAGS             -fdefault-real-8 -O3 -funroll-all-loops -fcray-pointer -ffree-line-length-none
 %FFLAGS              %FCFLAGS
-#%LD                  /usr/bin/mpif90 -Wl,-rpath=$HOME/INSTALL/lib:/usr/lib
-%LD                  /usr/bin/mpif90
+%LD                  mpif90
 %LDFLAGS             
-%FPPFLAGS            -P -C -traditional
+%FPPFLAGS            -P -traditional
 %AR                  ar
 %ARFLAGS             rs
 %MK                  make
-%USER_INC            %XIOS_INC %OASIS_INC %NCDF_INC
-%USER_LIB            %XIOS_LIB %OASIS_LIB %NCDF_LIB
+%USER_INC            %XIOS_INC %NCDF_INC
+%USER_LIB            %XIOS_LIB %NCDF_LIB
 
 %CC                  cc
 %CFLAGS              -O0

arch/arch-linux_ifort.fcm

@@ -48,7 +48,7 @@
 %FFLAGS              %FCFLAGS
 %LD                  ftn
 %LDFLAGS             
-%FPPFLAGS            -P -C -traditional
+%FPPFLAGS            -P -traditional
 %AR                  ar
 %ARFLAGS             rs
 %MK                  gmake

arch/arch-linux_ifort_omp.fcm

@@ -20,7 +20,7 @@
 %FCFLAGS 	         -r8 -O3  -traceback -openmp
 %FFLAGS 	            -r8 -O3  -traceback -openmp
 %LD                  ifort
-%FPPFLAGS            -P -C -traditional
+%FPPFLAGS            -P -traditional
 %LDFLAGS
 %AR                  ar 
 %ARFLAGS             -r

arch/arch-linux_pgf90.fcm

@@ -21,7 +21,7 @@
 %FFLAGS              %FCFLAGS
 %LD                  pgf90
 %LDFLAGS
-%FPPFLAGS            -P -C -traditional
+%FPPFLAGS            -P -traditional
 %AR                  ar
 %ARFLAGS             -rs
 %MK                  gmake

arch/arch-osx_gfortran.fcm

@@ -23,7 +23,7 @@
 #
 %NCDF_HOME           /opt/local
 %HDF5_HOME           /opt/local
-%XIOS_HOME           /Users/$( whoami )/xios-2.5
+%XIOS_HOME           /Users/$( whoami )/xios-trunk
 %OASIS_HOME          /not/defined
 
 %NCDF_INC            -I%NCDF_HOME/include -I%HDF5_HOME/include
@@ -35,7 +35,8 @@
 
 %CPP	             cpp -Dkey_nosignedzero 
 %FC	             mpif90 
-%FCFLAGS             -fdefault-real-8 -O3 -funroll-all-loops -fcray-pointer -ffree-line-length-none
+%PROD_FCFLAGS        -fdefault-real-8 -O3 -funroll-all-loops -fcray-pointer -ffree-line-length-none -fallow-argument-mismatch 
+%DEBUG_FCFLAGS       -fdefault-real-8 -O0 -g -fbacktrace -funroll-all-loops -fcray-pointer -ffree-line-length-none -fcheck=all -finit-real=nan -fallow-argument-mismatch 
 %FFLAGS              %FCFLAGS
 %LD                  %FC
 %LDFLAGS             

arch/arch-osx_gfortran_debug.fcm

-# generic gfortran compiler options for OSX installed with macport, http://www.macports.org/
-#
-#   Prerequisite softwares installed with MacPorts :
-#   Prerequisite softwares installed with MacPorts :
-#     sudo port install gcc9
-#     sudo port install gcc_select
-#     sudo port select --set gcc mp-gcc9
-#     sudo port install mpich-gcc9
-#     sudo port install mpi_select
-#     sudo port select --set mpi mpich-gcc9-fortran
-#     sudo port install hdf5 +gcc9 +mpich +szip
-#     sudo port install netcdf +gcc9 +mpich
-#     sudo port install netcdf-fortran +gcc9 +mpich
-#     sudo port install p5.30-uri
-#
-#     $ port select --show mpi
-#     The currently selected version for 'mpi' is 'mpich-gcc9-fortran'.
-#     $ port select --show gcc
-#     The currently selected version for 'gcc' is 'mp-gcc9'.
-#
-# Note that:
-#  - unix variables "$..." are accpeted and will be evaluated before calling fcm.
-#  - fcm variables are starting with a % (and not a $)
-#
-%NCDF_HOME           /opt/local
-%HDF5_HOME           /opt/local
-%XIOS_HOME           /Users/$( whoami )/xios-2.5
-%OASIS_HOME          /not/defined
-
-%NCDF_INC            -I%NCDF_HOME/include -I%HDF5_HOME/include
-%NCDF_LIB            -L%NCDF_HOME/lib -lnetcdff -lnetcdf
-%XIOS_INC            -I%XIOS_HOME/inc 
-%XIOS_LIB            -L%XIOS_HOME/lib -lxios -lstdc++
-%OASIS_INC           -I%OASIS_HOME/build/lib/mct -I%OASIS_HOME/build/lib/psmile.MPI1
-%OASIS_LIB           -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip
-
-%CPP	             cpp -Dkey_nosignedzero 
-%FC	             mpif90 
-%FCFLAGS             -fdefault-real-8 -O0 -g -fbacktrace -funroll-all-loops -fcray-pointer -ffree-line-length-none -fcheck=all -finit-real=nan
-%FFLAGS              %FCFLAGS
-%LD                  %FC
-%LDFLAGS             
-%FPPFLAGS            -P -traditional
-%AR                  ar
-%ARFLAGS             rs
-%MK                  make
-%USER_INC            %XIOS_INC %OASIS_INC %NCDF_INC
-%USER_LIB            %XIOS_LIB %OASIS_LIB %NCDF_LIB
-
-%CC                  cc
-%CFLAGS              -O0

arch/misc/arch-X64_BULL.fcm

@@ -20,7 +20,7 @@
 %FFLAGS              %FCFLAGS
 %LD                  scorep-mpiifort
 %LDFLAGS             -lstdc++
-%FPPFLAGS            -P -C -traditional -std=c99
+%FPPFLAGS            -P -traditional -std=c99
 %AR                  ar
 %ARFLAGS             rs
 %MK                  gmake

cfgs/AGRIF_DEMO/EXPREF/1_context_nemo.xml

@@ -4,7 +4,7 @@
 ============================================================================================== 
 -->
 <context id="nemo">
-    <!-- $id$ -->
+
     <variable_definition>
        <!-- Year/Month/Day of time origin for NetCDF files; defaults to 1800-01-01 -->
        <variable id="ref_year"  type="int"> 1900 </variable>
@@ -24,10 +24,8 @@
     <field_definition src="./field_def_nemo-pisces.xml"/>   <!--  NEMO ocean biogeochemical                      -->
     <field_definition src="./field_def_nemo-innerttrc.xml"/> <!--  NEMO ocean inert passive tracer           -->
 
-
 <!-- Files definition -->
     <file_definition src="./file_def_nemo-oce.xml"/>     <!--  NEMO ocean dynamics                     -->
-    <file_definition src="./file_def_nemo-ice.xml"/>     <!--  NEMO ocean sea ice                      -->
     <file_definition src="./file_def_nemo-innerttrc.xml"/> <!--  NEMO ocean inert passive tracer           -->
 
 <!-- Axis definition -->
@@ -38,6 +36,5 @@
 
 <!-- Grids definition -->
     <grid_definition   src="./grid_def_nemo.xml"/>
-  
 
 </context>

cfgs/AGRIF_DEMO/EXPREF/1_namelist_cfg

@@ -10,7 +10,6 @@
 !!   namcfg       parameters of the configuration                       (default: user defined GYRE)
 !!   namwad       Wetting and drying                                    (default: OFF)
 !!   namtsd       data: temperature & salinity                          (default: OFF)
-!!   namcrs       coarsened grid (for outputs and/or TOP)               (ln_crs =T)
 !!   namc1d       1D configuration options                              (ln_c1d =T)
 !!   namc1d_dyndmp 1D newtonian damping applied on currents             (ln_c1d =T)
 !!   namc1d_uvd   1D data (currents)                                    (ln_c1d =T)
@@ -27,9 +26,8 @@
 !-----------------------------------------------------------------------
 &namdom        !   time and space domain
 !-----------------------------------------------------------------------
-   ln_linssh   = .false.   !  =T  linear free surface  ==>>  model level are fixed in time
-   !
-   rn_Dt      = 5400.     !  time step for the dynamics and tracer
+!MLF   rn_Dt      = 5400.     !  time step for the dynamics and tracer
+   rn_Dt      = 10800.    !  time step for the dynamics and tracer
    ln_meshmask = .false.  !  =T create a mesh file
 /
 !-----------------------------------------------------------------------
@@ -85,7 +83,7 @@
                      ! Type of air-sea fluxes 
    ln_blk      = .true.    !  Bulk formulation                          (T => fill namsbc_blk )
                      ! Sea-ice :
-   nn_ice      = 2         !  =0 no ice boundary condition
+   nn_ice      = 0         !  =0 no ice boundary condition
       !                    !  =1 use observed ice-cover                 (  => fill namsbc_iif )
       !                    !  =2 or 3 for SI3 and CICE, respectively
                      ! Misc. options of sbc : 
@@ -273,8 +271,6 @@
       !                           !  time invariant coefficients:  aei0 = 1/2  Ue*Le 
       rn_Ue        = 0.03              !  lateral diffusive velocity [m/s] (nn_aht_ijk_t= 0, 10, 20, 30)
       rn_Le        = 200.e+3           !  lateral diffusive length   [m]   (nn_aht_ijk_t= 0, 10)
-      !
-      ln_ldfeiv_dia =.true.   ! diagnose eiv stream function and velocities
 /
 !-----------------------------------------------------------------------
 &namtra_dmp    !   tracer: T & S newtonian damping                      (default: OFF)
@@ -318,6 +314,10 @@
 &namdyn_spg    !   surface pressure gradient                            (default: NO selection)
 !-----------------------------------------------------------------------
    ln_dynspg_ts  = .true.  !  split-explicit free surface
+!MLF      nn_bt_flt     = 1          ! Time filtering with nn_e width boxcar averaging
+!MLF      rn_bt_alpha   = 0.         ! Dissipative Forward Backward parameter
+      nn_bt_flt     = 3          ! Time filtering with dissipative Forward Backward
+      rn_bt_alpha   = 0.09       ! Dissipative Forward Backward parameter
 /
 !-----------------------------------------------------------------------
 &namdyn_ldf    !   lateral diffusion on momentum                        (default: NO selection)
@@ -361,17 +361,18 @@
 !-----------------------------------------------------------------------
 &namzdf_tke    !   turbulent eddy kinetic dependent vertical diffusion  (ln_zdftke =T)
 !-----------------------------------------------------------------------
+      nn_mxlice = 0           ! type of scaling under sea-ice
+      !                       !    = 0 no scaling under sea-ice
+      !                       !    = 1 scaling with constant sea-ice thickness
+      !                       !    = 2 scaling with mean sea-ice thickness ( only with SI3 sea-ice model )
 /
 !!======================================================================
 !!                  ***  Diagnostics namelists  ***                   !!
 !!                                                                    !!
 !!   namtrd       dynamics and/or tracer trends                         (default: OFF)
-!!   namhsb       Heat and salt budgets                                 (default: OFF)
 !!   namdiu       Cool skin and warm layer models                       (default: OFF)
 !!   namdiu       Cool skin and warm layer models                       (default: OFF)
-!!   namflo       float parameters                                      (default: OFF)
 !!   nam_diadct   transports through some sections                      (default: OFF)
-!!   nam_dia25h   25h Mean Output                                       (default: OFF)
 !!   namnc4       netcdf4 chunking and compression settings             ("key_netcdf4")
 !!======================================================================
 !

cfgs/AGRIF_DEMO/EXPREF/2_context_nemo.xml

@@ -4,7 +4,7 @@
 ============================================================================================== 
 -->
 <context id="nemo">
-    <!-- $id$ -->
+
     <variable_definition>
        <!-- Year/Month/Day of time origin for NetCDF files; defaults to 1800-01-01 -->
        <variable id="ref_year"  type="int"> 1900 </variable>
@@ -24,7 +24,6 @@
     <field_definition src="./field_def_nemo-pisces.xml"/>   <!--  NEMO ocean biogeochemical                      -->
     <field_definition src="./field_def_nemo-innerttrc.xml"/> <!--  NEMO ocean inert passive tracer           -->
 
-
 <!-- Files definition -->
     <file_definition src="./file_def_nemo-oce.xml"/>     <!--  NEMO ocean dynamics                     -->
     <file_definition src="./file_def_nemo-ice.xml"/>     <!--  NEMO ocean sea ice                      -->
@@ -38,6 +37,5 @@
 
 <!-- Grids definition -->
     <grid_definition   src="./grid_def_nemo.xml"/>
-  
 
 </context>