Merge branch '68-summer-body-2022' into 'main'

Resolve "Summer Body 2022" Closes #68 See merge request nemo/nemo!106

Merge branch '68-summer-body-2022' into 'main'
Resolve "Summer Body 2022" Closes #68 See merge request nemo/nemo!106
2bee82bb · Sebastien Masson · fe3f5000 · 16443a0b · 2bee82bb · 2bee82bb
Commit 2bee82bb authored 2 years ago by Sebastien Masson
--- a/arch/CNRS/arch-X64_IRENE_GCC.fcm
+++ b/arch/CNRS/arch-X64_IRENE_GCC.fcm
@@ -5,9 +5,9 @@
 #   module purge
 #   module load gnu/8.3.0
 #   module load flavor/buildcompiler/gcc/8
-#   module load flavor/buildmpi/openmpi/2.0
+#   module load flavor/buildmpi/openmpi/4.0
 #   module load flavor/hdf5/parallel
-#   module load mpi/openmpi/2.0.4
+#   module load mpi/openmpi/4.0.5.3
 #   module load hdf5/1.8.20
 #   module load netcdf-c/4.6.0
 #   module load netcdf-fortran/4.4.4
@@ -30,7 +30,7 @@
 %CPP	             cpp -Dkey_nosignedzero 
 %FC                  mpif90
 %PROD_FCFLAGS        -fdefault-real-8 -O3 -funroll-all-loops -fcray-pointer -ffree-line-length-none -Wno-missing-include-dirs 
-%DEBUG_FCFLAGS       -fdefault-real-8 -O0 -g -fbacktrace -funroll-all-loops -fcray-pointer -ffree-line-length-none -fcheck=all -finit-real=nan
+%DEBUG_FCFLAGS       -fdefault-real-8 -O0 -g -fbacktrace -funroll-all-loops -fcray-pointer -ffree-line-length-none -Wno-missing-include-dirs -fcheck=all -finit-real=nan
 %FFLAGS              %FCFLAGS
 %LD                  mpif90
 %LDFLAGS             

--- a/arch/CNRS/arch-X64_JEANZAY_GCC.fcm
+++ b/arch/CNRS/arch-X64_JEANZAY_GCC.fcm
+# Jean-Zay HPE at IDRIS, http://www.idris.fr/jean-zay
+#
+# 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 $)
+#
+# Module we used:
+#    module purge
+#    module load gcc/8.3.1
+#    module load openmpi/4.1.1
+#    module load hdf5/1.12.0-mpi
+#    module load netcdf-c/4.7.4-mpi
+#    module load netcdf-fortran/4.5.3-mpi
+#
+#---------------------------------------------------------------------------------------------
+#---------------------------------------------------------------------------------------------
+# All NETCDF and HDF paths are empty as they are automatically defined through environment
+# variables by the load of modules
+#---------------------------------------------------------------------------------------------
+#---------------------------------------------------------------------------------------------
+#
+#
+%XIOS_HOME           $WORK/xios-trunk_gcc
+%OASIS_HOME          
+%NETCDF_C_HOME       $( echo $PATH | xargs -d ':' -n 1 | grep netcdf-c )/..
+%NETCDF_F_HOME       $( echo $PATH | xargs -d ':' -n 1 | grep netcdf-fortran )/..
+
+%NCDF_INC            -I%NETCDF_F_HOME/include -I%NETCDF_C_HOME/include
+%NCDF_LIB            -L%NETCDF_F_HOME/lib -lnetcdff -L%NETCDF_C_HOME/lib -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
+%PROD_FCFLAGS        -fdefault-real-8 -O3 -funroll-all-loops -fcray-pointer -ffree-line-length-none -Wno-missing-include-dirs 
+%DEBUG_FCFLAGS       -fdefault-real-8 -O0 -g -fbacktrace -funroll-all-loops -fcray-pointer -ffree-line-length-none  -Wno-missing-include-dirs -fcheck=all -finit-real=nan
+%FFLAGS              %FCFLAGS
+%LD                  mpif90
+%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
+%CFLAGS              -O0
--- a/arch/arch-osx_gfortran.fcm
+++ b/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             

--- a/cfgs/AGRIF_DEMO/EXPREF/file_def_nemo-oce.xml
+++ b/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" />

--- a/cfgs/AGRIF_DEMO/cpp_AGRIF_DEMO.fcm
+++ b/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
--- a/cfgs/AMM12/EXPREF/file_def_nemo-oce.xml
+++ b/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" >

--- a/cfgs/AMM12/cpp_AMM12.fcm
+++ b/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
--- a/cfgs/GYRE_PISCES/EXPREF/file_def_nemo.xml
+++ b/cfgs/GYRE_PISCES/EXPREF/file_def_nemo.xml
@@ -32,16 +32,16 @@
 	  <field field_ref="qt"           name="sohefldo"  />
 	  <field field_ref="mldr10_1"     name="somxl010"  />
 	  <field field_ref="mldkz5"       name="somixhgt"  />
+          <field field_ref="utau"         name="sozotaux"  />
+          <field field_ref="vtau"         name="sometauy"  /> 
        </file>
 	
        <file id="file2" name_suffix="_grid_U" description="ocean U grid variables" >
          <field field_ref="uoce"         name="vozocrtx"  />
-          <field field_ref="utau"         name="sozotaux"  />
        </file>
 	
        <file id="file3" name_suffix="_grid_V" description="ocean V grid variables" >
          <field field_ref="voce"         name="vomecrty"  /> 
-          <field field_ref="vtau"         name="sometauy"  /> 
        </file>
 	
        <file id="file4" name_suffix="_grid_W" description="ocean W grid variables" >

--- a/cfgs/GYRE_PISCES/cpp_GYRE_PISCES.fcm
+++ b/cfgs/GYRE_PISCES/cpp_GYRE_PISCES.fcm
-bld::tool::fppkeys   key_top key_linssh key_xios
+bld::tool::fppkeys   key_top key_linssh key_vco_1d key_xios
--- a/cfgs/ORCA2_ICE_ABL/EXPREF/file_def_nemo-oce.xml
+++ b/cfgs/ORCA2_ICE_ABL/EXPREF/file_def_nemo-oce.xml
@@ -30,6 +30,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 -->
@@ -40,14 +42,12 @@
 	  <field field_ref="e3u" />
 	  <field field_ref="ssu"          name="uos"      />
 	  <field field_ref="uoce"         name="uo"       />
-	  <field field_ref="utau"         name="tauuo"    />
 	</file>
 	
 	<file id="file13" 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"       />
-	  <field field_ref="vtau"         name="tauvo"    />
 	</file>
 	
 	<file id="file14" name_suffix="_grid_ABL" description="ABL grid variables" >

--- a/cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-oce.xml
+++ b/cfgs/ORCA2_ICE_PISCES/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" />

--- a/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_cfg
+++ b/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_cfg
@@ -118,6 +118,17 @@
 &namsbc_abl    !   Atmospheric Boundary Layer formulation           (ln_abl = T)
 !-----------------------------------------------------------------------
   cn_dom           = 'dom_cfg_abl_L25Z10'
+
+   nn_dyn_restore = 2         ! restoring option for dynamical ABL variables: = 0 no restoring
+                              !                                               = 1 equatorial restoring
+                              !                                               = 2 global restoring
+                              !                                               = 1 equatorial restoring
+                              !                                               = 2 global restoring
+   rn_ldyn_min   = 24.        ! dynamics nudging magnitude inside the ABL [hour] (~3 rn_Dt)
+   rn_ldyn_max   =  6.        ! dynamics nudging magnitude above  the ABL [hour] (~1 rn_Dt)
+   rn_ltra_min   = 24.        ! tracers  nudging magnitude inside the ABL [hour] (~3 rn_Dt)
+   rn_ltra_max   =  6.        ! tracers  nudging magnitude above  the ABL [hour] (~1 rn_Dt)
+   rn_vfac       =  1.
 /
 !-----------------------------------------------------------------------
 &namtra_qsr    !   penetrative solar radiation                          (ln_traqsr =T)

--- a/cfgs/ORCA2_ICE_PISCES/cpp_ORCA2_ICE_PISCES.fcm
+++ b/cfgs/ORCA2_ICE_PISCES/cpp_ORCA2_ICE_PISCES.fcm
-bld::tool::fppkeys   key_si3 key_top key_xios key_qco 
+bld::tool::fppkeys   key_si3 key_top key_xios key_qco key_vco_1d3d 
--- a/cfgs/ORCA2_OFF_PISCES/EXPREF/namelist_cfg
+++ b/cfgs/ORCA2_OFF_PISCES/EXPREF/namelist_cfg
@@ -325,7 +325,7 @@
   sn_sal      = 'dyna_grid_T'           ,       120.        , 'vosaline'  ,  .true.   , .true. , 'yearly'  , ''               , ''       , ''
   sn_mld      = 'dyna_grid_T'           ,       120.        , 'somixhgt'  ,  .true.   , .true. , 'yearly'  , ''               , ''       , ''
   sn_emp      = 'dyna_grid_T'           ,       120.        , 'sowaflcd'  ,  .true.   , .true. , 'yearly'  , ''               , ''       , ''
-   sn_fmf      = 'dyna_grid_T'           ,       120.        , 'iowaflup'  ,  .true.   , .true. , 'yearly'  , ''               , ''       , ''
+   sn_fwf      = 'dyna_grid_T'           ,       120.        , 'iowaflup'  ,  .true.   , .true. , 'yearly'  , ''               , ''       , ''
   sn_ice      = 'dyna_grid_T'           ,       120.        , 'soicecov'  ,  .true.   , .true. , 'yearly'  , ''               , ''       , ''
   sn_qsr      = 'dyna_grid_T'           ,       120.        , 'soshfldo'  ,  .true.   , .true. , 'yearly'  , ''               , ''       , ''
   sn_wnd      = 'dyna_grid_T'           ,       120.        , 'sowindsp'  ,  .true.   , .true. , 'yearly'  , ''               , ''       , ''

--- a/cfgs/ORCA2_OFF_PISCES/cpp_ORCA2_OFF_PISCES.fcm
+++ b/cfgs/ORCA2_OFF_PISCES/cpp_ORCA2_OFF_PISCES.fcm
-bld::tool::fppkeys   key_top key_xios
+bld::tool::fppkeys   key_top key_xios key_linssh key_vco_1d3d
--- a/cfgs/ORCA2_OFF_TRC/EXPREF/file_def_nemo-innerttrc.xml
+++ b/cfgs/ORCA2_OFF_TRC/EXPREF/file_def_nemo-innerttrc.xml
@@ -36,12 +36,23 @@
           <field field_ref="ssh"    name="zos"  />
         </file>

-	 <file id="file1" name_suffix="_trc" description="passive tracers variables" >
+	 <file id="file2" name_suffix="_trc" description="passive tracers variables" >
           <field field_ref="Age"     name="Age"     operation="average" freq_op="1y"  > @Age_e3t / @e3t   </field>		      
           <field field_ref="CFC11"   name="CFC11"   operation="average" freq_op="1y"  > @CFC11_e3t / @e3t </field>
           <field field_ref="CFC12"   name="CFC12"   operation="average" freq_op="1y"  > @CFC12_e3t / @e3t </field>
           <field field_ref="SF6"     name="SF6"     operation="average" freq_op="1y"  > @SF6_e3t / @e3t   </field>
-           <field field_ref="RC14"    name="RC14"    operation="average" freq_op="1y"  > @RC14_e3t / @e3t  </field>
+	   <field field_ref="RC14"    name="RC14"    operation="average" freq_op="1y"  > @RC14_e3t / @e3t  </field>
+           <field field_ref="qtr_CFC11"    />
+           <field field_ref="qint_CFC11"   />
+           <field field_ref="qtr_CFC12"    />
+           <field field_ref="qint_CFC12"  />
+           <field field_ref="qtr_SF6"     />
+           <field field_ref="qint_SF6"    />
+           <field field_ref="qtr_c14"    />
+           <field field_ref="qint_c14"  />
+           <field field_ref="DeltaC14"    />
+           <field field_ref="C14Age"      />
+           <field field_ref="RAge"       />
         </file>

      </file_group>

--- a/cfgs/ORCA2_OFF_TRC/EXPREF/namelist_cfg
+++ b/cfgs/ORCA2_OFF_TRC/EXPREF/namelist_cfg
@@ -324,7 +324,7 @@
   sn_mld      = 'dyna_grid_T'           ,       120.        , 'mldr10_1'  ,    .true.   , .true. , 'yearly'  , ''               , ''       , ''
   sn_emp      = 'dyna_grid_T'           ,       120.        , 'wfo'       ,    .true.   , .true. , 'yearly'  , ''               , ''       , ''
   sn_empb     = 'dyna_grid_T'           ,       120.        , 'wfob'      ,    .true.   , .true. , 'yearly'  , ''               , ''       , ''
-   sn_fmf      = 'dyna_grid_T'           ,       120.        , 'fmmflx'    ,    .true.   , .true. , 'yearly'  , ''               , ''       , ''
+   sn_fwf      = 'dyna_grid_T'           ,       120.        , 'iowaflup'  ,    .true.   , .true. , 'yearly'  , ''               , ''       , ''
   sn_rnf      = 'dyna_grid_T'           ,       120.        , 'runoffs'   ,    .true.   , .true. , 'yearly'  , ''               , ''       , ''
   sn_ice      = 'dyna_grid_T'           ,       120.        , 'siconc'    ,    .true.   , .true. , 'yearly'  , ''               , ''       , ''
   sn_qsr      = 'dyna_grid_T'           ,       120.        , 'rsntds'    ,    .true.   , .true. , 'yearly'  , ''               , ''       , ''

--- a/cfgs/ORCA2_SAS_ICE/EXPREF/file_def_nemo-oce.xml
+++ b/cfgs/ORCA2_SAS_ICE/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" />

--- a/cfgs/ORCA2_SAS_ICE/cpp_ORCA2_SAS_ICE.fcm
+++ b/cfgs/ORCA2_SAS_ICE/cpp_ORCA2_SAS_ICE.fcm
- bld::tool::fppkeys   key_si3 key_linssh key_xios
+ bld::tool::fppkeys   key_si3 key_linssh key_vco_1d3d key_xios
--- a/cfgs/SHARED/field_def_nemo-ice.xml
+++ b/cfgs/SHARED/field_def_nemo-ice.xml
@@ -18,7 +18,7 @@
  <field_group id="SBC" > <!-- time step automaticaly defined based on nn_fsbc -->

    <!-- 2D variables -->
-    <field_group id="SBC_2D" grid_ref="grid_T_2D" >
+    <field_group id="SBC_2D" grid_ref="grid_T_2D_inner" >

      <!-- =================== -->
      <!-- standard ice fields -->
@@ -69,8 +69,8 @@
      <field id="icesalm"      long_name="Mass of salt in sea ice per area"                        standard_name="sea_ice_salt_mass"                         unit="kg/m2" />

      <!-- momentum (rheology) -->
-      <field id="uice"         long_name="X-component of sea ice velocity"                         standard_name="sea_ice_x_velocity"                        unit="m/s"  />
-      <field id="vice"         long_name="Y-component of sea ice velocity"                         standard_name="sea_ice_y_velocity"                        unit="m/s"  />
+      <field id="uice"         long_name="X-component of sea ice velocity"                         standard_name="sea_ice_x_velocity"                        unit="m/s" grid_ref="grid_T_2D" />
+      <field id="vice"         long_name="Y-component of sea ice velocity"                         standard_name="sea_ice_y_velocity"                        unit="m/s" grid_ref="grid_T_2D" />
      <field id="icevel"       long_name="Sea-ice speed"                                           standard_name="sea_ice_speed"                             unit="m/s"  />
      <field id="utau_ai"      long_name="X-component of atmospheric stress on sea ice"            standard_name="surface_downward_x_stress"                 unit="N/m2" />
      <field id="vtau_ai"      long_name="Y-component of atmospheric stress on sea ice"            standard_name="surface_downward_y_stress"                 unit="N/m2" />
@@ -93,7 +93,7 @@
      <field id="yield11"      long_name="yield surface tensor component 11"                       standard_name="yield11"                                   unit="N/m"  />
      <field id="yield22"      long_name="yield surface tensor component 22"                       standard_name="yield22"                                   unit="N/m"  />
      <field id="yield12"      long_name="yield surface tensor component 12"                       standard_name="yield12"                                   unit="N/m"  />
-      <field id="beta_evp"     long_name="Relaxation parameter of ice rheology (beta)"             standard_name="relaxation_parameter_of_ice_rheology"      unit=""  />
+      <field id="beta_evp"     long_name="Relaxation parameter of ice rheology (beta)"             standard_name="relaxation_parameter_of_ice_rheology"      unit=""     grid_ref="grid_T_2D" />

      <!-- surface heat fluxes -->
      <field id="qt_ice"       long_name="total heat flux at ice surface"                          standard_name="surface_downward_heat_flux_in_air"         unit="W/m2" />
@@ -311,7 +311,7 @@
    </field_group> <!-- SBC_2D -->

    <!-- categories -->
-    <field_group id="SBC_3D" grid_ref="grid_T_ncatice" >
+    <field_group id="SBC_3D" grid_ref="grid_T_ncatice_inner" >

      <!-- standard ice fields -->
      <field id="iceconc_cat"  long_name="Sea-ice concentration per category"                unit=""        />
@@ -386,7 +386,7 @@
    -->
    <!-- output variables for my configuration (example) -->

-    <field_group id="myvarICE"        grid_ref="grid_T_2D" >
+    <field_group id="myvarICE" >
      <!-- ice mask -->
      <field field_ref="icemask"          name="simsk"   />
      <field field_ref="icemask05"        name="simsk05" />
@@ -495,7 +495,7 @@
    </field_group>


-    <field_group id="myvarICE_cat"        grid_ref="grid_T_ncatice" >
+    <field_group id="myvarICE_cat"  >

      <!-- categories -->
      <field field_ref="icemask_cat"      name="simskcat"/>
@@ -524,7 +524,7 @@
      <field field_ref="ilbgvol_tot"      name="ilbgvol_tot"  />
    </field_group>
    
-    <field_group id="ICE_budget"        grid_ref="grid_T_2D" >
+    <field_group id="ICE_budget"  >
      <!-- general -->
      <field field_ref="icemask"          name="simsk"      />
      <field field_ref="iceconc"          name="siconc"     />
@@ -579,7 +579,7 @@
    </field_group>

    <!-- SIMIP daily fields -->
-    <field_group id="SIday_fields"    grid_ref="grid_T_2D" >
+    <field_group id="SIday_fields"   >
      <field field_ref="icepres"          name="sitimefrac"   />
      <field field_ref="iceconc_pct"      name="siconc"       />
      <field field_ref="icethic_cmip"     name="sithick"      />
@@ -591,7 +591,7 @@
    </field_group>

    <!-- SIMIP monthly fields -->
-    <field_group id="SImon_fields"    grid_ref="grid_T_2D"  >
+    <field_group id="SImon_fields"    >
      <!-- Sea-ice state variables -->
      <field field_ref="icepres"          name="sitimefrac"   />
      <field field_ref="iceconc_pct"      name="siconc"       />