.gitlab/issue_templates/Bug.md

+#### Context
+
+_Please provide informations on how to reproduce the bug:_
+
+- [x] Branches impacted: current release and/or main 
+- [x] Reference configuration/test case (chosen or used as template) ~AMM ~gyre ~orca ~papa or engines involved ~ABL ~NST ~OFF ~TOP ~SAO ~SAS ~"SI³" ~SWE
+- [x] Computing architecture: compiler, MPI & NetCDF libs (name and version)
+- [x] Dependencies: ~AGRIF ~BFM ~CICE ~OASIS ~XIOS (with known branch and hash/revision/version), ...
+- [ ] _Any other relevant information_
+
+#### Analysis
+
+_Please give your thoughts on the issue._
+
+#### Fix
+
+_Please share your proven solution or your recommendation on how to proceed._
+
+---
+
+_You can_
+- :clipboard: _Copy code blocks_ (\`\`\`fortran ...\`\`\`) _or  diff outputs_ (\`\`\`diff ...\`\`\`)
+- :paperclip: _Include files_
+- :link:      _Add external links._
+
+:warning: _Please remove all unnecessary lines in this description, like the one you are reading in italic, before creating the issue._ :warning:

.gitlab/issue_templates/Feature.md

+#### Context
+
+_Please provide informations on how to set the modelling environment_
+
+- [ ] Reference configuration/test case (to add, chosen or used as template)
+- [x] Modifications of versioned files: Fortran routines (`*.[Ffh]90`), namelists (`namelist\_*cfg`), outputs settings (`*.xml`), ...
+- [ ] Additional dependencies
+- [ ] New datasets
+- [ ] _Any other relevant information_
+
+#### Proposal
+
+_Please share your ideas or your wishes about modelling improvements for the NEMO model._  
+_In particular, express if you are willing to contribute personally to the implementation of this feature in NEMO._
+
+---
+
+_You can_
+- :clipboard: _Copy code blocks_ (\`\`\`fortran ...\`\`\`) _or  diff outputs_ (\`\`\`diff ...\`\`\`)
+- :paperclip: _Include files_
+- :link:      _Add external links._
+
+:warning: _Please remove all unnecessary lines in this description, like the one you are reading in italic, before creating the issue._ :warning:

.gitlab/issue_templates/Task_preview.md

+#### Development description
+
+_Describe the goal and the methodology._  
+_Add reference documents or publications if relevant._
+
+#### Code implementation
+
+_Describe flow chart of the changes in the code._  
+_List the Fortran modules and subroutines to be created/edited/deleted._  
+_Detailed list of new variables to be defined (including namelists), give for each the chosen name and description wrt coding rules._
+
+#### Documentation updates
+
+_Using previous parts, define the main changes to be done in the ~doc (manuals, guide, web pages, ...)._

.gitlab/merge_request_templates/.gitkeep

+

.gitlab/merge_request_templates/Task_review.md

+#### Tests
+
+Once the development is done, the PI should complete the tests section below and after ask the reviewers to start their review.  
+This part should contain the detailed results of ~SETTE tests (restartability and reproducibility for each of the reference configuration) and detailed results of restartability and reproducibility when the option is activated on specified configurations used for this test.
+
+**Regular checks**
+
+- [ ] Can this change be shown to produce expected impact (option activated)?
+- [ ] Can this change be shown to have a null impact (option not activated)?
+- [ ] Results of the required bit comparability tests been run: are there no differences when activating the development?
+- [ ] If some differences appear, is reason for the change valid/understood?
+- [ ] If some differences appear, is the impact as expected on model configurations?
+- [ ] Is this change expected to preserve all diagnostics?  
+  - [ ] If no, is reason for the change valid/understood?
+- [ ] Are there significant changes in run time/memory?
+
+#### Review
+
+A successful review is needed to schedule the merge of this development into the future NEMO release during next Merge Party (usually in November).
+
+**Assessments**
+
+- [ ] Is the proposed methodology now implemented?
+- [ ] Are the code changes in agreement with the flowchart defined at preview step?
+- [ ] Are the code changes in agreement with list of routines and variables as proposed at preview step?  
+  - [ ] If, not, are the discrepancies acceptable?
+- [ ] Is the in-line documentation accurate and sufficient?
+- [ ] Do the code changes comply with NEMO coding standards?
+- [ ] Is the development documented with sufficient details for others to understand the impact of the change?
+- [ ] Is the project ~doc (manual, guide, web, ...) now updated or completed following the proposed summary in preview section?

arch/CNRS/arch-X64_IRENE.fcm

@@ -30,7 +30,8 @@
 #  - unix variables "$..." are accpeted and will be evaluated before calling fcm.
 #  - fcm variables are starting with a % (and not a $)
 #
-%XIOS_HOME           $CCCWORKDIR/xios-trunk
+%PROD_XIOS_HOME      $CCCWORKDIR/xios-trunk
+%DEBUG_XIOS_HOME     %{PROD_XIOS_HOME}_debug
 %OASIS_HOME          $CCCWORKDIR/now/models/oa3mct
 
 %NCDF_INC            -I$NETCDFFORTRAN_INCDIR -I$NETCDF_INCDIR
@@ -43,7 +44,8 @@
 
 %CPP	             cpp
 %FC                  mpif90 -c -cpp
-%FCFLAGS             -i4 -r8 -O3 -fp-model strict -xCORE-AVX512 -fno-alias
+%PROD_FCFLAGS        -i4 -r8 -O3 -fp-model strict -xCORE-AVX512 -fno-alias
+%DEBUG_FCFLAGS       -i4 -r8 -g -O0 -debug all -traceback -fp-model strict -ftrapuv -check all,noarg_temp_created -fpe-all0 -ftz -init=arrays,snan,huge
 %FFLAGS              %FCFLAGS
 %LD                  mpif90
 %LDFLAGS             

arch/CNRS/arch-X64_IRENE_GCC.fcm

@@ -29,7 +29,8 @@
 
 %CPP	             cpp -Dkey_nosignedzero 
 %FC                  mpif90
-%FCFLAGS             -fdefault-real-8 -O3 -funroll-all-loops -fcray-pointer -ffree-line-length-none -Wno-missing-include-dirs 
+%PROD_FCFLAGS        -fdefault-real-8 -O3 -funroll-all-loops -fcray-pointer -ffree-line-length-none -Wno-missing-include-dirs 
+%DEBUG_FCFLAGS       -fdefault-real-8 -O0 -g -fbacktrace -funroll-all-loops -fcray-pointer -ffree-line-length-none -fcheck=all -finit-real=nan
 %FFLAGS              %FCFLAGS
 %LD                  mpif90
 %LDFLAGS             

arch/CNRS/arch-X64_IRENE_GCC_DEBUG.fcm

-# Irene BULL at TGCC, http://www-hpc.cea.fr/en/complexe/tgcc-Irene.htm
-#
-# list of modules used
-#
-#   module purge
-#   module load gnu/8.3.0
-#   module load flavor/buildcompiler/gcc/8
-#   module load flavor/buildmpi/openmpi/2.0
-#   module load flavor/hdf5/parallel
-#   module load mpi/openmpi/2.0.4
-#   module load hdf5/1.8.20
-#   module load netcdf-c/4.6.0
-#   module load netcdf-fortran/4.4.4
-#
-# Note that:
-#  - unix variables "$..." are accpeted and will be evaluated before calling fcm.
-#  - fcm variables are starting with a % (and not a $)
-#
-%XIOS_HOME           $CCCWORKDIR/xios-trunk_gcc
-%OASIS_HOME          $CCCWORKDIR/now/models/oa3mct
-
-%NCDF_INC            -I$NETCDFFORTRAN_INCDIR -I$NETCDF_INCDIR
-%NCDF_LIB            -L$NETCDFFORTRAN_LIBDIR -lnetcdff -L$NETCDF_LIBDIR -lnetcdf -L$HDF5_LIBDIR -lhdf5_hl -lhdf5 -lz -lcurl
-
-%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                  mpif90
-%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/CNRS/arch-X64_JEANZAY.fcm

@@ -48,7 +48,8 @@
 
 %CPP	             cpp
 %FC                  mpiifort -c -cpp
-%FCFLAGS             -i4 -r8 -O3 -fp-model strict -xCORE-AVX512 -fno-alias
+%PROD_FCFLAGS        -i4 -r8 -O3 -fp-model strict -xCORE-AVX512 -fno-alias
+%DEBUG_FCFLAGS       -i4 -r8 -g -O0 -debug all -traceback -fp-model strict -ftrapuv -check all,noarg_temp_created -fpe-all0 -ftz -init=arrays,snan,huge
 %FFLAGS              %FCFLAGS
 %LD                  mpiifort
 %LDFLAGS             

arch/MERCATOR/arch-X64_KARA_GCC_OMPI_DEBUG.fcm → arch/MERCATOR/arch-X64_AA_GCC_OMPI.fcm

-# compiler options for KARA (using GNU compiler)
+# compiler options for AA (using GCC compiler & OpenMPI)
 #
-# GNU_OMPI (NEMO-4.0 + XIOS-2.5)
-# gcc/9.3.0 openmpi/4.0.5_gcc9.3.0 hdf5/1.8.18_gcc9.3.0 netcdf/4.7.1_gcc9.3.0 xios/2.5_rev1903_gcc9.3.0
-#
-# GNU_OMPI (NEMO-4.2 + XIOS-TRUNK)
-# gcc/9.3.0 openmpi/4.0.5_gcc9.3.0 hdf5/1.8.18_gcc9.3.0 netcdf/4.7.1_gcc9.3.0 xios/trunk_rev2136_gcc9.3.0
+# module use /home/ar0s/modules
+# prgenv/gnu gcc/11.2.0 openmpi/4.1.1.1 hdf5-parallel/1.10.6 netcdf4-parallel/4.7.4 xios/trunk/rev2320-impi
 #
 #
 # NCDF_INC    netcdf4 include file
@@ -40,8 +37,9 @@
 #---------------------------------------------------------------------------------------------
 #
 #
-%NCDF_INC            -I${NETCDF_INC}
-%NCDF_LIB            -L${NETCDF_LIB} -lnetcdff -lnetcdf -L${HDF5_LIB} -lhdf5_hl -lhdf5
+%NCDF_INC            ${NETCDF4_INCLUDE}
+#%NCDF_LIB            ${NETCDF4_LIB} ${HDF5_LIB}
+%NCDF_LIB            ${NETCDF4_LIB} -L/usr/local/apps/hdf5-parallel/1.10.6/GNU/8.4/OMPI/4.1/lib -Wl,-rpath,/usr/local/apps/hdf5-parallel/1.10.6/GNU/8.4/OMPI/4.1/lib -lhdf5hl_fortran -lhdf5_hl_cpp -lhdf5_hl -lhdf5_fortran -lhdf5_cpp -lhdf5 -lm -lhdf5_hl -lhdf5
 %XIOS_INC            -I${XIOS_INC}
 %XIOS_LIB            -L${XIOS_LIB} -lxios
 %OASIS_INC           -I${OASIS_DIR}/build/lib/mct -I${OASIS_DIR}/build/lib/psmile.MPI1
@@ -49,7 +47,8 @@
 
 %CPP                 cpp -Dkey_nosignedzero
 %FC                  mpif90 -c -cpp
-%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
+#%FCFLAGS             -fdefault-real-8 -O2 -ftree-vectorize -funroll-all-loops -ffree-line-length-none -Wno-missing-include-dirs
+%FCFLAGS             -fdefault-real-8 -O3 -ffree-line-length-none -Wno-missing-include-dirs -fallow-argument-mismatch
 %FFLAGS              %FCFLAGS
 %LD                  mpif90
 %LDFLAGS             -lstdc++
@@ -60,5 +59,5 @@
 %USER_INC            %XIOS_INC %OASIS_INC %NCDF_INC
 %USER_LIB            %XIOS_LIB %OASIS_LIB %NCDF_LIB
 
-%CC                  gcc
+%CC                  mpicc
 %CFLAGS              -O0

arch/MERCATOR/arch-X64_BELENOS_INTEL_IMPI_DEBUG.fcm → arch/MERCATOR/arch-X64_AA_INTEL_IMPI.fcm

-# compiler options for BELENOS/TARANIS (using INTEL compiler)
+# compiler options for AA (using INTEL compiler & INTEL MPI)
 #
-# INTEL_IMPI (XIOS-2.5)
-# intel/2018.5.274 intelmpi/2018.5.274 phdf5/1.8.18 netcdf_par/4.7.1_V2 xios-2.5_rev1903
-#
-# INTEL_IMPI (XIOS-TRUNK must be compiled)
-# gcc/9.2.0 intel/2018.5.274 intelmpi/2018.5.274 phdf5/1.8.18 netcdf_par/4.7.1_V2
+# module use /home/ar0s/modules
+# module load prgenv/intel intel/2021.4.0 intel-mpi/2021.4.0 hdf5-parallel/1.10.6 netcdf4-parallel/4.7.4 xios/trunk/rev2320-impi
 #
 #
 # NCDF_INC    netcdf4 include file
@@ -40,16 +37,17 @@
 #---------------------------------------------------------------------------------------------
 #
 #
-%NCDF_INC            -I${NETCDF_INC}
-%NCDF_LIB            -L${NETCDF_LIB} -lnetcdff -lnetcdf -L${PHDF5_LIB_DIR} -lhdf5_hl -lhdf5
+%NCDF_INC            ${NETCDF4_INCLUDE}
+%NCDF_LIB            ${NETCDF4_LIB} ${HDF5_LIB}
 %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}/include
 %OASIS_LIB           -L${OASIS_DIR}/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip
 
 %CPP                 cpp
 %FC                  mpiifort -c -cpp
-%FCFLAGS             -march=core-avx2 -i4 -r8 -g -O0 -debug all -traceback -fp-model strict -ftrapuv -check all,noarg_temp_created -fpe-all0 -ftz -init=arrays,snan,huge
+%PROD_FCFLAGS        -march=core-avx2 -i4 -r8 -O3 -fp-model strict -fno-alias -align array64byte
+%DEBUG_FCFLAGS       -march=core-avx2 -i4 -r8 -g -O0 -debug all -traceback -fp-model strict -ftrapuv -check all,noarg_temp_created -fpe-all0 -ftz -init=arrays,snan,huge
 %FFLAGS              %FCFLAGS
 %LD                  mpiifort
 %LDFLAGS             

arch/CNRS/arch-X64_IRENE_DEBUG.fcm → arch/MERCATOR/arch-X64_AA_INTEL_OMPI.fcm

-# Irene BULL at TGCC, http://www-hpc.cea.fr/en/complexe/tgcc-Irene.htm
+# compiler options for AA (using INTEL compiler & OpenMPI)
+#
+# module purge
+# module use /home/ar0s/modules
+# module load prgenv/intel intel/2021.4.0 openmpi/4.1.1.1 hdf5-parallel/1.10.6 netcdf4-parallel/4.7.4 xios/trunk/rev2320-nmpi
 #
-# 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
@@ -30,22 +30,27 @@
 #  - unix variables "$..." are accpeted and will be evaluated before calling fcm.
 #  - fcm variables are starting with a % (and not a $)
 #
-%XIOS_HOME           $CCCWORKDIR/xios-trunk
-%OASIS_HOME          $CCCWORKDIR/now/models/oa3mct
-
-%NCDF_INC            -I$NETCDFFORTRAN_INCDIR -I$NETCDF_INCDIR
-%NCDF_LIB            -L$NETCDFFORTRAN_LIBDIR -lnetcdff -L$NETCDF_LIBDIR -lnetcdf -L$HDF5_LIBDIR -lhdf5_hl -lhdf5 -lz -lcurl
-
-%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
+#---------------------------------------------------------------------------------------------
+#---------------------------------------------------------------------------------------------
+# All NETCDF and HDF paths are empty as they are automatically defined through environment
+# variables by the load of modules
+#---------------------------------------------------------------------------------------------
+#---------------------------------------------------------------------------------------------
+#
+#
+%NCDF_INC            ${NETCDF4_INCLUDE}
+%NCDF_LIB            ${NETCDF4_LIB} -L${HDF5_DIR}/lib -Wl,-rpath,${HDF5_DIR}/lib -lhdf5_hl -lhdf5 -lz
+%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_LIB           -L${OASIS_DIR}/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip
 
-%CPP	             cpp
-%FC                  mpif90 -c -cpp
-%FCFLAGS             -i4 -r8 -g -O0 -debug all -traceback -fp-model strict -ftrapuv -check all,noarg_temp_created -fpe-all0 -ftz -init=arrays,snan,huge
+%CPP                 cpp
+%FC                  mpifort -c -cpp
+%PROD_FCFLAGS        -march=core-avx2 -i4 -r8 -O3 -fp-model strict -fno-alias -align array64byte
+%DEBUG_FCFLAGS       -march=core-avx2 -i4 -r8 -g -O0 -debug all -traceback -fp-model strict -ftrapuv -check all,noarg_temp_created -fpe-all0 -ftz -init=arrays,snan,huge
 %FFLAGS              %FCFLAGS
-%LD                  mpif90
+%LD                  mpifort
 %LDFLAGS             
 %FPPFLAGS            -P -traditional
 %AR                  ar
@@ -54,5 +59,5 @@
 %USER_INC            %XIOS_INC %OASIS_INC %NCDF_INC
 %USER_LIB            %XIOS_LIB %OASIS_LIB %NCDF_LIB
 
-%CC                  cc
+%CC                  mpicc
 %CFLAGS              -O0

arch/CNRS/arch-X64_JEANZAY_DEBUG.fcm → arch/MERCATOR/arch-X64_AA_INTEL_XMPI.fcm

-# Jean-Zay HPE at IDRIS, http://www.idris.fr/jean-zay
+# compiler options for AA (using INTEL compiler & HPCX OpenMPI)
+#
+# module use /home/ar0s/modules
+# module load prgenv/intel intel/2021.4.0 hpcx-openmpi/2.9.0 hdf5-parallel/1.10.6 netcdf4-parallel/4.7.4 xios/trunk/rev2320-xmpi
 #
-# 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
@@ -36,21 +37,18 @@
 #---------------------------------------------------------------------------------------------
 #
 #
-%XIOS_HOME           $WORK/xios-trunk
-%OASIS_HOME          
-
-%NCDF_INC            
-%NCDF_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
+%NCDF_INC            ${NETCDF4_INCLUDE}
+%NCDF_LIB            ${NETCDF4_LIB} ${HDF5_LIB}
+%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_LIB           -L${OASIS_DIR}/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip
 
-%CPP	             cpp
-%FC                  mpiifort -c -cpp
-%FCFLAGS             -i4 -r8 -g -O0 -debug all -traceback -fp-model strict -ftrapuv -check all,noarg_temp_created -fpe-all0 -ftz -init=arrays,snan,huge
+%CPP                 cpp
+%FC                  mpifort -c -cpp
+%FCFLAGS             -march=core-avx2 -i4 -r8 -O3 -fp-model strict -fno-alias -align array64byte
 %FFLAGS              %FCFLAGS
-%LD                  mpiifort
+%LD                  mpifort
 %LDFLAGS             
 %FPPFLAGS            -P -traditional
 %AR                  ar
@@ -59,5 +57,5 @@
 %USER_INC            %XIOS_INC %OASIS_INC %NCDF_INC
 %USER_LIB            %XIOS_LIB %OASIS_LIB %NCDF_LIB
 
-%CC                  cc
+%CC                  mpicc
 %CFLAGS              -O0

arch/MERCATOR/arch-X64_BELENOS_INTEL_IMPI.fcm

-# compiler options for BELENOS/TARANIS (using INTEL compiler)
+# compiler options for BELENOS/TARANIS (using INTEL compiler + INTEL MPI)
 #
-# INTEL_IMPI (XIOS-2.5)
-# intel/2018.5.274 intelmpi/2018.5.274 phdf5/1.8.18 netcdf_par/4.7.1_V2 xios-2.5_rev1903
+# --------------------------------
+# INTEL_IMPI (NEMO 4.0 + XIOS-2.5)
+# --------------------------------
+# module use /home/ext/mr/smer/samsong/modules
+# module load intel/2018.5.274 intelmpi/2018.5.274 phdf5/1.8.18 netcdf_par/4.7.1_V2 xios/2.5/rev1903
 #
-# INTEL_IMPI (XIOS-TRUNK must be compiled)
-# gcc/9.2.0 intel/2018.5.274 intelmpi/2018.5.274 phdf5/1.8.18 netcdf_par/4.7.1_V2
+# ----------------------------------
+# INTEL_IMPI (NEMO 4.2 + XIOS-TRUNK)
+# ----------------------------------
+# module use /home/ext/mr/smer/samsong/modules
+# module load gcc/9.2.0 intel/2018.5.274 intelmpi/2018.5.274 phdf5/1.8.18 netcdf_par/4.7.1_V2 xios/trunk/rev2134
 #
 #
 # NCDF_INC    netcdf4 include file
@@ -44,12 +50,13 @@
 %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}/include
 %OASIS_LIB           -L${OASIS_DIR}/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip
 
 %CPP                 cpp
 %FC                  mpiifort -c -cpp
-%FCFLAGS             -march=core-avx2 -i4 -r8 -O3 -fp-model strict -fno-alias -align array64byte
+%PROD_FCFLAGS        -march=core-avx2 -i4 -r8 -O3 -fp-model strict -fno-alias -align array64byte
+%DEBUG_FCFLAGS       -march=core-avx2 -i4 -r8 -g -O0 -debug all -traceback -fp-model strict -ftrapuv -check all,noarg_temp_created -fpe-all0 -ftz -init=arrays,snan,huge
 %FFLAGS              %FCFLAGS
 %LD                  mpiifort
 %LDFLAGS             

arch/MERCATOR/arch-X64_BELENOS_INTEL_MVAP.fcm

+# compiler options for BELENOS/TARANIS (using INTEL compiler + MVAPICH2 MPI)
+#
+# --------------------------------
+# INTEL_MVAP (NEMO 4.0 + XIOS-2.5)
+# --------------------------------
+# module use /home/ext/mr/smer/samsong/modules
+# module load intel/2018.5.274 mvapich2-2.3.5 hdf5-1.8.18-mvapich2 netcdf-4.7.1-mvapich2 xios/2.5/rev1903-mvapich2
+#
+# ----------------------------------
+# INTEL_MVAP (NEMO 4.2 + XIOS-TRUNK)
+# ----------------------------------
+# module use /home/ext/mr/smer/samsong/modules
+# module load gcc/9.2.0 intel/2018.5.274 mvapich2-2.3.5 hdf5-1.8.18-mvapich2 netcdf-4.7.1-mvapich2 xios/trink/rev2134-mvapich2
+#
+#
+# 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 $)
+#
+#---------------------------------------------------------------------------------------------
+#---------------------------------------------------------------------------------------------
+# All NETCDF and HDF paths are empty as they are automatically defined through environment
+# variables by the load of modules
+#---------------------------------------------------------------------------------------------
+#---------------------------------------------------------------------------------------------
+#
+#
+%NCDF_INC            -I${NETCDF_INC}
+%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}/include
+%OASIS_LIB           -L${OASIS_DIR}/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip
+
+%CPP                 cpp
+%FC                  mpiifort -c -cpp
+%PROD_FCFLAGS        -march=core-avx2 -i4 -r8 -O3 -fp-model strict -fno-alias -align array64byte
+%DEBUG_FCFLAGS       -march=core-avx2 -i4 -r8 -g -O0 -debug all -traceback -fp-model strict -ftrapuv -check all,noarg_temp_created -fpe-all0 -ftz -init=arrays,snan,huge
+%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                  mpiicc
+%CFLAGS              -O0

arch/MERCATOR/arch-X64_BELENOS_INTEL_OMPI.fcm

-# compiler options for BELENOS/TARANIS (using INTEL compiler)
+# compiler options for BELENOS/TARANIS (using INTEL compiler + Open MPI)
 #
-# 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_OMPI (NEMO 4.0 + XIOS-2.5)
+# --------------------------------
+# module use /home/ext/mr/smer/samsong/modules
+# module load 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
+# ----------------------------------
+# INTEL_OMPI (NEMO 4.2 + XIOS-TRUNK)
+# ----------------------------------
+# module use /home/ext/mr/smer/samsong/modules
+# module load 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/rev2134-ompi
 #
 #
 # NCDF_INC    netcdf4 include file

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/arch-linux_gfortran.fcm

@@ -49,7 +49,7 @@
 %FFLAGS              %FCFLAGS
 %LD                  mpif90
 %LDFLAGS             
-%FPPFLAGS            -P -C -traditional
+%FPPFLAGS            -P -traditional
 %AR                  ar
 %ARFLAGS             rs
 %MK                  make

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