diff --git a/arch/MERCATOR/arch-X64_BELENOS_INTEL_IMPI.fcm b/arch/MERCATOR/arch-X64_BELENOS_INTEL_IMPI.fcm
index 79d9b07903a3db43468043c7026e174669b755ae..83772b33db60d8575d031b3fa74e30e3d2eff468 100644
--- a/arch/MERCATOR/arch-X64_BELENOS_INTEL_IMPI.fcm
+++ b/arch/MERCATOR/arch-X64_BELENOS_INTEL_IMPI.fcm
@@ -1,10 +1,16 @@
-# 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)
-# 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
+# ----------------------------------
+# 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
diff --git a/arch/MERCATOR/arch-X64_BELENOS_INTEL_IMPI_DEBUG.fcm b/arch/MERCATOR/arch-X64_BELENOS_INTEL_IMPI_DEBUG.fcm
index 363941d960b0f979784542de41bb33539aea6d3b..9ca5dcc091d181d8b1d6c2b1d393c2a3a68cc0a6 100644
--- a/arch/MERCATOR/arch-X64_BELENOS_INTEL_IMPI_DEBUG.fcm
+++ b/arch/MERCATOR/arch-X64_BELENOS_INTEL_IMPI_DEBUG.fcm
@@ -1,10 +1,16 @@
# compiler options for BELENOS/TARANIS (using INTEL compiler)
#
-# 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,7 +50,7 @@
%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
diff --git a/arch/MERCATOR/arch-X64_BELENOS_INTEL_MVAP.fcm b/arch/MERCATOR/arch-X64_BELENOS_INTEL_MVAP.fcm
new file mode 100644
index 0000000000000000000000000000000000000000..0e28d12b963e3ffb1b796478f5eb1799d91ff4c0
--- /dev/null
+++ b/arch/MERCATOR/arch-X64_BELENOS_INTEL_MVAP.fcm
@@ -0,0 +1,70 @@
+# 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}/build/lib/mct -I${OASIS_DIR}/build/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
+%FFLAGS %FCFLAGS
+%LD mpifort
+%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 mpicc
+%CFLAGS -O0
diff --git a/arch/MERCATOR/arch-X64_BELENOS_INTEL_OMPI.fcm b/arch/MERCATOR/arch-X64_BELENOS_INTEL_OMPI.fcm
index 076cb7f70ba9d3268d8443a43bc176f664c0a8ae..bb826c749d4cc957d766cd52526a5cdafec9d4d0 100644
--- a/arch/MERCATOR/arch-X64_BELENOS_INTEL_OMPI.fcm
+++ b/arch/MERCATOR/arch-X64_BELENOS_INTEL_OMPI.fcm
@@ -1,10 +1,16 @@
-# 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