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

-# compiler options for Archer CRAY XC-30 (using crayftn compiler)
+# 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
@@ -30,33 +30,38 @@
 #  - 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           /work/n01/shared/nemo/xios-trunk
-#OASIS_HOME          
+%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
-#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
+%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             -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"
-%FPPFLAGS            -P -traditional
-%LDFLAGS             -lmpifort_cray
-%AR                  ar 
+
+%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            %XIOS_INC %NCDF_INC
-%USER_LIB            %XIOS_LIB %NCDF_LIB
-#USER_INC            %XIOS_INC %OASIS_INC %NCDF_INC
-#USER_LIB            %XIOS_LIB %OASIS_LIB %NCDF_LIB
+
+%USER_INC            %NCDF_INC %XIOS_INC
+%USER_LIB            %NCDF_LIB %XIOS_LIB 
 
 %CC                  cc
 %CFLAGS              -O0
-bld::tool::fc_modsearch -J
+

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-osx_gfortran.fcm

@@ -35,8 +35,8 @@
 
 %CPP	             cpp -Dkey_nosignedzero 
 %FC	             mpif90 
-%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
+%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             

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,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-innerttrc.xml"/> <!--  NEMO ocean inert passive tracer           -->
@@ -37,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
 /
 !-----------------------------------------------------------------------
@@ -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)
@@ -370,12 +370,9 @@
 !!                  ***  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>

cfgs/AGRIF_DEMO/EXPREF/2_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)
@@ -28,9 +27,7 @@
 !-----------------------------------------------------------------------
 &namdom        !   space and time domain
 !-----------------------------------------------------------------------
-   ln_linssh   = .false.   !  =T  linear free surface  ==>>  model level are fixed in time
-   !
-   rn_Dt      = 1350.     !  time step for the dynamics (and tracer if nn_acc=0)
+   rn_Dt      = 2700.     !  time step for the dynamics (and tracer if nn_acc=0)
    ln_meshmask = .false.  !  =T create a mesh file
 /
 !-----------------------------------------------------------------------
@@ -241,7 +238,7 @@
 !-----------------------------------------------------------------------
 &namdyn_adv    !   formulation of the momentum advection                (default: NO selection)
 !-----------------------------------------------------------------------
-   ln_dynadv_ubs = .true.  !  flux form - 3rd order UBS      scheme
+   ln_dynadv_up3 = .true.  !  flux form - 3rd order UBS      scheme
 /
 !-----------------------------------------------------------------------
 &namdyn_vor    !   Vorticity / Coriolis scheme                          (default: NO selection)
@@ -257,6 +254,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.07       ! Dissipative Forward Backward parameter
 /
 !-----------------------------------------------------------------------
 &namdyn_ldf    !   lateral diffusion on momentum                        (default: NO selection)
@@ -307,12 +308,9 @@
 !!                  ***  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/3_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>

cfgs/AGRIF_DEMO/EXPREF/3_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)
@@ -28,9 +27,7 @@
 !-----------------------------------------------------------------------
 &namdom        !   space and time domain
 !-----------------------------------------------------------------------
-   ln_linssh   = .false.   !  =T  linear free surface  ==>>  model level are fixed in time
-   !
-   rn_Dt      = 450.       !  time step for the dynamics (and tracer if nn_acc=0)
+   rn_Dt      = 900.       !  time step for the dynamics (and tracer if nn_acc=0)
    ln_meshmask = .false.   !  =T create a mesh file
 /
 !-----------------------------------------------------------------------
@@ -242,7 +239,7 @@
 !-----------------------------------------------------------------------
 &namdyn_adv    !   formulation of the momentum advection                (default: NO selection)
 !-----------------------------------------------------------------------
-   ln_dynadv_ubs = .true.  !  flux form - 3rd order UBS      scheme
+   ln_dynadv_up3 = .true.  !  flux form - 3rd order UBS      scheme
 /
 !-----------------------------------------------------------------------
 &namdyn_vor    !   Vorticity / Coriolis scheme                          (default: NO selection)
@@ -258,6 +255,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)
@@ -308,12 +309,9 @@
 !!                  ***  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/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>

cfgs/AGRIF_DEMO/EXPREF/file_def_nemo-ice.xml

 <?xml version="1.0"?>
-    <!-- $id$ -->
     
  <!--
 ============================================================================================================
@@ -11,8 +10,8 @@
     
  <file_definition type="one_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="5d" min_digits="4">
    
-   <file_group id="5d" output_freq="5d"  output_level="10" enabled=".TRUE.">  <!-- 5d files -->   	
-     <file id="file21" name_suffix="_icemod" description="ice variables" enabled=".true." >
+   <file_group id="ice_5d" output_freq="5d"  output_level="10" enabled=".TRUE.">  <!-- 5d files -->   	
+     <file id="file101" name_suffix="_icemod" description="ice variables" enabled=".true." >
 
        <!-- ice mask -->
        <field field_ref="icemask"          name="simsk"   />
@@ -86,7 +85,7 @@
        
      </file>
      
-     <file id="file22" name_suffix="_SBC_scalar" description="scalar variables" enabled=".true." >
+     <file id="file102" name_suffix="_SBC_scalar" description="scalar variables" enabled=".true." >
        <!-- global contents -->
        <field field_ref="ibgvol_tot"       name="ibgvol_tot"   />
        <field field_ref="sbgvol_tot"       name="sbgvol_tot"   />
@@ -113,20 +112,20 @@
      
    </file_group>
    
-   <file_group id="1h"  output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files -->
-   <file_group id="2h"  output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files -->
-   <file_group id="3h"  output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
-   <file_group id="4h"  output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->
-   <file_group id="6h"  output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->        
-   <file_group id="1m"  output_freq="1mo" output_level="10" enabled=".TRUE."/> <!-- real monthly files -->
-   <file_group id="2m"  output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
-   <file_group id="3m"  output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files -->
-   <file_group id="4m"  output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files -->
-   <file_group id="6m"  output_freq="6mo" output_level="10" enabled=".TRUE."/> <!-- real 6m files -->
-   <file_group id="1y"  output_freq="1y"  output_level="10" enabled=".TRUE."/> <!-- real yearly files -->
-   <file_group id="2y"  output_freq="2y"  output_level="10" enabled=".TRUE."/> <!-- real 2y files -->
-   <file_group id="5y"  output_freq="5y"  output_level="10" enabled=".TRUE."/> <!-- real 5y files -->
-   <file_group id="10y" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files -->
+   <file_group id="ice_1h"  output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files -->
+   <file_group id="ice_2h"  output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files -->
+   <file_group id="ice_3h"  output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
+   <file_group id="ice_4h"  output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->
+   <file_group id="ice_6h"  output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->        
+   <file_group id="ice_1m"  output_freq="1mo" output_level="10" enabled=".TRUE."/> <!-- real monthly files -->
+   <file_group id="ice_2m"  output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
+   <file_group id="ice_3m"  output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files -->
+   <file_group id="ice_4m"  output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files -->
+   <file_group id="ice_6m"  output_freq="6mo" output_level="10" enabled=".TRUE."/> <!-- real 6m files -->
+   <file_group id="ice_1y"  output_freq="1y"  output_level="10" enabled=".TRUE."/> <!-- real yearly files -->
+   <file_group id="ice_2y"  output_freq="2y"  output_level="10" enabled=".TRUE."/> <!-- real 2y files -->
+   <file_group id="ice_5y"  output_freq="5y"  output_level="10" enabled=".TRUE."/> <!-- real 5y files -->
+   <file_group id="ice_10y" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files -->
    
  </file_definition>
  

cfgs/AGRIF_DEMO/EXPREF/file_def_nemo-innerttrc.xml

@@ -9,38 +9,38 @@
 
    <file_definition type="one_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="10d" min_digits="4">
     
-      <file_group id="1ts" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files -->
-      <file_group id="1h" output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files -->
-      <file_group id="2h" output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files -->
-      <file_group id="3h" output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
-      <file_group id="4h" output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->
-      <file_group id="6h" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->
+      <file_group id="trc_1ts" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files -->
+      <file_group id="trc_1h" output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files -->
+      <file_group id="trc_2h" output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files -->
+      <file_group id="trc_3h" output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
+      <file_group id="trc_4h" output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->
+      <file_group id="trc_6h" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->
      
-      <file_group id="1d" output_freq="1d"  output_level="10" enabled=".TRUE."> <!-- 1d files -->
+      <file_group id="trc_1d" output_freq="1d"  output_level="10" enabled=".TRUE."> <!-- 1d files -->
       </file_group>
 
       <file_group id="3d" output_freq="3d"  output_level="10" enabled=".TRUE."/> <!-- 3d files -->    
       <file_group id="5d" output_freq="5d"  output_level="10" enabled=".TRUE.">  <!-- 5d files -->   
-        <file id="file40" name_suffix="_trc" description="passive tracers variables" >
+        <file id="file201" name_suffix="_trc" description="passive tracers variables" >
            <field field_ref="Age"       name="Age"      operation="average" freq_op="5d" > @Age_e3t / @e3t </field>
          </file>
       </file_group>
 
-      <file_group id="1m" output_freq="1mo" output_level="10" enabled=".TRUE."> <!-- real monthly files -->
+      <file_group id="trc_1m" output_freq="1mo" output_level="10" enabled=".TRUE."> <!-- real monthly files -->
       </file_group>
-      <file_group id="2m" output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
-      <file_group id="3m" output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files -->
-      <file_group id="4m" output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files -->
-      <file_group id="6m" output_freq="6mo" output_level="10" enabled=".TRUE."/> <!-- real 6m files -->
+      <file_group id="trc_2m" output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
+      <file_group id="trc_3m" output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files -->
+      <file_group id="trc_4m" output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files -->
+      <file_group id="trc_6m" output_freq="6mo" output_level="10" enabled=".TRUE."/> <!-- real 6m files -->
 
-      <file_group id="1y"  output_freq="1y" output_level="10" enabled=".TRUE."> <!-- real yearly files -->
-	 <file id="file41" name_suffix="_trc" description="passive tracers variables" >
+      <file_group id="trc_1y"  output_freq="1y" output_level="10" enabled=".TRUE."> <!-- real yearly files -->
+	 <file id="file211" name_suffix="_trc" description="passive tracers variables" >
            <field field_ref="Age"       name="Age"      operation="average" freq_op="1y" > @Age_e3t / @e3t </field>
          </file>
       </file_group>
-      <file_group id="2y"  output_freq="2y" output_level="10" enabled=".TRUE."/> <!-- real 2y files -->
-      <file_group id="5y"  output_freq="5y" output_level="10" enabled=".TRUE."/> <!-- real 5y files -->
-      <file_group id="10y" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files -->
+      <file_group id="trc_2y"  output_freq="2y" output_level="10" enabled=".TRUE."/> <!-- real 2y files -->
+      <file_group id="trc_5y"  output_freq="5y" output_level="10" enabled=".TRUE."/> <!-- real 5y files -->
+      <file_group id="trc_10y" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files -->
 
    </file_definition>
    

cfgs/AGRIF_DEMO/EXPREF/file_def_nemo-oce.xml

@@ -10,8 +10,8 @@
    
     <file_definition type="one_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="5d" min_digits="4">
     
-      <file_group id="5d" output_freq="5d"  output_level="10" enabled=".TRUE.">  <!-- 5d files -->   
-        <file id="file11" name_suffix="_grid_T" description="ocean T grid variables" >
+      <file_group id="oce_5d" output_freq="5d"  output_level="10" enabled=".TRUE.">  <!-- 5d files -->   
+        <file id="file1" name_suffix="_grid_T" description="ocean T grid variables" >
           <field field_ref="e3t"      />
           <field field_ref="toce"         name="thetao"                                                                      operation="instant" freq_op="5d" > @toce_e3t / @e3t </field>
           <field field_ref="soce"         name="so"                                                                          operation="instant" freq_op="5d" > @soce_e3t / @e3t </field>
@@ -34,17 +34,18 @@
 	  <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 -->
 	  <field field_ref="snowpre" />
 	</file>
 
-	<file id="file12" name_suffix="_grid_U" description="ocean U grid variables" >
+	<file id="file2" name_suffix="_grid_U" description="ocean U grid variables" >
 	  <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" />
@@ -52,11 +53,10 @@
 	  <field field_ref="u_salttr"     name="sozosatr" />
 	</file>
 	
-	<file id="file13" name_suffix="_grid_V" description="ocean V grid variables" >
+	<file id="file3" name_suffix="_grid_V" description="ocean V grid variables" >
 	  <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" />
@@ -64,7 +64,7 @@
           <field field_ref="v_salttr"     name="somesatr" />
 	</file>
 	
-	<file id="file14" name_suffix="_grid_W" description="ocean W grid variables" >
+	<file id="file4" name_suffix="_grid_W" description="ocean W grid variables" >
 	  <field field_ref="e3w" />
 	  <field field_ref="woce"         name="wo"       />
 	  <field field_ref="avt"          name="difvho"   />
@@ -82,24 +82,24 @@
       </file_group> 
 
 
-      <file_group id="1m" output_freq="1mo" output_level="10" enabled=".TRUE."> <!-- real monthly files -->
+      <file_group id="oce_1m" output_freq="1mo" output_level="10" enabled=".TRUE."> <!-- real monthly files -->
       </file_group>
 
-      <file_group id="1y"  output_freq="1y" output_level="10" enabled=".TRUE."> <!-- real yearly files -->
+      <file_group id="oce_1y"  output_freq="1y" output_level="10" enabled=".TRUE."> <!-- real yearly files -->
       </file_group>
 	
       
-      <file_group id="2h"  output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files -->
-      <file_group id="3h"  output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
-      <file_group id="4h"  output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->
-      <file_group id="6h"  output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->     
-      <file_group id="2m"  output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
-      <file_group id="3m"  output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files -->
-      <file_group id="4m"  output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files -->
-      <file_group id="6m"  output_freq="6mo" output_level="10" enabled=".TRUE."/> <!-- real 6m files -->
-      <file_group id="2y"  output_freq="2y"  output_level="10" enabled=".TRUE."/> <!-- real 2y files -->
-      <file_group id="5y"  output_freq="5y"  output_level="10" enabled=".TRUE."/> <!-- real 5y files -->
-      <file_group id="10y" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files -->
+      <file_group id="oce_2h"  output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files -->
+      <file_group id="oce_3h"  output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->     
+      <file_group id="oce_4h"  output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files -->
+      <file_group id="oce_6h"  output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files -->     
+      <file_group id="oce_2m"  output_freq="2mo" output_level="10" enabled=".TRUE."/> <!-- real 2m files -->
+      <file_group id="oce_3m"  output_freq="3mo" output_level="10" enabled=".TRUE."/> <!-- real 3m files -->
+      <file_group id="oce_4m"  output_freq="4mo" output_level="10" enabled=".TRUE."/> <!-- real 4m files -->
+      <file_group id="oce_6m"  output_freq="6mo" output_level="10" enabled=".TRUE."/> <!-- real 6m files -->
+      <file_group id="oce_2y"  output_freq="2y"  output_level="10" enabled=".TRUE."/> <!-- real 2y files -->
+      <file_group id="oce_5y"  output_freq="5y"  output_level="10" enabled=".TRUE."/> <!-- real 5y files -->
+      <file_group id="oce_10y" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files -->
 
    </file_definition>
     

cfgs/AGRIF_DEMO/EXPREF/namelist_cfg

@@ -10,10 +10,7 @@
 !!   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 +24,7 @@
 !-----------------------------------------------------------------------
 &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
+   rn_Dt      = 10800.    !  time step for the dynamics and tracer
    ln_meshmask = .false.  !  =T create a mesh file
 /
 !-----------------------------------------------------------------------
@@ -93,7 +88,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)
@@ -121,6 +116,10 @@
    ln_qsr_rgb  = .true.       !  RGB light penetration (Red-Green-Blue)
    !
    nn_chldta   =      1       !  RGB : Chl data (=1) or cst value (=0)
+      nn_chlprfl  =      1       !  Chl vertical profile (nn_chldta = 1)
+                                 !  0 = vertical extrapolation of surface data
+                                 !  1 = vertical analytical profile deduced from surface data
+                                 !  2 = 3D Chl data
 
    cn_dir = './'  !  root directory for the chlorophyl data location
    !___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
@@ -273,8 +272,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)
@@ -314,6 +311,8 @@
 &namdyn_spg    !   surface pressure gradient                            (default: NO selection)
 !-----------------------------------------------------------------------
    ln_dynspg_ts  = .true.  !  split-explicit free surface
+      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)
@@ -366,13 +365,10 @@
 !!                  ***  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")
+!!   namnc4       netcdf4 chunking and compression settings
 !!======================================================================
 !
 !!======================================================================

cfgs/AGRIF_DEMO/EXPREF/namelist_top_cfg

@@ -36,6 +36,10 @@
    ln_trcldf_tra   =  .true.     !  use active tracer setting
 /
 !-----------------------------------------------------------------------
+&namtrc_snk      !  Sedimentation of particles
+!-----------------------------------------------------------------------
+/
+!-----------------------------------------------------------------------
 &namtrc_rad      !  treatment of negative concentrations 
 !-----------------------------------------------------------------------
 /

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_3d

cfgs/AMM12/EXPREF/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>
@@ -65,6 +65,36 @@
         <field id="diamlr_r036" enabled=".FALSE." />
         <field id="diamlr_r037" enabled=".FALSE." />
         <field id="diamlr_r038" enabled=".FALSE." />
+        <field id="diamlr_r039" enabled=".FALSE." />
+        <field id="diamlr_r040" enabled=".FALSE." />
+        <field id="diamlr_r041" enabled=".FALSE." />
+        <field id="diamlr_r042" enabled=".FALSE." />
+        <field id="diamlr_r043" enabled=".FALSE." />
+        <field id="diamlr_r044" enabled=".FALSE." />
+        <field id="diamlr_r045" enabled=".FALSE." />
+        <field id="diamlr_r046" enabled=".FALSE." />
+        <field id="diamlr_r047" enabled=".FALSE." />
+        <field id="diamlr_r048" enabled=".FALSE." />
+        <field id="diamlr_r049" enabled=".FALSE." />
+        <field id="diamlr_r050" enabled=".FALSE." />
+        <field id="diamlr_r051" enabled=".FALSE." />
+        <field id="diamlr_r052" enabled=".FALSE." />
+        <field id="diamlr_r053" enabled=".FALSE." />
+        <field id="diamlr_r054" enabled=".FALSE." />
+        <field id="diamlr_r055" enabled=".FALSE." />
+        <field id="diamlr_r056" enabled=".FALSE." />
+        <field id="diamlr_r057" enabled=".FALSE." />
+        <field id="diamlr_r058" enabled=".FALSE." />
+        <field id="diamlr_r059" enabled=".FALSE." />
+        <field id="diamlr_r060" enabled=".FALSE." />
+        <field id="diamlr_r061" enabled=".FALSE." />
+        <field id="diamlr_r062" enabled=".FALSE." />
+        <field id="diamlr_r063" enabled=".FALSE." />
+        <field id="diamlr_r064" enabled=".FALSE." />
+        <field id="diamlr_r065" enabled=".FALSE." />
+        <field id="diamlr_r066" enabled=".FALSE." />
+        <field id="diamlr_r067" enabled=".FALSE." />
+        <field id="diamlr_r068" enabled=".FALSE." />
         <field id="diamlr_r101" field_ref="diamlr_time" expr="diamlr_time^0.0"                       enabled=".TRUE."  comment="mean"            />
         <!-- Fields selected for regression analysis -->
         <field id="diamlr_f001" field_ref="ssh"  enabled=".TRUE." />
@@ -77,26 +107,6 @@
 <!-- Files definition -->
     <file_definition src="./file_def_nemo-oce.xml"/>     <!--  NEMO ocean dynamics                     -->
 
-    <file_definition type="multiple_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="10d" min_digits="4">
-
-<!-- Activation of intermediate output for multiple-linear-regression analysis (diamlr) -->
-      <file_group id="diamlr_files" output_freq="1d"  output_level="10" enabled=".TRUE."/>
-
-<!-- Activation and selection of daily detided model diagnostics (diadetide) -->
-      <file_group id="diadetide_files" output_freq="1d" output_level="10" enabled=".TRUE.">
-	<file id="file22" name_suffix="_M2detided_grid_T" description="M2-detided ocean T-grid variables">
-	  <field id="diadetide_ssh"  field_ref="diadetide_weight_grid_T_2D" operation="accumulate"> this * ssh </field>
-	</file>
-	<file id="file23" name_suffix="_M2detided_grid_U" description="M2-detided ocean U-grid variables">
-	  <field id="diadetide_uoce" field_ref="diadetide_weight_grid_U_3D" operation="accumulate"> this * uoce </field>
-	</file>
-	<file id="file24" name_suffix="_M2detided_grid_V" description="M2-detided ocean V-grid variables">
-	  <field id="diadetide_voce"  field_ref="diadetide_weight_grid_V_3D" operation="accumulate"> this * voce </field>
-	</file>
-      </field_group>
-
-    </file_definition>
-
 <!-- Axis definition -->
     <axis_definition src="./axis_def_nemo.xml"/>