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
@@ -49,7 +55,8 @@
 
 %CPP                 cpp
 %FC                  mpifort -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                  mpifort
 %LDFLAGS             

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

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

@@ -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-trunk
-%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/build_arch-auto.sh

+#!/bin/bash
+#
+set -u
+#
+#- Choice of the options ---
+#
+while [ $# -gt 0 ]
+do
+    case $( echo $1 | tr '[:upper:]' '[:lower:]' ) in
+	-h|--help) cat <<'EOF'
+
+Usage:
+------
+./build_arch-auto.sh
+
+
+build_arch-auto.sh should automatically find all necessary information by itself...
+However the following environment variables or their corresponding optional arguments can be used
+to force the default and automatic definition of the variables used by build_arch-auto.sh
+
+Environment variables that can be defined
+-----------------------------------------
+
+  NETCDF_C_prefix : prefix of the NetCDF-C library ($NCDF_F_PREFIX/lib) and include ($NCDF_C_PREFIX/include)
+	     - set it to "no" if you don't want to use NetCDF library
+	     - if not defined : we look for the path of the command "nc-config"
+  	     Can also be specified with the optional argument --NETCDF_C_prefix
+
+  NETCDF_F_prefix : prefix of the NetCDF-Fortran library ($NCDF_F_PREFIX/lib) and include ($NCDF_F_PREFIX/include)
+	     - if not defined : we use "nc-config  --flibs" to find it
+	     - not used if NETCDF_C_prefix="no"
+  	     Can also be specified with the optional argument --NETCDF_F_prefix
+
+  HDF5_prefix : prefix of the HFD5 library ($HDF5_PREFIX/lib)
+	     - if not defined : we use "nc-config  --cflags" and "h5pcc -showconfig" to find it
+	     - not used if NETCDF_C_prefix="no"
+  	     Can also be specified with the optional argument --HDF5_prefix
+
+  XIOS_prefix : prefix of the XIOS library ($XIOS_PREFIX/lib) and include ($XIOS_PREFIX/inc)
+  	     Can also be specified with the optional argument --XIOS_prefix
+
+  OASIS_prefix : prefix of the OASIS library ($OASIS_PREFIX/lib) and
+	     include ($OASIS_PREFIX/build/lib/mct and $OASIS_PREFIX/build/lib/psmile.MPI1)
+  	     Can also be specified with the optional argument --OASIS_prefix
+
+  LIBMpath : path of the m library (standard C library of basic mathematical functions)
+  	     Can also be specified with the optional argument --LIBMpath
+
+  CURLpath : path of the curl library
+  	     Can also be specified with the optional argument --CURLpath
+
+  ZLIBpath : path of the z library
+  	     Can also be specified with the optional argument --ZLIBpath
+
+  FCnemo : fortran compiler
+  	   Can also be specified with the optional argument --FCnemo
+
+  CCnemo : C compiler (used only for AGRIF conv)
+  	   Can also be specified with the optional argument --CCnemo
+
+  CPPnemo : cpp compiler
+  	    Can also be specified with the optional argument --CPPnemo
+
+  MKnemo : make 
+  	   Can also be specified with the optional argument --MKnemo
+
+  ARnemo : archiver
+           Can also be specified with the optional argument --ARnemo
+
+EOF
+	   exit 0 ;;
+
+	--netcdf_c_prefix) NETCDF_C_prefix=${2} ; shift ;;
+	--netcdf_f_prefix) NETCDF_F_prefix=${2} ; shift ;;
+	--hdf5_prefix)     HDF5_prefix=${2}     ; shift ;;
+	--xios_prefix)     XIOS_prefix=${2}     ; shift ;;
+	--oasis_prefix)    OASIS_prefix=${2}    ; shift ;;
+	--libmpath)        LIBMpath=${2}        ; shift ;;
+	--curlpath)        CURLpath=${2}        ; shift ;;
+	--zlibpath)        ZLIBpath=${2}        ; shift ;;
+	--fcnemo)          FCnemo=${2}          ; shift ;;
+	--ccnemo)          CCnemo=${2}          ; shift ;;
+	--cppnemo)         CPPnemo=${2}         ; shift ;;
+	--mknemo)          MKnemo=${2}          ; shift ;;
+	--arnemo)          ARnemo=${2}          ; shift ;;
+	
+	*) echo -e "\033[0;31m\nERROR: \"$1\" BAD OPTION\033[0m\n"
+	   exit 2 ;;
+    esac
+    
+    shift
+done
+#
+#-----------------------------------------------------
+#
+echo_red () {
+    echo
+    while [ $# -gt 0 ] ; do echo -e "\033[0;31m$1\033[0m" ; shift ; done
+}
+
+echo_green () {
+    echo
+    while [ $# -gt 0 ] ; do echo -e "\033[0;32m$1\033[0m" ; shift ; done
+}
+#
+echo_orange () {
+    echo
+    while [ $# -gt 0 ] ; do echo -e "\033[0;33m$1\033[0m" ; shift ; done
+}
+#
+# check the exit status of which 
+err_which () { which ${1} > /dev/null 2>&1 ; echo $? ; }
+#
+# call err_which and print and error message
+chk_which () {
+    if [ $( err_which ${!1} ) -ne 0 ]
+    then
+	echo_red "ERROR: ${2^} ${!1} not found." \
+		 "       please define your ${2,} path with 'export $1=...'"
+	exit 1
+    fi
+}
+#
+# find fortran wrapper
+find_fortran_wrapper () {
+    if   [ $( err_which mpiifort ) -eq 0 ] ; then FCnemo=mpiifort
+    elif [ $( err_which mpif90   ) -eq 0 ] ; then FCnemo=mpif90
+    elif [ $( err_which ftn      ) -eq 0 ] ; then FCnemo=ftn
+    else
+	echo_red "ERROR: we found neither \"mpiifort\" nor \"mpif90\" nor \"ftn\"." \
+		 "       please define your fortran compiler path with 'export FCnemo=...'"
+	exit 1
+    fi
+}
+# find the fortran compiler associated with the fortran wrapper $FCnemo
+find_fortran_compiler () {
+    if   [ $( $FCnemo --version | head -n 1 | grep -ci            gcc ) -eq 1 ] ; then ftncomp="gnu"
+    elif [ $( $FCnemo --version | head -n 1 | grep -ci          ifort ) -eq 1 ] ; then ftncomp="intel"
+    elif [ $( $FCnemo --version | head -n 1 | grep -ci "Cray Fortran" ) -eq 1 ] ; then ftncomp="cray"
+    else
+	echo_red "ERROR: the fortran wrapper $FCnemo does not correspond to the gnu, the intel or the cray compiler" \
+		 "       please use one of these compilers or add your compiler in $0"
+	exit 1
+    fi
+}
+#
+#-----------------------------------------------------
+# NetCDF
+#-----------------------------------------------------
+#
+NETCDF_C_prefix=${NETCDF_C_prefix:-notdef}
+if [ "$NETCDF_C_prefix" == "no" ]
+then
+    echo_orange "WARNING: You chose to compile without any NetCDF Library" \
+		"     1)  You must use --nonetcdf when calling makenemo" \
+		"     2)  You won't be able to read/write any input/output file when running nemo" \
+		"         -> You can run only the BENCH test" \
+		"     3)  You can neither use XIOS nor OASIS" \
+    
+    NETCDF_F_prefix=no
+    HDF5_prefix=no
+    XIOS_prefix=no
+    OASIS_prefix=no
+    NCDF_INC=""
+    NCDF_LIB=""
+    XIOS_INC=""
+    XIOS_LIB=""    
+    OASIS_INC=""
+    OASIS_LIB=""
+else
+    if [ "$NETCDF_C_prefix" == "notdef" ]
+    then
+	if [ $( err_which nc-config ) -ne 0 ]   # use nc-config to define NETCDF_C_prefix
+	then
+	    echo_red "ERROR: nc-config not found." \
+		     "       please define either your path to the NETCDF_C with 'export NETCDF_C_prefix=...'" \
+		     "       or specify you don't want to use NetCDF with 'export NETCDF_C_prefix=no'" \
+	    exit 2
+	fi    
+       	NC_CONFIG=nc-config
+	NETCDF_C_prefix=$( $NC_CONFIG --prefix  )
+    else
+	NC_CONFIG=$NETCDF_C_prefix/bin/nc-config   # assume that nc-config is in $NETCDF_C_prefix/bin
+	nbok=$( ls $NC_CONFIG 2>/dev/null | wc -l )   # check if we have nc-config
+	if [ $nbok -eq 0 ]
+	then
+	    echo_red "ERROR: nc-config not found in $NETCDF_C_prefix/bin" ; exit 2
+	fi
+    fi
+    
+    # do we have the proper path to the netcdf library?
+    nbok=$( ls $NETCDF_C_prefix/lib/libnetcdf* 2>/dev/null | wc -l )
+    if [ $nbok -eq 0 ]
+    then
+	echo_red "ERROR: netcdf library not found in $NETCDF_C_prefix/lib" ; exit 2
+    else
+	echo_green "NETCDF_C_prefix=$NETCDF_C_prefix"
+    fi
+
+    # do we have NetCDF-Fortran?
+    if [ "$( $NC_CONFIG --has-fortran )" != "yes" ]
+    then
+	echo_red "ERROR: no netcdf-fortran " ; exit 2
+    fi
+    
+    # do we have NetCDF-F90 interface?
+    if [ "$( $NC_CONFIG --has-f03 )" != "yes" ]
+    then
+	if [ "$( $NC_CONFIG --has-f90 )" != "yes" ]
+	then
+	    echo_red "ERROR: no netcdf-fortran F90 interface" ; exit 2
+	fi
+    fi
+
+    # NetCDF fortran prefix
+    NETCDF_F_prefix=${NETCDF_F_prefix:-notdef}
+    if [ "$NETCDF_F_prefix" == "notdef" ]
+    then
+	# get the path of the netcdff library
+	NETCDF_F_prefix=$( $NC_CONFIG --flibs | sed -e "s/.*\(-L\|-rpath,\)\([^ ]*\)\/lib  *-lnetcdff.*/\2/" )
+        [ -z $NETCDF_F_prefix ] && NETCDF_F_prefix=$NETCDF_C_prefix   # empty -> we try NETCDF_C_prefix
+    fi
+  
+    # do we have the proper path to the netcdff library?
+    nbok=$( ls $NETCDF_F_prefix/lib/libnetcdff* 2>/dev/null | wc -l )
+    if [ $nbok -eq 0 ]
+    then
+	echo_red "ERROR: netcdff library not found in $NETCDF_F_prefix/lib" ; exit 2
+    else
+        echo_green "NETCDF_F_prefix=$NETCDF_F_prefix"
+    fi
+
+    # do we have nc4?
+    if [ "$( $NC_CONFIG --has-nc4 )" != "yes" ]
+    then
+	echo_red "ERROR: no nc4 interface in your netcdf library" ; exit 2
+    fi
+    
+    # do we have hdf5?
+    if [ "$( $NC_CONFIG --has-hdf5 )" != "yes" ]
+    then
+	echo_red "ERROR: no hdf5 interface in your netcdf library" ; exit 2
+    fi
+    
+    HDF5_prefix=${HDF5_prefix:-notdef}
+    if [ "$HDF5_prefix" == "notdef" ]
+    then
+	# look for libhdf5 in the paths found in nc-config --cflags
+	for dd in $( $NC_CONFIG --cflags | sed -e "s/-I//g" )
+	do
+	    nbok=$( ls $dd/../lib/libhdf5* 2>/dev/null | wc -l )
+	    [ $nbok -gt 0 ] && HDF5_prefix=$( dirname $dd )
+	done
+    fi
+    if [ "$HDF5_prefix" == "notdef" ]   # not found any libhdf5 file... try "h5pcc -showconfig"
+    then
+	if [ $( err_which h5pcc ) -eq 0 ]   # do we have h5pcc?
+	then
+	    HDF5_prefix=$( h5pcc -showconfig | grep "Installation point" | sed -e "s/.*: //" )
+	    [ -z $HDF5_prefix ] && HDF5_prefix=notdef # empty -> back to "notdef"
+	fi
+    fi
+    if [ "$HDF5_prefix" == "notdef" ]   # still not found any libhdf5 file... try $NETCDF_C_prefix
+    then
+	nbok=$( ls $NETCDF_C_prefix/lib/libhdf5* 2>/dev/null | wc -l )
+	[ $nbok -gt 0 ] && HDF5_prefix=$NETCDF_C_prefix
+    fi
+    if [ "$HDF5_prefix" == "notdef" ]   # still not found any libhdf5 file...
+    then
+	echo_red "ERROR: HDF5_prefix not found." \
+		 "       please define it with 'export HDF5_prefix=...'" ; exit 2
+    fi
+    
+    # do we have the proper path to the hdf5 library?
+    nbok=$( ls $HDF5_prefix/lib/libhdf5* 2>/dev/null | wc -l )
+    if [ $nbok -eq 0 ]
+    then
+	echo_red "ERROR: hdf5 library not found in $HDF5_prefix/lib" ; exit 2
+    else
+	echo_green "HDF5_prefix=$HDF5_prefix"
+    fi
+    
+    # do we have netcdf parallel?
+    if [ "$( $NC_CONFIG --has-parallel )" != "yes" ]
+    then
+	echo_orange "WARNING: your netcdf library cannot write in parallel" \
+		    "         you can use only 'the one_file' mode in XOS"
+    fi
+    if [ $( err_which h5pcc ) -eq 0 ]
+    then
+	if [ $( h5pcc -showconfig | grep "Parallel HDF5" | grep -c yes ) -ne 1 ]
+	then
+	    echo_orange "WARNING: your hdf5 library was configured without --enable-parallel" \
+			"         you cannot use only the 'one_file' mode in XOS"
+	fi
+    fi
+    
+    # curl
+    CURLpath=${CURLpath:-notdef}
+    if [ "$( $NC_CONFIG --dap )" == "yes" ]
+    then
+	if [ "$CURLpath" == "notdef" ]
+	then
+	    if [ $( err_which curl ) -eq 0 ]
+	    then
+		CURLpath="-L$( dirname $( ls -1 $( dirname $( dirname $( which curl ) ) )/*/libcurl* | head -n 1 ) )"
+		echo_green "CURLpath=$CURLpath"
+	    else
+		CURLpath=""
+	    fi    
+	fi
+	CURLlib="$CURLpath -lcurl"
+    else
+	CURLlib=""
+    fi
+    
+    # Zlib: compression library
+    Zlib="${ZLIBpath:-""} -lz"
+
+    # libM: standard C library of basic mathematical functions
+    libM="${LIBMpath:-""} -lm"
+    
+    # NCDF_INC and NCDF_LIB
+    NCDF_INC="-I%NCDF_F_PREFIX/include -I%NCDF_C_PREFIX/include"
+    NCDF_LIB="-L%NCDF_F_PREFIX/lib -lnetcdff -L%NCDF_C_PREFIX/lib -lnetcdf -L%HDF5_PREFIX/lib -lhdf5_hl -lhdf5 $CURLlib $Zlib $libM"
+
+fi
+#
+#-----------------------------------------------------
+# fortran Compileur
+#-----------------------------------------------------
+#
+nompi=0 # default
+FCnemo=${FCnemo:-notdef}
+if [ "$FCnemo" == "notdef" ]
+then
+    if [ "$NETCDF_C_prefix" == "no" ]
+    then
+	find_fortran_wrapper
+    else
+	FCnemo=$( $NC_CONFIG --fc ) # use nc-config to find the fortran compiler
+	[ -z $FCnemo ] && find_fortran_wrapper # if $FCnemo is empty try to find it...
+	chk_which FCnemo "fortran compiler"
+
+	# does the fortran compiler start with the 3 letters mpi or ftn
+	ismpi=$( basename $FCnemo | cut -c 1-3 | grep -Ec 'mpi|ftn' )
+	if [ $ismpi -eq 0 ]
+	then
+	    echo_orange "WARNING: the fortran compiler provided by nc-config \"$FCnemo\" is not starting with \"mpi\" or \"ftn\"." \
+			"         we look for mpiifort, mpif90 or ftn..."
+	    FCnemo_org=$FCnemo
+	    find_fortran_compiler
+	    ftncomp_org=$ftncomp
+	    find_fortran_wrapper
+	    find_fortran_compiler
+	    if [ "$ftncomp" != "$ftncomp_org" ]
+	    then
+		echo_red "ERROR: \"$FCnemo\" and \"$FCnemo_org\" are refering to different compilers: \"$ftncomp\" and \"$ftncomp_org\"" \
+			 "       please define your fortran compiler path with 'export FCnemo=...'"
+		exit 1
+	    fi
+	fi
+    fi
+else
+    ismpi=$( basename $FCnemo | cut -c 1-3 | grep -Ec 'mpi|ftn' ) # the fortran compiler does not start with mpi or ftn...
+    if [ $ismpi -eq 0 ]
+    then
+	echo_orange "WARNING: the fortran compiler you provided does not start with mpi or ftn." \
+		    "         you must compile nemo with key_mpi_off and you cannot run nemo in parallel"
+	nompi=1
+    fi
+fi
+echo_green "FCnemo=$FCnemo"
+
+find_fortran_compiler
+#
+#-----------------------------------------------------
+# C Compileur (not critical, needed only for the conv of AGRIF)
+#-----------------------------------------------------
+#
+# first guess
+case "$ftncomp" in
+    intel) guess=${CCnemo:-icc}	;;
+    gnu)   guess=${CCnemo:-gcc}	;;
+    cray)  guess=${CCnemo:-cc}	;;
+    *)     guess=${CCnemo:-""}	;;
+esac
+listcc="$guess gcc cc icc"  # try $guess and other usuals C compilers... 
+CCnemo="notfound"
+for ii in $listcc
+do
+    [ $( err_which $ii ) -eq 0 ] && [ "$CCnemo" == "notfound" ] && CCnemo=$ii
+done
+if [ "$CCnemo" == "notfound" ]
+then
+    echo_red "ERROR: we found neither \"gcc\" nor \"icc\" nor \"cc\"." \
+	     "       please define your C compiler with 'export CCnemo=...'"
+    exit 1
+fi
+#
+#-----------------------------------------------------
+# CPP
+#-----------------------------------------------------
+#
+CPPnemo=${CPPnemo:-cpp}
+chk_which CPPnemo "pre-compiler"
+echo_green "CPPnemo=$CPPnemo"
+
+[ "$ftncomp" == "gnu" ] || [ "$ftncomp" == "cray" ] && CPPnemo="$CPPnemo -Dkey_nosignedzero"
+[ $nompi     -eq  1   ] && CPPnemo="$CPPnemo -Dkey_mpi_off"
+#
+#-----------------------------------------------------
+# FCFLAGS
+#-----------------------------------------------------
+#
+case "$ftncomp" in
+    intel)
+	PROD_FCFLAGS="-i4 -r8 -O3 -fp-model strict -xHost -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"
+	echo_orange "WARNING: We assume you will execute NEMO on the same machine you compiled it. " \
+		    "         If it is not the case, replace -xHost by the appropiate option in PROD_FCFLAGS"
+	;;
+    gnu)
+	PROD_FCFLAGS="-fdefault-real-8 -O3 -march=native -funroll-all-loops -fcray-pointer -ffree-line-length-none" 
+	DEBUG_FCFLAGS="-fdefault-real-8 -Og -g -fbacktrace -funroll-all-loops -fcray-pointer -ffree-line-length-none -fcheck=all -finit-real=nan -ffpe-trap=invalid,zero,overflow -ffpe-summary=invalid,zero,overflow"
+	rev=$( $FCnemo --version | head -n 1 | sed -e "s/.* \([0-9]*\).*/\1/" )
+	# if gfortran version >= 10 : add -fallow-argument-mismatch 
+	if [ $rev -ge 10 ]
+	then
+	    PROD_FCFLAGS="$PROD_FCFLAGS -fallow-argument-mismatch" 
+	    DEBUG_FCFLAGS="$DEBUG_FCFLAGS -fallow-argument-mismatch"
+	fi
+	echo_orange "WARNING: We assume you will execute NEMO on the same machine you compiled it. " \
+		    "         If it is not the case, replace -march=native by the appropiate option in PROD_FCFLAGS"
+	;;
+    cray)
+	PROD_FCFLAGS="-s real64 -s integer32 -O2 -hflex_mp=intolerant"
+	DEBUG_FCFLAGS="-s real64 -s integer32 -Ovector0 -hfp0 -O0 -hflex_mp=intolerant -e mCI -G0 -m2 -rl -Rcdsp -N1023"
+	;;
+    *)
+	echo_red "ERROR: compilation options for $ftncomp are not defined..."
+	exit 1
+	;;
+esac
+#
+#-----------------------------------------------------
+# XIOS and OASIS
+#-----------------------------------------------------
+#
+if [ "$NETCDF_C_prefix" != "no" ]
+then
+
+    # XIOS
+    XIOS_prefix=${XIOS_prefix:-notdef}
+    if [ "$XIOS_prefix" == "notdef" ]
+    then
+	echo_orange "WARNING: XIOS_prefix not specified" \
+		    "         either define it with 'export XIOS_prefix=...'" \
+ 		    "         or don't use key_xios when compiling nemo (-> you will not be able to use XIOS)."
+	XIOS_INC=""
+	XIOS_LIB=""
+    else
+	XIOS_INC="-I%XIOS_PREFIX/inc"
+	XIOS_LIB="-L%XIOS_PREFIX/lib -lxios -lstdc++ "    
+    fi
+
+    # OASIS
+    OASIS_prefix=${OASIS_prefix:-notdef}
+    if [ "$OASIS_prefix" == "notdef" ]
+    then
+	echo_orange "WARNING: OASIS_prefix not specified" \
+		    "         either define it with 'export OASIS_prefix=...'" \
+		    "         or don't use key_oasis3 when compiling nemo (-> you will not be able to run coupled simulations)."
+	OASIS_INC=""
+	OASIS_LIB=""
+    else
+	OASIS_INC="-I%OASIS_PREFIX/build/lib/mct -I%OASIS_PREFIX/build/lib/psmile.MPI1"
+	OASIS_LIB="-L%OASIS_PREFIX/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip"    
+    fi
+fi
+#
+#-----------------------------------------------------
+#   make
+#-----------------------------------------------------
+#
+MKnemo=${MKnemo:-make}
+mkerr=$( err_which make )
+gmkerr=$( err_which gmake )
+
+if [ $( err_which $MKnemo ) -ne 0 ]   # no make found
+then
+    if [ $mkerr -eq 0 ]   # make found
+    then
+	echo_orange "WARNING: $MKnemo not found, we switch to make"
+	MKnemo=make
+    else
+	if [ $gmkerr -ne 0 ]   # gmake found
+	then
+	    echo_orange "WARNING: $MKnemo not found, we switch to gmake"
+	    MKnemo=gmake
+	else
+	    echo_red "ERROR: gnu make not found, please define its path with 'export MKnemo=...'"
+	    exit 1
+	fi
+    fi
+fi
+#
+isgnu=$( $MKnemo --version | head -n 1 | grep -ic gnu )   # make is gmake
+if [ $isgnu -ne 1 ]
+then
+    if [ $gmkerr -ne 0 ]   # gmake found
+    then
+	echo_orange "WARNING: $MKnemo is not gnu make, we switch to gmake"
+	MKnemo=gmake
+    else
+	echo_red "ERROR: $MKnemo is not gnu make and gmake not found." \
+		 "       please define gnu make path with 'export MKnemo=...'"
+	exit 1
+    fi
+fi
+echo_green "MKnemo=$MKnemo"
+#
+#-----------------------------------------------------
+# ar command
+#-----------------------------------------------------
+#
+ARnemo=${ARnemo:-ar}
+chk_which ARnemo "archiver"
+echo_green "ARnemo=$ARnemo"
+#
+#
+#-----------------------------------------------------
+#-----------------------------------------------------
+# write arch file
+#-----------------------------------------------------
+#-----------------------------------------------------
+#
+#
+archname=arch-auto.fcm
+cat > $archname << EOF
+#
+# This arch file was automatically created by $0
+# $( date ) 
+#
+%NCDF_C_PREFIX       $NETCDF_C_prefix
+%NCDF_F_PREFIX       $NETCDF_F_prefix
+%HDF5_PREFIX         $HDF5_prefix
+%XIOS_PREFIX         $XIOS_prefix
+%OASIS_PREFIX        $OASIS_prefix
+
+%NCDF_INC            $NCDF_INC
+%NCDF_LIB            $NCDF_LIB
+%XIOS_INC            $XIOS_INC
+%XIOS_LIB            $XIOS_LIB
+%OASIS_INC           $OASIS_INC
+%OASIS_LIB           $OASIS_LIB
+
+%CPP	             $CPPnemo
+%FC                  $FCnemo 
+%PROD_FCFLAGS        $PROD_FCFLAGS
+%DEBUG_FCFLAGS       $DEBUG_FCFLAGS
+%FFLAGS              %FCFLAGS
+%LD                  %FC
+%LDFLAGS             
+%FPPFLAGS            -P -traditional
+%AR                  $ARnemo
+%ARFLAGS             rs
+%MK                  $MKnemo
+%USER_INC            %XIOS_INC %OASIS_INC %NCDF_INC
+%USER_LIB            %XIOS_LIB %OASIS_LIB %NCDF_LIB
+
+%CC                  $CCnemo
+%CFLAGS              -O0
+EOF
+#
+# Additional module search command for Cray Fortran to enable successful parallel builds
+if [ $ftncomp == "cray" ] ; then
+    echo "bld::tool::fc_modsearch -J" >> $archname
+fi
+#
+echo
+echo "Content of the created $archname:"
+echo "-------------------------------------"
+echo
+cat $archname
+echo

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/file_def_nemo-oce.xml

@@ -34,6 +34,8 @@
 	  <field field_ref="qt_oce"       name="qt_oce"   />
 	  <field field_ref="saltflx"      name="sfx"      />
 	  <field field_ref="taum"         name="taum"     />
+	  <field field_ref="utau"         name="tauuo"    />
+	  <field field_ref="vtau"         name="tauvo"    />
 	  <field field_ref="wspd"         name="windsp"   />
 	  <field field_ref="precip"       name="precip"   />
 	  <!-- ice and snow -->
@@ -44,7 +46,6 @@
 	  <field field_ref="e3u" />
 	  <field field_ref="ssu"          name="uos"      />
 	  <field field_ref="uoce"         name="uo"       operation="instant" freq_op="5d" > @uoce_e3u / @e3u </field>
-	  <field field_ref="utau"         name="tauuo"    />
           <field field_ref="uocetr_eff"   name="uocetr_eff"  />
           <!-- available with diaar5 -->
 	  <field field_ref="u_masstr"     name="vozomatr" />
@@ -56,7 +57,6 @@
 	  <field field_ref="e3v" />
 	  <field field_ref="ssv"          name="vos"      />
 	  <field field_ref="voce"         name="vo"       operation="instant" freq_op="5d" > @voce_e3v / @e3v </field>
-	  <field field_ref="vtau"         name="tauvo"    />
           <field field_ref="vocetr_eff"   name="vocetr_eff"  />
           <!-- available with diaar5 -->
 	  <field field_ref="v_masstr"     name="vomematr" />

cfgs/AGRIF_DEMO/EXPREF/namelist_cfg

@@ -93,7 +93,7 @@
    ln_traqsr   = .true.    !  Light penetration in the ocean            (T => fill namtra_qsr)
    ln_ssr      = .true.    !  Sea Surface Restoring on T and/or S       (T => fill namsbc_ssr)
    ln_rnf      = .true.    !  runoffs                                   (T => fill namsbc_rnf)
-   nn_fwb      = 0         !  FreshWater Budget: =0 unchecked
+   nn_fwb      = 1         !  FreshWater Budget: =0 unchecked
 /
 !-----------------------------------------------------------------------
 &namsbc_blk    !   namsbc_blk  generic Bulk formula                     (ln_blk =T)

cfgs/AGRIF_DEMO/cpp_AGRIF_DEMO.fcm

-bld::tool::fppkeys   key_si3 key_top key_xios key_agrif key_qco
+bld::tool::fppkeys   key_si3 key_top key_xios key_agrif key_qco key_vco_1d3d

cfgs/AMM12/EXPREF/file_def_nemo-oce.xml

@@ -100,6 +100,8 @@
 	  <field field_ref="qsr"          name="rsntds" />
 	  <field field_ref="qt"           name="tohfls" />
 	  <field field_ref="taum"     />
+	  <field field_ref="utau"         name="tauuo" />
+	  <field field_ref="vtau"         name="tauvo" />
 	  <field field_ref="mldkz5"   />
 	  <field field_ref="mldr10_1" />
 	</file>
@@ -107,13 +109,11 @@
 	<file id="file5" name_suffix="_grid_U" description="ocean U grid variables" >
 	  <field field_ref="uoce"         name="uo"    />
 	  <field field_ref="ssu"          name="uos"   />
-	  <field field_ref="utau"         name="tauuo" />
 	</file>
 	
 	<file id="file6" name_suffix="_grid_V" description="ocean V grid variables" >
 	  <field field_ref="voce"         name="vo"    />
 	  <field field_ref="ssv"          name="vos"   />
-	  <field field_ref="vtau"         name="tauvo" />
 	</file>
 	
 	<file id="file7" name_suffix="_grid_W" description="ocean W grid variables" >

cfgs/AMM12/cpp_AMM12.fcm

- bld::tool::fppkeys   key_diainstant key_xios key_qco
+ bld::tool::fppkeys   key_diainstant key_xios key_qco key_vco_3d

cfgs/C1D_PAPA/MY_SRC/usrdef_nam.F90

@@ -14,7 +14,6 @@ MODULE usrdef_nam
    !!   usr_def_hgr   : initialize the horizontal mesh 
    !!----------------------------------------------------------------------
    USE dom_oce  , ONLY: nimpp, njmpp             ! ocean space and time domain
-   USE dom_oce  , ONLY: ln_zco, ln_zps, ln_sco   ! flag of type of coordinate
    USE par_oce        ! ocean space and time domain
    USE phycst         ! physical constants
    !
@@ -84,13 +83,9 @@ CONTAINS
          WRITE(numout,*) 'usr_def_nam  : read the user defined namelist (namusr_def) in namelist_cfg'
          WRITE(numout,*) '~~~~~~~~~~~ '
          WRITE(numout,*) '   Namelist namusr_def : C1 case'
-         WRITE(numout,*) '      type of vertical coordinate : '
-         WRITE(numout,*) '         z-coordinate flag                     ln_zco = ', ln_zco
-         WRITE(numout,*) '         z-partial-step coordinate flag        ln_zps = ', ln_zps
-         WRITE(numout,*) '         s-coordinate flag                     ln_sco = ', ln_sco
          WRITE(numout,*) '      C1D domain = 1 x 1 x 75 grid-points                '
-         WRITE(numout,*) '         resulting global domain size :        jpiglo = ', kpi
-         WRITE(numout,*) '                                               jpjglo = ', kpj
+         WRITE(numout,*) '         resulting global domain size :        Ni0glo = ', kpi
+         WRITE(numout,*) '                                               Nj0glo = ', kpj
          WRITE(numout,*) '                                               jpkglo = ', kpk
          WRITE(numout,*) '   '
       ENDIF

cfgs/C1D_PAPA/MY_SRC/usrdef_zgr.F90

@@ -7,6 +7,7 @@ MODULE usrdef_zgr
    !! User defined : vertical coordinate system of a user configuration
    !!======================================================================
    !! History :  4.0  ! 2016-06  (R. Bourdalle-Badie)  Original code
+   !!            4.3  ! 2023-01  (S. Techene,G. Madec) New zps : depth and w-level scale factors are horizontally uniform
    !!----------------------------------------------------------------------
 
    !!----------------------------------------------------------------------
@@ -39,25 +40,25 @@ MODULE usrdef_zgr
 CONTAINS             
 
    SUBROUTINE usr_def_zgr( ld_zco  , ld_zps  , ld_sco  , ld_isfcav,    &   ! type of vertical coordinate
+      &                    k_top   , k_bot                        ,    &   ! top & bottom ocean level
       &                    pdept_1d, pdepw_1d, pe3t_1d , pe3w_1d  ,    &   ! 1D reference vertical coordinate
+      &                    pe3t  , pe3u  , pe3v   , pe3f ,             &   ! 3D t-level vertical scale factors
       &                    pdept , pdepw ,                             &   ! 3D t & w-points depth
-      &                    pe3t  , pe3u  , pe3v   , pe3f ,             &   ! vertical scale factors
-      &                    pe3w  , pe3uw , pe3vw         ,             &   !     -      -      -
-      &                    k_top  , k_bot    )                             ! top & bottom ocean level
+      &                    pe3w  , pe3uw , pe3vw                       )   ! 3D w-level vertical scale factors
       !!---------------------------------------------------------------------
       !!              ***  ROUTINE usr_def_zgr  ***
       !!
       !! ** Purpose :   User defined the vertical coordinates
       !!
       !!----------------------------------------------------------------------
-      LOGICAL                   , INTENT(out) ::   ld_zco, ld_zps, ld_sco      ! vertical coordinate flags
-      LOGICAL                   , INTENT(out) ::   ld_isfcav                   ! under iceshelf cavity flag
-      REAL(wp), DIMENSION(:)    , INTENT(out) ::   pdept_1d, pdepw_1d          ! 1D grid-point depth     [m]
-      REAL(wp), DIMENSION(:)    , INTENT(out) ::   pe3t_1d , pe3w_1d           ! 1D grid-point depth     [m]
-      REAL(wp), DIMENSION(:,:,:), INTENT(out) ::   pdept, pdepw                ! grid-point depth        [m]
-      REAL(wp), DIMENSION(:,:,:), INTENT(out) ::   pe3t , pe3u , pe3v , pe3f   ! vertical scale factors  [m]
-      REAL(wp), DIMENSION(:,:,:), INTENT(out) ::   pe3w , pe3uw, pe3vw         ! i-scale factors 
-      INTEGER , DIMENSION(:,:)  , INTENT(out) ::   k_top, k_bot                ! first & last ocean level
+      LOGICAL                             , INTENT(out) ::   ld_zco, ld_zps, ld_sco      ! vertical coordinate flags
+      LOGICAL                             , INTENT(out) ::   ld_isfcav                   ! under iceshelf cavity flag
+      INTEGER , DIMENSION(:,:)            , INTENT(out) ::   k_top, k_bot                ! first & last ocean level
+      REAL(wp), DIMENSION(:)              , INTENT(out) ::   pdept_1d, pdepw_1d          ! 1D grid-point depth             [m]
+      REAL(wp), DIMENSION(:)              , INTENT(out) ::   pe3t_1d , pe3w_1d           ! 1D grid-point depth             [m]
+      REAL(wp), DIMENSION(:,:,:), OPTIONAL, INTENT(out) ::   pe3t , pe3u , pe3v , pe3f   ! t-level vertical scale factors  [m]
+      REAL(wp), DIMENSION(:,:,:), OPTIONAL, INTENT(out) ::   pdept, pdepw                ! grid-point depth                [m]
+      REAL(wp), DIMENSION(:,:,:), OPTIONAL, INTENT(out) ::   pe3w , pe3uw, pe3vw         ! w-level vertical scale factors  [m]
       !
       INTEGER  ::   ji, jj, jk        ! dummy indices
       INTEGER  ::   ik                ! local integers
@@ -148,34 +149,37 @@ CONTAINS
       !
       !                                !* vertical coordinate system
       DO jk = 1, jpk                      ! initialization to the reference z-coordinate
-         pdept(:,:,jk) = pdept_1d(jk)
-         pdepw(:,:,jk) = pdepw_1d(jk)
          pe3t (:,:,jk) = pe3t_1d (jk)
          pe3u (:,:,jk) = pe3t_1d (jk)
          pe3v (:,:,jk) = pe3t_1d (jk)
          pe3f (:,:,jk) = pe3t_1d (jk)
+!!st : new zps framework toward penalization only fluxed at t-level are affected by scale factor change 
+#if defined key_vco_3d
+         pdept(:,:,jk) = pdept_1d(jk)
+         pdepw(:,:,jk) = pdepw_1d(jk)
          pe3w (:,:,jk) = pe3w_1d (jk)
          pe3uw(:,:,jk) = pe3w_1d (jk)
          pe3vw(:,:,jk) = pe3w_1d (jk)
+#endif
       END DO
       ! bottom scale factors and depth at T- and W-points
       DO_2D( 1, 1, 1, 1 )
          ik = k_bot(ji,jj)
-         pdepw(ji,jj,ik+1) = MIN( zht(ji,jj) , pdepw_1d(ik+1) )
-         pe3t (ji,jj,ik  ) = pdepw(ji,jj,ik+1) - pdepw(ji,jj,ik)
+!!st         pdepw(ji,jj,ik+1) = MIN( zht(ji,jj) , pdepw_1d(ik+1) )
+         pe3t (ji,jj,ik  ) =  MIN( zht(ji,jj) , pdepw_1d(ik+1) )- pdepw_1d(ik)
          pe3t (ji,jj,ik+1) = pe3t (ji,jj,ik  ) 
          !
-         pdept(ji,jj,ik  ) = pdepw(ji,jj,ik  ) + pe3t (ji,jj,ik  ) * 0.5_wp
-         pdept(ji,jj,ik+1) = pdepw(ji,jj,ik+1) + pe3t (ji,jj,ik+1) * 0.5_wp
-         pe3w (ji,jj,ik+1) = pdept(ji,jj,ik+1) - pdept(ji,jj,ik)              ! = pe3t (ji,jj,ik  )
+!!st         pdept(ji,jj,ik  ) = pdepw(ji,jj,ik  ) + pe3t (ji,jj,ik  ) * 0.5_wp
+!!st         pdept(ji,jj,ik+1) = pdepw(ji,jj,ik+1) + pe3t (ji,jj,ik+1) * 0.5_wp
+!!st         pe3w (ji,jj,ik+1) = pdept(ji,jj,ik+1) - pdept(ji,jj,ik)              ! = pe3t (ji,jj,ik  )
       END_2D        
       !                                   ! bottom scale factors and depth at  U-, V-, UW and VW-points
       !                                   ! usually Computed as the minimum of neighbooring scale factors
       pe3u (:,:,:) = pe3t(:,:,:)          ! HERE C1D configuration : 
       pe3v (:,:,:) = pe3t(:,:,:)          !    e3 increases with k-index 
       pe3f (:,:,:) = pe3t(:,:,:)          !    so e3 minimum of (i,i+1) points is (i) point
-      pe3uw(:,:,:) = pe3w(:,:,:)          !    in j-direction e3v=e3t and e3f=e3v
-      pe3vw(:,:,:) = pe3w(:,:,:)          !    ==>>  no need of lbc_lnk calls
+!!st      pe3uw(:,:,:) = pe3w(:,:,:)          !    in j-direction e3v=e3t and e3f=e3v
+!!st      pe3vw(:,:,:) = pe3w(:,:,:)          !    ==>>  no need of lbc_lnk calls
       !      
       !
    END SUBROUTINE usr_def_zgr

cfgs/C1D_PAPA/cpp_C1D_PAPA.fcm

- bld::tool::fppkeys   key_xios key_linssh
+ bld::tool::fppkeys   key_xios key_linssh key_vco_1d3d