Changeset 14328

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT

Property svn:externals

old	new
9	9
10	10	# SETTE
11		^/utils/CI/sette~~_wave@13990~~ sette
	11	^/utils/CI/sette@14244 sette

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/INSTALL.rst

r14229	r14328
268	268	Once changed, one needs to recompile ``nemo`` in order for this change to be taken in account.
269	269	Note that most NEMO configurations will need to specify the following CPP keys:
270		``key_~~iomput~~`` for IOs. MPI parallelism is activated by default. Use ``key_mpi_off`` to compile without MPI.
	270	``key_xios`` for IOs. MPI parallelism is activated by default. Use ``key_mpi_off`` to compile without MPI.

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/cfgs/AGRIF_DEMO/cpp_AGRIF_DEMO.fcm

r14229	r14328
1		bld::tool::fppkeys key_si3 key_top key_~~iomput~~ key_agrif key_qco
	1	bld::tool::fppkeys key_si3 key_top key_xios key_agrif key_qco

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/cfgs/AMM12/cpp_AMM12.fcm

r14229	r14328
1		bld::tool::fppkeys key_diainstant key_~~iomput~~ key_qco
	1	bld::tool::fppkeys key_diainstant key_xios key_qco

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/cfgs/C1D_PAPA/cpp_C1D_PAPA.fcm

r14229	r14328
1		bld::tool::fppkeys key_c1d key_~~iomput~~ key_linssh
	1	bld::tool::fppkeys key_c1d key_xios key_linssh

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/cfgs/GYRE_BFM/cpp_GYRE_BFM.fcm

r14229	r14328
1		bld::tool::fppkeys key_top key_my_trc key_~~iomput~~ key_linssh
	1	bld::tool::fppkeys key_top key_my_trc key_xios key_linssh
2	2	inc $BFMDIR/src/nemo/bfm.fcm

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/cfgs/GYRE_PISCES/cpp_GYRE_PISCES.fcm

r14229	r14328
1		bld::tool::fppkeys key_top key_linssh key_~~iomput~~
	1	bld::tool::fppkeys key_top key_linssh key_xios

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/cfgs/ORCA2_ICE_ABL/cpp_ORCA2_ICE_ABL.fcm

r14229	r14328
1		bld::tool::fppkeys key_si3 key_~~iomput~~ key_qco
	1	bld::tool::fppkeys key_si3 key_xios key_qco

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/cfgs/ORCA2_ICE_PISCES/EXPREF/file_def_nemo-pisces.xml

-                      r11536
+                      r14328
         <file id="file32" name_suffix="_ptrc_T" description="pisces sms variables" >
           <field field_ref="DIC"      />
           <field field_ref="Alkalini" />
           <field field_ref="O2"       />
           <field field_ref="PO4"      />
           <field field_ref="Si"       />
           <field field_ref="Fer"      />
           <field field_ref="NCHL"     />
           <field field_ref="DCHL"     />
           <field field_ref="NO3"      />
+          <field field_ref="DIC"       name="DIC"      operation="average" freq_op="1mo" > @DIC_e3t / @e3t </field>
+          <field field_ref="Alkalini"  name="Alkalini" operation="average" freq_op="1mo" > @Alkalini_e3t / @e3t </field>
+          <field field_ref="O2"        name="O2"       operation="average" freq_op="1mo" > @O2_e3t / @e3t </field>
+          <field field_ref="PO4"       name="PO4"      operation="average" freq_op="1mo" > @PO4_e3t / @e3t </field>
+          <field field_ref="Si"        name="Si"       operation="average" freq_op="1mo" > @Si_e3t / @e3t </field>
+          <field field_ref="Fer"       name="Fer"      operation="average" freq_op="1mo" > @Fer_e3t / @e3t </field>
+          <field field_ref="NCHL"      name="NCHL"     operation="average" freq_op="1mo" > @NCHL_e3t / @e3t </field>
+          <field field_ref="DCHL"      name="DCHL"     operation="average" freq_op="1mo" > @DCHL_e3t / @e3t </field>
+          <field field_ref="NO3"       name="NO3"      operation="average" freq_op="1mo" > @NO3_e3t / @e3t </field>
         </file>
 …
       <file_group id="1y"  output_freq="1y" output_level="10" enabled=".TRUE."> <!-- real yearly files -->
         <file id="file34" name_suffix="_ptrc_T" description="pisces sms variables" >
           <field field_ref="DIC"      />
           <field field_ref="Alkalini" />
           <field field_ref="O2"       />
           <field field_ref="CaCO3"    />
           <field field_ref="PO4"      />
           <field field_ref="POC"      />
           <field field_ref="Si"       />
           <field field_ref="PHY"      />
           <field field_ref="ZOO"      />
           <field field_ref="DOC"      />
           <field field_ref="PHY2"     />
           <field field_ref="ZOO2"     />
           <field field_ref="DSi"      />
           <field field_ref="Fer"      />
           <field field_ref="BFe"      />
           <field field_ref="GOC"      />
           <field field_ref="SFe"      />
           <field field_ref="DFe"      />
           <field field_ref="GSi"      />
           <field field_ref="NFe"      />
           <field field_ref="NCHL"     />
           <field field_ref="DCHL"     />
           <field field_ref="NO3"      />
           <field field_ref="NH4"      />
+   <file id="file34" name_suffix="_ptrc_T" description="pisces sms variables" >
+          <field field_ref="DIC"       name="DIC"      operation="average" freq_op="1y" > @DIC_e3t / @e3t </field>
+          <field field_ref="Alkalini"  name="Alkalini" operation="average" freq_op="1y" > @Alkalini_e3t / @e3t </field>
+          <field field_ref="O2"        name="O2"       operation="average" freq_op="1y" > @O2_e3t / @e3t </field>
+          <field field_ref="CaCO3"     name="CaCO3"    operation="average" freq_op="1y" > @CaCO3_e3t / @e3t </field>
+          <field field_ref="PO4"       name="PO4"      operation="average" freq_op="1y" > @PO4_e3t / @e3t </field>
+          <field field_ref="POC"       name="POC"      operation="average" freq_op="1y" > @POC_e3t / @e3t </field>
+          <field field_ref="Si"        name="Si"       operation="average" freq_op="1y" > @Si_e3t / @e3t </field>
+          <field field_ref="PHY"       name="PHY"      operation="average" freq_op="1y" > @PHY_e3t / @e3t </field>
+          <field field_ref="ZOO"       name="ZOO"      operation="average" freq_op="1y" > @ZOO_e3t / @e3t </field>
+          <field field_ref="DOC"       name="DOC"      operation="average" freq_op="1y" > @DOC_e3t / @e3t </field>
+          <field field_ref="PHY2"      name="PHY2"     operation="average" freq_op="1y" > @PHY2_e3t / @e3t </field>
+          <field field_ref="ZOO2"      name="ZOO2"     operation="average" freq_op="1y" > @ZOO2_e3t / @e3t </field>
+          <field field_ref="DSi"       name="DSi"      operation="average" freq_op="1y" > @DSi_e3t / @e3t </field>
+          <field field_ref="Fer"       name="Fer"      operation="average" freq_op="1y" > @Fer_e3t / @e3t </field>
+          <field field_ref="BFe"       name="BFe"      operation="average" freq_op="1y" > @BFe_e3t / @e3t </field>
+          <field field_ref="GOC"       name="GOC"      operation="average" freq_op="1y" > @GOC_e3t / @e3t </field>
+          <field field_ref="SFe"       name="SFe"      operation="average" freq_op="1y" > @SFe_e3t / @e3t </field>
+          <field field_ref="DFe"       name="DFe"      operation="average" freq_op="1y" > @DFe_e3t / @e3t </field>
+          <field field_ref="GSi"       name="GSi"      operation="average" freq_op="1y" > @GSi_e3t / @e3t </field>
+          <field field_ref="NFe"       name="NFe"      operation="average" freq_op="1y" > @NFe_e3t / @e3t </field>
+          <field field_ref="NCHL"      name="NCHL"     operation="average" freq_op="1y" > @NCHL_e3t / @e3t </field>
+          <field field_ref="DCHL"      name="DCHL"     operation="average" freq_op="1y" > @DCHL_e3t / @e3t </field>
+          <field field_ref="NO3"       name="NO3"      operation="average" freq_op="1y" > @NO3_e3t / @e3t </field>
+          <field field_ref="NH4"       name="NH4"      operation="average" freq_op="1y" > @NH4_e3t / @e3t </field>
         </file>

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/cfgs/ORCA2_ICE_PISCES/cpp_ORCA2_ICE_PISCES.fcm

r14229	r14328
1		bld::tool::fppkeys key_si3 key_top key_~~iomput~~ key_qco
	1	bld::tool::fppkeys key_si3 key_top key_xios key_qco

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/cfgs/ORCA2_OFF_PISCES/EXPREF/namelist_cfg

-                      r14229
+                      r14328
    ln_dynrnf       =  .false.    !  runoffs option enabled (T) or not (F)
    ln_dynrnf_depth =  .false.    !  runoffs is spread in vertical (T) or not (F)
+!   fwbcorr        = 3.786e-06   !  annual global mean of empmr for ssh correction
+   !
    cn_dir      = './'      !  root directory for the ocean data location
    !___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/cfgs/ORCA2_OFF_PISCES/cpp_ORCA2_OFF_PISCES.fcm

r14229	r14328
1		bld::tool::fppkeys key_top key_~~iomput~~
	1	bld::tool::fppkeys key_top key_xios

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/cfgs/ORCA2_OFF_TRC/EXPREF/context_nemo.xml

-                      r13476
+                      r14328
 <!-- Fields definition -->
+    <field_definition src="./field_def_nemo-oce.xml"/>    <!--  NEMO ocean dynamics     -->
+    <field_definition src="./field_def_nemo-innerttrc.xml"/> <!--  NEMO ocean biology      -->
+    <field_definition src="./field_def_nemo-oce.xml"/>      <!--  NEMO ocean dynamics     -->
+    <field_definition src="./field_def_nemo-pisces.xml"/>    <!--  NEMO ocean biogeochemistry     -->
+    <field_definition src="./field_def_nemo-innerttrc.xml"/> <!--  NEMO ocean passive tracers      -->
 <!-- Files definition -->
     <file_definition src="./file_def_nemo-innerttrc.xml"/>  <!--  NEMO ocean biology       -->
+    <file_definition src="./file_def_nemo-innerttrc.xml"/>  <!--  NEMO ocean passive tracers       -->

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/cfgs/ORCA2_OFF_TRC/EXPREF/file_def_nemo-innerttrc.xml

-                      r12276
+                      r14328
       <file_group id="1y"  output_freq="1y" output_level="10" enabled=".TRUE."> <!-- real yearly files -->
+   <file id="file1" name_suffix="grid_T" description="passive tracers variables" >
+           <field field_ref="e3t"     />
+           <field field_ref="ssh"    name="zos"  />
+         </file>
         <file id="file1" name_suffix="_ptrc_T" description="passive tracers variables" >
            <field field_ref="Age"    />
            <field field_ref="CFC11"  />
            <field field_ref="CFC12"  />
            <field field_ref="SF6"    />
            <field field_ref="RC14"   />
+    <file id="file1" 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>
          </file>

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/cfgs/ORCA2_OFF_TRC/EXPREF/namelist_cfg

-                      r14229
+                      r14328
    cn_exp      =  "TRACERS"  !  experience name
    nn_it000    =       1     !  first time step
    nn_itend    =    14600    !  last  time step (std 5475)
+   nn_itend    =    1460    !  last  time step (std 5475)
    nn_date0    =  19600101   !  date at nit_0000 (format yyyymmdd) used if ln_rstart=F or (ln_rstart=T and nn_rstctl=0 or 1)
    nn_stock    =    14600    !  frequency of creation of a restart file (modulo referenced to 1)
+   nn_stock    =    1460    !  frequency of creation of a restart file (modulo referenced to 1)
    ln_mskland  = .true.      !  mask land points in NetCDF outputs (costly: + ~15%)
    ln_cfmeta   = .true.      !  output additional data to netCDF files required for compliance with the CF metadata standard
 …
 &namdom        !   time and space domain
 !-----------------------------------------------------------------------
-   ln_linssh   = .true.   !  =T  linear free surface  ==>>  model level are fixed in time
+   !
    rn_Dt      = 21600.     !  time step for the dynamics and tracer
 …
 &namdrg        !   top/bottom drag coefficient                          (default: NO selection)
 !-----------------------------------------------------------------------
+   ln_drg_OFF  = .true.   !  free-slip
+/
 !-----------------------------------------------------------------------
 …
 &namdta_dyn    !   offline ocean input files                            (OFF_SRC only)
 !-----------------------------------------------------------------------
    ln_dynrnf       =  .false.    !  runoffs option enabled (T) or not (F)
+   ln_dynrnf       =  .true.    !  runoffs option enabled (T) or not (F)
    ln_dynrnf_depth =  .false.    !  runoffs is spread in vertical (T) or not (F)
+!   fwbcorr        = 3.786e-06   !  annual global mean of empmr for ssh correction
+   !
    cn_dir      = './'      !  root directory for the ocean data location
+   !___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
+   !           !  file name              ! frequency (hours) ! variable  ! time interp.!  clim  ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
+   !           !                         !  (if <0  months)  !   name    !   (logical) !  (T/F) ! 'monthly' !                  ! pairing  !    filename   !
+   sn_tem      = 'dyna_grid_T'           ,       120.        , 'votemper'  ,  .true.   , .true. , 'yearly'  , ''               , ''       , ''
+   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.        , 'sowaflup'  ,  .true.   , .true. , 'yearly'  , ''               , ''       , ''
+   sn_fmf      = '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'  , ''               , ''       , ''
+   sn_uwd      = 'dyna_grid_U'           ,       120.        , 'uocetr_eff',  .true.   , .true. , 'yearly'  , ''               , ''       , ''
+   sn_vwd      = 'dyna_grid_V'           ,       120.        , 'vocetr_eff',  .true.   , .true. , 'yearly'  , ''               , ''       , ''
+   sn_wwd      = 'dyna_grid_W'           ,       120.        , 'wocetr_eff',  .true.   , .true. , 'yearly'  , ''               , ''       , ''
+   sn_avt      = 'dyna_grid_W'           ,       120.        , 'voddmavs'  ,  .true.   , .true. , 'yearly'  , ''               , ''       , ''
+   sn_ubl      = 'dyna_grid_U'           ,       120.        , 'sobblcox'  ,  .true.   , .true. , 'yearly'  , ''               , ''       , ''
+   sn_vbl      = 'dyna_grid_V'           ,       120.        , 'sobblcoy'  ,  .true.   , .true. , 'yearly'  , ''               , ''       , ''
+   !___________!_________________________!___________________!_____________!_____________!________!___________!__________________!__________!_______________!
+   !           !  file name              ! frequency (hours) !   variable  ! time interp.!  clim  ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
+   !           !                         !  (if <0  months)  !     name    !   (logical) !  (T/F) ! 'monthly' !                  ! pairing  !    filename   !
+   sn_tem      = 'dyna_grid_T'           ,       120.        , 'thetao'    ,    .true.   , .true. , 'yearly'  , ''               , ''       , ''
+   sn_sal      = 'dyna_grid_T'           ,       120.        , 'so'        ,    .true.   , .true. , 'yearly'  , ''               , ''       , ''
+   sn_div      = 'dyna_grid_T'           ,       120.        , 'hdivtr'    ,    .true.   , .true. , 'yearly'  , ''               , ''       , ''
+   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_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'  , ''               , ''       , ''
+   sn_wnd      = 'dyna_grid_T'           ,       120.        , 'windsp'    ,    .true.   , .true. , 'yearly'  , ''               , ''       , ''
+   sn_uwd      = 'dyna_grid_U'           ,       120.        , 'uocetr_eff',    .true.   , .true. , 'yearly'  , ''               , ''       , ''
+   sn_vwd      = 'dyna_grid_V'           ,       120.        , 'vocetr_eff',    .true.   , .true. , 'yearly'  , ''               , ''       , ''
+   sn_wwd      = 'dyna_grid_W'           ,       120.        , 'wocetr_eff',    .true.   , .true. , 'yearly'  , ''               , ''       , ''
+   sn_avt      = 'dyna_grid_W'           ,       120.        , 'difvsolog' ,    .true.   , .true. , 'yearly'  , ''               , ''       , ''
+   sn_ubl      = 'dyna_grid_U'           ,       120.        , 'ahu_bbl'   ,    .true.   , .true. , 'yearly'  , ''               , ''       , ''
+   sn_vbl      = 'dyna_grid_V'           ,       120.        , 'ahv_bbl'   ,    .true.   , .true. , 'yearly'  , ''               , ''       , ''
+/
 !!======================================================================
 …
 &namzdf        !   vertical physics manager                             (default: NO selection)
 !-----------------------------------------------------------------------
+   ln_zdfcst   = .true.      !  constant mixing
+/
 !-----------------------------------------------------------------------

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/cfgs/ORCA2_OFF_TRC/cpp_ORCA2_OFF_TRC.fcm

r14229	r14328
1		bld::tool::fppkeys key_top key_~~iomput~~
	1	bld::tool::fppkeys key_top key_xios key_qco

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/cfgs/ORCA2_SAS_ICE/cpp_ORCA2_SAS_ICE.fcm

r14229	r14328
1		bld::tool::fppkeys key_si3 key_linssh key_~~iomput~~
	1	bld::tool::fppkeys key_si3 key_linssh key_xios

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/cfgs/SHARED/README.rst

r11747	r14328
17	17	Much more information is available from the :xios:`XIOS homepage<>` above and from the NEMO manual.
18	18
19		Use of XIOS for diagnostics is activated using the pre-compiler key ``key_~~iomput~~``.
	19	Use of XIOS for diagnostics is activated using the pre-compiler key ``key_xios``.
20	20
21	21	Extracting and installing XIOS

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/cfgs/SHARED/namelist_ice_ref

r14006	r14328
210	210	rn_apnd_min = 0.15 ! minimum meltwater fraction contributing to pond growth (TOPO and LEV)
211	211	rn_apnd_max = 0.85 ! maximum meltwater fraction contributing to pond growth (TOPO and LEV)
212		rn_pnd_flush= 0.01 ! pond flushing efficiency (tuning parameter) (LEV)
	212	rn_pnd_flush= 0.1 ! pond flushing efficiency (tuning parameter) (LEV)
213	213	ln_pnd_CST = .false. ! constant melt ponds
214	214	rn_apnd = 0.2 ! prescribed pond fraction, at Tsu=0 degC

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/cfgs/SHARED/namelist_ref

-                      r14229
+                      r14328
       !                          !    = -1 do not do any restart
    nn_stocklist = 0,0,0,0,0,0,0,0,0,0 ! List of timesteps when a restart file is to be written
    nn_write    =       0   !  used only if key_iomput is not defined: output frequency (modulo referenced to nn_it000)
+   nn_write    =       0   !  used only if key_xios is not defined: output frequency (modulo referenced to nn_it000)
       !                          !    =  0 force to write output files only at the end of the run
       !                          !    = -1 do not do any output file
 …
    ln_dynrnf       =  .false.    !  runoffs option enabled (T) or not (F)
    ln_dynrnf_depth =  .false.    !  runoffs is spread in vertical (T) or not (F)
+   fwbcorr         =    0.0      !  annual global mean of empmr for ssh correction
+   !
    cn_dir      = './'      !  root directory for the ocean data location
    !___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/cfgs/SPITZ12/cpp_SPITZ12.fcm

r14229	r14328
1		bld::tool::fppkeys key_~~iomput~~ key_si3 key_qco
	1	bld::tool::fppkeys key_xios key_si3 key_qco

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/cfgs/WED025/cpp_WED025.fcm

r14232	r14328
1		bld::tool::fppkeys key_~~iomput~~ key_si3
	1	bld::tool::fppkeys key_xios key_si3

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/.svnignore

r14113	r14328
11	11	*.toc
12	12	*.xdv
13		~~_minted-~~*
	13	cache*

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/build

Property svn:ignore

old	new
11	11	*.toc
12	12	*.xdv
13		~~_minted-~~*
	13	cache*

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/main/abstract.tex

-                      r11591
+                      r14328
 %% ================================================================
 %% Abstract
 %% ================================================================
+%% =================================================================================================
+%% Specific abstract
+%% =================================================================================================
+%% Common part between NEMO-SI3-TOP
+\NEMO\ (``Nucleus for European Modelling of the Ocean'') is a framework of ocean-related engines.
+It is intended to be a flexible tool for studying the ocean dynamics and thermodynamics (``blue ocean''),
+as well as its interactions with the components of the Earth climate system over
+a wide range of space and time scales.
+Within \NEMO, the ocean engine is interfaced with a sea-ice model (\SIcube\ or
+\href{http://github.com/CICE-Consortium/CICE}{CICE}),
+passive tracers and biogeochemical models (\TOP) and,
+via the \href{http://portal.enes.org/oasis}{OASIS} coupler,
+with several atmospheric general circulation models.
+It also supports two-way grid embedding by means of the \href{http://agrif.imag.fr}{AGRIF} software.
+%% Common part
+\input{../../global/nemo}
 %% Specific part

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/main/appendices.tex

r14113	r14328
	1	%% =================================================================================================
	2	%% Appendices
	3	%% =================================================================================================
1	4
2	5	\subfile{../subfiles/apdx_s_coord} %% A. Generalised vertical coordinate

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/main/authors.tex

-                      r11591
+                      r14328
+%Romain Bourdall\'{e}-Badie
+%\orcid{0000-0002-8742-3289} \\
+%Mike Bell                   \\
+%J\'{e}r\^{o}me Chanut       \\
+%Emanuela Clementi
+%\orcid{0000-0002-5752-1849} \\
+%Andrew Coward
+%\orcid{0000-0002-0456-129X} \\
+%Massimiliano Drudi
+%\orcid{0000-0002-9951-740X} \\
+%Christian \'{E}th\'{e}      \\
+%Doroteaciro Iovino
+%\orcid{0000-0001-5132-7255} \\
+%Dan Lea                     \\
+%Claire L\'{e}vy
+%\orcid{0000-0003-2518-6692} \\
+%Gurvan Madec
+%\orcid{0000-0002-6447-4198} \\
+%Nicolas Martin              \\
+%S\'{e}bastien Masson
+%\orcid{0000-0002-1694-8117} \\
+%Pierre Mathiot              \\
+%Silvia Mocavero
+%\orcid{0000-0002-6309-8282} \\
+%Simon M\"{u}ller            \\
+%George Nurser               \\
+%Guillaume Samson
+%\orcid{0000-0001-7481-6369} \\
+%Dave Storkey
+%% =================================================================================================
+%% Authors
+%% =================================================================================================
+\orcid{0000-0002-6447-4198} Gurvan Madec                \\
+                            Mike Bell                   \\
 \orcid{0000-0002-8742-3289} Romain Bourdall\'{e}-Badie  \\
-                            Mike Bell                   \\
                             J\'{e}r\^{o}me Chanut       \\
 \orcid{0000-0002-5752-1849} Emanuela Clementi           \\
 …
                             Dan Lea                     \\
 \orcid{0000-0003-2518-6692} Claire L\'{e}vy             \\
-\orcid{0000-0002-6447-4198} Gurvan Madec                \\
                             Nicolas Martin              \\
 \orcid{0000-0002-1694-8117} S\'{e}bastien Masson        \\

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/main/bibliography.bib

-                      r14116
+                      r14328
   issn          = "0148-0227",
   doi           = "10.1029/2001jc000922"
+}
+@Article{         Asaydavis2016,
+  author        = {Asay-Davis, X. S. and Cornford, S. L. and Durand, G. and Galton-Fenzi, B. K. and Gladstone, R. M. and Gudmundsson, G. H. and Hattermann, T. and Holland, D. M. and Holland, D. and Holland, P. R. and Martin, D. F. and Mathiot, P. and Pattyn, F. and Seroussi, H.},
+  title         = {Experimental design for three interrelated marine ice sheet and ocean model intercomparison projects: MISMIP v. 3 (MISMIP$+$), ISOMIP v. 2 (ISOMIP$+$) and MISOMIP v. 1 (MISOMIP1)},
+  journal       = {Geoscientific Model Development},
+  volume        = {9},
+  year          = {2016},
+  number        = {7},
+  pages         = {2471--2497},
+  url           = {https://www.geosci-model-dev.net/9/2471/2016/},
+  doi           = {10.5194/gmd-9-2471-2016}
+}
 …
+}
+@Article{         favier2019,
+  author        = {Favier, L. and Jourdain, N. C. and Jenkins, A. and Merino, N. and Durand, G. and Gagliardini, O. and Gillet-Chaulet, F. and Mathiot, P.},
+  title         = {Assessment of sub-shelf melting parameterisations using the ocean--ice-sheet coupled model NEMO(v3.6)--Elmer/Ice(v8.3)},
+  journal       = {Geoscientific Model Development},
+  volume        = {12},
+  year          = {2019},
+  number        = {6},
+  pages         = {2255--2283},
+  url           = {https://www.geosci-model-dev.net/12/2255/2019/},
+  doi           = {10.5194/gmd-12-2255-2019}
+}
 @article{         flather_JPO94,
   title         = "A storm surge prediction model for the northern Bay of
 …
+}
+@article{         grosfeld1997,
+author          = {Grosfeld, K. and Gerdes, R. and Determann, J.},
+title           = {Thermohaline circulation and interaction between ice shelf cavities and the adjacent open ocean},
+journal         = {Journal of Geophysical Research: Oceans},
+volume          = {102},
+number          = {C7},
+pages           = {15595-15610},
+doi             = {10.1029/97JC00891},
+url             = {https://agupubs.onlinelibrary.wiley.com/doi/abs/10.1029/97JC00891},
+year            = {1997}
+}
 @article{         guilyardi.madec.ea_CD01,
   title         = "The role of lateral ocean physics in the upper ocean
 …
   issn          = "0148-0227",
   doi           = "10.1029/91jc01842"
+}
+@article{         jenkins2001,
+  author        = {Jenkins, Adrian and Hellmer, Hartmut H. and Holland, David M.},
+  title         = {The Role of Meltwater Advection in the Formulation of Conservative Boundary Conditions at an Ice–Ocean Interface},
+  journal       = {Journal of Physical Oceanography},
+  volume        = {31},
+  number        = {1},
+  pages         = {285-296},
+  year          = {2001},
+  doi           = {10.1175/1520-0485(2001)031<0285:TROMAI>2.0.CO;2},
+  url           = {https://doi.org/10.1175/1520-0485(2001)031<0285:TROMAI>2.0.CO;2}
+}
+@article{         jourdain2017,
+  author        = {Jourdain, Nicolas C. and Mathiot, Pierre and Merino, Nacho and Durand, Gaël and Le Sommer, Julien and Spence, Paul and Dutrieux, Pierre and Madec, Gurvan},
+  title         = {Ocean circulation and sea-ice thinning induced by melting ice shelves in the Amundsen Sea},
+  journal       = {Journal of Geophysical Research: Oceans},
+  volume        = {122},
+  number        = {3},
+  pages         = {2550-2573},
+  keywords      = {Amundsen Sea, ice shelf, efficiency, circumpolar deep water, ocean circulation, sea ice},
+  doi           = {10.1002/2016JC012509},
+  url           = {https://agupubs.onlinelibrary.wiley.com/doi/abs/10.1002/2016JC012509},
+  year          = {2017}
+}
 …
+}
+@article{Merino_OM2016,
+title = "Antarctic icebergs melt over the Southern Ocean: Climatology and impact on sea ice",
+journal = "Ocean Modelling",
+volume = "104",
+pages = "99 - 110",
+year = "2016",
+issn = "1463-5003",
+doi = "https://doi.org/10.1016/j.ocemod.2016.05.001",
+url = "http://www.sciencedirect.com/science/article/pii/S1463500316300300",
+author = "Nacho Merino and Julien {Le Sommer} and Gael Durand and Nicolas C. Jourdain and Gurvan Madec and Pierre Mathiot and Jean Tournadre",
+keywords = "Icebergs, Southern Ocean, Sea ice, Freshwater fluxes",
+abstract = "Recent increase in Antarctic freshwater release to the Southern Ocean is suggested to contribute to change in water masses and sea ice. However, climate models differ in their representation of the freshwater sources. Recent improvements in altimetry-based detection of small icebergs and in estimates of the mass loss of Antarctica may help better constrain the values of Antarctic freshwater releases. We propose a model-based seasonal climatology of iceberg melt over the Southern Ocean using state-of-the-art observed glaciological estimates of the Antarctic mass loss. An improved version of a Lagrangian iceberg model is coupled with a global, eddy-permitting ocean/sea ice model and compared to small icebergs observations. Iceberg melt increases sea ice cover, about 10% in annual mean sea ice volume, and decreases sea surface temperature over most of the Southern Ocean, but with distinctive regional patterns. Our results underline the importance of improving the representation of Antarctic freshwater sources. This can be achieved by forcing ocean/sea ice models with a climatological iceberg fresh-water flux."
+}
 @article{         merryfield.holloway.ea_JPO99,
   title         = "A Global Ocean Model with Double-Diffusive Mixing",

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/main/chapters.tex

-                      r14113
+                      r14328
+\subfile{../subfiles/chap_model_basics}   %% 1.
+\subfile{../subfiles/chap_time_domain}    %% 2.  Time discretisation (time stepping strategy)
+\subfile{../subfiles/chap_DOM}            %% 3.  Space discretisation
+\subfile{../subfiles/chap_TRA}            %% 4.  Tracer advection/diffusion equation
+\subfile{../subfiles/chap_DYN}            %% 5.  Dynamics : momentum equation
+\subfile{../subfiles/chap_SBC}            %% 6.  Surface Boundary Conditions
+\subfile{../subfiles/chap_LBC}            %% 7.  Lateral Boundary Conditions
+\subfile{../subfiles/chap_LDF}            %% 8.  Lateral diffusion
+\subfile{../subfiles/chap_ZDF}            %% 9.  Vertical diffusion
+\subfile{../subfiles/chap_DIA}            %% 10. Outputs and Diagnostics
+\subfile{../subfiles/chap_OBS}            %% 11. Observation operator
+\subfile{../subfiles/chap_ASM}            %% 12. Assimilation increments
+\subfile{../subfiles/chap_STO}            %% 13. Stochastic param.
+\subfile{../subfiles/chap_misc}           %% 14. Miscellaneous topics
+\subfile{../subfiles/chap_cfgs}           %% 15. Predefined configurations
+%% =================================================================================================
+%% Chapters
+%% =================================================================================================
+\subfile{../subfiles/chap_model_basics} %% Continuous equations and assumptions
+\subfile{../subfiles/chap_time_domain}  %% Time discretisation (time stepping strategy)
+\subfile{../subfiles/chap_DOM}          %% Space discretisation
+\subfile{../subfiles/chap_TRA}          %% Tracer advection/diffusion equation
+\subfile{../subfiles/chap_DYN}          %% Dynamics : momentum equation
+\subfile{../subfiles/chap_SBC}          %% Surface Boundary Conditions
+\subfile{../subfiles/chap_LBC}          %% Lateral Boundary Conditions
+\subfile{../subfiles/chap_LDF}          %% Lateral diffusion
+\subfile{../subfiles/chap_ZDF}          %% Vertical diffusion
+\subfile{../subfiles/chap_DIA}          %% Outputs and Diagnostics
+\subfile{../subfiles/chap_OBS}          %% Observation operator
+\subfile{../subfiles/chap_ASM}          %% Assimilation increments
+\subfile{../subfiles/chap_STO}          %% Stochastic param.
+\subfile{../subfiles/chap_misc}         %% Miscellaneous topics
+\subfile{../subfiles/chap_cfgs}         %% Predefined configurations
 %% Not included

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/main/introduction.tex

-                      r11543
+                      r14328
 \chapter*{Introduction}
-%\chaptertoc
-%\paragraph{Changes record} ~\\
-%\thispagestyle{plain}
-%{\footnotesize
-%  \begin{tabularx}{\textwidth}{l||X|X}
-%    Release & Author(s) & Modifications \\
-%    \hline
-%    {\em x.x} & {\em ...} & {\em ...}   \\
-%    {\em ...} & {\em ...} & {\em ...}   \\
-%  \end{tabularx}
-%}
-%\clearpage
 The \textbf{N}ucleus for \textbf{E}uropean \textbf{M}odelling of the \textbf{O}cean (\NEMO) is

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/main/settings.tex

-                      r11591
+                      r14328
 %% Engine (subfolder name)
 \def \engine{NEMO}
+%% Engine
+\def\eng{NEMO}
 %% Cover page settings
 \def \spacetop{  \vspace*{1.85cm} }
 \def \heading{NEMO ocean engine}
 %\def \subheading{}
 \def \spacedown{ \vspace*{0.75cm } }
 \def \authorswidth{ 0.3\linewidth}
 \def \rulelenght{270pt}
 \def \abstractwidth{0.6\linewidth}
+%% Cover page
+\def\spcup{\vspace*{2.15cm}}
+\def\hdg{NEMO ocean engine}
+%\def\shdg{}
+\def\spcdn{\vspace*{1cm}}
+\def\autwd{0.25\linewidth}
+\def\lnlg{270pt}
+\def\abswd{0.65\linewidth}
 %% Manual color (frontpage banner, links  and chapter boxes)
 \def \setmanualcolor{ \definecolor{manualcolor}{cmyk}{1, .60, 0, .4} }
+%% Color in cmyk model for manual theme (frontpage banner, links and chapter boxes)
+\def\clr{1,.60,0,.4}
 %% IPSL publication number
 \def \ipslnum{27}
+\def\ipsl{27}
 %% Zenodo ID, i.e. doi:10.5281/zenodo.\([0-9]*\)
 \def \zid{1464816}
+%% Zenodo ID, i.e. doi:10.5281/zenodo.\zid
+\def\zid{1464816}

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/subfiles/apdx_DOMAINcfg.tex

-                      r14178
+                      r14328
 %    {\em 4.0} & {\em Andrew Coward} & {\em Created at v4.0 from materials removed from chap\_DOM that are still relevant to the \forcode{DOMAINcfg} tool and which illustrate and explain the choices to be made by the user when setting up new domains }  \\
-\thispagestyle{plain}
 \chaptertoc
 …
     Release & Author(s) & Modifications \\
     \hline
+    {\em   4.0} & {\em ...} & {\em ...} \\
+    {\em   next}& {\em Pierre Mathiot} & {\em add ice shelf and closed sea option description } \\
+    {\em   4.0} & {\em Andrew Coward}  & {\em Created at v4.0 from materials removed from chap\_DOM that are still relevant to the \forcode{DOMAINcfg} tool and which illustrate and explain the choices to be made by the user when setting up new domains }  \\
     {\em   3.6} & {\em ...} & {\em ...} \\
     {\em   3.4} & {\em ...} & {\em ...} \\
 …
  \item [{\np{jphgr_mesh}{jphgr\_mesh}=0}]  The most general curvilinear orthogonal grids.
   The coordinates and their first derivatives with respect to $i$ and $j$ are provided
   in a input file (\ifile{coordinates}), read in \rou{hgr\_read} subroutine of the domhgr module.
+  in a input file (\textit{coordinates.nc}), read in \rou{hgr\_read} subroutine of the domhgr module.
   This is now the only option available within \NEMO\ itself from v4.0 onwards.
 \item [{\np{jphgr_mesh}{jphgr\_mesh}=1 to 5}] A few simple analytical grids are provided (see below).
 …
 The reference coordinate transformation $z_0(k)$ defines the arrays $gdept_0$ and
 $gdepw_0$ for $t$- and $w$-points, respectively. See \autoref{sec:DOMCFG_sco} for the
 S-coordinate options.  As indicated on \autoref{fig:DOM_index_vert} \jp{jpk} is the number of
 $w$-levels.  $gdepw_0(1)$ is the ocean surface.  There are at most \jp{jpk}-1 $t$-points
+S-coordinate options.  As indicated on \autoref{fig:DOM_index_vert} \texttt{jpk} is the number of
+$w$-levels.  $gdepw_0(1)$ is the ocean surface.  There are at most \texttt{jpk}-1 $t$-points
 inside the ocean, the additional $t$-point at $jk = jpk$ is below the sea floor and is not
 used.  The vertical location of $w$- and $t$-levels is defined from the analytic
 …
 It is possible to define a simple regular vertical grid by giving zero stretching
 (\np[=0]{ppacr}{ppacr}).  In that case, the parameters \jp{jpk} (number of $w$-levels)
+(\np[=0]{ppacr}{ppacr}).  In that case, the parameters \texttt{jpk} (number of $w$-levels)
 and \np{pphmax}{pphmax} (total ocean depth in meters) fully define the grid.
 …
 \end{gather}
 where $k = 1$ to \jp{jpk} for $w$-levels and $k = 1$ to $k = 1$ for $t-$levels.  Such an
+where $k = 1$ to \texttt{jpk} for $w$-levels and $k = 1$ to $k = 1$ for $t-$levels.  Such an
 expression allows us to define a nearly uniform vertical location of levels at the ocean
 top and bottom with a smooth hyperbolic tangent transition in between (\autoref{fig:DOMCFG_zgr}).
 …
 \end{equation}
 With the choice of the stretching $h_{cr} = 3$ and the number of levels \jp{jpk}~$= 31$,
+With the choice of the stretching $h_{cr} = 3$ and the number of levels \texttt{jpk}~$= 31$,
 the four coefficients $h_{sur}$, $h_0$, $h_1$, and $h_{th}$ in
 \autoref{eq:DOMCFG_zgr_ana_2} have been determined such that \autoref{eq:DOMCFG_zgr_coef}
 …
   Values from $3$ to $10$ are usual.
 \item \np{ppkth}{ppkth}~$= h_{th}$: is approximately the model level at which maximum stretching occurs
   (nondimensional, usually of order 1/2 or 2/3 of \jp{jpk})
+  (nondimensional, usually of order 1/2 or 2/3 of \texttt{jpk})
 \item \np{ppdzmin}{ppdzmin}: minimum thickness for the top layer (in meters).
 \item \np{pphmax}{pphmax}: total depth of the ocean (meters).
 …
 As an example, for the $45$ layers used in the DRAKKAR configuration those parameters are:
 \jp{jpk}~$= 46$, \np{ppacr}{ppacr}~$= 9$, \np{ppkth}{ppkth}~$= 23.563$, \np{ppdzmin}{ppdzmin}~$= 6~m$,
+\texttt{jpk}~$= 46$, \np{ppacr}{ppacr}~$= 9$, \np{ppkth}{ppkth}~$= 23.563$, \np{ppdzmin}{ppdzmin}~$= 6~m$,
 \np{pphmax}{pphmax}~$= 5750~m$.
 …
   This is meant for the "EEL-R5" configuration, a periodic or open boundary channel with a seamount.
 \item [{\np[=1]{nn_bathy}{nn\_bathy}}]: read a bathymetry and ice shelf draft (if needed).
   The \ifile{bathy\_meter} file (Netcdf format) provides the ocean depth (positive, in meters) at
+  The \textit{bathy\_meter.nc} file (Netcdf format) provides the ocean depth (positive, in meters) at
   each grid point of the model grid.
   The bathymetry is usually built by interpolating a standard bathymetry product (\eg\ ETOPO2) onto
 …
   Defining the bathymetry also defines the coastline: where the bathymetry is zero,
   no wet levels are defined (all levels are masked).
-  The \ifile{isfdraft\_meter} file (Netcdf format) provides the ice shelf draft (positive, in meters) at
-  each grid point of the model grid.
-  This file is only needed if \np[=.true.]{ln_isfcav}{ln\_isfcav}.
-  Defining the ice shelf draft will also define the ice shelf edge and the grounding line position.
 \end{description}
 …
 bathymetry varies by less than one level thickness from one grid point to the next).  The
 reference layer thicknesses $e_{3t}^0$ have been defined in the absence of bathymetry.
 With partial steps, layers from 1 to \jp{jpk}-2 can have a thickness smaller than
+With partial steps, layers from 1 to \texttt{jpk-2} can have a thickness smaller than
 $e_{3t}(jk)$.
 The model deepest layer (\jp{jpk}-1) is allowed to have either a smaller or larger
+The model deepest layer (\texttt{jpk-1}) is allowed to have either a smaller or larger
 thickness than $e_{3t}(jpk)$: the maximum thickness allowed is $2*e_{3t}(jpk - 1)$.
 …
 This option is described in the Report by Levier \textit{et al.} (2007), available on the \NEMO\ web site.
+\section{Ice shelf cavity definition}
+\label{subsec:zgrisf}
+  If the under ice shelf seas are opened (\np{ln_isfcav}{ln\_isfcav}), the depth of the ice shelf/ocean interface has to be include in
+  the \textit{isfdraft\_meter} file (Netcdf format). This file need to include the \textit{isf\_draft} variable.
+  A positive value will mean ice shelf/ocean or ice shelf bedrock interface below the reference 0m ssh.
+  The exact shape of the ice shelf cavity (grounding line position and minimum thickness of the water column under an ice shelf, ...) can be specify in \nam{zgr_isf}{zgr_isf}.
+\begin{listing}
+  \caption{\forcode{&namzgr_isf}}
+  \label{lst:namzgr_isf}
+  \begin{forlines}
+!-----------------------------------------------------------------------
+&namzgr_isf    !   isf cavity geometry definition                       (default: OFF)
+!-----------------------------------------------------------------------
+   rn_isfdep_min    = 10.         ! minimum isf draft tickness (if lower, isf draft set to this value)
+   rn_glhw_min      = 1.e-3       ! minimum water column thickness to define the grounding line
+   rn_isfhw_min     = 10          ! minimum water column thickness in the cavity once the grounding line defined.
+   ln_isfchannel    = .false.     ! remove channel (based on 2d mask build from isfdraft-bathy)
+   ln_isfconnect    = .false.     ! force connection under the ice shelf (based on 2d mask build from isfdraft-bathy)
+      nn_kisfmax       = 999         ! limiter in level on the previous condition. (if change larger than this number, get back to value before we enforce the connection)
+      rn_zisfmax       = 7000.       ! limiter in m     on the previous condition. (if change larger than this number, get back to value before we enforce the connection)
+   ln_isfcheminey   = .false.     ! close cheminey
+   ln_isfsubgl      = .false.     ! remove subglacial lake created by the remapping process
+      rn_isfsubgllon   =    0.0      !  longitude of the seed to determine the open ocean
+      rn_isfsubgllat   =    0.0      !  latitude  of the seed to determine the open ocean
+/
+  \end{forlines}
+\end{listing}
+   The options available to define the shape of the under ice shelf cavities are listed in \nam{zgr_isf}{zgr_isf} (\texttt{DOMAINcfg} only, \autoref{lst:namzgr_isf}).
+   \subsection{Model ice shelf draft definition}
+   \label{subsec:zgrisf_isfd}
+   First of all, the tool make sure, the ice shelf draft ($h_{isf}$) is sensible and compatible with the bathymetry.
+   There are 3 compulsory steps to achieve this:
+   \begin{description}
+   \item{\np{rn_isfdep_min}{rn\_isfdep\_min}:} this is the minimum ice shelf draft. This is to make sure there is no ridiculous thin ice shelf. If \np{rn_isfdep_min}{rn\_isfdep\_min} is smaller than the surface level, \np{rn_isfdep_min}{rn\_isfdep\_min} is set to $e3t\_1d(1)$.
+   Where $h_{isf} < MAX(e3t\_1d(1),\np{rn_isfdep_min}{rn\_isfdep\_min}$), $h_{isf}$ is set to \np{rn_isfdep_min}{rn\_isfdep\_min}.
+   \item{\np{rn_glhw_min}{rn\_glhw\_min}:} This parameter is used to define the grounding line position.
+   Where the difference between the bathymetry and the ice shelf draft is smaller than \np{rn_glhw_min}{rn\_glhw\_min}, the cell are grounded (ie masked).
+   This step is needed to take into account possible small mismatch between ice shelf draft value and bathymetry value (sources are coming from different grid, different data processes, rounding error, ...).
+   \item{\np{rn_isfhw_min}{rn\_isfhw\_min}:} This parameter is the minimum water column thickness in the cavity.
+   Where the water column thickness is lower than \np{rn_isfhw_min}{rn\_isfhw\_min}, the ice shelf draft is adjusted to match this criterion.
+   If for any reason, this adjustement break the minimum ice shelf draft allowed (\np{rn_isfdep_min}{rn\_isfdep\_min}), the cell is masked.
+   \end{description}
+   Once all these adjustements are made, if the water column thickness contains one cell wide channels, these channels can be closed using \np{ln_isfchannel}{ln\_isfchannel}.
+   \subsection{Model top level definition}
+   After the definition of the ice shelf draft, the tool defines the top level.
+   The compulsory criterion is that the water column needs at least 2 wet cells in the water column at U- and V-points.
+   To do so, if there one cell wide water column, the tools adjust the ice shelf draft to fillful the requierement.\\
+   The process is the following:
+   \begin{description}
+   \item{step 1:} The top level is defined in the same way as the bottom level is defined.
+   \item{step 2:} The isolated grid point in the bathymetry are filled (as it is done in a domain without ice shelf)
+   \item{step 3:} The tools make sure, the top level is above or equal to the bottom level
+   \item{step 4:} If the water column at a U- or V- point is one wet cell wide, the ice shelf draft is adjusted. So the actual top cell become fully open and the new
+   top cell thickness is set to the minimum cell thickness allowed (following the same logic as for the bottom partial cell). This step is iterated 4 times to ensure the condition is fullfill along the 4 sides of the cell.
+   \end{description}
+   In case of steep slope and shallow water column, it likely that 2 cells are disconnected (bathymetry above its neigbourging ice shelf draft).
+   The option \np{ln_isfconnect}{ln\_isfconnect} allow the tool to force the connection between these 2 cells.
+   Some limiters in meter or levels on the digging allowed by the tool are available (respectively, \np{rn_zisfmax}{rn\_zisfmax} or \np{rn_kisfmax}{rn\_kisfmax}).
+   This will prevent the formation of subglacial lakes at the expense of long vertical pipe to connect cells at very different levels.
+   \subsection{Subglacial lakes}
+   Despite careful setting of your ice shelf draft and bathymetry input file as well as setting described in \autoref{subsec:zgrisf_isfd}, some situation are unavoidable.
+   For exemple if you setup your ice shelf draft and bathymetry to do ocean/ice sheet coupling,
+   you may decide to fill the whole antarctic with a bathymetry and an ice shelf draft value (ice/bedrock interface depth when grounded).
+   If you do so, the subglacial lakes will show up (Vostock for example). An other possibility is with coarse vertical resolution, some ice shelves could be cut in 2 parts:
+   one connected to the main ocean and an other one closed which can be considered as a subglacial sea be the model.\\
+   The namelist option \np{ln_isfsubgl}{ln\_isfsubgl} allow you to remove theses subglacial lakes.
+   This may be useful for esthetical reason or for stability reasons:
+   \begin{description}
+   \item $\bullet$ In a subglacial lakes, in case of very weak circulation (often the case), the only heat flux is the conductive heat flux through the ice sheet.
+         This will lead to constant freezing until water reaches -20C.
+         This is one of the defitiency of the 3 equation melt formulation (for details on this formulation, see: \autoref{sec:isf}).
+   \item $\bullet$ In case of coupling with an ice sheet model,
+         the ssh in the subglacial lakes and the main ocean could be very different (ssh initial adjustement for example),
+         and so if for any reason both a connected at some point, the model is likely to fall over.\\
+   \end{description}
+\section{Closed sea definition}
+\label{sec:clocfg}
+\begin{listing}
+  \caption{\forcode{&namclo}}
+  \label{lst:namdom_clo}
+  \begin{forlines}
+!-----------------------------------------------------------------------
+&namclo ! (closed sea : need ln_domclo = .true. in namcfg)
+!-----------------------------------------------------------------------
+   rn_lon_opnsea = -2.0     ! longitude seed of open ocean
+   rn_lat_opnsea = -2.0     ! latitude  seed of open ocean
+   nn_closea = 8           ! number of closed seas ( = 0; only the open_sea mask will be computed)
+   !                name   ! lon_src ! lat_src ! lon_trg ! lat_trg ! river mouth area   ! net evap/precip correction scheme ! radius tgt   ! id trg
+   !                       ! (degree)! (degree)! (degree)! (degree)! local/coast/global ! (glo/rnf/emp)                     !     (m)      !
+   ! North American lakes
+   sn_lake(1) = 'superior' ,  -86.57 ,  47.30  , -66.49  , 50.45   , 'local'            , 'rnf'                             ,   550000.0 , 2
+   sn_lake(2) = 'michigan' ,  -87.06 ,  42.74  , -66.49  , 50.45   , 'local'            , 'rnf'                             ,   550000.0 , 2
+   sn_lake(3) = 'huron'    ,  -82.51 ,  44.74  , -66.49  , 50.45   , 'local'            , 'rnf'                             ,   550000.0 , 2
+   sn_lake(4) = 'erie'     ,  -81.13 ,  42.25  , -66.49  , 50.45   , 'local'            , 'rnf'                             ,   550000.0 , 2
+   sn_lake(5) = 'ontario'  ,  -77.72 ,  43.62  , -66.49  , 50.45   , 'local'            , 'rnf'                             ,   550000.0 , 2
+   ! African Lake
+   sn_lake(6) = 'victoria' ,   32.93 ,  -1.08  ,  30.44  , 31.37   , 'coast'            , 'emp'                             ,   100000.0 , 3
+   ! Asian Lakes
+   sn_lake(7) = 'caspian'  ,   50.0  ,  44.0   ,   0.0   ,  0.0    , 'global'           , 'glo'                             ,        0.0 , 1
+   sn_lake(8) = 'aral'     ,   60.0  ,  45.0   ,   0.0   ,  0.0    , 'global'           , 'glo'                             ,        0.0 , 1
+/
+   \end{forlines}
+\end{listing}
+The options available to define the closed seas and how closed sea net fresh water input will be redistributed by NEMO are listed in \nam{clo}{dom_clo} (\texttt{DOMAINcfg} only).
+The individual definition of each closed sea is managed by \np{sn_lake}{sn\_lake}. In this fields the user needs to define:\\
+   \begin{description}
+   \item $\bullet$    the name of the closed sea (print output purposes).
+   \item $\bullet$    the seed location to define the area of the closed sea (if seed on land because not present in this configuration, this closed sea will be ignored).\\
+   \item $\bullet$    the seed location for the target area.
+   \item $\bullet$    the type of target area ('local','coast' or 'global'). See point 6 for definition of these cases.
+   \item $\bullet$    the type of redistribution scheme for the net fresh water flux over the closed sea (as a runoff in a target area, as emp in a target area, as emp globally). For the runoff case, if the net fwf is negative, it will be redistribut globally.
+   \item $\bullet$    the radius of the target area (not used for the 'global' case). So the target defined by a 'local' target area of a radius of 100km, for example, correspond to all the wet points within this radius. The coastal case will return only the coastal point within the specifid radius.
+   \item $\bullet$    the target id. This target id is used to group multiple lakes into the same river ouflow (Great Lakes for example).
+   \end{description}
+The closed sea module defines a number of masks in the \textit{domain\_cfg} output:
+   \begin{description}
+   \item[\textit{mask\_opensea}:] a mask of the main ocean without all the closed seas closed. This mask is defined by a flood filling algorithm with an initial seed (localisation defined by \np{rn_lon_opnsea}{rn\_lon\_opnsea} and \np{rn_lat_opnsea}{rn\_lat\_opnsea}).
+   \item[\textit{mask\_csglo}, \textit{mask\_csrnf}, \textit{mask\_csemp}:] a mask of all the closed seas defined in the namelist by \np{sn_lake}{sn\_lake} for each redistribution scheme. The total number of defined closed seas has to be defined in \np{nn_closea}{nn\_closea}.
+   \item[\textit{mask\_csgrpglo}, \textit{mask\_csgrprnf}, \textit{mask\_csgrpemp}:] a mask of all the closed seas and targets grouped by target id for each type of redistribution scheme.
+   \item[\textit{mask\_csundef}:] a mask of all the closed sea not defined in \np{sn_lake}{sn\_lake}. This will allows NEMO to mask them if needed or to inform the user of potential minor issues in its bathymetry.
+   \end{description}
 \subinc{\input{../../global/epilogue}}

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/subfiles/apdx_algos.tex

r11693	r14328
5	5	\chapter{Note on some algorithms}
6	6	\label{apdx:ALGOS}
7
8		~~\thispagestyle{plain}~~
9	7
10	8	\chaptertoc

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/subfiles/apdx_diff_opers.tex

r11693	r14328
5	5	\chapter{Diffusive Operators}
6	6	\label{apdx:DIFFOPERS}
7
8		~~\thispagestyle{plain}~~
9	7
10	8	\chaptertoc

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/subfiles/apdx_invariants.tex

r11693	r14328
5	5	\chapter{Discrete Invariants of the Equations}
6	6	\label{apdx:INVARIANTS}
7
8		~~\thispagestyle{plain}~~
9	7
10	8	\chaptertoc

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/subfiles/apdx_s_coord.tex

r11693	r14328
8	8	% {\em 4.0} & {\em Mike Bell} & {\em review} \\
9	9	% {\em 3.x} & {\em Gurvan Madec} & {\em original} \\
10
11		~~\thispagestyle{plain}~~
12	10
13	11	\chaptertoc

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/subfiles/apdx_triads.tex

r14113	r14328
15	15	\chapter{Iso-Neutral Diffusion and Eddy Advection using Triads}
16	16	\label{apdx:TRIADS}
17
18		~~\thispagestyle{plain}~~
19	17
20	18	\chaptertoc

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/subfiles/chap_ASM.tex

r11693	r14328
8	8	% {\em 4.0} & {\em D. J. Lea} & {\em \NEMO\ 4.0 updates} \\
9	9	% {\em 3.4} & {\em D. J. Lea, M. Martin, K. Mogensen, A. Weaver} & {\em Initial version} \\
10
11		~~\thispagestyle{plain}~~
12	10
13	11	\chaptertoc

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/subfiles/chap_DIA.tex

-                      r13970
+                      r14328
 %    {\em 3.4} & {\em Gurvan Madec, Rachid Benshila, Andrew Coward } & {\em }  \\
 %    {\em }      & {\em Christian Ethe, Sebastien Masson } & {\em }  \\
-\thispagestyle{plain}
 \chaptertoc
 …
 \end{forlines}
 \noindent will give the following file name radical: \ifile{myfile\_ORCA2\_19891231\_freq1d}
+\noindent will give the following file name radical: \textit{myfile\_ORCA2\_19891231\_freq1d}
 %% =================================================================================================
 …
 When \np[=.true.]{ln_subbas}{ln\_subbas}, transports and stream function are computed for the Atlantic, Indian,
 Pacific and Indo-Pacific Oceans (defined north of 30\deg{S}) as well as for the World Ocean.
 The sub-basin decomposition requires an input file (\ifile{subbasins}) which contains three 2D mask arrays,
+The sub-basin decomposition requires an input file (\textit{subbasins}) which contains three 2D mask arrays,
 the Indo-Pacific mask been deduced from the sum of the Indian and Pacific mask (\autoref{fig:DIA_mask_subasins}).
 \begin{listing}
   \nlst{namptr}
+%  \nlst{namptr}
   \caption{\forcode{&namptr}}
   \label{lst:namptr}

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/subfiles/chap_DIU.tex

r11693	r14328
5	5	\chapter{Diurnal SST Models (DIU)}
6	6	\label{chap:DIU}
7
8		~~\thispagestyle{plain}~~
9	7
10	8	\chaptertoc

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/subfiles/chap_DOM.tex

-                      r11693
+                      r14328
 % -    domclo: closed sea and lakes....
 %              management of closea sea area: specific to global cfg, both forced and coupled
-\thispagestyle{plain}
 \chaptertoc
 …
 \label{subsec:DOM_size}
 The total size of the computational domain is set by the parameters \jp{jpiglo}, \jp{jpjglo} and
 \jp{jpkglo} for the $i$, $j$ and $k$ directions, respectively.
+The total size of the computational domain is set by the parameters \texttt{jpiglo}, \texttt{jpjglo} and
+\texttt{jpkglo} for the $i$, $j$ and $k$ directions, respectively.
 Note, that the variables \texttt{jpi} and \texttt{jpj} refer to
 the size of each processor subdomain when the code is run in parallel using domain decomposition
 …
 in which case \np{cn_cfg}{cn\_cfg} and \np{nn_cfg}{nn\_cfg} are set from these values accordingly).
 The global lateral boundary condition type is selected from 8 options using parameter \jp{jperio}.
+The global lateral boundary condition type is selected from 8 options using parameter \texttt{jperio}.
 See \autoref{sec:LBC_jperio} for details on the available options and
 the corresponding values for \jp{jperio}.
+the corresponding values for \texttt{jperio}.
 %% =================================================================================================
 …
 \begin{enumerate}
 \item the bathymetry given in meters;
 \item the number of levels of the model (\jp{jpk});
+\item the number of levels of the model (\texttt{jpk});
 \item the analytical transformation $z(i,j,k)$ and the vertical scale factors
   (derivatives of the transformation); and
 …
 every gridcell in the model regardless of the choice of vertical coordinate.
 With constant z-levels, e3 metrics will be uniform across each horizontal level.
 In the partial step case each e3 at the \jp{bottom\_level}
 (and, possibly, \jp{top\_level} if ice cavities are present)
+In the partial step case each e3 at the \texttt{bottom\_level}
+(and, possibly, \texttt{top\_level} if ice cavities are present)
 may vary from its horizontal neighbours.
 And, in s-coordinates, variations can occur throughout the water column.
 …
 those arising from a flat sea surface with zero elevation.
 The \jp{bottom\_level} and \jp{top\_level} 2D arrays define
 the \jp{bottom\_level} and top wet levels in each grid column.
 Without ice cavities, \jp{top\_level} is essentially a land mask (0 on land; 1 everywhere else).
 With ice cavities, \jp{top\_level} determines the first wet point below the overlying ice shelf.
+The \texttt{bottom\_level} and \texttt{top\_level} 2D arrays define
+the \texttt{bottom\_level} and top wet levels in each grid column.
+Without ice cavities, \texttt{top\_level} is essentially a land mask (0 on land; 1 everywhere else).
+With ice cavities, \texttt{top\_level} determines the first wet point below the overlying ice shelf.
 %% =================================================================================================
 …
 \label{subsec:DOM_msk}
 From \jp{top\_level} and \jp{bottom\_level} fields, the mask fields are defined as follows:
+From \texttt{top\_level} and \texttt{bottom\_level} fields, the mask fields are defined as follows:
 \begin{align*}
   tmask(i,j,k) &=

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/subfiles/chap_DYN.tex

r14177	r14328
5	5	\chapter{Ocean Dynamics (DYN)}
6	6	\label{chap:DYN}
7
8		~~\thispagestyle{plain}~~
9	7
10	8	\chaptertoc

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/subfiles/chap_LBC.tex

-                      r14178
+                      r14328
 \chapter{Lateral Boundary Condition (LBC)}
 \label{chap:LBC}
-\thispagestyle{plain}
 \chaptertoc
 …
 %% =================================================================================================
 \section[Model domain boundary condition (\forcode{jperio})]{Model domain boundary condition (\protect\jp{jperio})}
+\section{Model domain boundary condition (\forcode{jperio})}
 \label{sec:LBC_jperio}
 …
 %% =================================================================================================
 \subsection[Closed, cyclic (\forcode{=0,1,2,7})]{Closed, cyclic (\protect\jp{jperio}\forcode{=0,1,2,7})}
+\subsection{Closed, cyclic (\forcode{jperio={0,1,2,7}})}
 \label{subsec:LBC_jperio012}
 The choice of closed or cyclic model domain boundary condition is made by
 setting \jp{jperio} to 0, 1, 2 or 7 in namelist \nam{cfg}{cfg}.
+setting \forcode{jperio} to 0, 1, 2 or 7 in namelist \nam{cfg}{cfg}.
 Each time such a boundary condition is needed, it is set by a call to routine \mdl{lbclnk}.
 The computation of momentum and tracer trends proceeds from $i=2$ to $i=jpi-1$ and from $j=2$ to $j=jpj-1$,
 …
 \begin{description}
 \item [For closed boundary (\jp{jperio}\forcode{=0})], solid walls are imposed at all model boundaries:
+\item [For closed boundary (\forcode{jperio=0})], solid walls are imposed at all model boundaries:
   first and last rows and columns are set to zero.
 \item [For cyclic east-west boundary (\jp{jperio}\forcode{=1})], first and last rows are set to zero (closed) whilst the first column is set to
+\item [For cyclic east-west boundary (\forcode{jperio=1})], first and last rows are set to zero (closed) whilst the first column is set to
   the value of the last-but-one column and the last column to the value of the second one
   (\autoref{fig:LBC_jperio}-a).
   Whatever flows out of the eastern (western) end of the basin enters the western (eastern) end.
 \item [For cyclic north-south boundary (\jp{jperio}\forcode{=2})], first and last columns are set to zero (closed) whilst the first row is set to
+\item [For cyclic north-south boundary (\forcode{jperio=2})], first and last columns are set to zero (closed) whilst the first row is set to
   the value of the last-but-one row and the last row to the value of the second one
   (\autoref{fig:LBC_jperio}-a).
   Whatever flows out of the northern (southern) end of the basin enters the southern (northern) end.
 \item [Bi-cyclic east-west and north-south boundary (\jp{jperio}\forcode{=7})] combines cases 1 and 2.
+\item [Bi-cyclic east-west and north-south boundary (\forcode{jperio=7})] combines cases 1 and 2.
 \end{description}
 …
 %% =================================================================================================
 \subsection[North-fold (\forcode{=3,6})]{North-fold (\protect\jp{jperio}\forcode{=3,6})}
+\subsection{North-fold (\forcode{jperio={3,6}})}
 \label{subsec:LBC_north_fold}
 …
 Each processor is independent and without message passing or synchronous process, programs run alone and access just its own local memory.
 For this reason,
 the main model dimensions are now the local dimensions of the subdomain (pencil) that are named \jp{jpi}, \jp{jpj}, \jp{jpk}.
+the main model dimensions are now the local dimensions of the subdomain (pencil) that are named \texttt{jpi}, \texttt{jpj}, \texttt{jpk}.
 These dimensions include the internal domain and the overlapping rows.
 The number of rows to exchange (known as the halo) is usually set to one (nn\_hls=1, in \mdl{par\_oce},
+The number of rows to exchange (known as the halo) is usually set to one (\forcode{nn_hls=1}, in \mdl{par\_oce},
 and must be kept to one until further notice).
 The whole domain dimensions are named \jp{jpiglo}, \jp{jpjglo} and \jp{jpk}.
+The whole domain dimensions are named \texttt{jpiglo}, \texttt{jpjglo} and \texttt{jpk}.
 The relationship between the whole domain and a sub-domain is:
 \begin{gather*}
 …
 \end{gather*}
 One also defines variables nldi and nlei which correspond to the internal domain bounds, and the variables nimpp and njmpp which are the position of the (1,1) grid-point in the global domain (\autoref{fig:LBC_mpp}). Note that since the version 4, there is no more extra-halo area as defined in \autoref{fig:LBC_mpp} so \jp{jpi} is now always equal to nlci and \jp{jpj} equal to nlcj.
+One also defines variables nldi and nlei which correspond to the internal domain bounds, and the variables nimpp and njmpp which are the position of the (1,1) grid-point in the global domain (\autoref{fig:LBC_mpp}). Note that since the version 4, there is no more extra-halo area as defined in \autoref{fig:LBC_mpp} so \texttt{jpi} is now always equal to nlci and \texttt{jpj} equal to nlcj.
 An element of $T_{l}$, a local array (subdomain) corresponds to an element of $T_{g}$,
 …
 with $1 \leq i \leq jpi$, $1  \leq j \leq jpj $ , and  $1  \leq k \leq jpk$.
 The 1-d arrays $mig(1:\jp{jpi})$ and $mjg(1:\jp{jpj})$, defined in \rou{dom\_glo} routine (\mdl{domain} module), should be used to get global domain indices from local domain indices. The 1-d arrays, $mi0(1:\jp{jpiglo})$, $mi1(1:\jp{jpiglo})$ and $mj0(1:\jp{jpjglo})$, $mj1(1:\jp{jpjglo})$ have the reverse purpose and should be used to define loop indices expressed in global domain indices (see examples in \mdl{dtastd} module).\\
+The 1-d arrays $mig(1:\texttt{jpi})$ and $mjg(1:\texttt{jpj})$, defined in \rou{dom\_glo} routine (\mdl{domain} module), should be used to get global domain indices from local domain indices. The 1-d arrays, $mi0(1:\texttt{jpiglo})$, $mi1(1:\texttt{jpiglo})$ and $mj0(1:\texttt{jpjglo})$, $mj1(1:\texttt{jpjglo})$ have the reverse purpose and should be used to define loop indices expressed in global domain indices (see examples in \mdl{dtastd} module).\\
 The \NEMO\ model computes equation terms with the help of mask arrays (0 on land points and 1 on sea points). It is therefore possible that an MPI subdomain contains only land points. To save ressources, we try to supress from the computational domain as much land subdomains as possible. For example if $N_{mpi}$ processes are allocated to NEMO, the domain decomposition will be given by the following equation:
 …
 The number of boundary sets is defined by \np{nb_bdy}{nb\_bdy}.
 Each boundary set can be either defined as a series of straight line segments directly in the namelist
 (\np[=.false.]{ln_coords_file}{ln\_coords\_file}, and a namelist block \forcode{&nambdy_index} must be included for each set) or read in from a file (\np[=.true.]{ln_coords_file}{ln\_coords\_file}, and a ``\ifile{coordinates.bdy}'' file must be provided).
 The coordinates.bdy file is analagous to the usual \NEMO\ ``\ifile{coordinates}'' file.
+(\np[=.false.]{ln_coords_file}{ln\_coords\_file}, and a namelist block \forcode{&nambdy_index} must be included for each set) or read in from a file (\np[=.true.]{ln_coords_file}{ln\_coords\_file}, and a ``\textit{coordinates.bdy.nc}'' file must be provided).
+The coordinates.bdy file is analagous to the usual \NEMO\ ``\textit{coordinates.nc}'' file.
 In the example above, there are two boundary sets, the first of which is defined via a file and
 the second is defined in the namelist.
 …
 The boundary geometry for each set may be defined in a namelist \forcode{&nambdy_index} or
 by reading in a ``\ifile{coordinates.bdy}'' file.
 The \texttt{nambdy\_index} namelist defines a series of straight-line segments for north, east, south and west boundaries.
 One \texttt{nambdy\_index} namelist block is needed for each boundary condition defined by indexes.
+by reading in a ``\textit{coordinates.bdy.nc}'' file.
+The \forcode{&nambdy_index} namelist defines a series of straight-line segments for north, east, south and west boundaries.
+One \forcode{&nambdy_index} namelist block is needed for each boundary condition defined by indexes.
 For the northern boundary, \texttt{nbdysegn} gives the number of segments,
 \jp{jpjnob} gives the $j$ index for each segment and \jp{jpindt} and
 \jp{jpinft} give the start and end $i$ indices for each segment with similar for the other boundaries.
+\texttt{jpjnob} gives the $j$ index for each segment and \texttt{jpindt} and
+\texttt{jpinft} give the start and end $i$ indices for each segment with similar for the other boundaries.
 These segments define a list of $T$ grid points along the outermost row of the boundary ($nbr\,=\, 1$).
 The code deduces the $U$ and $V$ points and also the points for $nbr\,>\, 1$ if \np[>1]{nn_rimwidth}{nn\_rimwidth}.
 The boundary geometry may also be defined from a ``\ifile{coordinates.bdy}'' file.
+The boundary geometry may also be defined from a ``\textit{coordinates.bdy.nc}'' file.
 \autoref{fig:LBC_nc_header} gives an example of the header information from such a file, based on the description of geometrical setup given above.
 The file should contain the index arrays for each of the $T$, $U$ and $V$ grids.
 …
   \centering
   \includegraphics[width=0.66\textwidth]{LBC_nc_header}
   \caption[Header for a \protect\ifile{coordinates.bdy} file]{
     Example of the header for a \protect\ifile{coordinates.bdy} file}
+  \caption[Header for a \textit{coordinates.bdy.nc} file]{
+    Example of the header for a \textit{coordinates.bdy.nc} file}
   \label{fig:LBC_nc_header}
 \end{figure}
 …
 \texttt{<constituent>\_z1} and \texttt{<constituent>\_z2} for the real and imaginary parts of
 SSH, respectively, are expected to be available in file
 \ifile{<input>\_grid\_T}, variables \texttt{<constituent>\_u1} and
+\textit{<input>\_grid\_T.nc}, variables \texttt{<constituent>\_u1} and
 \texttt{<constituent>\_u2} for the real and imaginary parts of u, respectively, in file
 \ifile{<input>\_grid\_U}, and \texttt{<constituent>\_v1} and
+\textit{<input>\_grid\_U.nc}, and \texttt{<constituent>\_v1} and
 \texttt{<constituent>\_v2} for the real and imaginary parts of v, respectively, in file
 \ifile{<input>\_grid\_V}; when data along open boundary segments is used,
+\textit{<input>\_grid\_V.nc}; when data along open boundary segments is used,
 variables \texttt{z1} and \texttt{z2} (real and imaginary part of SSH) are
 expected to be available in file \ifile{<input><constituent>\_grid\_T},
+expected to be available in file \textit{<input><constituent>\_grid\_T.nc},
 variables \texttt{u1} and \texttt{u2} (real and imaginary part of u) in file
 \ifile{<input><constituent>\_grid\_U}, and variables \texttt{v1} and \texttt{v2}
+\textit{<input><constituent>\_grid\_U.nc}, and variables \texttt{v1} and \texttt{v2}
 (real and imaginary part of v) in file
 \ifile{<input><constituent>\_grid\_V}.\par
+\textit{<input><constituent>\_grid\_V.nc}.\par
 Note that the barotropic velocity components are assumed to be defined

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/subfiles/chap_LDF.tex

r14113	r14328
5	5	\chapter{Lateral Ocean Physics (LDF)}
6	6	\label{chap:LDF}
7
8		~~\thispagestyle{plain}~~
9	7
10	8	\chaptertoc

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/subfiles/chap_OBS.tex

-                      r14177
+                      r14328
 %    {\em --\texttt{"}--} & {\em ... K. Mogensen, A. Vidard, A. Weaver} & {\em ---\texttt{"}---}  \\
 %\end{tabular}
-\thispagestyle{plain}
 \chaptertoc
 …
 To use Sea Level Anomaly (SLA) data the mean dynamic topography (MDT) must be provided in a separate file defined on
 the model grid called \ifile{slaReferenceLevel}.
+the model grid called \textit{slaReferenceLevel.nc}.
 The MDT is required in order to produce the model equivalent sea level anomaly from the model sea surface height.
 Below is an example header for this file (on the ORCA025 grid).

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/subfiles/chap_SBC.tex

-                      r14177
+                      r14328
 \chapter{Surface Boundary Condition (SBC, SAS, ISF, ICB, TDE)}
 \label{chap:SBC}
-\thispagestyle{plain}
 \chaptertoc
 …
     \hline
     {\em  next} & {\em Simon M{\" u}ller} & {\em Update of \autoref{sec:SBC_TDE}; revision of \autoref{subsec:SBC_fwb}}\\[2mm]
+    {\em  next} & {\em Pierre Mathiot} & {\em update of the ice shelf section (2019 developments)}\\[2mm]
     {\em   4.0} & {\em ...} & {\em ...} \\
     {\em   3.6} & {\em ...} & {\em ...} \\
 …
   (\np[=0..3]{nn_ice}{nn\_ice}),
 \item the addition of river runoffs as surface freshwater fluxes or lateral inflow (\np[=.true.]{ln_rnf}{ln\_rnf}),
-\item the addition of ice-shelf melting as lateral inflow (parameterisation) or
-  as fluxes applied at the land-ice ocean interface (\np[=.true.]{ln_isf}{ln\_isf}),
 \item the addition of a freshwater flux adjustment in order to avoid a mean sea-level drift
   (\np[=0..2]{nn_fwb}{nn\_fwb}),
 …
 One of these is modification by icebergs (see \autoref{sec:SBC_ICB_icebergs}),
 which act as drifting sources of fresh water.
-Another example of modification is that due to the ice shelf melting/freezing (see \autoref{sec:SBC_isf}),
-which provides additional sources of fresh water.
 %% =================================================================================================
 …
 parameters. It is therefore recommended to chose version 3.6 over 3.
 \subsection{Cool-skin and warm-layer parametrizations}
 %\subsection[Cool-skin and warm-layer parameterizations (\forcode{ln_skin_cs} \& \forcode{ln_skin_wl})]{Cool-skin and warm-layer parameterizations (\protect\np{ln_skin_cs}{ln\_skin\_cs} \& \np{ln_skin_wl}{ln\_skin\_wl})}
+\subsection[Cool-skin and warm-layer parameterizations (   \forcode{ln_skin_cs}               \& \forcode{ln_skin_wl}              )]
+           {Cool-skin and warm-layer parameterizations (\protect\np{ln_skin_cs}{ln\_skin\_cs} \&      \np{ln_skin_wl}{ln\_skin\_wl})}
 \label{subsec:SBC_skin}
 …
   ocean tide model}: Mf, Mm, Ssa, Mtm, Msf, Msqm, Sa, K1, O1, P1, Q1, J1, S1,
 M2, S2, N2, K2, nu2, mu2, 2N2, L2, T2, eps2, lam2, R2, M3, MKS2, MN4, MS4, M4,
 N4, S4, M6, and M8; see file \hf{tide} and \mdl{tide\_mod} for further
+N4, S4, M6, and M8; see file \textit{tide.h90} and \mdl{tide\_mod} for further
 information and references\footnote{As a legacy option \np{ln_tide_var} can be
   set to \forcode{0}, in which case the 19 tidal constituents (M2, N2, 2N2, S2,
   K2, K1, O1, Q1, P1, M4, Mf, Mm, Msqm, Mtm, S1, MU2, NU2, L2, and T2; see file
   \hf{tide}) and associated parameters that have been available in NEMO version
+  \textit{tide.h90}) and associated parameters that have been available in NEMO version
 .0 and earlier are available}. Constituents to be included in the tidal forcing
 (surface and lateral boundaries) are selected by enumerating their respective
 …
 potential). The tidal tilt factor $\gamma = 1 + k - h$ includes the
 Love numbers $k$ and $h$ \citep{love_PRSL09}; this factor is
 configurable using \np{rn_tide_gamma} (default value 0.7). Optionally,
+configurable using \np{rn_tide_gamma}{rn\_tide\_gamma} (default value 0.7). Optionally,
 when \np[=.true.]{ln_tide_ramp}{ln\_tide\_ramp}, the equilibrium tidal
 forcing can be ramped up linearly from zero during the initial
 …
 %% =================================================================================================
 \section[Ice shelf melting (\textit{sbcisf.F90})]{Ice shelf melting (\protect\mdl{sbcisf})}
 \label{sec:SBC_isf}
+\section[Ice Shelf (ISF)]{Interaction with ice shelves (ISF)}
+\label{sec:isf}
 \begin{listing}
   \nlst{namsbc_isf}
   \caption{\forcode{&namsbc_isf}}
   \label{lst:namsbc_isf}
+  \nlst{namisf}
+  \caption{\forcode{&namisf}}
+  \label{lst:namisf}
 \end{listing}
+The namelist variable in \nam{sbc}{sbc}, \np{nn_isf}{nn\_isf}, controls the ice shelf representation.
+Description and result of sensitivity test to \np{nn_isf}{nn\_isf} are presented in \citet{mathiot.jenkins.ea_GMD17}.
+The different options are illustrated in \autoref{fig:SBC_isf}.
+The namelist variable in \nam{isf}{isf}, \np{ln_isf}{ln\_isf}, controls the ice shelf interactions:
 \begin{description}
+  \item [{\np[=1]{nn_isf}{nn\_isf}}]: The ice shelf cavity is represented (\np[=.true.]{ln_isfcav}{ln\_isfcav} needed).
+  The fwf and heat flux are depending of the local water properties.
+  Two different bulk formulae are available:
+   \item $\bullet$ representation of the ice shelf/ocean melting/freezing for opened cavity (cav, \np{ln_isfcav_mlt}{ln\_isfcav\_mlt}).
+   \item $\bullet$ parametrisation of the ice shelf/ocean melting/freezing for closed cavities (par, \np{ln_isfpar_mlt}{ln\_isfpar\_mlt}).
+   \item $\bullet$ coupling with an ice sheet model (\np{ln_isfcpl}{ln\_isfcpl}).
+\end{description}
+  \subsection{Ocean/Ice shelf fluxes in opened cavities}
+     \np{ln_isfcav_mlt}{ln\_isfcav\_mlt}\forcode{ = .true.} activates the ocean/ice shelf thermodynamics interactions at the ice shelf/ocean interface.
+     If \np{ln_isfcav_mlt}\forcode{ = .false.}, thermodynamics interactions are desctivated but the ocean dynamics inside the cavity is still active.
+     The logical flag \np{ln_isfcav}{ln\_isfcav} control whether or not the ice shelf cavities are closed. \np{ln_isfcav}{ln\_isfcav} is not defined in the namelist but in the domcfg.nc input file.\\
+options are available to represent to ice-shelf/ocean fluxes at the interface:
+     \begin{description}
+        \item[\np{cn_isfcav_mlt}\forcode{ = 'spe'}]:
+        The fresh water flux is specified by a forcing fields \np{sn_isfcav_fwf}{sn\_isfcav\_fwf}. Convention of the input file is: positive toward the ocean (i.e. positive for melting and negative for freezing).
+        The latent heat fluxes is derived from the fresh water flux.
+        The heat content flux is derived from the fwf flux assuming a temperature set to the freezing point in the top boundary layer (\np{rn_htbl}{rn\_htbl})
+        \item[\np{cn_isfcav_mlt}\forcode{ = 'oasis'}]:
+        The \forcode{'oasis'} is a prototype of what could be a method to spread precipitation on Antarctic ice sheet as ice shelf melt inside the cavity when a coupled model Atmosphere/Ocean is used.
+        It has not been tested and therefore the model will stop if you try to use it.
+        Actions will be undertake in 2020 to build a comprehensive interface to do so for Greenland, Antarctic and ice shelf (cav), ice shelf (par), icebergs, subglacial runoff and runoff.
+        \item[\np{cn_isfcav_mlt}\forcode{ = '2eq'}]:
+        The heat flux and the fresh water flux (negative for melting) resulting from ice shelf melting/freezing are parameterized following \citet{Grosfeld1997}.
+        This formulation is based on a balance between the vertical diffusive heat flux across the ocean top boundary layer (\autoref{eq:ISOMIP1})
+        and the latent heat due to melting/freezing (\autoref{eq:ISOMIP2}):
+        \begin{equation}
+        \label{eq:ISOMIP1}
+        \mathcal{Q}_h = \rho c_p \gamma (T_w - T_f)
+        \end{equation}
+        \begin{equation}
+        \label{eq:ISOMIP2}
+        q = \frac{-\mathcal{Q}_h}{L_f}
+        \end{equation}
+        where $\mathcal{Q}_h$($W.m^{-2}$) is the heat flux,q($kg.s^{-1}m^{-2}$) the fresh-water flux,
+        $L_f$ the specific latent heat, $T_w$ the temperature averaged over a boundary layer below the ice shelf (explained below),
+        $T_f$ the freezing point using  the  pressure  at  the  ice  shelf  base  and  the  salinity  of the water in the boundary layer,
+        and $\gamma$ the thermal exchange coefficient.
+        \item[\np{cn_isfcav_mlt}\forcode{ = '3eq'}]:
+        For realistic studies, the heat and freshwater fluxes are parameterized following \citep{Jenkins2001}. This formulation is based on three equations:
+        a balance between the vertical diffusive heat flux across the boundary layer
+        , the latent heat due to melting/freezing of ice and the vertical diffusive heat flux into the ice shelf (\autoref{eq:3eq1});
+        a balance between the vertical diffusive salt flux across the boundary layer and the salt source or sink represented by the melting/freezing (\autoref{eq:3eq2});
+        and a linear equation for the freezing temperature of sea water (\autoref{eq:3eq3}, detailed of the linearisation coefficient in \citet{AsayDavis2016}):
+        \begin{equation}
+        \label{eq:3eq1}
+        c_p \rho \gamma_T (T_w-T_b) = -L_f q - \rho_i c_{p,i} \kappa \frac{T_s - T_b}{h_{isf}}
+        \end{equation}
+        \begin{equation}
+        \label{eq:3eq2}
+        \rho \gamma_S (S_w - S_b) = (S_i - S_b)q
+        \end{equation}
+        \begin{equation}
+        \label{eq:3eq3}
+        T_b = \lambda_1 S_b + \lambda_2 +\lambda_3 z_{isf}
+        \end{equation}
+        where $T_b$ is the temperature at the interface, $S_b$ the salinity at the interface, $\gamma_T$ and $\gamma_S$ the exchange coefficients for temperature and salt, respectively,
+        $S_i$ the salinity of the ice (assumed to be 0), $h_{isf}$ the ice shelf thickness, $z_{isf}$ the ice shelf draft, $\rho_i$ the density of the iceshelf,
+        $c_{p,i}$ the specific heat capacity of the ice, $\kappa$ the thermal diffusivity of the ice
+        and $T_s$ the atmospheric surface temperature (at the ice/air interface, assumed to be -20C).
+        The Liquidus slope ($\lambda_1$), the liquidus intercept ($\lambda_2$) and the Liquidus pressure coefficient ($\lambda_3$)
+        for TEOS80 and TEOS10 are described in \citep{AsayDavis2016} and in \citep{Jourdain2017}.
+        The linear system formed by \autoref{eq:3eq1}, \autoref{eq:3eq2} and the linearised equation for the freezing temperature of sea water (\autoref{eq:3eq3}) can be solved for $S_b$ or $T_b$.
+        Afterward, the freshwater flux ($q$) and the heat flux ($\mathcal{Q}_h$) can be computed.
+     \end{description}
+     \begin{table}[h]
+        \centering
+        \caption{Description of the parameters hard coded into the ISF module}
+        \label{tab:isf}
+        \begin{tabular}{|l|l|l|l|}
+        \hline
+        Symbol    & Description               & Value              & Unit               \\
+        \hline
+        $C_p$     & Ocean specific heat       & 3992               & $J.kg^{-1}.K^{-1}$ \\
+        $L_f$     & Ice latent heat of fusion & $3.34 \times 10^5$ & $J.kg^{-1}$        \\
+        $C_{p,i}$ & Ice specific heat         & 2000               & $J.kg^{-1}.K^{-1}$ \\
+        $\kappa$  & Heat diffusivity          & $1.54 \times 10^{-6}$& $m^2.s^{-1}$     \\
+        $\rho_i$  & Ice density               & 920                & $kg.m^3$           \\
+        \hline
+        \end{tabular}
+     \end{table}
+     Temperature and salinity used to compute the fluxes in \autoref{eq:ISOMIP1}, \autoref{eq:3eq1} and \autoref{eq:3eq2} are the average temperature in the top boundary layer \citep{losch_JGR08}.
+     Its thickness is defined by \np{rn_htbl}{rn\_htbl}.
+     The fluxes and friction velocity are computed using the mean temperature, salinity and velocity in the first \np{rn_htbl}{rn\_htbl} m.
+     Then, the fluxes are spread over the same thickness (ie over one or several cells).
+     If \np{rn_htbl}{rn\_htbl} is larger than top $e_{3}t$, there is no more direct feedback between the freezing point at the interface and the top cell temperature.
+     This can lead to super-cool temperature in the top cell under melting condition.
+     If \np{rn_htbl}{rn\_htbl} smaller than top $e_{3}t$, the top boundary layer thickness is set to the top cell thickness.\\
+     Each melt formula (\np{cn_isfcav_mlt}\forcode{ = '3eq'} or \np{cn_isfcav_mlt}\forcode{ = '2eq'}) depends on an exchange coeficient ($\Gamma^{T,S}$) between the ocean and the ice.
+     Below, the exchange coeficient $\Gamma^{T}$ and $\Gamma^{S}$ are respectively defined by \np{rn_gammat0}{rn\_gammat0} and \np{rn_gammas0}{rn\_gammas0}.
+     There are 3 different ways to compute the exchange velocity:
+     \begin{description}
+        \item[\np{cn_gammablk}\forcode{='spe'}]:
+        The salt and heat exchange coefficients are constant and defined by:
+\[
+\gamma^{T} = \Gamma^{T}
+\]
+\[
+\gamma^{S} = \Gamma^{S}
+\]
+        This is the recommended formulation for ISOMIP.
+   \item[\np{cn_gammablk}\forcode{='vel'}]:
+        The salt and heat exchange coefficients are velocity dependent and defined as
+\[
+\gamma^{T} = \Gamma^{T} \times u_{*}
+\]
+\[
+\gamma^{S} = \Gamma^{S} \times u_{*}
+\]
+        where $u_{*}$ is the friction velocity in the top boundary layer (ie first \np{rn_htbl}{rn\_htbl} meters).
+        See \citet{jenkins.nicholls.ea_JPO10} for all the details on this formulation. It is the recommended formulation for realistic application and ISOMIP+/MISOMIP configuration.
+   \item[\np{cn_gammablk}\forcode{'vel\_stab'}]:
+        The salt and heat exchange coefficients are velocity and stability dependent and defined as:
+\[
+\gamma^{T,S} = \frac{u_{*}}{\Gamma_{Turb} + \Gamma^{T,S}_{Mole}}
+\]
+        where $u_{*}$ is the friction velocity in the top boundary layer (ie first \np{rn_tbl}{rn\_htbl} meters),
+        $\Gamma_{Turb}$ the contribution of the ocean stability and
+        $\Gamma^{T,S}_{Mole}$ the contribution of the molecular diffusion.
+        See \citet{holland.jenkins_JPO99} for all the details on this formulation.
+        This formulation has not been extensively tested in NEMO (not recommended).
+     \end{description}
+\subsection{Ocean/Ice shelf fluxes in parametrised cavities}
   \begin{description}
+  \item [{\np[=1]{nn_isfblk}{nn\_isfblk}}]: The melt rate is based on a balance between the upward ocean heat flux and
+    the latent heat flux at the ice shelf base. A complete description is available in \citet{hunter_trpt06}.
+  \item [{\np[=2]{nn_isfblk}{nn\_isfblk}}]: The melt rate and the heat flux are based on a 3 equations formulation
+    (a heat flux budget at the ice base, a salt flux budget at the ice base and a linearised freezing point temperature equation).
+    A complete description is available in \citet{jenkins_JGR91}.
+     \item[\np{cn_isfpar_mlt}\forcode{ = 'bg03'}]:
+     The ice shelf cavities are not represented.
+     The fwf and heat flux are computed using the \citet{beckmann.goosse_OM03} parameterisation of isf melting.
+     The fluxes are distributed along the ice shelf edge between the depth of the average grounding line (GL)
+     (\np{sn_isfpar_zmax}{sn\_isfpar\_zmax}) and the base of the ice shelf along the calving front
+     (\np{sn_isfpar_zmin}{sn\_isfpar\_zmin}) as in (\np{cn_isfpar_mlt}\forcode{ = 'spe'}).
+     The effective melting length (\np{sn_isfpar_Leff}{sn\_isfpar\_Leff}) is read from a file.
+     This parametrisation has not been tested since a while and based on \citet{Favier2019},
+     this parametrisation should probably not be used.
+     \item[\np{cn_isfpar_mlt}\forcode{ = 'spe'}]:
+     The ice shelf cavity is not represented.
+     The fwf (\np{sn_isfpar_fwf}{sn\_isfpar\_fwf}) is prescribed and distributed along the ice shelf edge between
+     the depth of the average grounding line (GL) (\np{sn_isfpar_zmax}{sn\_isfpar\_zmax}) and
+     the base of the ice shelf along the calving front (\np{sn_isfpar_zmin}{sn\_isfpar\_min}). Convention of the input file is positive toward the ocean (i.e. positive for melting and negative for freezing).
+     The heat flux ($Q_h$) is computed as $Q_h = fwf \times L_f$.
+     \item[\np{cn_isfpar_mlt}\forcode{ = 'oasis'}]:
+     The \forcode{'oasis'} is a prototype of what could be a method to spread precipitation on Antarctic ice sheet as ice shelf melt inside the cavity when a coupled model Atmosphere/Ocean is used.
+     It has not been tested and therefore the model will stop if you try to use it.
+     Action will be undertake in 2020 to build a comprehensive interface to do so for Greenland, Antarctic and ice shelf (cav), ice shelf (par), icebergs, subglacial runoff and runoff.
   \end{description}
+  Temperature and salinity used to compute the melt are the average temperature in the top boundary layer \citet{losch_JGR08}.
+  Its thickness is defined by \np{rn_hisf_tbl}{rn\_hisf\_tbl}.
+  The fluxes and friction velocity are computed using the mean temperature, salinity and velocity in the the first \np{rn_hisf_tbl}{rn\_hisf\_tbl} m.
+  Then, the fluxes are spread over the same thickness (ie over one or several cells).
+  If \np{rn_hisf_tbl}{rn\_hisf\_tbl} larger than top $e_{3}t$, there is no more feedback between the freezing point at the interface and the the top cell temperature.
+  This can lead to super-cool temperature in the top cell under melting condition.
+  If \np{rn_hisf_tbl}{rn\_hisf\_tbl} smaller than top $e_{3}t$, the top boundary layer thickness is set to the top cell thickness.\\
+  Each melt bulk formula depends on a exchange coeficient ($\Gamma^{T,S}$) between the ocean and the ice.
+  There are 3 different ways to compute the exchange coeficient:
+  \begin{description}
+  \item [{\np[=0]{nn_gammablk}{nn\_gammablk}}]: The salt and heat exchange coefficients are constant and defined by \np{rn_gammas0}{rn\_gammas0} and \np{rn_gammat0}{rn\_gammat0}.
+    \begin{gather*}
+       % \label{eq:SBC_isf_gamma_iso}
+      \gamma^{T} = rn\_gammat0 \\
+      \gamma^{S} = rn\_gammas0
+    \end{gather*}
+    This is the recommended formulation for ISOMIP.
+  \item [{\np[=1]{nn_gammablk}{nn\_gammablk}}]: The salt and heat exchange coefficients are velocity dependent and defined as
+    \begin{gather*}
+      \gamma^{T} = rn\_gammat0 \times u_{*} \\
+      \gamma^{S} = rn\_gammas0 \times u_{*}
+    \end{gather*}
+    where $u_{*}$ is the friction velocity in the top boundary layer (ie first \np{rn_hisf_tbl}{rn\_hisf\_tbl} meters).
+    See \citet{jenkins.nicholls.ea_JPO10} for all the details on this formulation. It is the recommended formulation for realistic application.
+  \item [{\np[=2]{nn_gammablk}{nn\_gammablk}}]: The salt and heat exchange coefficients are velocity and stability dependent and defined as:
+    \[
+      \gamma^{T,S} = \frac{u_{*}}{\Gamma_{Turb} + \Gamma^{T,S}_{Mole}}
+    \]
+    where $u_{*}$ is the friction velocity in the top boundary layer (ie first \np{rn_hisf_tbl}{rn\_hisf\_tbl} meters),
+    $\Gamma_{Turb}$ the contribution of the ocean stability and
+    $\Gamma^{T,S}_{Mole}$ the contribution of the molecular diffusion.
+    See \citet{holland.jenkins_JPO99} for all the details on this formulation.
+    This formulation has not been extensively tested in \NEMO\ (not recommended).
+  \end{description}
+\item [{\np[=2]{nn_isf}{nn\_isf}}]: The ice shelf cavity is not represented.
+  The fwf and heat flux are computed using the \citet{beckmann.goosse_OM03} parameterisation of isf melting.
+  The fluxes are distributed along the ice shelf edge between the depth of the average grounding line (GL)
+  (\np{sn_depmax_isf}{sn\_depmax\_isf}) and the base of the ice shelf along the calving front
+  (\np{sn_depmin_isf}{sn\_depmin\_isf}) as in (\np[=3]{nn_isf}{nn\_isf}).
+  The effective melting length (\np{sn_Leff_isf}{sn\_Leff\_isf}) is read from a file.
+\item [{\np[=3]{nn_isf}{nn\_isf}}]: The ice shelf cavity is not represented.
+  The fwf (\np{sn_rnfisf}{sn\_rnfisf}) is prescribed and distributed along the ice shelf edge between
+  the depth of the average grounding line (GL) (\np{sn_depmax_isf}{sn\_depmax\_isf}) and
+  the base of the ice shelf along the calving front (\np{sn_depmin_isf}{sn\_depmin\_isf}).
+  The heat flux ($Q_h$) is computed as $Q_h = fwf \times L_f$.
+\item [{\np[=4]{nn_isf}{nn\_isf}}]: The ice shelf cavity is opened (\np[=.true.]{ln_isfcav}{ln\_isfcav} needed).
+  However, the fwf is not computed but specified from file \np{sn_fwfisf}{sn\_fwfisf}).
+  The heat flux ($Q_h$) is computed as $Q_h = fwf \times L_f$.
+  As in \np[=1]{nn_isf}{nn\_isf}, the fluxes are spread over the top boundary layer thickness (\np{rn_hisf_tbl}{rn\_hisf\_tbl})
+\end{description}
+$\bullet$ \np[=1]{nn_isf}{nn\_isf} and \np[=2]{nn_isf}{nn\_isf} compute a melt rate based on
+\np{cn_isfcav_mlt}\forcode{ = '2eq'}, \np{cn_isfcav_mlt}\forcode{ = '3eq'} and \np{cn_isfpar_mlt}\forcode{ = 'bg03'} compute a melt rate based on
 the water mass properties, ocean velocities and depth.
 This flux is thus highly dependent of the model resolution (horizontal and vertical),
 realism of the water masses onto the shelf ...\\
 $\bullet$ \np[=3]{nn_isf}{nn\_isf} and \np[=4]{nn_isf}{nn\_isf} read the melt rate from a file.
+The resulting fluxes are thus highly dependent of the model resolution (horizontal and vertical) and
+realism of the water masses onto the shelf.\\
+\np{cn_isfcav_mlt}\forcode{ = 'spe'} and \np{cn_isfpar_mlt}\forcode{ = 'spe'} read the melt rate from a file.
 You have total control of the fwf forcing.
 This can be useful if the water masses on the shelf are not realistic or
 the resolution (horizontal/vertical) are too coarse to have realistic melting or
+for studies where you need to control your heat and fw input.\\
+The ice shelf melt is implemented as a volume flux as for the runoff.
+The fw addition due to the ice shelf melting is, at each relevant depth level, added to
+the horizontal divergence (\textit{hdivn}) in the subroutine \rou{sbc\_isf\_div}, called from \mdl{divhor}.
+See \autoref{sec:SBC_rnf} for all the details about the divergence correction.
+for studies where you need to control your heat and fw input.
+However, if your forcing is not consistent with the dynamics below you can reach unrealistic low water temperature.\\
+The ice shelf fwf is implemented as a volume flux as for the runoff.
+The fwf addition due to the ice shelf melting is, at each relevant depth level, added to
+the horizontal divergence (\textit{hdivn}) in the subroutine \rou{isf\_hdiv}, called from \mdl{divhor}.
+See the runoff section \autoref{sec:SBC_rnf} for all the details about the divergence correction.\\
+Description and result of sensitivity tests to \np{ln_isfcav_mlt}{ln\_isfcav\_mlt} and \np{ln_isfpar_mlt}{ln\_isfpar\_mlt} are presented in \citet{mathiot.jenkins.ea_GMD17}.
+The different options are illustrated in \autoref{fig:ISF}.
 \begin{figure}[!t]
   \centering
   \includegraphics[width=0.66\textwidth]{SBC_isf}
+  \includegraphics[width=0.66\textwidth]{SBC_isf_v4.2}
   \caption[Ice shelf location and fresh water flux definition]{
     Illustration of the location where the fwf is injected and
     whether or not the fwf is interactif or not depending of \protect\np{nn_isf}{nn\_isf}.}
   \label{fig:SBC_isf}
+    whether or not the fwf is interactive or not.}
+  \label{fig:ISF}
 \end{figure}
+%% =================================================================================================
+\section{Ice sheet coupling}
+\label{sec:SBC_iscpl}
+\begin{listing}
+  \nlst{namsbc_iscpl}
+  \caption{\forcode{&namsbc_iscpl}}
+  \label{lst:namsbc_iscpl}
+\end{listing}
+\subsection{Available outputs}
+The following outputs are availables via XIOS:
+\begin{description}
+   \item[for parametrised cavities]:
+      \begin{xmllines}
+ <field id="isftfrz_par"     long_name="freezing point temperature in the parametrization boundary layer" unit="degC"     />
+ <field id="fwfisf_par"      long_name="Ice shelf melt rate"                           unit="kg/m2/s"  />
+ <field id="qoceisf_par"     long_name="Ice shelf ocean  heat flux"                    unit="W/m2"     />
+ <field id="qlatisf_par"     long_name="Ice shelf latent heat flux"                    unit="W/m2"     />
+ <field id="qhcisf_par"      long_name="Ice shelf heat content flux of injected water" unit="W/m2"     />
+ <field id="fwfisf3d_par"    long_name="Ice shelf melt rate"                           unit="kg/m2/s"  grid_ref="grid_T_3D" />
+ <field id="qoceisf3d_par"   long_name="Ice shelf ocean  heat flux"                    unit="W/m2"     grid_ref="grid_T_3D" />
+ <field id="qlatisf3d_par"   long_name="Ice shelf latent heat flux"                    unit="W/m2"     grid_ref="grid_T_3D" />
+ <field id="qhcisf3d_par"    long_name="Ice shelf heat content flux of injected water" unit="W/m2"     grid_ref="grid_T_3D" />
+ <field id="ttbl_par"        long_name="temperature in the parametrisation boundary layer" unit="degC" />
+ <field id="isfthermald_par" long_name="thermal driving of ice shelf melting"          unit="degC"     />
+      \end{xmllines}
+   \item[for open cavities]:
+      \begin{xmllines}
+ <field id="isftfrz_cav"     long_name="freezing point temperature at ocean/isf interface"                unit="degC"     />
+ <field id="fwfisf_cav"      long_name="Ice shelf melt rate"                           unit="kg/m2/s"  />
+ <field id="qoceisf_cav"     long_name="Ice shelf ocean  heat flux"                    unit="W/m2"     />
+ <field id="qlatisf_cav"     long_name="Ice shelf latent heat flux"                    unit="W/m2"     />
+ <field id="qhcisf_cav"      long_name="Ice shelf heat content flux of injected water" unit="W/m2"     />
+ <field id="fwfisf3d_cav"    long_name="Ice shelf melt rate"                           unit="kg/m2/s"  grid_ref="grid_T_3D" />
+ <field id="qoceisf3d_cav"   long_name="Ice shelf ocean  heat flux"                    unit="W/m2"     grid_ref="grid_T_3D" />
+ <field id="qlatisf3d_cav"   long_name="Ice shelf latent heat flux"                    unit="W/m2"     grid_ref="grid_T_3D" />
+ <field id="qhcisf3d_cav"    long_name="Ice shelf heat content flux of injected water" unit="W/m2"     grid_ref="grid_T_3D" />
+ <field id="ttbl_cav"        long_name="temperature in Losch tbl"                      unit="degC"     />
+ <field id="isfthermald_cav" long_name="thermal driving of ice shelf melting"          unit="degC"     />
+ <field id="isfgammat"       long_name="Ice shelf heat-transfert velocity"             unit="m/s"      />
+ <field id="isfgammas"       long_name="Ice shelf salt-transfert velocity"             unit="m/s"      />
+ <field id="stbl"            long_name="salinity in the Losh tbl"                      unit="1e-3"     />
+ <field id="utbl"            long_name="zonal current in the Losh tbl at T point"      unit="m/s"      />
+ <field id="vtbl"            long_name="merid current in the Losh tbl at T point"      unit="m/s"      />
+ <field id="isfustar"        long_name="ustar at T point used in ice shelf melting"    unit="m/s"      />
+ <field id="qconisf"         long_name="Conductive heat flux through the ice shelf"    unit="W/m2"     />
+      \end{xmllines}
+\end{description}
+%% =================================================================================================
+\subsection{Ice sheet coupling}
+\label{subsec:ISF_iscpl}
 Ice sheet/ocean coupling is done through file exchange at the restart step.
 At each restart step:
 \begin{enumerate}
 \item the ice sheet model send a new bathymetry and ice shelf draft netcdf file.
 \item a new domcfg.nc file is built using the DOMAINcfg tools.
 \item \NEMO\ run for a specific period and output the average melt rate over the period.
 \item the ice sheet model run using the melt rate outputed in step 4.
 \item go back to 1.
 \end{enumerate}
 If \np[=.true.]{ln_iscpl}{ln\_iscpl}, the isf draft is assume to be different at each restart step with
+At each restart step, the procedure is this one:
+\begin{description}
+\item[Step 1]: the ice sheet model send a new bathymetry and ice shelf draft netcdf file.
+\item[Step 2]: a new domcfg.nc file is built using the DOMAINcfg tools.
+\item[Step 3]: NEMO run for a specific period and output the average melt rate over the period.
+\item[Step 4]: the ice sheet model run using the melt rate outputed in step 3.
+\item[Step 5]: go back to 1.
+\end{description}
+If \np{ln_iscpl}\forcode{ = .true.}, the isf draft is assume to be different at each restart step with
 potentially some new wet/dry cells due to the ice sheet dynamics/thermodynamics.
 The wetting and drying scheme applied on the restart is very simple and described below for the 6 different possible cases:
+The wetting and drying scheme, applied on the restart, is very simple. The 6 different possible cases for the tracer and ssh are:
 \begin{description}
+\item [Thin a cell down]: T/S/ssh are unchanged and U/V in the top cell are corrected to keep the barotropic transport (bt) constant
+  ($bt_b=bt_n$).
+\item [Enlarge  a cell]: See case "Thin a cell down"
+\item [Dry a cell]: mask, T/S, U/V and ssh are set to 0.
+  Furthermore, U/V into the water column are modified to satisfy ($bt_b=bt_n$).
+\item [Wet a cell]: mask is set to 1, T/S is extrapolated from neighbours, $ssh_n = ssh_b$ and U/V set to 0.
+  If no neighbours, T/S is extrapolated from old top cell value.
+  If no neighbours along i,j and k (both previous test failed), T/S/U/V/ssh and mask are set to 0.
+\item [Dry a column]: mask, T/S, U/V are set to 0 everywhere in the column and ssh set to 0.
+\item [Wet a column]: set mask to 1, T/S is extrapolated from neighbours, ssh is extrapolated from neighbours and U/V set to 0.
+  If no neighbour, T/S/U/V and mask set to 0.
+   \item[Thin a cell]:
+   T/S/ssh are unchanged.
+   \item[Enlarge  a cell]:
+   See case "Thin a cell down"
+   \item[Dry a cell]:
+   Mask, T/S, U/V and ssh are set to 0.
+   \item[Wet a cell]:
+   Mask is set to 1, T/S is extrapolated from neighbours, $ssh_n = ssh_b$.
+   If no neighbours, T/S is extrapolated from old top cell value.
+   If no neighbours along i,j and k (both previous tests failed), T/S/ssh and mask are set to 0.
+   \item[Dry a column]:
+   mask, T/S and ssh are set to 0.
+   \item[Wet a column]:
+   set mask to 1, T/S/ssh are extrapolated from neighbours.
+   If no neighbour, T/S/ssh and mask set to 0.
 \end{description}
+The method described above will strongly affect the barotropic transport under an ice shelf when the geometry change.
+In order to keep the model stable, an adjustment of the dynamics at the initialisation after the coupling step is needed.
+The idea behind this is to keep $\pd[\eta]{t}$ as it should be without change in geometry at the initialisation.
+This will prevent any strong velocity due to large pressure gradient.
+To do so, we correct the horizontal divergence before $\pd[\eta]{t}$ is computed in the first time step.\\
 Furthermore, as the before and now fields are not compatible (modification of the geometry),
 …
 The horizontal extrapolation to fill new cell with realistic value is called \np{nn_drown}{nn\_drown} times.
 It means that if the grounding line retreat by more than \np{nn_drown}{nn\_drown} cells between 2 coupling steps,
 the code will be unable to fill all the new wet cells properly.
+the code will be unable to fill all the new wet cells properly and the model is likely to blow up at the initialisation.
 The default number is set up for the MISOMIP idealised experiments.
 This coupling procedure is able to take into account grounding line and calving front migration.
 However, it is a non-conservative processe.
+However, it is a non-conservative proccess.
 This could lead to a trend in heat/salt content and volume.\\
 In order to remove the trend and keep the conservation level as close to 0 as possible,
+a simple conservation scheme is available with \np[=.true.]{ln_hsb}{ln\_hsb}.
+The heat/salt/vol. gain/loss is diagnosed, as well as the location.
+A correction increment is computed and apply each time step during the next \np{rn_fiscpl}{rn\_fiscpl} time steps.
+For safety, it is advised to set \np{rn_fiscpl}{rn\_fiscpl} equal to the coupling period (smallest increment possible).
+The corrective increment is apply into the cell itself (if it is a wet cell), the neigbouring cells or the closest wet cell (if the cell is now dry).
+a simple conservation scheme is available with \np{ln_isfcpl_cons}\forcode{ = .true.}.
+The heat/salt/vol. gain/loss are diagnosed, as well as the location.
+A correction increment is computed and applied each time step during the model run.
+The corrective increment are applied into the cells itself (if it is a wet cell), the neigbouring cells or the closest wet cell (if the cell is now dry).
 %% =================================================================================================
 …
 which are assumed to propagate with their larger parent and thus delay fluxing into the ocean.
 Melt water (and other variables on the configuration grid) are written into the main \NEMO\ model output files.
+By default, iceberg thermodynamic and dynamic are computed using ocean surface variable (sst, ssu, ssv) and the icebergs are not sensible to the bathymetry (only to land) whatever the iceberg draft.
+\citet{Merino_OM2016} developed an option to use vertical profiles of ocean currents and temperature instead (\np{ln_M2016}{ln\_M2016}).
+Full details on the sensitivity to this parameter in done in \citet{Merino_OM2016}.
+If \np{ln_M2016}{ln\_M2016} activated, \np{ln_icb_grd}{ln\_icb\_grd} activate (or not) an option to prevent thick icebergs to move across shallow bank (ie shallower than the iceberg draft).
+This option need to be used with care as it could required to either change the distribution to prevent generation of icebergs with draft larger than the bathymetry
+or to build a variable \forcode{maxclass} to prevent NEMO filling the icebergs classes too thick for the local bathymetry.
 Extensive diagnostics can be produced.

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/subfiles/chap_STO.tex

r11693	r14328
5	5	\chapter{Stochastic Parametrization of EOS (STO)}
6	6	\label{chap:STO}
7
8		~~\thispagestyle{plain}~~
9	7
10	8	\chaptertoc

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/subfiles/chap_TRA.tex

-                      r13476
+                      r14328
 \chapter{Ocean Tracers (TRA)}
 \label{chap:TRA}
-\thispagestyle{plain}
 \chaptertoc
 …
   (see \autoref{sec:SBC_rnf} for further detail of how it acts on temperature and salinity tendencies)
 \item [\textit{fwfisf}] The mass flux associated with ice shelf melt,
   (see \autoref{sec:SBC_isf} for further details on how the ice shelf melt is computed and applied).
+  (see \autoref{sec:isf} for further details on how the ice shelf melt is computed and applied).
 \end{labeling}
 …
 When \np{nn_geoflx}{nn\_geoflx} is set to 2,
 a spatially varying geothermal heat flux is introduced which is provided in
 the \ifile{geothermal\_heating} NetCDF file
+the \textit{geothermal\_heating.nc} NetCDF file
 (\autoref{fig:TRA_geothermal}) \citep{emile-geay.madec_OS09}.
 …
 \citep{madec.delecluse.ea_JPO96}.
 For generating \ifile{resto},
+For generating \textit{resto.nc},
 see the documentation for the DMP tools provided with the source code under \path{./tools/DMP_TOOLS}.
 …
 $\gamma$ is initialized as \np{rn_atfp}{rn\_atfp}, its default value is \forcode{10.e-3}.
 Note that the forcing correction term in the filter is not applied in linear free surface
 (\jp{ln\_linssh}\forcode{=.true.}) (see \autoref{subsec:TRA_sbc}).
+(\np[=.true.]{ln_linssh}{ln\_linssh}) (see \autoref{subsec:TRA_sbc}).
 Not also that in constant volume case, the time stepping is performed on $T$,
 not on its content, $e_{3t}T$.

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/subfiles/chap_ZDF.tex

-                      r14177
+                      r14328
 \chapter{Vertical Ocean Physics (ZDF)}
 \label{chap:ZDF}
-\thispagestyle{plain}
 \chaptertoc
 …
 These values are assigned in \mdl{zdfdrg}.
 Note that there is support for local enhancement of these values via an externally defined 2D mask array
 (\np[=.true.]{ln_boost}{ln\_boost}) given in the \ifile{bfr\_coef} input NetCDF file.
+(\np[=.true.]{ln_boost}{ln\_boost}) given in the \textit{bfr\_coef.nc} input NetCDF file.
 The mask values should vary from 0 to 1.
 Locations with a non-zero mask value will have the friction coefficient increased by

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/subfiles/chap_cfgs.tex

-                      r14196
+                      r14328
 \chapter{Configurations}
 \label{chap:CFGS}
-\thispagestyle{plain}
 \chaptertoc
 …
 the SI3 model (ORCA-ICE) and possibly with PISCES biogeochemical model (ORCA-ICE-PISCES).
 An appropriate namelist is available in \path{./cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_cfg} for ORCA2.
 The domain of ORCA2 configuration is defined in \ifile{ORCA\_R2\_zps\_domcfg} file,
+The domain of ORCA2 configuration is defined in \textit{ORCA\_R2\_zps\_domcfg.nc} file,
 this file is available in tar file on the \NEMO\ community zenodo platform: \\
 https://doi.org/10.5281/zenodo.2640723
 …
 Each of configuration is set through the \textit{domain\_cfg} domain configuration file,
 which sets the grid size and configuration name parameters.
 The \NEMO\ System Team provides only ORCA2 domain input file "\ifile{ORCA\_R2\_zps\_domcfg}" file
+The \NEMO\ System Team provides only ORCA2 domain input file "\textit{ORCA\_R2\_zps\_domcfg.nc}" file
 (\autoref{tab:CFGS_ORCA}).
 …
   \centering
   \begin{tabular}{p{4cm} c c c c}
     Horizontal Grid & \jp{ORCA\_index} & \jp{jpiglo} & \jp{jpjglo} \\
+    Horizontal Grid & \texttt{ORCA\_index} & \texttt{jpiglo} & \texttt{jpjglo} \\
     \hline \hline
     % 4   \deg\ &              4   &          92 &          76 \\
 …
 Its horizontal resolution (and thus the size of the domain) is determined by
 setting \np{nn_GYRE}{nn\_GYRE} in \nam{usr_def}{usr\_def}:
 \begin{align*}
   \jp{jpiglo} = 30 \times \text{\np{nn_GYRE}{nn\_GYRE}} + 2 + 2 \times \text{\np{nn_hls}{nn\_hls}} \\
   \jp{jpjglo} = 20 \times \text{\np{nn_GYRE}{nn\_GYRE}} + 2 + 2 \times \text{\np{nn_hls}{nn\_hls}}
+   jpiglo = 30 \times \text{\np{nn_GYRE}{nn\_GYRE}} + 2 + 2 \times \text{\np{nn_hls}{nn\_hls}} \\
+   jpjglo = 20 \times \text{\np{nn_GYRE}{nn\_GYRE}} + 2 + 2 \times \text{\np{nn_hls}{nn\_hls}}
 \end{align*}
 Obviously, the namelist parameters have to be adjusted to the chosen resolution,
 see the Configurations pages on the \NEMO\ web site (\NEMO\ Configurations).
 In the vertical, GYRE uses the default 30 ocean levels (\jp{jpk}\forcode{ = 31}) (\autoref{fig:DOM_zgr_e3}).
+In the vertical, GYRE uses the default 30 ocean levels (\forcode{jpk = 31}, \autoref{fig:DOM_zgr_e3}).
 \begin{listing}

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/subfiles/chap_conservation.tex

r11693	r14328
5	5	\chapter{Invariants of the Primitive Equations}
6	6	\label{chap:CONS}
7
8		~~\thispagestyle{plain}~~
9	7
10	8	\chaptertoc

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/subfiles/chap_misc.tex

-                      r14113
+                      r14328
 \chapter{Miscellaneous Topics}
 \label{chap:MISC}
-\thispagestyle{plain}
 \chaptertoc
 …
     Release & Author(s) & Modifications \\
     \hline
+    {\em   X.X} & {\em Pierre Mathiot} & {update of the closed sea section}
     {\em   4.0} & {\em ...} & {\em ...} \\
     {\em   3.6} & {\em ...} & {\em ...} \\
 …
 \end{figure}
-\begin{figure}[!tbp]
-  \centering
-  \includegraphics[width=0.66\textwidth]{MISC_closea_mask_example}
-  \caption[Mask fields for the \protect\mdl{closea} module]{
-    Example of mask fields for the \protect\mdl{closea} module.
-    \textit{Left}: a closea\_mask field;
-    \textit{Right}: a closea\_mask\_rnf field.
-    In this example, if \protect\np{ln_closea}{ln\_closea} is set to \forcode{.true.},
-    the mean freshwater flux over each of the American Great Lakes will be set to zero,
-    and the total residual for all the lakes, if negative, will be put into
-    the St Laurence Seaway in the area shown.}
-  \label{fig:MISC_closea_mask_example}
-\end{figure}
 %% =================================================================================================
 \section[Closed seas (\textit{closea.F90})]{Closed seas (\protect\mdl{closea})}
 \label{sec:MISC_closea}
+\begin{listing}
+  \nlst{namclo}
+  \caption{\forcode{&namclo}}
+  \label{lst:namclo}
+\end{listing}
 Some configurations include inland seas and lakes as ocean
 …
 to zero and put the residual flux into the ocean.
+Prior to \NEMO\ 4 the locations of inland seas and lakes was set via
+hardcoded indices for various ORCA configurations. From \NEMO\ 4 onwards
+the inland seas and lakes are defined using mask fields in the
+domain configuration file. The options are as follows.
+\begin{enumerate}
+\item {{\bfseries No ``closea\_mask'' field is included in domain configuration
+  file.} In this case the closea module does nothing.}
+\item {{\bfseries A field called closea\_mask is included in the domain
+configuration file and ln\_closea=.false. in namelist namcfg.} In this
+case the inland seas defined by the closea\_mask field are filled in
+(turned to land points) at run time. That is every point in
+closea\_mask that is nonzero is set to be a land point.}
+\item {{\bfseries A field called closea\_mask is included in the domain
+configuration file and ln\_closea=.true. in namelist namcfg.} Each
+inland sea or group of inland seas is set to a positive integer value
+in the closea\_mask field (see \autoref{fig:MISC_closea_mask_example}
+for an example). The net surface flux over each inland sea or group of
+The inland seas and lakes are defined using mask fields in the
+domain configuration file. Special treatment of the closed sea (redistribution of net freshwater or mask those), are defined in \autoref{lst:namclo} and
+can be trigger by \np{ln_closea}{ln\_closea}\forcode{=.true.} in namelist namcfg.
+The options available are the following:
+\begin{description}
+\item[\np{ln_maskcs}{ln\_maskcs}\forcode{ = .true.}] All the closed seas are masked using \textit{mask\_opensea} variable.
+\item[\np{ln_maskcs}{ln\_maskcs}\forcode{ = .false.}] The net surface flux over each inland sea or group of
 inland seas is set to zero each timestep and the residual flux is
+distributed over the global ocean (ie. all ocean points where
+closea\_mask is zero).}
+\item {{\bfseries Fields called closea\_mask and closea\_mask\_rnf are
+included in the domain configuration file and ln\_closea=.true. in
+namelist namcfg.} This option works as for option 3, except that if
+the net surface flux over an inland sea is negative (net
+precipitation) it is put into the ocean at specified runoff points. A
+net positive surface flux (net evaporation) is still spread over the
+global ocean. The mapping from inland seas to runoff points is defined
+by the closea\_mask\_rnf field. Each mapping is defined by a positive
+integer value for the inland sea(s) and the corresponding runoff
+points. An example is given in
+\autoref{fig:MISC_closea_mask_example}. If no mapping is provided for a
+particular inland sea then the residual is spread over the global
+ocean.}
+\item {{\bfseries Fields called closea\_mask and closea\_mask\_emp are
+included in the domain configuration file and ln\_closea=.true. in
+namelist namcfg.} This option works the same as option 4 except that
+the nonzero net surface flux is sent to the ocean at the specified
+runoff points regardless of whether it is positive or negative. The
+mapping from inland seas to runoff points in this case is defined by
+the closea\_mask\_emp field.}
+\end{enumerate}
+There is a python routine to create the closea\_mask fields and append
+them to the domain configuration file in the utils/tools/DOMAINcfg directory.
+distributed over a target area.
+\end{description}
+When \np{ln_maskcs}{ln\_maskcs}\forcode{ = .false.},
+options are available for the redistribution (set up of these options is done in the tool DOMAINcfg):
+\begin{description}[font=$\bullet$ ]
+\item[ glo]: The residual flux is redistributed globally.
+\item[ emp]: The residual flux is redistributed as emp in a river outflow.
+\item[ rnf]: The residual flux is redistributed as rnf in a river outflow if negative. If there is a net evaporation, the residual flux is redistributed globally.
+\end{description}
+For each case, 2 masks are needed (\autoref{fig:MISC_closea_mask_example}):
+\begin{description}
+\item $\bullet$ one describing the 'sources' (ie the closed seas concerned by each options) called \textit{mask\_csglo}, \textit{mask\_csrnf}, \textit{mask\_csemp}.
+\item $\bullet$ one describing each group of inland seas (the Great Lakes for example) and the target area (river outflow or world ocean) for each group of inland seas (St Laurence for the Great Lakes for example) called
+\textit{mask\_csgrpglo}, \textit{mask\_csgrprnf}, \textit{mask\_csgrpemp}.
+\end{description}
+\begin{figure}[!tbp]
+  \centering
+  \includegraphics[width=0.66\textwidth]{MISC_closea_mask_example}
+  \caption[Mask fields for the \protect\mdl{closea} module]{
+    Example of mask fields for the \protect\mdl{closea} module.
+    \textit{Left}: a \textit{mask\_csrnf} field;
+    \textit{Right}: a \textit{mask\_csgrprnf} field.
+    In this example, if \protect\np{ln_closea}{ln\_closea} is set to \forcode{.true.},
+    the mean freshwater flux over each of the American Great Lakes will be set to zero,
+    and the total residual for all the lakes, if negative, will be put into
+    the St Laurence Seaway in the area shown.}
+  \label{fig:MISC_closea_mask_example}
+\end{figure}
+Closed sea not defined (because too small, issue in the bathymetry definition ...) are defined in \textit{mask\_csundef}.
+These points can be masked using the namelist option \np{ln_mask_csundef}{ln\_mask\_csundef}\forcode{= .true.} or used to correct the bathymetry input file.\\
+The masks needed for the closed sea can be created using the DOMAINcfg tool in the utils/tools/DOMAINcfg directory.
+See \autoref{sec:clocfg} for details on the usage of definition of the closed sea masks.
 %% =================================================================================================
 …
 \noindent Consider an ORCA1
 configuration using the extended grid domain configuration file: \ifile{eORCA1\_domcfg.nc}
+configuration using the extended grid domain configuration file: \textit{eORCA1\_domcfg.nc}
 This file define a horizontal domain of 362x332.  The first row with
 open ocean wet points in the non-isf bathymetry for this set is row 42 (\fortran\ indexing)
 …
 \noindent Note that with this option, the j-size of the global domain is (extended
 j-size minus \np{open_ocean_jstart}{open\_ocean\_jstart} + 1 ) and this must match the \texttt{jpjglo} value
 for the configuration. This means an alternative version of \ifile{eORCA1\_domcfg.nc} must
+for the configuration. This means an alternative version of \textit{eORCA1\_domcfg.nc} must
 be created for when \np{ln_use_jattr}{ln\_use\_jattr} is active. The \texttt{ncap2} tool provides a
 convenient way of achieving this:
 …
 \end{cmds}
 The domain configuration file is unique in this respect since it also contains the value of \jp{jpjglo}
+The domain configuration file is unique in this respect since it also contains the value of \texttt{jpjglo}
 that is read and used by the model.
 Any other global, 2D and 3D, netcdf, input field can be prepared for use in a reduced domain by adding the
 …
 When more information is required for monitoring or debugging purposes, the various
 forms of output can be selected via the \np{sn\_cfctl} structure. As well as simple
+forms of output can be selected via the \np{sn_cfctl}{sn\_cfctl} structure. As well as simple
 on-off switches this structure also allows selection of a range of processors for
 individual reporting (where appropriate) and a time-increment option to restrict
 …
 systems so bug-hunting efforts using this facility should also utilise the \fortran:
+\begin{forlines}
+   CALL FLUSH(numout)
+\end{forlines}
+\forline|CALL FLUSH(numout)|
 statement after any additional write statements to ensure that file contents reflect
 …
 \begin{forlines}
    sn_cfctl%l_glochk = .FALSE.    ! Range sanity checks are local (F) or global (T). Set T for debugging only
    sn_cfctl%l_allon  = .FALSE.    ! IF T activate all options. If F deactivate all unless l_config is T
      sn_cfctl%l_config = .TRUE.     ! IF .true. then control which reports are written with the following
        sn_cfctl%l_runstat = .FALSE. ! switches and which areas produce reports with the proc integer settings.
        sn_cfctl%l_trcstat = .FALSE. ! The default settings for the proc integers should ensure
        sn_cfctl%l_oceout  = .FALSE. ! that  all areas report.
        sn_cfctl%l_layout  = .FALSE. !
        sn_cfctl%l_prtctl  = .FALSE. !
        sn_cfctl%l_prttrc  = .FALSE. !
        sn_cfctl%l_oasout  = .FALSE. !
        sn_cfctl%procmin   = 0       ! Minimum area number for reporting [default:0]
        sn_cfctl%procmax   = 1000000 ! Maximum area number for reporting [default:1000000]
        sn_cfctl%procincr  = 1       ! Increment for optional subsetting of areas [default:1]
        sn_cfctl%ptimincr  = 1       ! Timestep increment for writing time step progress info
+   sn_cfctl%l_glochk  = .false. ! Range sanity checks are local (F) or global (T). Set T for debugging only
+   sn_cfctl%l_allon   = .false. ! IF T activate all options. If F deactivate all unless l_config is T
+   sn_cfctl%l_config  = .true.  ! IF .true. then control which reports are written with the following
+   sn_cfctl%l_runstat = .false. ! switches and which areas produce reports with the proc integer settings.
+   sn_cfctl%l_trcstat = .false. ! The default settings for the proc integers should ensure
+   sn_cfctl%l_oceout  = .false. ! that  all areas report.
+   sn_cfctl%l_layout  = .false. !
+   sn_cfctl%l_prtctl  = .false. !
+   sn_cfctl%l_prttrc  = .false. !
+   sn_cfctl%l_oasout  = .false. !
+   sn_cfctl%procmin   = 0       ! Minimum area number for reporting [default:0]
+   sn_cfctl%procmax   = 1000000 ! Maximum area number for reporting [default:1000000]
+   sn_cfctl%procincr  = 1       ! Increment for optional subsetting of areas [default:1]
+   sn_cfctl%ptimincr  = 1       ! Timestep increment for writing time step progress info
 \end{forlines}

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/subfiles/chap_model_basics.tex

r14113	r14328
5	5	\chapter{Model Basics}
6	6	\label{chap:MB}
7
8		~~\thispagestyle{plain}~~
9	7
10	8	\chaptertoc

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/subfiles/chap_model_basics_zstar.tex

r14178	r14328
4	4
5	5	\chapter{ essai \zstar \sstar}
6
7		~~\thispagestyle{plain}~~
8	6
9	7	\chaptertoc

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/NEMO/subfiles/chap_time_domain.tex

r11693	r14328
5	5	\chapter{Time Domain}
6	6	\label{chap:TD}
7
8		~~\thispagestyle{plain}~~
9	7
10	8	\chaptertoc

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/SI3/build

Property svn:ignore

old	new
11	11	*.toc
12	12	*.xdv
13		~~_minted-~~*
	13	cache*

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/TOP/build

Property svn:ignore

old	new
11	11	*.toc
12	12	*.xdv
13		~~_minted-~~*
	13	cache*

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/TOP/subfiles/miscellaneous.tex

-                      r14229
+                      r14328
+%
 \begin{minted}{bash}
     bld::tool::fppkeys   key_iomput key_top
+    bld::tool::fppkeys   key_xios key_top
 \end{minted}
 …
+%
 \begin{minted}{bash}
    bld::tool::fppkeys   key_iomput key_top
+   bld::tool::fppkeys   key_xios key_top
    src::MYBGC::initialization         <MYBGCPATH>/initialization
 …
 %Note that, the additional lines specific for the BGC model source and build paths, can be written into a separate file, e.g. named MYBGC.fcm, and then simply included in the cpp_NEMO_MYBGC.fcm as follow
+%
 %bld::tool::fppkeys  key_zdftke key_dynspg_ts key_iomput key_top
+%bld::tool::fppkeys  key_zdftke key_dynspg_ts key_xios key_top
 %inc <MYBGCPATH>/MYBGC.fcm
 %This will enable a more portable compilation structure for all MYBGC related configurations.

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/global

Property svn:ignore set to
*.aux
*.bbl
*.blg
*.fdb*
*.fls
*.idx
*.ilg
*.ind
*.lo*
*.out
*.toc
*.xdv
cache*

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/global/document.tex

-                      r14113
+                      r14328
 %% =================================================================================================
 %% Template structure for reference manuals
+%% Manual structure
 %% =================================================================================================
+%% NEMO release version
+\def \version{trunk}
+%% Preamble
+%% Preamble: global configuration
 %% =================================================================================================
+%% Document layout
+\documentclass[fontsize = 10pt, twoside, abstract]{scrreprt}
+%% Layout
+%\documentclass[fontsize=10pt,twoside,abstract,draft]{scrreprt}
+\documentclass[fontsize=10pt,twoside,abstract      ]{scrreprt}
 %% Load manual configuration
 \input{../../global/prologue}
+%% Overall configuration
+\input{../../global/preamble}
+%% End of common preamble between main and sub-files
+%% Override custom cmds for full manual compilation
+\newcommand{\subinc}[1]{#1}
+\newcommand{\subexc}[1]{}
+%% Special cmds around to {in,ex}clude content only in subfile
+  \newcommand{\subinc}[1]{#1}
+  \newcommand{\subexc}[1]{  }
 \begin{document}
 \renewcommand{\subinc}[1]{}
+\renewcommand{\subinc}[1]{  }
 \renewcommand{\subexc}[1]{#1}
 %% Frontmatter
+%% Frontmatter: covers
+%% ({sub}title, DOI, authors, abstract and color theme are specific to each manual)
 %% =================================================================================================
+%\frontmatter %% Not recognized in 'scrreprt' document class
 \pagenumbering{gobble}   %% Disable page numbering temporarily
+\pagestyle{empty}
-%% Title page
 \input{../../global/frontpage}
-%% Footer for introductory parts (no header by cleaning default)
-\ofoot[]{\engine\ Reference Manual} \ifoot[]{\pagemark}
-%% Information page (2nd page)
 \input{../../global/info_page}
+\cleardoublepage
+\pagenumbering{Roman} %% Reactivate page numbering (uppercase roman numbers)
+\pagestyle{plain}
+%\lastpageref{pagesLTS.0}
+\tableofcontents
 \listoffigures
 \listoflistings
 \listoftables
+%\listoftodos
+%\lastpageref{pagesLTS.Roman}
 \clearpage
+\cleardoublepage
+\pagenumbering{roman}
+\ofoot[]{\engine\ Reference Manual} \ifoot[]{\pagemark}
+%% Mainmatter: toc, lists, introduction and primary chapters
+%% =================================================================================================
+%\mainmatter %% Not recognized in 'scrreprt' document class
+\pagenumbering{arabic} %% Standard page numbering
+\pagestyle{plain}
 \input{introduction}
+%% Table of Contents
+\tableofcontents
+\cleardoublepage
+\clearpage
+\pagestyle{scrheadings}
+\renewcommand{\chapterpagestyle}{empty}
+\input{chapters}
 %% Mainmatter
+%% Appendix: subordinate chapters
 %% =================================================================================================
+%% Headings for document body
+\pagenumbering{arabic}
+\lohead{Chap.\ \thechapter\ \leftmark} \rehead{Sect.\ \thesection\ \rightmark}
+\ifoot[]{Page\ \pagemark\ of \pageref*{LastPage}}
+\appendix %% Chapter numbering with letters by now
+\lohead{Apdx \thechapter\ \leftmark}
 \include{chapters}
+\input{appendices}
+\input{../../global/coding_rules} %% Add coding rules on every manual
+%% Appendix
+%\lastpageref{pagesLTS.arabic}
+\cleardoublepage
+%% Backmatter: bibliography, glossaries and indices
 %% =================================================================================================
+\appendix   %% Chapter numbering with letters by now
 \lohead{Apdx\ \thechapter\ \leftmark}
 \include{appendices}
+%\backmatter %% Not recognized in 'scrreprt' document class
+\pagenumbering{roman} %% Lowercase roman numbers
+\pagestyle{plain}
-%% Append coding rules for every manual
-\input{../../global/coding_rules}
-%% Backmatter
-%% =================================================================================================
-%% Bibliography and indexes
 \input{../../global/epilogue}
+%\lastpageref{pagesLTS.roman}
 \end{document}

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/global/epilogue.tex

-                      r14113
+                      r14328
+\clearpage
+%% =================================================================================================
+%% Backmatter
+%% =================================================================================================
 %% Bibliography
+%% =================================================================================================
 \phantomsection
 \addcontentsline{toc}{chapter}{Bibliography}
+\lohead{Bibliography} \rehead{Bibliography}
+\lohead{Bibliography}
+\rehead{Bibliography}
 \bibliography{../main/bibliography}
 \clearpage
+%% Indexes
+%% Indices
+%% =================================================================================================
 \phantomsection
+\addcontentsline{toc}{chapter}{Indexes}
+\lohead{Indexes} \rehead{Indexes}
+\addcontentsline{toc}{chapter}{Indices}
+\lohead{Indices}
+\rehead{Indices}
 \printindex[blocks]
 \printindex[keys]
 …
 \printindex[parameters]
 \printindex[subroutines]
+\clearpage
+%% Glossary
+%% =================================================================================================
+%\phantomsection
+%\addcontentsline{toc}{chapter}{Glossary}
+%\lohead{Glossary}\rehead{Glossary}
+%\printglossaries

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/global/frontpage.tex

-                      r14113
+                      r14328
+%% =================================================================================================
+%% Front cover
+%% =================================================================================================
 \begin{titlepage}
 %  \newgeometry{hmargin = 1.5cm, vmargin = 3cm}
   \setlength{\parindent}{0pt}
+%   \newgeometry{hmargin=1.5cm,vmargin=3cm}
+   \setlength{\parindent}{0pt}
+  \begin{center}
+    \begin{minipage}{0.3\textwidth}
+      \includegraphics[height=1.5cm]{logos/NEMO_grey}
+    \end{minipage}\begin{minipage}{0.6\textwidth}
+      \begin{center}
+      \Large\slshape
+      \textbf{N}ucleus for \textbf{E}uropean \textbf{M}odelling of the \textbf{O}cean \\
+   \begin{center}
+      \begin{minipage}{0.3\textwidth}
+         \includegraphics[height=1.5cm]{NEMO_grey}
+      \end{minipage} %% Don't insert void line between `minipage` envs
+      \begin{minipage}{0.6\textwidth}
+         \begin{center}
+            \Large\slshape
+            \textbf{N}ucleus for \textbf{E}uropean \textbf{M}odelling of the \textbf{O}cean \\
+            \medskip
+            \hyperref[resources]{
+               \faWordpress \hspace{1cm} \faCodeFork      \hspace{1cm}
+               \faGithub    \hspace{1cm} \faCloudDownload \hspace{1cm} \faEnvelope
+            }
+         \end{center}
+      \end{minipage}
+   \end{center}
+   \spcup
+   \textcolor{white}{\fontsize{0.8cm}{0.8cm}\selectfont\textbf{\hdg}}
+   \ifdef{\shdg}{\medskip\par\textcolor{white}{\Huge\shdg}}{}
+   \spcdn
+   \begin{center}
+      \LARGE Version {\ver} - {\today} \\
       \medskip
+      \hyperref[resources]{\textcolor{black}{
+          \faWordpress \hspace{0.75cm} \faCodeFork      \hspace{0.75cm}
+          \faGithub    \hspace{0.75cm} \faCloudDownload \hspace{0.75cm} \faEnvelope
+        }
+      }
+      \end{center}
+    \end{minipage}
+  \end{center}
+      \href{http://doi.org/10.5281/zenodo.\zid}{\includegraphics{zenodo.\zid}}
+   \end{center}
+  \spacetop
+  \textcolor{white}{\fontsize{0.8cm}{0.8cm}\selectfont\textbf{\heading}}
+  \ifdef{\subheading}{
+    \medskip
+    \par
+    \textcolor{white}{\Huge \subheading}
+  }{}
+  \spacedown
+   \vfill
+  \begin{center}
+    \LARGE Version \version\ -\ \today \\
+    \medskip
+    \href{http://doi.org/10.5281/zenodo.\zid}{ \includegraphics{badges/zenodo.\zid} }
+  \end{center}
+   \begin{minipage}{\autwd}
+      \raggedleft\input{authors}
+   \end{minipage}
+   \hspace{15pt} %% Don't insert void line between `minipage` envs
+   \begin{minipage}{0.02\linewidth}
+      \rule{1pt}{\lnlg}
+   \end{minipage}
+   \hspace{ 5pt} %%   "     ""    ""   ""     "        ""      ""
+   \begin{minipage}{\abswd}
+      \begin{abstract}
+         \input{abstract}
+      \end{abstract}
+   \end{minipage}
   \vfill
+   \vfill
+  \begin{minipage}{\authorswidth}
+    \raggedleft
+    \input{authors}
+  \end{minipage}\hspace{15pt}\begin{minipage}{0.02\linewidth}
+    \rule{1pt}{\rulelenght}
+  \end{minipage}\hspace{ 5pt}\begin{minipage}{\abstractwidth}
+    \begin{abstract}
+      \input{abstract}
+    \end{abstract}
+  \end{minipage}
+  \vfill
+  \begin{center}
+    \Large
+    \href{http://www.cmcc.it          }{ \includegraphics[height=1cm]{logos/CMCC} } \hspace{0.25cm}
+    \href{http://www.cnrs.fr          }{ \includegraphics[height=1cm]{logos/CNRS} } \hspace{0.25cm}
+    \href{http://www.mercator-ocean.fr}{ \includegraphics[height=1cm]{logos/MOI}  } \hspace{0.25cm}
+    \href{http://www.metoffice.gov.uk }{ \includegraphics[height=1cm]{logos/UKMO} } \hspace{0.25cm}
+    \href{http://nerc.ukri.org        }{ \includegraphics[height=1cm]{logos/NERC} } \\
+    \medskip
+    \slshape
+    {C}ommunity \hspace{1.5em} {O}cean \hspace{1.5em} {M}odel \\
+  \end{center}
+   \begin{center}
+      \Large
+      \CMCC{\includegraphics[height=1cm]{CMCC}} \hspace{0.25cm}
+      \CNRS{\includegraphics[height=1cm]{CNRS}} \hspace{0.25cm}
+       \MOI{\includegraphics[height=1cm]{MOI} } \hspace{0.25cm}
+      \UKMO{\includegraphics[height=1cm]{UKMO}} \hspace{0.25cm}
+      \NERC{\includegraphics[height=1cm]{NERC}}                 \\
+      \medskip
+      \slshape
+         {C}ommunity \hspace{1.5em} {O}cean \hspace{1.5em} {M}odel
+   \end{center}
 \end{titlepage}
 \restoregeometry
+%\restoregeometry

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/global/highlighting.tex

-                      r14113
+                      r14328
+%% =================================================================================================
 %% Syntax highlighting configuration
+%% ==============================================================================
+\usepackage[outputdir=../build, chapter, newfloat]{minted}
+%% =================================================================================================
 %% Global highlighting style
 \definecolor{bg}{HTML}{f8f8f8}
+\definecolor{bg}{HTML}{f8f8f8} %% ?
 \usemintedstyle{emacs}
+\setminted{bgcolor=bg, fontsize=\scriptsize, breaklines}
+\setminted[xml]{style=borland} %% Specific per language
+\setminted{bgcolor=bg,fontsize=\scriptsize,breaklines}
+\setminted[xml]{style=borland} %% Specific style for XML
+%% Inline
+\newmintinline[forcode]{fortran}{bgcolor=,fontsize=auto} %% \forcode{...}
+\newmintinline[xmlcode]{xml}{    bgcolor=,fontsize=auto} %% \xmlcode{...}
+\newmintinline[snippet]{console}{bgcolor=,fontsize=auto} %% \snippet{...}
 %% Oneliner
 \newmint[forline]{fortran}{}   % \forline|...|
 \newmint[xmlline]{xml}{}       % \xmlline|...|
 \newmint[cmd]{console}{}       % \cmd|...|
+\newmint[forline]{fortran}{} %% \forline|...|
+\newmint[xmlline]{xml    }{} %% \xmlline|...|
+\newmint[cmd]{    console}{} %% \cmd|...|
 %% Multi-lines
 \newminted[forlines]{fortran}{}   % \begin{forlines}
 \newminted[xmllines]{xml}{}       % \begin{xmllines}
 \newminted[cmds]{console}{}       % \begin{cmds}
 \newminted[clines]{c}{}           % \begin{clines}
+\newminted[forlines]{fortran}{} %% \begin{forlines}
+\newminted[xmllines]{xml    }{} %% \begin{xmllines}
+\newminted[cmds]{    console}{} %% \begin{cmds}
+\newminted[clines]{  c      }{} %% \begin{clines}
 %% File
+%% File (namelist or module)
 \newmintedfile[forfile]{fortran}{}
-%% Inline
-\newmintinline[forcode]{fortran}{bgcolor=, fontsize=auto}   % \forcode{...}
-\newmintinline[xmlcode]{xml}{    bgcolor=, fontsize=auto}   % \xmlcode{...}
-\newmintinline[snippet]{console}{bgcolor=, fontsize=auto}   % \snippet{...}
 %% Namelists inclusion
 \newcommand{\nlst}[1]{\forfile{../../../namelists/#1}}
+%\newcommand{\nlst}[1]{
+%   \begin{listing}
+%      \newmintedfile{fortran}{../../../namelists/#1}
+%      \caption{\forcode{&#1}}
+%      \label{lst:#1}
+%   \end{listing}
+%}

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/global/info_page.tex

-                      r14113
+                      r14328
+%% =================================================================================================
+%% Back cover
+%% =================================================================================================
+\thispagestyle{plain}
+%% Disclaimer
+%% =================================================================================================
-%% ================================================================
-%% Disclaimer
-%% ================================================================
 \subsubsection*{Disclaimer}
 Like all components of the modelling framework,
 the \engine\ core engine is developed under the \href{http://www.cecill.info}{CECILL license},
+the \eng\ core engine is developed under the \href{http://www.cecill.info}{CECILL license},
 which is a French adaptation of the GNU GPL (\textbf{G}eneral \textbf{P}ublic \textbf{L}icense).
 Anyone may use it freely for research purposes, and is encouraged to
 …
 The authors assume no responsibility for problems, errors, or incorrect usage of \NEMO.
-%% ================================================================
 %% External resources
+%% ================================================================
+%% =================================================================================================
 \subsubsection*{Other resources}
 \label{resources}
 Additional information can be found on:
 \begin{itemize}
+\item \faWordpress\ the \href{http://www.nemo-ocean.eu}{website} of the project detailing several
+  associated applications and an exhaustive users bibliography
+\item \faCodeFork\ the \href{http://forge.ipsl.jussieu.fr/nemo}{development platform} of
+  the model with the code repository for the shared reference and some main resources
+  (wiki, ticket system, forums, \ldots) \\
+  \faGithub\ the \href{http://github.com/NEMO-ocean/NEMO-examples}
+  {repository of the demonstration cases} for research or training
+\item \faCloudDownload\ the \href{http://zenodo.org/communities/nemo-ocean}{online archive}
+  delivering the publications issued by the consortium (manuals, reports, datasets, \ldots)
+\item \faEnvelope\ two mailing lists:
+  the \href{http://listes.ipsl.fr/sympa/info/nemo-newsletter}{newsletter} for
+  top-down communications from the project
+  (announcements, calls, job opportunities, \ldots)
+  and the \href{http://listes.ipsl.fr/sympa/info/nemo-forge}{forge updates}
+  (commits, tickets and forums)
+   \item \faWordpress\ the \href{http://www.nemo-ocean.eu}{website} of the project detailing
+      several associated applications and an exhaustive users bibliography
+   \item \faCodeFork\ the \href{http://forge.ipsl.jussieu.fr/nemo}{development platform} of
+      the model with the code repository for the shared reference and some main resources
+      (wiki, ticket system, forums, \ldots) \\
+      \faGithub\ the \href{http://github.com/NEMO-ocean/NEMO-examples}
+      {repository of the demonstration cases} for research or training
+   \item \faCloudDownload\ the \href{http://zenodo.org/communities/nemo-ocean}{online archive}
+      delivering the publications issued by the consortium (manuals, reports, datasets, \ldots)
+   \item \faEnvelope\ two mailing lists:
+      the \href{http://listes.ipsl.fr/sympa/info/nemo-newsletter}{newsletter} for
+      top-down communications from the project (announcements, calls, job opportunities, \ldots)
+      and the \href{http://listes.ipsl.fr/sympa/info/nemo-forge}{forge updates}
+      (commits, tickets and forums)
 \end{itemize}
-%% ================================================================
 %% Citation
+%% ================================================================
+%% =================================================================================================
 \subsubsection*{Citation}
 …
 \begin{sloppypar}
   ``{\bfseries \heading}\ifdef{\subheading}{ -- \subheading}{}'',
   {\em Scientific Notes of Climate Modelling Center}, \textbf{\ipslnum} --- ISSN 1288-1619,
   Institut Pierre-Simon Laplace (IPSL),
   \href{https://doi.org/10.5281/zenodo.\zid}{doi:10.5281/zenodo.\zid}
+   ``{\bfseries \hdg}\ifdef{\shdg}{ -- \shdg}{}'',
+   {\em Scientific Notes of Climate Modelling Center}, \textbf{\ipsl} --- ISSN 1288-1619,
+   Institut Pierre-Simon Laplace (IPSL),
+   \href{https://doi.org/10.5281/zenodo.\zid}{doi:10.5281/zenodo.\zid}
 \end{sloppypar}
 \begin{figure}[b]
+  \begin{minipage}[c]{0.7\textwidth}
+    \small
+    \ttfamily{
+      Scientific Notes of Climate Modelling Center \\
+      ISSN 1288-1619                               \\
+      Institut Pierre-Simon Laplace (IPSL)
+    }
+  \end{minipage}
+  \hfill
+  \begin{minipage}[c]{0.25\textwidth}
+    \href{http://www.cmc.ipsl.fr}{\includegraphics[width=\textwidth]{logos/IPSL_master}}
+  \end{minipage}
+   \begin{minipage}[c]{0.7\textwidth}
+      \small
+      \ttfamily{
+         Scientific Notes of Climate Modelling Center \\
+         ISSN 1288-1619                               \\
+         Institut Pierre-Simon Laplace (IPSL)
+      }
+   \end{minipage}
+   \hfill %% Don't insert void line between `minipage` envs
+   \begin{minipage}[c]{0.25\textwidth}
+      \href{http://www.cmc.ipsl.fr}{\includegraphics[width=\textwidth]{IPSL_master}}
+   \end{minipage}
 \end{figure}

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/global/latexmk.pl

-                      r14113
+                      r14328
+## Defaults
+#$silent   = 1;
+$pdf_mode = 5;
+## Defaults
+$do_cd    = 1;   ## Change to the directory of the main source file
+$silent   = 1;   ## Less verbosity
+## Using relative paths
+$ENV{'openout_any'} = 'a'       ;
+$do_cd              = 1         ;
+$out_dir            = '../build';
+## Use of 'build' relative directory
+$ENV{'openout_any'}='a';
+$out_dir = '../build';
+## Global option
+set_tex_cmds( '-shell-escape' );
+$makeindex = "makeindex %O -s ../../global/index -o $out_dir/%D $out_dir/%S";
+## Custom cmds
+set_tex_cmds('-shell-escape -interaction=batchmode');
+#set_tex_cmds('-shell-escape');
+$makeindex = 'makeindex -s %R.ist %O -o %D %S';

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/global/new_cmds.tex

-                      r14113
+                      r14328
+%% Global custom commands: \newcommand{<name>}[<args>][<first argument value>]{<code>}
+%% ==============================================================================
+%% =================================================================================================
+%% Global custom commands
+%% =================================================================================================
+%% Same slanted font for NEMO and its core engines
+\newcommand{\NEMO  }{\textsl{NEMO}}
+\newcommand{\OPA   }{\textsl{OPA}}
+\newcommand{\SIcube}{\textsl{SI$^3$}}
+\newcommand{\TOP   }{\textsl{TOP}}
+\newcommand{\PISCES}{\textsl{PISCES}}
+%% \newcommand{<name>}[<args>][<first argument value>]{<code>}
+%% Same font for NEMO and its core engines
+\newcommand{\NEMO   }{\textsl{NEMO}}
+\newcommand{\OPA    }{\textsl{OPA}}
+\newcommand{\SIcube }{\textsl{SI$^3$}}
+\newcommand{\TOP    }{\textsl{TOP}}
+\newcommand{\PISCES }{\textsl{PISCES}}
 \newcommand{\NEMOVAR}{\textsl{NEMOVAR}}
+%% Links for external components
+\newcommand{\AGRIF}{\href{http://agrif.imag.fr}{AGRIF}}
+%% URL links for consortium institutes and external components
+\newcommand{\CMCC }{\href{http://www.cmcc.it}          }
+\newcommand{\CNRS }{\href{http://www.cnrs.fr}          }
+\newcommand{\MOI  }{\href{http://www.mercator-ocean.fr}}
+\newcommand{\UKMO }{\href{http://www.metoffice.gov.uk} }
+\newcommand{\NERC }{\href{http://nerc.ukri.org}        }
+\newcommand{\AGRIF}{\href{http://agrif.imag.fr                  }{AGRIF}}
+\newcommand{\BFM  }{\href{http://bfm-community.eu               }{BFM}}
 \newcommand{\CICE }{\href{http://github.com/CICE-Consortium/CICE}{CICE}}
 \newcommand{\OASIS}{\href{http://portal.enes.org/oasis}{OASIS}}
 \newcommand{\XIOS }{\href{http://forge.ipsl.jussieu.fr/ioserver}{XIOS}}
+\newcommand{\OASIS}{\href{http://portal.enes.org/oasis          }{OASIS}}
+\newcommand{\XIOS }{\href{http://forge.ipsl.jussieu.fr/ioserver }{XIOS}}
 %% Fortran in small capitals
 …
 %% Common aliases
 \renewcommand{\deg}[1][]{\ensuremath{^{\circ}#1}}
+\newcommand{\eg    }{\ensuremath{e.g.}}
+\newcommand{\ie    }{\ensuremath{i.e.}}
 \newcommand{\zstar }{\ensuremath{z^\star}}
 \newcommand{\sstar }{\ensuremath{s^\star}}
 \newcommand{\ztilde}{\ensuremath{\tilde z}}
 \newcommand{\stilde}{\ensuremath{\tilde s}}
-\newcommand{\ie}{\ensuremath{i.e.}}
-\newcommand{\eg}{\ensuremath{e.g.}}
-%% Inline maths
-\newcommand{\fractext}[2]{\textstyle \frac{#1}{#2}}
-\newcommand{\rdt}{\Delta t}
 %% Gurvan's comments
 \newcommand{\cmtgm}[1]{}
+%% Maths
+%% Maths: reduce equation
+\newcommand{\fractext}[2]{\textstyle\frac{#1}{#2}}
 \newcommand{\lt}{\left}
+\newcommand{\pd}[2][]{\ensuremath{\frac{\partial #1}{\partial #2}}}
+\newcommand{\rdt}{\Delta t}
 \newcommand{\rt}{\right}
+\newcommand{\vect}[1]{\ensuremath{ \mathbf{#1} }}
+\newcommand{\pd}[2][]{\ensuremath{\frac{\partial #1}{\partial #2}}}
+%% Convert chapter/section headings to lowercase
+\renewcommand{\chaptermark}[1]{\markboth{#1}{}}
+\renewcommand{\sectionmark}[1]{\markright{#1}{}}
+\newcommand{\vect}[1][]{\ensuremath{\mathbf{#1}}}
 %% Retrieve month name
 \renewcommand{\today}{
+  \ifcase \month\or January\or February\or March\or
+                    April\or   May\or      June\or
+                    July\or    August\or   September\or
+                    October\or November\or December
+  \ifcase \month\or   January\or February\or    March\or    April\or
+                          May\or     June\or     July\or   August\or
+                    September\or  October\or November\or December
   \fi, \number \year
+}
+%% Link to orcid profile
+\newcommand{\orcid}[1]{\href{http://orcid.org/#1}{\textcolor{orcidcolor}\aiOrcidSquare}}
+%% Workaround for \listoffigures issue
+\DeclareRobustCommand{\triad}[6]{
+  \ensuremath{{}_{#2}^{#3}{\mathbb{#4}_{#1}}_{#5}^{\,#6}}
+}
+%% Workaround for \listoffigures
+\DeclareRobustCommand{\triad}[6][]{\ensuremath{ {}_{#2}^{#3} { \mathbb{#4}_{#1} }_{#5}^{\,#6} }}
+%% New command for ToC
+\newcommand{\chaptertoc}[1][Table of contents]{%
+  \thispagestyle{empty}
+  \etocsettocstyle{\addsec*{#1}}{}%
+  \localtableofcontents%
+%% New command for ToC (?)
+\newcommand{\chaptertoc}[1][Table of contents]{
+  \etocsettocstyle{\addsec*{#1}}{}
+  \localtableofcontents
   \vfill
+}
+%% ORCID links
+\newcommand{\orcid}[1]{\href{http://orcid.org/#1}{\textcolor{orcidclr}\aiOrcidSquare}}

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/global/packages.tex

-                      r14113
+                      r14328
+%% =================================================================================================
+%% Packages
+%% =================================================================================================
 %% LaTeX packages in use
+%% ==============================================================================
+%% Document class
+\usepackage[footsepline=0.25pt,headsepline=0.25pt]{scrlayer-scrpage} %% KOMA-script
+%% 'hyperref' pkg is loaded at the end of the preamble for higher compatibility
+%% KOMA-script
+\usepackage[footsepline=0.25pt, headsepline=0.25pt]{scrlayer-scrpage}
+%% customization (layout, header/footer styles & contents, background)
+\usepackage{draftwatermark}
+\usepackage[margin = 2cm]{geometry}
+\usepackage[pages = some]{background}   %% 'some' for title page
+\usepackage[Bjornstrup]{fncychap}
+%% Customisation (cover page, chapter headings and mark of draft copy)
+\usepackage[margin=2cm]{geometry} %% Why 2cm margin? Load geometry before background!
+\usepackage[pages=some]{background} %% 'some' for title page
+\usepackage[scale=15,color=pink]{draftwatermark}
+\usepackage[Bjornstrup]{fncychap} %% Chapter style
 %% Fonts
 \usepackage{fontspec}
+%% Issue with fontawesome pkg: path to FontAwesome.otf has to be hard-coded
+\defaultfontfeatures{
+    Path = /home/nicolas/.local/texlive/2020/texmf-dist/fonts/opentype/public/fontawesome/
+}
+\usepackage{academicons, fontawesome, newtxtext}
+%% Issue with path to 'FontAwesome.otf'
+\defaultfontfeatures{Path=/usr/local/texlive/2020/texmf-dist/fonts/opentype/public/fontawesome/}
+\usepackage{academicons,fontawesome}
 %% Formatting
 \usepackage[inline]{enumitem}
 \usepackage{etoc, tabularx, xcolor}
+\usepackage{etoc,tabularx,xcolor}
 %% Graphics
+\usepackage{caption, graphicx, grffile}
+\usepackage{caption}
+\graphicspath{{../../../badges/}{../figures/}{../../../logos/}}
 %% Labels
+\usepackage{lastpage, natbib}
+\usepackage{lastpage,natbib}
+%\usepackage{natbib,pageslts}
 %% Mathematics
 \usepackage{amsmath, amssymb, mathtools}
+%% Mathematics: 'amsmath' is loaded by 'mathtools'
+\usepackage{mathtools,amssymb}
 %% Versatility
 \usepackage{subfiles}
+%% Configuration
+\graphicspath{ {../../../} {../figures/} }
+%% Source code listings
+\usepackage[cachedir=cache,outputdir=../build,chapter,newfloat]{minted}
+%% chapter? newfloat?
+%% Indexing and cross-referencing, loaded at the end for higher compatibility
+\usepackage{hyperref,imakeidx}
 %% Missing utmr8a font
 \usepackage{times}
-\usepackage{hyperref}   %% links

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/global/styles.tex

-                      r14113
+                      r14328
+%% =================================================================================================
 %% Styles
 %% ==============================================================================
+%% =================================================================================================
 %% Colors
+\setmanualcolor
+\colorlet{manualcolorshaded}{manualcolor!60}
+\definecolor{orcidcolor}{HTML}{A6CE39}
+\definecolor{orcidclr}{HTML}{A6CE39}
+\definecolor{manclr}{cmyk}{\clr} %% \clr defined for each manual from local settings.tex
+\colorlet{manclrshd}{manclr!60} %% Derived color for chapter heading, see below
+%% Cover page
+\backgroundsetup{
+   firstpage=true,scale  =1,
+   angle    =0   ,opacity=1,
+   contents ={
+      \begin{tikzpicture}[remember picture,overlay]
+         \path[fill=manclr] (-0.5\paperwidth,7) rectangle (0.5\paperwidth,10);
+      \end{tikzpicture}
+    }
+}
 %% Page layout
+\pagestyle{scrheadings}
+%\pagestyle{scrheadings}
+%\renewcommand{\chapterpagestyle}{empty}
+\renewcommand{\chaptermark}[1]{ \markboth{#1}{}} %% Convert mark to lowercase
+\renewcommand{\sectionmark}[1]{\markright{#1}{}} %%    "     ""  ""     "
+\ohead{} %% Clear default headings
+\lohead{Chap. \thechapter\  \leftmark}
+\rehead{Sect. \thesection\ \rightmark}
+\ifoot{Page \thepage\ of \pageref*{LastPage}}
+%\ifoot[\pagemark]{Page \thepage\ of \lastpageref*{pagesLTS.arabic}}
+\ofoot{\eng\ Reference Manual}
 \addtokomafont{pagehead}{  \sffamily              }
 \addtokomafont{pagefoot}{  \sffamily \footnotesize}
 \addtokomafont{pagenumber}{\sffamily \slshape     }
+\addtokomafont{chapter}{\color{white}}
+\ohead{} \ofoot{}   %% Clear defaults
+%\addtokomafont{chapter}{\color{white}}
+%% Caption
+\captionsetup{font = footnotesize, justification = justified}
+%% Cross-referencing
+\hypersetup{
+   pdftitle=\hdg                                          ,
+   pdfauthor=Gurvan Madec and NEMO System Team            ,
+   pdfsubject=Reference manual of NEMO modelling framework,
+   pdfkeywords=ocean circulation modelling                ,
+   colorlinks                                             ,
+   allcolors=manclr
+}
+\renewcommand{\appendixautorefname}{appendix}          %% `\autoref` uncapitalization
+\renewcommand{\equationautorefname}{equation}          %%     ""            ""
+\renewcommand{\figureautorefname  }{figure}            %%     ""            ""
+\renewcommand{\listingname        }{namelist}          %%     ""            ""
+\renewcommand{\listlistingname    }{List of Namelists} %%     ""            ""
+\renewcommand{\tableautorefname   }{table}             %%     ""            ""
+%% Footnote
+%% Misc. (caption and footnote)
+\captionsetup{font=footnotesize,justification=justified}
 \renewcommand{\thefootnote}{\fnsymbol{footnote}}
 …
 \renewcommand{\bibpostamble}{  \end{multicols}   }
 %% Catcodes
+%% Catcodes (between `\makeatletter` and `\makeatother`)
 \makeatletter
+%% Prevent error with tikz and namelist inclusion
+\global\let\tikz@ensure@dollar@catcode=\relax
+%\global\let\tikz@ensure@dollar@catcode=\relax %% Prevent error with tikz and namelist inclusion
+%% First page
+\backgroundsetup{
+  firstpage = true,
+  scale = 1, angle = 0, opacity = 1,
+  contents = {
+    \begin{tikzpicture}[remember picture, overlay]
+      \path [fill = manualcolor] (-0.5\paperwidth, 7) rectangle (0.5\paperwidth, 10);
+    \end{tikzpicture}
+  }
+%% Apply manual color for chap. headings (original snippets from fncychap.sty)
+%% !!! Let trailing percent sign to avoid space insertion
+\renewcommand{\DOCH}{% %% Upper box with chapter number
+   \settowidth{\py}{\CNoV\thechapter}%
+   \addtolength{\py}{-10pt}% %% Amount of space by which the number is shifted right
+   \fboxsep=0pt%
+   \colorbox{manclr}{\rule{0pt}{40pt}\parbox[b]{\textwidth}{\hfill}}%
+   \kern-\py\raise20pt%
+   \hbox{\color{manclrshd}\CNoV\thechapter}\\
+}
+\renewcommand{\DOTI}[1]{% %% Lower box with chapter title
+   \nointerlineskip\raggedright%
+   \fboxsep=\myhi%
+   \vskip-1ex%
+   \colorbox{manclr}{\parbox[t]{\mylen}{\color{white}\CTV\FmTi{#1}}}\par\nobreak%
+   \vskip 40\p@%
+}
+\renewcommand{\DOTIS}[1]{% %% Box for unumbered chapter
+   \fboxsep=0pt%
+   \colorbox{manclr}{\rule{0pt}{40pt}\parbox[b]{\textwidth}{\hfill}}\\
+   \nointerlineskip\raggedright%
+   \fboxsep=\myhi%
+   \vskip-1ex% %% Remove white 1pt line
+   \colorbox{manclr}{\parbox[t]{\mylen}{\color{white}\CTV\FmTi{#1}}}\par\nobreak%
+   \vskip 40\p@%
+}
+%% Apply engine color for chapter headings: tweaking snippets from fncychap.sty
+\renewcommand{\DOCH}{%
+  \settowidth{\py}{\CNoV\thechapter}
+  \addtolength{\py}{-10pt}      % Amount of space by which the
+%                                  % number is shifted right
+  \fboxsep=0pt%
+  \colorbox{manualcolor}{\rule{0pt}{40pt}\parbox[b]{\textwidth}{\hfill}}%
+  \kern-\py\raise20pt%
+  \hbox{\color{manualcolorshaded}\CNoV\thechapter}\\%
+}
+\renewcommand{\DOTI}[1]{%
+  \nointerlineskip\raggedright%
+  \fboxsep=\myhi%
+  \vskip-1ex%
+  \colorbox{manualcolor}{\parbox[t]{\mylen}{\color{white}\CTV\FmTi{#1}}}\par\nobreak%
+  \vskip 40\p@%
+}
+\renewcommand{\DOTIS}[1]{%
+  \fboxsep=0pt
+  \colorbox{manualcolor}{\rule{0pt}{40pt}\parbox[b]{\textwidth}{\hfill}}\\%
+  \nointerlineskip\raggedright%
+  \fboxsep=\myhi%
+  \vskip-1ex% Remove white 1pt line
+  \colorbox{manualcolor}{\parbox[t]{\mylen}{\color{white}\CTV\FmTi{#1}}}\par\nobreak%
+  \vskip 40\p@%
+}
+%% Temporary fix
+\def\set@curr@file#1{%
+  \begingroup
+    \escapechar\m@ne
+    \xdef\@curr@file{\expandafter\string\csname #1\endcsname}%
+  \endgroup
+}
+\def\quote@name#1{"\quote@@name#1\@gobble""}
+\def\quote@@name#1"{#1\quote@@name}
+\def\unquote@name#1{\quote@@name#1\@gobble"}
+%% Temporary fix?
+%\def\set@curr@file#1{
+%  \begingroup
+%    \escapechar\m@ne
+%    \xdef\@curr@file{\expandafter\string\csname #1\endcsname}
+%  \endgroup
+%}
+%\def\quote@name#1{"\quote@@name#1\@gobble""}
+%\def\quote@@name#1"{#1\quote@@name}
+%\def\unquote@name#1{\quote@@name#1\@gobble"}
 \makeatother

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/latex/global/todonotes.tex

-                      r11187
+                      r14328
+\usepackage[]{todonotes}
+%% =================================================================================================
+%% Notes
+%% =================================================================================================
+\usepackage{todonotes}
 \newcounter{ubcomment}
+\newcommand{\ubcomment}[2][]{%
+\refstepcounter{ubcomment}%
+{%
+\todo[linecolor=black,backgroundcolor={green!40!},size=\footnotesize]{%
+\textbf{Fixme: UB [\uppercase{#1}\theubcomment]:}~#2}%
+}}
+\newcommand{\ubcommentinline}[2][]{%
+\refstepcounter{ubcomment}%
+{%
+\todo[linecolor=black,inline,backgroundcolor={green!40!},size=\footnotesize]{%
+\textbf{Fixme: UB [\uppercase{#1}\theubcomment]:}~#2}%
+\newcommand{\ubcomment         }[2][]{
+\refstepcounter{ubcomment}
+{
+\todo[linecolor=black,       backgroundcolor={green!40!},size=\footnotesize ]{
+\textbf{Fixme: UB [\uppercase{#1}\theubcomment]:}~#2}
 }}
+\newcommand{\ubcommentmultiline}[2]{%
+\refstepcounter{ubcomment}%
+{%
+\todo[linecolor=black,inline,caption={\textbf{{Fixme: UB}
+    [\theubcomment] #1}} ,backgroundcolor={green!40!},size=\footnotesize]{%
+\textbf{Fixme: UB [\theubcomment]:}~#2}%
+\newcommand{\ubcommentinline   }[2][]{
+\refstepcounter{ubcomment}
+{
+\todo[linecolor=black,inline,backgroundcolor={green!40!},size=\footnotesize ]{
+\textbf{Fixme: UB [\uppercase{#1}\theubcomment]:}~#2}
+}}
+\newcommand{\ubcommentmultiline}[2]{
+\refstepcounter{ubcomment}
+{
+\todo[linecolor=black,inline,backgroundcolor={green!40!},size=\footnotesize,
+      caption={\textbf{{Fixme: UB} [\theubcomment] #1}}                     ]{
+\textbf{Fixme: UB [              \theubcomment]:}~#2}
 }}

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/manual_build.sh

-                      r11594
+                      r14328
 ## LaTeX installation, find latexmk should be enough
 [ -z $( which latexmk ) ] && { echo 'latexmk not installed => QUIT'; exit 2; }
+[ -z "$( which latexmk )" ] && { echo 'latexmk not installed => QUIT'; exit 2; }
 ## Pygments package for syntax highlighting of source code (namelists & snippets)
 [ -n "$( ./tools/check_pkg.py pygments )" ] && { echo 'Python pygments is missing => QUIT'; exit 2; }
-## Retrieve figures if not already there
-#if [ ! -d latex/figures ]; then
-#    printf "Downloading of shared figures and logos\n\n"
-#    svn co http://forge.ipsl.jussieu.fr/nemo/svn/utils/figures latex/figures > /dev/null
-#fi
 ## Loop on the models

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/namelists/namberg

-                      r11703
+                      r14328
    rn_speed_limit          = 0.      ! CFL speed limit for a berg
+   ln_M2016                = .false. ! use Merino et al. (2016) modification (use of 3d ocean data instead of only sea surface data)
+      ln_icb_grd           = .false. ! ground icb when icb bottom level hit oce bottom level (need ln_M2016 to be activated)
    cn_dir      = './'      !  root directory for the calving data location
    !___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/namelists/namrun

r11703	r14328
26	26	! ! = -1 do not do any restart
27	27	nn_stocklist = 0,0,0,0,0,0,0,0,0,0 ! List of timesteps when a restart file is to be written
28		nn_write = 0 ! used only if key_~~iomput~~ is not defined: output frequency (modulo referenced to nn_it000)
	28	nn_write = 0 ! used only if key_xios is not defined: output frequency (modulo referenced to nn_it000)
29	29	! ! = 0 force to write output files only at the end of the run
30	30	! ! = -1 do not do any output file

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/tools/check_pkg.py

-                      r11008
+                      r14328
 #!/usr/bin/env python
+#!/usr/bin/env python3
 import sys, importlib
 …
       importlib.import_module(argv)
    except ImportError:
       print("Package %s is missing in Python" % argv)
+      print("Package %s is missing in Python 3" % argv)

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/doc/tools/shr_func.sh

-                      r14113
+                      r14328
 build() {
     printf "\t¤ Generation of the PDF format\n"
     latexmk -r ./latex/global/latexmk.pl -pdfxe ./latex/$1/main/$1_manual \
 #  1> /dev/null
+    printf "\t¤ Generation of the PDF export of the manual\n"
+    latexmk -r ./latex/global/latexmk.pl ./latex/$1/main/$1_manual \
+> /dev/null
     [ -f ./latex/$1/build/$1_manual.pdf ] && mv ./latex/$1/build/$1_manual.pdf .
     echo

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/ABL/ablmod.F90

r14235	r14328
537	537	CALL lbc_lnk_multi( 'ablmod', tq_abl(:,:,:,nt_a,jp_ta), 'T', 1._wp , tq_abl(:,:,:,nt_a,jp_qa), 'T', 1._wp , kfillmode = jpfillnothing ) ! ++++ this should not be needed...
538	538	!
539		#if defined key_~~iomput~~
	539	#if defined key_xios
540	540	! 2D & first ABL level
541	541	IF ( iom_use("pblh" ) ) CALL iom_put ( "pblh", pblh(:,: ) )

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/ABL/sbcabl.F90

-                      r14235
+                      r14328
    USE sbc_ice, ONLY : wndm_ice, utau_ice, vtau_ice
 #endif
 #if ! defined key_iomput
+#if ! defined key_xios
    USE diawri    , ONLY : dia_wri_alloc_abl
 #endif
 …
       CALL iom_close( inum )
 #if ! defined key_iomput
+#if ! defined key_xios
       IF( dia_wri_alloc_abl()  /= 0 ) CALL ctl_stop( 'STOP', 'abl_init : unable to allocate arrays' )
 #endif

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/ICE/icerst.F90

r14072	r14328
88	88	CALL iom_open( TRIM(clpath)//TRIM(clname), numriw, ldwrt = .TRUE., kdlev = jpl, cdcomp = 'ICE' )
89	89	ELSE
90		#if defined key_~~iomput~~
	90	#if defined key_xios
91	91	cw_icerst_cxt = "rstwi_"//TRIM(ADJUSTL(clkt))
92	92	IF( TRIM(Agrif_CFixed()) == '0' ) THEN

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/ICE/icethd_pnd.F90

-                      r14072
+                      r14328
       !!-------------------------------------------------------------------
       REAL(wp), PARAMETER :: &   ! shared parameters for topographic melt ponds
          zTd     = 0.15_wp       , & ! temperature difference for freeze-up (C)
+         zTd     = 273._wp       , & ! temperature difference for freeze-up (K)
          zvp_min = 1.e-4_wp          ! minimum pond volume (m)
 …
          zv_mlt          ! total amount of meltwater produced
+      REAL(wp), DIMENSION(jpi,jpj) ::   zvolp, &     !! total melt pond water available before redistribution and drainage
+                                        zvolp_res    !! remaining melt pond water available after drainage
+      REAL(wp), DIMENSION(jpi,jpj) ::   zvolp_ini , &   !! total melt pond water available before redistribution and drainage
+                                        zvolp     , &   !! total melt pond water volume
+                                        zvolp_res       !! remaining melt pond water available after drainage
       REAL(wp), DIMENSION(jpi,jpj,jpl) ::   z1_a_i
 …
       END DO ! ji
+      zvolp_ini(:,:) = zvolp(:,:)
       !--------------------------------------------------------------
       ! Redistribute and drain water from ponds
 …
          DO_2D( 1, 1, 1, 1 )
             IF ( at_i(ji,jj) > 0.01 .AND. hm_i(ji,jj) > rn_himin .AND. vt_ip(ji,jj) > zvp_min * at_i(ji,jj) ) THEN
+            IF ( at_i(ji,jj) > 0.01 .AND. hm_i(ji,jj) > rn_himin .AND. zvolp_ini(ji,jj) > zvp_min * at_i(ji,jj) ) THEN
                !--------------------------
 …
                         ! differential growth of base of surface floating ice layer
                         zdTice = MAX( - t_su(ji,jj,jl) - zTd , 0._wp ) ! > 0
+                        zdTice = MAX( - ( t_su(ji,jj,jl) - zTd ) , 0._wp ) ! > 0
                         zomega = rcnd_i * zdTice / zrhoi_L
                         zdHui  = SQRT( 2._wp * zomega * rDt_ice + ( v_il(ji,jj,jl) / a_i(ji,jj,jl) )**2 ) &

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/C1D/step_c1d.F90

r14227	r14328
142	142	IF( lrst_oce ) CALL rst_write( kstp, Nbb, Nnn ) ! write output ocean restart file
143	143	!
144		#if defined key_~~iomput~~
	144	#if defined key_xios
145	145	IF( kstp == nitend .OR. nstop > 0 ) CALL xios_context_finalize() ! needed for XIOS
146	146	!

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/CRS/crsdom.F90

-                      r13286
+                      r14328
            ENDDO
         ENDDO
         Nje0_crs  = nje0all_crs(nproc + 1)
         jpj_crs   = jpjall_crs (nproc + 1)
         Njs0_crs  = njs0all_crs(nproc + 1)
         njmpp_crs = njmppt_crs (nproc + 1)
+        Nje0_crs  = nje0all_crs(narea)
+        jpj_crs   = jpjall_crs (narea)
+        Njs0_crs  = njs0all_crs(narea)
+        njmpp_crs = njmppt_crs (narea)
         ! Calcul suivant un decoupage en i
 …
          ENDDO
          Nie0_crs  = nie0all_crs(nproc + 1)
          jpi_crs   = jpiall_crs (nproc + 1)
          Nis0_crs  = nis0all_crs(nproc + 1)
          nimpp_crs = nimppt_crs (nproc + 1)
+         Nie0_crs  = nie0all_crs(narea)
+         jpi_crs   = jpiall_crs (narea)
+         Nis0_crs  = nis0all_crs(narea)
+         nimpp_crs = nimppt_crs (narea)
          DO ji = 1, jpi_crs
 …
          WRITE(numout,*) '~~~~~~~   coarse domain local  j-dimension              jpj = ', jpj
          WRITE(numout,*)
          WRITE(numout,*) ' nproc  = '     , nproc
+         WRITE(numout,*) ' narea  = '     , narea
          WRITE(numout,*) ' jpi    = '     , jpi
          WRITE(numout,*) ' jpj    = '     , jpj

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/DIA/diadetide.F90

-                      r12489
+                      r14328
    USE phycst         , ONLY :   rpi
    USE tide_mod
 #if defined key_iomput
+#if defined key_xios
    USE xios
 #endif
 …
       lk_diadetide = .FALSE.
 #if defined key_iomput
+#if defined key_xios
       ! Enquire detiding activation state (test for presence of detiding-related
       ! weights field and output file group)

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/DIA/diamlr.F90

-                      r13237
+                      r14328
    USE iom            , ONLY :   iom_put, iom_use, iom_update_file_name
    USE timing         , ONLY :   timing_start, timing_stop
 #if defined key_iomput
+#if defined key_xios
    USE xios
 #endif
 …
       !!
       !!----------------------------------------------------------------------
 #if defined key_iomput
+#if defined key_xios
       TYPE(xios_fieldgroup)                       ::   slxhdl_fldgrp

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/DIA/diawri.F90

-                      r14179
+                      r14328
    PUBLIC   dia_wri_state
    PUBLIC   dia_wri_alloc           ! Called by nemogcm module
 #if ! defined key_iomput
+#if ! defined key_xios
    PUBLIC   dia_wri_alloc_abl       ! Called by sbcabl  module (if ln_abl = .true.)
 #endif
 …
 CONTAINS
 #if defined key_iomput
+#if defined key_xios
    !!----------------------------------------------------------------------
    !!   'key_iomput'                                        use IOM library
+   !!   'key_xios'                                        use IOM library
    !!----------------------------------------------------------------------
    INTEGER FUNCTION dia_wri_alloc()

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/DOM/dom_oce.F90

-                      r14223
+                      r14328
    !                             !: domain MPP decomposition parameters
    INTEGER             , PUBLIC ::   nimpp, njmpp     !: i- & j-indexes for mpp-subdomain left bottom
+   INTEGER             , PUBLIC ::   nproc            !: number for local processor
+   INTEGER             , PUBLIC ::   narea            !: number for local area
+   INTEGER             , PUBLIC ::   narea            !: number for local area = MPI rank + 1
    INTEGER             , PUBLIC ::   nbondi, nbondj   !: mark of i- and j-direction local boundaries
    INTEGER, ALLOCATABLE, PUBLIC ::   nbondi_bdy(:)    !: mark i-direction local boundaries for BDY open boundaries

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/DOM/domain.F90

-                      r14223
+                      r14328
       !                                 != ssh initialization
+      !
       IF( l_offline .OR. l_SAS ) THEN        !* No ocean dynamics calculation : set to 0
+      IF( l_SAS ) THEN        !* No ocean dynamics calculation : set to 0
          ssh(:,:,:) = 0._wp
 #if defined key_agrif
 …
             WRITE(numout,*) '      frequency of restart file       nn_stock        = ', nn_stock
          ENDIF
 #if ! defined key_iomput
+#if ! defined key_xios
          WRITE(numout,*) '      frequency of output file        nn_write        = ', nn_write
 #endif
 …
          ENDIF
       ENDIF
 #if ! defined key_iomput
+#if ! defined key_xios
       IF( nn_write == -1 )   CALL ctl_warn( 'nn_write = -1 --> no output files will be done' )
       IF ( nn_write == 0 ) THEN

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/FLO/flowri.F90

r13286	r14328
199	199	!----------------------
200	200
201		#if defined key_~~iomput~~
	201	#if defined key_xios
202	202	CALL iom_put( "traj_lon" , zlon )
203	203	CALL iom_put( "traj_lat" , zlat )

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/ICB/icbstp.F90

r14030	r14328
126	126	! !* Gridded diagnostics
127	127	! ! To get these iom_put's and those preceding to actually do something
128		! ! use key_~~iomput~~ in cpp file and create content for XML file
	128	! ! use key_xios in cpp file and create content for XML file
129	129	!
130	130	CALL iom_put( "calving" , berg_grid%calving (:,:) ) ! 'calving mass input'

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/IOM/iom.F90

-                      r14072
+                      r14328
    USE phycst          ! physical constants
    USE dianam          ! build name of file
 #if defined key_iomput
+#if defined key_xios
    USE xios
 # endif
 …
    PUBLIC   !   must be public to be able to access iom_def through iom
 #if defined key_iomput
+#if defined key_xios
    LOGICAL, PUBLIC, PARAMETER ::   lk_iomput = .TRUE.        !: iom_put flag
 #else
 …
    PRIVATE iom_p1d_sp, iom_p2d_sp, iom_p3d_sp, iom_p4d_sp
    PRIVATE iom_p1d_dp, iom_p2d_dp, iom_p3d_dp, iom_p4d_dp
 #if defined key_iomput
+#if defined key_xios
    PRIVATE iom_set_domain_attr, iom_set_axis_attr, iom_set_field_attr, iom_set_file_attr, iom_get_file_attr, iom_set_grid_attr
    PRIVATE set_grid, set_grid_bounds, set_scalar, set_xmlatt, set_mooring, iom_sdate
 …
       INTEGER         , OPTIONAL, INTENT(in)  :: kdid
       LOGICAL         , OPTIONAL, INTENT(in)  :: ld_closedef
 #if defined key_iomput
+#if defined key_xios
+      !
       TYPE(xios_duration) :: dtime    = xios_duration(0, 0, 0, 0, 0, 0)
 …
       !!----------------------------------------------------------------------
       CHARACTER(len=*), OPTIONAL, INTENT(IN) :: cdname
 #if defined key_iomput
+#if defined key_xios
       LOGICAL :: llrstw
 …
       INTEGER, INTENT(IN) :: idnum
 #if defined key_iomput
+#if defined key_xios
       INTEGER                                    :: ndims, nvars, natts, unlimitedDimId, dimlen, xtype,mdims
       TYPE(xios_field)                           :: field_hdl
 …
       !!---------------------------------------------------------------------
       CHARACTER(len=*) :: cdrst_file
 #if defined key_iomput
+#if defined key_xios
       TYPE(xios_file) :: file_hdl
       TYPE(xios_filegroup) :: filegroup_hdl
 …
       REAL(dp), OPTIONAL, INTENT(IN), DIMENSION(:, :, :) :: rd3
       REAL(sp), OPTIONAL, INTENT(IN), DIMENSION(:, :, :) :: rs3
 #if defined key_iomput
+#if defined key_xios
       TYPE(xios_field) :: field_hdl
       TYPE(xios_file) :: file_hdl
 …
       LOGICAL, INTENT(IN)               :: ld_rstr
       INTEGER :: ji
 #if defined key_iomput
+#if defined key_xios
       TYPE(xios_domaingroup)            :: domaingroup_hdl
       TYPE(xios_domain)                 :: domain_hdl
 …
       !!---------------------------------------------------------------------
       CHARACTER(len=*), INTENT(in) :: cdname
 #if defined key_iomput
+#if defined key_xios
       TYPE(xios_context) :: nemo_hdl
       IF( TRIM(Agrif_CFixed()) == '0' ) THEN
 …
          ENDIF
       ELSE
 #if defined key_iomput
+#if defined key_xios
          IF(lwp) WRITE(numout,*) 'XIOS RST READ (0D): ', trim(cdvar)
          CALL iom_swap(context)
 …
          ENDIF
       ELSE
 #if defined key_iomput
+#if defined key_xios
          IF(lwp) WRITE(numout,*) 'XIOS RST READ (0D): ', trim(cdvar)
          CALL iom_swap(context)
 …
+         !
       ELSE        ! read using XIOS. Only if KEY_IOMPUT is defined
 #if defined key_iomput
+#if defined key_xios
 !would be good to be able to check which context is active and swap only if current is not restart
          idvar = iom_varid( kiomid, cdvar )
 …
       CHARACTER(LEN=*), INTENT(in ) ::   cdname
       REAL(wp), DIMENSION(jpi,jpj) ::   z2d
 #if defined key_iomput
+#if defined key_xios
       IF( xios_field_is_active( cdname, at_current_timestep_arg = .TRUE. ) ) THEN
          z2d(:,:) = 0._wp
 …
       IF( llx ) THEN
 #ifdef key_iomput
+#ifdef key_xios
          IF( kt == kwrite ) THEN
             IF(lwp) write(numout,*) 'RESTART: write (XIOS 0D) ',trim(cdvar)
 …
       IF( llx ) THEN
 #ifdef key_iomput
+#ifdef key_xios
          IF( kt == kwrite ) THEN
             IF(lwp) write(numout,*) 'RESTART: write (XIOS 0D) ',trim(cdvar)
 …
       IF( llx ) THEN
 #ifdef key_iomput
+#ifdef key_xios
          IF( kt == kwrite ) THEN
             IF(lwp) write(numout,*) 'RESTART: write (XIOS 1D) ',trim(cdvar)
 …
       IF( llx ) THEN
 #ifdef key_iomput
+#ifdef key_xios
          IF( kt == kwrite ) THEN
             IF(lwp) write(numout,*) 'RESTART: write (XIOS 1D) ',trim(cdvar)
 …
       IF( llx ) THEN
 #ifdef key_iomput
+#ifdef key_xios
          IF( kt == kwrite ) THEN
             IF(lwp) write(numout,*) 'RESTART: write (XIOS 2D) ',trim(cdvar)
 …
       IF( llx ) THEN
 #ifdef key_iomput
+#ifdef key_xios
          IF( kt == kwrite ) THEN
             IF(lwp) write(numout,*) 'RESTART: write (XIOS 2D) ',trim(cdvar)
 …
       IF( llx ) THEN
 #ifdef key_iomput
+#ifdef key_xios
          IF( kt == kwrite ) THEN
             IF(lwp) write(numout,*) 'RESTART: write (XIOS 3D) ',trim(cdvar)
 …
       IF( llx ) THEN
 #ifdef key_iomput
+#ifdef key_xios
          IF( kt == kwrite ) THEN
             IF(lwp) write(numout,*) 'RESTART: write (XIOS 3D) ',trim(cdvar)
 …
       REAL(sp)        , INTENT(in) ::   pfield0d
       !!      REAL(wp)        , DIMENSION(jpi,jpj) ::   zz     ! masson
 #if defined key_iomput
+#if defined key_xios
 !!clem      zz(:,:)=pfield0d
 !!clem      CALL xios_send_field(cdname, zz)
 …
       REAL(dp)        , INTENT(in) ::   pfield0d
 !!      REAL(wp)        , DIMENSION(jpi,jpj) ::   zz     ! masson
 #if defined key_iomput
+#if defined key_xios
 !!clem      zz(:,:)=pfield0d
 !!clem      CALL xios_send_field(cdname, zz)
 …
       CHARACTER(LEN=*)          , INTENT(in) ::   cdname
       REAL(sp),     DIMENSION(:), INTENT(in) ::   pfield1d
 #if defined key_iomput
+#if defined key_xios
       CALL xios_send_field( cdname, RESHAPE( (/pfield1d/), (/1,1,SIZE(pfield1d)/) ) )
 #else
 …
       CHARACTER(LEN=*)          , INTENT(in) ::   cdname
       REAL(dp),     DIMENSION(:), INTENT(in) ::   pfield1d
 #if defined key_iomput
+#if defined key_xios
       CALL xios_send_field( cdname, RESHAPE( (/pfield1d/), (/1,1,SIZE(pfield1d)/) ) )
 #else
 …
       REAL(sp),     DIMENSION(:,:), INTENT(in) ::   pfield2d
       IF( iom_use(cdname) ) THEN
 #if defined key_iomput
+#if defined key_xios
          CALL xios_send_field( cdname, pfield2d )
 #else
 …
       REAL(dp),     DIMENSION(:,:), INTENT(in) ::   pfield2d
       IF( iom_use(cdname) ) THEN
 #if defined key_iomput
+#if defined key_xios
          CALL xios_send_field( cdname, pfield2d )
 #else
 …
       REAL(sp),       DIMENSION(:,:,:), INTENT(in) ::   pfield3d
       IF( iom_use(cdname) ) THEN
 #if defined key_iomput
+#if defined key_xios
          CALL xios_send_field( cdname, pfield3d )
 #else
 …
       REAL(dp),       DIMENSION(:,:,:), INTENT(in) ::   pfield3d
       IF( iom_use(cdname) ) THEN
 #if defined key_iomput
+#if defined key_xios
          CALL xios_send_field( cdname, pfield3d )
 #else
 …
       REAL(sp),       DIMENSION(:,:,:,:), INTENT(in) ::   pfield4d
       IF( iom_use(cdname) ) THEN
 #if defined key_iomput
+#if defined key_xios
          CALL xios_send_field (cdname, pfield4d )
 #else
 …
       REAL(dp),       DIMENSION(:,:,:,:), INTENT(in) ::   pfield4d
       IF( iom_use(cdname) ) THEN
 #if defined key_iomput
+#if defined key_xios
          CALL xios_send_field (cdname, pfield4d )
 #else
 …
    END SUBROUTINE iom_p4d_dp
 #if defined key_iomput
+#if defined key_xios
    !!----------------------------------------------------------------------
    !!   'key_iomput'                                         XIOS interface
+   !!   'key_xios'                                         XIOS interface
    !!----------------------------------------------------------------------
 …
 #else
    !!----------------------------------------------------------------------
    !!   NOT 'key_iomput'                               a few dummy routines
+   !!   NOT 'key_xios'                               a few dummy routines
    !!----------------------------------------------------------------------
    SUBROUTINE iom_setkt( kt, cdname )
 …
    LOGICAL FUNCTION iom_use( cdname )
       CHARACTER(LEN=*), INTENT(in) ::   cdname
 #if defined key_iomput
+#if defined key_xios
       iom_use = xios_field_is_active( cdname )
 #else
 …
       REAL(wp)        , INTENT(out) ::   pmiss_val
       REAL(dp)                      ::   ztmp_pmiss_val
 #if defined key_iomput
+#if defined key_xios
       ! get missing value
       CALL xios_get_field_attr( cdname, default_value = ztmp_pmiss_val )

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/IOM/restart.F90

r14179	r14328
119	119	CALL iom_open( TRIM(clpath)//TRIM(clname), numrow, ldwrt = .TRUE. )
120	120	ELSE
121		#if defined key_~~iomput~~
	121	#if defined key_xios
122	122	cw_ocerst_cxt = "rstw_"//TRIM(ADJUSTL(clkt))
123	123	IF( TRIM(Agrif_CFixed()) == '0' ) THEN

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/LBC/lib_mpp.F90

-                      r14229
+                      r14328
 #endif
-   INTEGER, PARAMETER         ::   nprocmax = 2**10   ! maximun dimension (required to be a power of 2)
    INTEGER, PUBLIC ::   mppsize        ! number of process
    INTEGER, PUBLIC ::   mpprank        ! process number  [ 0 - size-1 ]
 …
       !!----------------------------------------------------------------------
 #if ! defined key_mpi_off
       !-$$     WRITE (numout,*) 'mpp_ini_znl ', nproc, ' - ngrp_world     : ', ngrp_world
       !-$$     WRITE (numout,*) 'mpp_ini_znl ', nproc, ' - mpi_comm_world : ', mpi_comm_world
       !-$$     WRITE (numout,*) 'mpp_ini_znl ', nproc, ' - mpi_comm_oce   : ', mpi_comm_oce
+      !-$$     WRITE (numout,*) 'mpp_ini_znl ', mpprank, ' - ngrp_world     : ', ngrp_world
+      !-$$     WRITE (numout,*) 'mpp_ini_znl ', mpprank, ' - mpi_comm_world : ', mpi_comm_world
+      !-$$     WRITE (numout,*) 'mpp_ini_znl ', mpprank, ' - mpi_comm_oce   : ', mpi_comm_oce
+      !
       ALLOCATE( kwork(jpnij), STAT=ierr )
 …
+         !
          CALL MPI_ALLGATHER ( njmpp, 1, mpi_integer, kwork, 1, mpi_integer, mpi_comm_oce, ierr )
          !-$$        WRITE (numout,*) 'mpp_ini_znl ', nproc, ' - kwork pour njmpp : ', kwork
+         !-$$        WRITE (numout,*) 'mpp_ini_znl ', mpprank, ' - kwork pour njmpp : ', kwork
          !-$$        CALL flush(numout)
+         !
 …
             ENDIF
          END DO
          !-$$        WRITE (numout,*) 'mpp_ini_znl ', nproc, ' - ndim_rank_znl : ', ndim_rank_znl
+         !-$$        WRITE (numout,*) 'mpp_ini_znl ', mpprank, ' - ndim_rank_znl : ', ndim_rank_znl
          !-$$        CALL flush(numout)
          ! Allocate the right size to nrank_znl
 …
             ENDIF
          END DO
          !-$$        WRITE (numout,*) 'mpp_ini_znl ', nproc, ' - nrank_znl : ', nrank_znl
+         !-$$        WRITE (numout,*) 'mpp_ini_znl ', mpprank, ' - nrank_znl : ', nrank_znl
          !-$$        CALL flush(numout)
          ! Create the opa group
          CALL MPI_COMM_GROUP(mpi_comm_oce,ngrp_opa,ierr)
          !-$$        WRITE (numout,*) 'mpp_ini_znl ', nproc, ' - ngrp_opa : ', ngrp_opa
+         !-$$        WRITE (numout,*) 'mpp_ini_znl ', mpprank, ' - ngrp_opa : ', ngrp_opa
          !-$$        CALL flush(numout)
          ! Create the znl group from the opa group
          CALL MPI_GROUP_INCL  ( ngrp_opa, ndim_rank_znl, nrank_znl, ngrp_znl, ierr )
          !-$$        WRITE (numout,*) 'mpp_ini_znl ', nproc, ' - ngrp_znl ', ngrp_znl
+         !-$$        WRITE (numout,*) 'mpp_ini_znl ', mpprank, ' - ngrp_znl ', ngrp_znl
          !-$$        CALL flush(numout)
          ! Create the znl communicator from the opa communicator, ie the pool of procs in the same row
          CALL MPI_COMM_CREATE ( mpi_comm_oce, ngrp_znl, ncomm_znl, ierr )
          !-$$        WRITE (numout,*) 'mpp_ini_znl ', nproc, ' - ncomm_znl ', ncomm_znl
+         !-$$        WRITE (numout,*) 'mpp_ini_znl ', mpprank, ' - ncomm_znl ', ncomm_znl
          !-$$        CALL flush(numout)
+         !

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/LBC/mppini.F90

-                      r14229
+                      r14328
       !!                    nbondi    : mark for "east-west local boundary"
       !!                    nbondj    : mark for "north-south local boundary"
-      !!                    nproc     : number for local processor
       !!                    noea      : number for local neighboring processor
       !!                    nowe      : number for local neighboring processor
 …
       ! just to save nono etc for all proc
       ! warning ii*ij (zone) /= nproc (processors)!
+      ! warning ii*ij (zone) /= mpprank (processors)!
       ! ioso = zone number, ii_noso = proc number
       ii_noso(:) = -1
 …
          WRITE(inum,'(6i8,a,3i8,a)') jpnij,jpimax,jpjmax,jpk,jpiglo,jpjglo,&
    &           ' ( local: ',narea,jpi,jpj,' )'
          WRITE(inum,'(a)') 'nproc   jpi  jpj Nis0 Njs0 Nie0 Nje0 nimp njmp nono noso nowe noea nbondi nbondj '
+         WRITE(inum,'(a)') 'narea   jpi  jpj Nis0 Njs0 Nie0 Nje0 nimp njmp nono noso nowe noea nbondi nbondj '
          DO jproc = 1, jpnij
             WRITE(inum,'(13i5,2i7)')   jproc-1,  jpiall(jproc),  jpjall(jproc),   &
+            WRITE(inum,'(13i5,2i7)')     jproc,  jpiall(jproc),  jpjall(jproc),   &
                &                                nis0all(jproc), njs0all(jproc),   &
                &                                nie0all(jproc), nje0all(jproc),   &
 …
       ENDIF
+      !
-      nproc = narea-1
       IF(lwp) THEN
          WRITE(numout,*)
          WRITE(numout,*) '   resulting internal parameters : '
          WRITE(numout,*) '      nproc  = ', nproc
+         WRITE(numout,*) '      narea  = ', narea
          WRITE(numout,*) '      nowe   = ', nowe  , '   noea  =  ', noea
          WRITE(numout,*) '      nono   = ', nono  , '   noso  =  ', noso
 …
       ENDIF
+      !
       CALL flio_dom_set ( jpnij, nproc, idid, iglo, iloc, iabsf, iabsl, ihals, ihale, 'BOX', nidom)
+      CALL flio_dom_set ( jpnij, narea-1, idid, iglo, iloc, iabsf, iabsl, ihals, ihale, 'BOX', nidom)
+      !
    END SUBROUTINE init_ioipsl

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/LDF/ldfslp.F90

-                      r13497
+                      r14328
                &                       + 4.*  zww(ji,jj    ,jk)                       )
          END_2D
-         DO jj = 3, jpj-2                                    ! other rows
-            DO ji = 2, jpim1   ! vector opt.
-               uslp(ji,jj,jk) = z1_16 * (        zwz(ji-1,jj-1,jk) + zwz(ji+1,jj-1,jk)      &
-                  &                       +      zwz(ji-1,jj+1,jk) + zwz(ji+1,jj+1,jk)      &
-                  &                       + 2.*( zwz(ji  ,jj-1,jk) + zwz(ji-1,jj  ,jk)      &
-                  &                       +      zwz(ji+1,jj  ,jk) + zwz(ji  ,jj+1,jk) )    &
-                  &                       + 4.*  zwz(ji  ,jj  ,jk)                       )
-               vslp(ji,jj,jk) = z1_16 * (        zww(ji-1,jj-1,jk) + zww(ji+1,jj-1,jk)      &
-                  &                       +      zww(ji-1,jj+1,jk) + zww(ji+1,jj+1,jk)      &
-                  &                       + 2.*( zww(ji  ,jj-1,jk) + zww(ji-1,jj  ,jk)      &
-                  &                       +      zww(ji+1,jj  ,jk) + zww(ji  ,jj+1,jk) )    &
-                  &                       + 4.*  zww(ji,jj    ,jk)                       )
-            END DO
-         END DO
          !                                 !* decrease along coastal boundaries
          DO_2D( 0, 0, 0, 0 )
 …
                  &               + 4.*  zww(ji  ,jj  ,jk)                         ) * zcofw
          END_2D
-         DO jj = 3, jpj-2                               ! other rows
-            DO ji = 2, jpim1   ! vector opt.
-               zcofw = wmask(ji,jj,jk) * z1_16
-               wslpi(ji,jj,jk) = (         zwz(ji-1,jj-1,jk) + zwz(ji+1,jj-1,jk)     &
-                    &               +      zwz(ji-1,jj+1,jk) + zwz(ji+1,jj+1,jk)     &
-                    &               + 2.*( zwz(ji  ,jj-1,jk) + zwz(ji-1,jj  ,jk)     &
-                    &               +      zwz(ji+1,jj  ,jk) + zwz(ji  ,jj+1,jk) )   &
-                    &               + 4.*  zwz(ji  ,jj  ,jk)                         ) * zcofw
-               wslpj(ji,jj,jk) = (         zww(ji-1,jj-1,jk) + zww(ji+1,jj-1,jk)     &
-                    &               +      zww(ji-1,jj+1,jk) + zww(ji+1,jj+1,jk)     &
-                    &               + 2.*( zww(ji  ,jj-1,jk) + zww(ji-1,jj  ,jk)     &
-                    &               +      zww(ji+1,jj  ,jk) + zww(ji  ,jj+1,jk) )   &
-                    &               + 4.*  zww(ji  ,jj  ,jk)                         ) * zcofw
-            END DO
-         END DO
          !                                        !* decrease in vicinity of topography
          DO_2D( 0, 0, 0, 0 )

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/OBS/obs_averg_h2d.F90

-                      r12377
+                      r14328
       & e1t, e2t, &
       & e1f, e2f, &
+      & glamt, gphit, &
+      & nproc
+      & glamt, gphit
    USE in_out_manager
    USE obs_const, ONLY : &

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/OBS/obs_grid.F90

-                      r13286
+                      r14328
                CALL obs_grd_bruteforce( jpi, jpj, jpiglo, jpjglo, &
                   &                             1, jpi, 1, jpj,           &
                   &                             nproc, jpnij,             &
+                  &                             narea-1, jpnij,           &
                   &                             glamt, gphit, tmask,      &
                   &                             kobsin, plam, pphi,       &
 …
                CALL obs_grd_bruteforce( jpi, jpj, jpiglo, jpjglo, &
                   &                             1, jpi, 1, jpj,           &
                   &                             nproc, jpnij,             &
+                  &                             narea-1, jpnij,           &
                   &                             glamu, gphiu, umask,      &
                   &                             kobsin, plam, pphi,       &
 …
                CALL obs_grd_bruteforce( jpi, jpj, jpiglo, jpjglo, &
                   &                             1, jpi, 1, jpj,           &
                   &                             nproc, jpnij,             &
+                  &                             narea-1, jpnij,           &
                   &                             glamv, gphiv, vmask,      &
                   &                             kobsin, plam, pphi,       &
 …
                CALL obs_grd_bruteforce( jpi, jpj, jpiglo, jpjglo, &
                   &                             1, jpi, 1, jpj,           &
                   &                             nproc, jpnij,             &
+                  &                             narea-1, jpnij,           &
                   &                             glamf, gphif, fmask,      &
                   &                             kobsin, plam, pphi,       &
 …
       !!
       !! ** Action  : Return kproc holding the observation and kiobsi,kobsj
       !!              valid on kproc=nproc processor only.
+      !!              valid on kproc=narea-1 processor only.
       !!
       !! History :
 …
          jlon     = jpiglo
          jlat     = jpjglo
          joffset  = nproc
+         joffset  = narea-1
          jostride = jpnij
       ELSE
 …
                         IF ( ABS( zlam - zplam(jo) ) < 1e-6 ) THEN
                            IF ( llinvalidcell(ji,jj) ) THEN
                               kproc(jo) = nproc + 1000000
+                              kproc(jo) = narea-1 + 1000000
                               kobsi(jo) = ji + 1
                               kobsj(jo) = jj + 1
                               CYCLE
                            ELSE
                               kproc(jo) = nproc
+                              kproc(jo) = narea-1
                               kobsi(jo) = ji + 1
                               kobsj(jo) = jj + 1
 …
                            &          zlamtm(:,ji,jj), zphitm(:,ji,jj) ) ) THEN
                            IF ( llinvalidcell(ji,jj) ) THEN
                               kproc(jo) = nproc + 1000000
+                              kproc(jo) = narea-1 + 1000000
                               kobsi(jo) = ji + 1
                               kobsj(jo) = jj + 1
                               CYCLE
                            ELSE
                               kproc(jo) = nproc
+                              kproc(jo) = narea-1
                               kobsi(jo) = ji + 1
                               kobsj(jo) = jj + 1
 …
                            &          zlamtm(:,ji,jj), zphitm(:,ji,jj) ) ) THEN
                            IF ( llinvalidcell(ji,jj) ) THEN
                               kproc(jo) = nproc + 1000000
+                              kproc(jo) = narea-1 + 1000000
                               kobsi(jo) = ji + 1
                               kobsj(jo) = jj + 1
                               CYCLE
                            ELSE
                               kproc(jo) = nproc
+                              kproc(jo) = narea-1
                               kobsi(jo) = ji + 1
                               kobsj(jo) = jj + 1
 …
             ! define the following format: "(a,a,ix.x,a,ix.x,a,ix.x,a)"
             WRITE(clfmt, "('(a,a,i', i1, '.', i1',a,i', i1, '.', i1',a,i', i1, '.', i1',a)')") idg, idg, idg, idg, idg, idg
             WRITE(cfname,      clfmt     ) TRIM(cn_gridsearchfile),'_', nproc,'of', jpni,'by', jpnj,'.nc'
+            WRITE(cfname,      clfmt     ) TRIM(cn_gridsearchfile),'_', narea-1,'of', jpni,'by', jpnj,'.nc'
          ENDIF
 …
             CALL obs_grd_bruteforce( jpi, jpj, jpiglo, jpjglo,  &
                &                     1, jpi, 1, jpj,            &
                &                     nproc, jpnij,              &
+               &                     narea-1, jpnij,            &
                &                     glamt, gphit, tmask,       &
                &                     nlons*nlats, lonsi, latsi, &
 …
             IF ( ( .NOT. ln_grid_global ) .OR. &
                & ( ( ln_grid_global ) .AND. ( nproc==0 ) ) ) THEN
+               & ( ( ln_grid_global ) .AND. ( narea-1==0 ) ) ) THEN
                CALL chkerr( nf90_create (TRIM(cfname), nf90_clobber, idfile), &

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/OBS/obs_mpp.F90

r14229	r14328
18	18	!! obs_mpp_sum_integer : Sum an integer from all processors
19	19	!!----------------------------------------------------------------------
20		~~USE dom_oce, ONLY : nproc, mig, mjg ! Ocean space and time domain variables~~
21	20	USE mpp_map, ONLY : mppmap
22	21	USE in_out_manager

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/OBS/obs_prep.F90

-                      r14056
+                      r14328
       !! * Modules used
       USE par_oce             ! Ocean parameters
       USE dom_oce, ONLY       :   glamt, gphit, tmask, nproc   ! Geographical information
+      USE dom_oce, ONLY       :   glamt, gphit, tmask   ! Geographical information
       !! * Arguments
       TYPE(obs_surf), INTENT(INOUT) :: surfdata    ! Full set of surface data
 …
       USE par_oce             ! Ocean parameters
       USE dom_oce, ONLY : &   ! Geographical information
+         & gdept_1d,             &
+         & nproc
+         & gdept_1d
       !! * Arguments

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/OBS/obs_read_prof.F90

-                      r14056
+                      r14328
                IF ( ( inpfiles(jj)%ptim(ji) >  djulini(jj) ) .AND. &
                   & ( inpfiles(jj)%ptim(ji) <= djulend(jj) )       ) THEN
                   IF ( nproc == 0 ) THEN
                      IF ( inpfiles(jj)%iproc(ji,1) >  nproc ) CYCLE
+                  IF ( narea == 1 ) THEN
+                     IF ( inpfiles(jj)%iproc(ji,1) >  narea-1 ) CYCLE
                   ELSE
                      IF ( inpfiles(jj)%iproc(ji,1) /= nproc ) CYCLE
+                     IF ( inpfiles(jj)%iproc(ji,1) /= narea-1 ) CYCLE
                   ENDIF
                   llvalprof = .FALSE.
 …
             & ( inpfiles(jj)%ptim(ji) <= djulend(jj) ) ) THEN
             IF ( nproc == 0 ) THEN
                IF ( inpfiles(jj)%iproc(ji,1) >  nproc ) CYCLE
+            IF ( narea == 1 ) THEN
+               IF ( inpfiles(jj)%iproc(ji,1) >  narea-1 ) CYCLE
             ELSE
                IF ( inpfiles(jj)%iproc(ji,1) /= nproc ) CYCLE
+               IF ( inpfiles(jj)%iproc(ji,1) /= narea-1 ) CYCLE
             ENDIF

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/OBS/obs_read_surf.F90

-                      r14056
+                      r14328
                IF ( ( inpfiles(jj)%ptim(ji) >  djulini(jj) ) .AND. &
                   & ( inpfiles(jj)%ptim(ji) <= djulend(jj) )       ) THEN
                   IF ( nproc == 0 ) THEN
                      IF ( inpfiles(jj)%iproc(ji,1) >  nproc ) CYCLE
+                  IF ( narea == 1 ) THEN
+                     IF ( inpfiles(jj)%iproc(ji,1) >  narea-1 ) CYCLE
                   ELSE
                      IF ( inpfiles(jj)%iproc(ji,1) /= nproc ) CYCLE
+                     IF ( inpfiles(jj)%iproc(ji,1) /= narea-1 ) CYCLE
                   ENDIF
                   llvalprof = .FALSE.
 …
             & ( inpfiles(jj)%ptim(ji) <= djulend(jj) ) ) THEN
             IF ( nproc == 0 ) THEN
                IF ( inpfiles(jj)%iproc(ji,1) >  nproc ) CYCLE
+            IF ( narea == 1 ) THEN
+               IF ( inpfiles(jj)%iproc(ji,1) >  narea-1 ) CYCLE
             ELSE
                IF ( inpfiles(jj)%iproc(ji,1) /= nproc ) CYCLE
+               IF ( inpfiles(jj)%iproc(ji,1) /= narea-1 ) CYCLE
             ENDIF

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/OBS/obs_utils.F90

-                      r10068
+                      r14328
       !! * Modules used
       USE netcdf             ! NetCDF library
-      USE dom_oce, ONLY : &  ! Ocean space and time domain variables
-         & nproc
       !! * Arguments
 …
       !! * Modules used
       USE netcdf             ! NetCDF library
-      USE dom_oce, ONLY : &  ! Ocean space and time domain variables
-         & nproc
       !! * Arguments

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/OBS/obs_write.F90

-                      r14056
+                      r14328
       idg = MAX( INT(LOG10(REAL(jpnij,wp))) + 1, 4 )            ! how many digits to we need to write? min=4, max=9
       WRITE(clfmt, "('(a,a,i', i1, '.', i1, ',a)')") idg, idg   ! '(a,a,ix.x,a)'
       WRITE(clfname,clfmt) TRIM(clfiletype), '_fdbk_', nproc, '.nc'
+      WRITE(clfname,clfmt) TRIM(clfiletype), '_fdbk_', narea-1, '.nc'
       IF(lwp) THEN
 …
       idg = MAX( INT(LOG10(REAL(jpnij,wp))) + 1, 4 )            ! how many digits to we need to write? min=4, max=9
       WRITE(clfmt, "('(a,a,i', i1, '.', i1, ',a)')") idg, idg   ! '(a,a,ix.x,a)'
       WRITE(clfname,clfmt) TRIM(clfiletype), '_fdbk_', nproc, '.nc'
+      WRITE(clfname,clfmt) TRIM(clfiletype), '_fdbk_', narea-1, '.nc'
       IF(lwp) THEN

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/SBC/sbcice_cice.F90

-                      r14215
+                      r14328
 ! (may be OK but not 100% sure)
       IF(nproc==0) THEN
+      IF(narea==1) THEN
 !        pcg(:,:)=0.0
          DO jn=1,jpnij
 …
 ! the lbclnk call on pn will replace these with sensible values
       IF(nproc==0) THEN
+      IF(narea==1) THEN
          png(:,:,:)=0.0
          DO jn=1,jpnij

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/TRA/traadv_fct.F90

-                      r14189
+                      r14328
             IF (nn_hls.EQ.1) CALL lbc_lnk_multi( 'traadv_fct', ztu, 'U', -1.0_wp , ztv, 'V', -1.0_wp )   ! Lateral boundary cond. (unchanged sgn)
+            !
-            IF (nn_hls.EQ.1) CALL lbc_lnk_multi( 'traadv_fct', ztu, 'U', -1.0_wp , ztv, 'V', -1.0_wp )   ! Lateral boundary cond. (unchanged sgn)
+            !
             DO_3D( 0, 0, 0, 0, 1, jpkm1 )    ! Horizontal advective fluxes
                zC2t_u = pt(ji,jj,jk,jn,Kmm) + pt(ji+1,jj  ,jk,jn,Kmm)   ! 2 x C2 interpolation of T at u- & v-points (x2)
 …
          END IF
+         !
-         IF (nn_hls.EQ.1) THEN
-            CALL lbc_lnk_multi( 'traadv_fct', zwi, 'T', 1.0_wp, zwx, 'U', -1.0_wp , zwy, 'V', -1.0_wp, zwz, 'T', 1.0_wp )
-         ELSE
-            CALL lbc_lnk( 'traadv_fct', zwi, 'T', 1.0_wp)
-         END IF
+         !
          IF ( ll_zAimp ) THEN
             DO_3D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1, 1, jpkm1 )    !* trend and after field with monotonic scheme

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/TRD/trd_oce.F90

r14045	r14328
27	27	LOGICAL , PUBLIC :: l_trddyn !: momentum trend flag (set from namelist in trdini)
28	28
29		# if ( defined key_trdtrc && defined key_~~iomput~~ ) \|\| defined key_trdmxl_trc
	29	# if ( defined key_trdtrc && defined key_xios ) \|\| defined key_trdmxl_trc
30	30	LOGICAL , PUBLIC :: l_trdtrc = .TRUE. !: tracers trend flag
31	31	# else

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/USR/README.rst

r11743	r14328
37	37	.. code-block:: console
38	38
39		$ ./makenemo –n 'ORCA2_ICE_PISCES_MINE' -r 'ORCA2_ICE_PISCES' -m 'my_arch' del_key 'key_~~iomput~~' add_key 'key_diahth'
	39	$ ./makenemo –n 'ORCA2_ICE_PISCES_MINE' -r 'ORCA2_ICE_PISCES' -m 'my_arch' del_key 'key_xios' add_key 'key_diahth'
40	40
41	41	Option 3: Use the SIREN tools to subset an existing model

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/nemogcm.F90

-                      r14229
+                      r14328
       CALL nemo_closefile
+      !
 #if defined key_iomput
+#if defined key_xios
                                     CALL xios_finalize  ! end mpp communications with xios
       IF( lk_oasis     )            CALL cpl_finalize   ! end coupling and mpp communications with OASIS
 …
       !                             !-------------------------------------------------!
+      !
 #if defined key_iomput
+#if defined key_xios
       IF( Agrif_Root() ) THEN
          IF( lk_oasis ) THEN

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/step.F90

-                      r14227
+                      r14328
       ENDIF
       IF( kstp == nit000 + 1 )   lk_agrif_fstep = .FALSE.
 # if defined key_iomput
+# if defined key_xios
       IF( Agrif_Nbstepint() == 0 )   CALL iom_swap( cxios_context )
 # endif
 …
       IF( lk_oasis .AND. nstop == 0 )   CALL sbc_cpl_snd( kstp, Nbb, Nnn )     ! coupled mode : field exchanges
+      !
 #if defined key_iomput
+#if defined key_xios
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
       ! Finalize contextes if end of simulation or error detected

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/step_oce.F90

r14143	r14328
104	104	USE timing ! Timing
105	105
106		#if defined key_~~iomput~~
	106	#if defined key_xios
107	107	USE xios ! I/O server
108	108	#endif

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/stpctl.F90

-                      r14143
+                      r14328
    !!----------------------------------------------------------------------
    !!   stp_ctl      : Control the run
-   !!   stp_ctl_SWE  : Control the run (SWE only)
    !!----------------------------------------------------------------------
    USE oce             ! ocean dynamics and tracers variables
 …
    PUBLIC stp_ctl           ! routine called by step.F90
+   PUBLIC stp_ctl_SWE       ! routine called by stpmlf.F90
+   INTEGER                ::   nrunid   ! netcdf file id
+   INTEGER, DIMENSION(8)  ::   nvarid   ! netcdf variable id
+   INTEGER, DIMENSION(2)  ::   nvarid_SWE   ! netcdf variable id (SWE only)
+   INTEGER, PARAMETER         ::   jpvar = 8
+   INTEGER                    ::   nrunid   ! netcdf file id
+   INTEGER, DIMENSION(jpvar)  ::   nvarid   ! netcdf variable id
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
 …
       !!----------------------------------------------------------------------
       !!                    ***  ROUTINE stp_ctl  ***
       !!
+      !!
       !! ** Purpose :   Control the run
       !!
 …
       INTEGER, INTENT(in   ) ::   Kmm      ! ocean time level index
       !!
+      INTEGER, PARAMETER              ::   jptst = 4
       INTEGER                         ::   ji                                    ! dummy loop indices
       INTEGER                         ::   idtime, istatus
       INTEGER , DIMENSION(9)          ::   iareasum, iareamin, iareamax
       INTEGER , DIMENSION(3,4)        ::   iloc                                  ! min/max loc indices
+      INTEGER , DIMENSION(jptst)      ::   iareasum, iareamin, iareamax
+      INTEGER , DIMENSION(3,jptst)    ::   iloc                                  ! min/max loc indices
       REAL(wp)                        ::   zzz, zminsal, zmaxsal                 ! local real
+      REAL(wp), DIMENSION(9)          ::   zmax, zmaxlocal
+      REAL(wp), DIMENSION(jpvar+1)    ::   zmax
+      REAL(wp), DIMENSION(jptst)      ::   zmaxlocal
       LOGICAL                         ::   ll_wrtstp, ll_colruns, ll_wrtruns, ll_0oce
       LOGICAL, DIMENSION(jpi,jpj,jpk) ::   llmsk
 …
+      !
       ll_wrtstp  = ( MOD( kt-nit000, sn_cfctl%ptimincr ) == 0 ) .OR. ( kt == nitend )
       ll_colruns = ll_wrtstp .AND. sn_cfctl%l_runstat .AND. jpnij > 1
+      ll_colruns = ll_wrtstp .AND. sn_cfctl%l_runstat .AND. jpnij > 1
       ll_wrtruns = ( ll_colruns .OR. jpnij == 1 ) .AND. lwm
+      !
 …
             istatus = NF90_ENDDEF(nrunid)
          ENDIF
+         !
+         !
       ENDIF
+      !
 …
          zmax(5:8) = 0._wp
       ENDIF
       zmax(9) = REAL( nstop, wp )                                                 ! stop indicator
+      zmax(jpvar+1) = REAL( nstop, wp )                                           ! stop indicator
+      !
       !                                   !==               get global extrema             ==!
       !                                   !==  done by all processes if writting run.stat  ==!
       IF( ll_colruns ) THEN
          zmaxlocal(:) = zmax(:)
+         zmaxlocal(:) = zmax(1:jptst)
          CALL mpp_max( "stpctl", zmax )          ! max over the global domain: ok even of ll_0oce = .true.
          nstop = NINT( zmax(9) )                 ! update nstop indicator (now sheared among all local domains)
+         nstop = NINT( zmax(jpvar+1) )           ! update nstop indicator (now sheared among all local domains)
       ELSE
          ! if no ocean point: MAXVAL returns -HUGE => we must overwrite this value to avoid error handling bellow.
+         IF( ll_0oce )   zmax(1:4) = (/ 0._wp, 0._wp, -1._wp, 1._wp /)   ! default "valid" values...
+      ENDIF
+      !
+      zmax(3) = -zmax(3)                         ! move back from max(-zz) to min(zz) : easier to manage!
+      zmax(5) = -zmax(5)                         ! move back from max(-zz) to min(zz) : easier to manage!
+      IF( ll_colruns ) THEN
+         zmaxlocal(3) = -zmaxlocal(3)            ! move back from max(-zz) to min(zz) : easier to manage!
+         zmaxlocal(5) = -zmaxlocal(5)            ! move back from max(-zz) to min(zz) : easier to manage!
+      ENDIF
+         IF( ll_0oce )   zmax(1:jptst) = (/ 0._wp, 0._wp, -1._wp, 1._wp /)   ! default "valid" values...
+      ENDIF
+      !
+      zmax(3) = -zmax(3)                              ! move back from max(-zz) to min(zz) : easier to manage!
+      zmax(5) = -zmax(5)                              ! move back from max(-zz) to min(zz) : easier to manage!
+      IF( ll_colruns ) zmaxlocal(3) = -zmaxlocal(3)   ! move back from max(-zz) to min(zz) : easier to manage!
+      !
       !                                   !==              write "run.stat" files              ==!
       !                                   !==  done only by 1st subdomain at writting timestep  ==!
       IF( ll_wrtruns ) THEN
          WRITE(numrun,9500) kt, zmax(1), zmax(2), zmax(3), zmax(4)
          DO ji = 1, 6 + 2 * COUNT( (/ln_zad_Aimp/) )
+         WRITE(numrun,9500) kt, zmax(1:jptst)
+         DO ji = 1, jpvar - 2 * COUNT( .NOT. (/ln_zad_Aimp/) )
             istatus = NF90_PUT_VAR( nrunid, nvarid(ji), (/zmax(ji)/), (/kt/), (/1/) )
          END DO
 …
+      !
       IF ( ln_SEOS.AND.(rn_b0==0._wp) ) THEN             ! Discard checks on salinity
          zmaxsal = +1.e38                                ! if not used in eos
          zminsal = -1.e38
+         zmaxsal =  HUGE(1._wp)                               ! if not used in eos
+         zminsal = -HUGE(1._wp)
       ELSE
          zmaxsal = 100._wp
 …
       ENDIF
+      !
       IF(  zmax(1) >   20._wp .OR.   &                   ! too large sea surface height ( > 20 m )
          & zmax(2) >   10._wp .OR.   &                   ! too large velocity ( > 10 m/s)
          & zmax(3) <= zminsal .OR.   &                   ! negative or zero sea surface salinity
          & zmax(4) >= zmaxsal .OR.   &                   ! too large sea surface salinity ( > 100 )
          & zmax(4) <  zminsal .OR.   &                   ! too large sea surface salinity (keep this line for sea-ice)
          & ISNAN( zmax(1) + zmax(2) + zmax(3) ) .OR.   &               ! NaN encounter in the tests
          & ABS(   zmax(1) + zmax(2) + zmax(3) ) > HUGE(1._wp) ) THEN   ! Infinity encounter in the tests
+      IF(  zmax(1) >   20._wp .OR.   &                        ! too large sea surface height ( > 20 m )
+         & zmax(2) >   10._wp .OR.   &                        ! too large velocity ( > 10 m/s)
+         & zmax(3) <= zminsal .OR.   &                        ! negative or zero sea surface salinity
+         & zmax(4) >= zmaxsal .OR.   &                        ! too large sea surface salinity ( > 100 )
+         & zmax(4) <  zminsal .OR.   &                        ! too large sea surface salinity (keep this line for sea-ice)
+         & ISNAN( SUM(zmax(1:jptst)) ) .OR.   &               ! NaN encounter in the tests
+         & ABS(   SUM(zmax(1:jptst)) ) > HUGE(1._wp) ) THEN   ! Infinity encounter in the tests
+         !
          iloc(:,:) = 0
 …
             ! find which subdomain has the max.
             iareamin(:) = jpnij+1   ;   iareamax(:) = 0   ;   iareasum(:) = 0
             DO ji = 1, 9
+            DO ji = 1, jptst
                IF( zmaxlocal(ji) == zmax(ji) ) THEN
                   iareamin(ji) = narea   ;   iareamax(ji) = narea   ;   iareasum(ji) = 1
 …
             iloc(1:3,3) = MINLOC(       ts(:,:,:,jp_sal,Kmm) , mask = llmsk(:,:,:) )
             iloc(1:3,4) = MAXLOC(       ts(:,:,:,jp_sal,Kmm) , mask = llmsk(:,:,:) )
             DO ji = 1, 4   ! local domain indices ==> global domain indices, excluding halos
+            DO ji = 1, jptst   ! local domain indices ==> global domain indices, excluding halos
                iloc(1:2,ji) = (/ mig0(iloc(1,ji)), mjg0(iloc(2,ji)) /)
             END DO
 …
          CALL dia_wri_state( Kmm, 'output.abort' )     ! create an output.abort file
+         !
          IF( ll_colruns .or. jpnij == 1 ) THEN   ! all processes synchronized -> use lwp to print in opened ocean.output files
+         IF( ll_colruns .OR. jpnij == 1 ) THEN   ! all processes synchronized -> use lwp to print in opened ocean.output files
             IF(lwp) THEN   ;   CALL ctl_stop( ctmp1, ' ', ctmp2, ctmp3, ctmp4, ctmp5, ' ', ctmp6 )
             ELSE           ;   nstop = MAX(1, nstop)   ! make sure nstop > 0 (automatically done when calling ctl_stop)
 …
+      !
    END SUBROUTINE stp_ctl
-   SUBROUTINE stp_ctl_SWE( kt, Kmm )
-      !!----------------------------------------------------------------------
-      !!                    ***  ROUTINE stp_ctl_SWE  ***
-      !!
-      !! ** Purpose :   Control the run
-      !!
-      !! ** Method  : - Save the time step in numstp
-      !!              - Print it each 50 time steps
-      !!              - Stop the run IF problem encountered by setting nstop > 0
-      !!                Problems checked: e3t0+ssh minimum smaller that 0
-      !!                                  |U|   maximum larger than 10 m/s
-      !!                                  ( not for SWE : negative sea surface salinity )
-      !!
-      !! ** Actions :   "time.step" file = last ocean time-step
-      !!                "run.stat"  file = run statistics
-      !!                 nstop indicator sheared among all local domain
-      !!----------------------------------------------------------------------
-      INTEGER, INTENT(in   ) ::   kt       ! ocean time-step index
-      INTEGER, INTENT(in   ) ::   Kmm      ! ocean time level index
-      !!
-      INTEGER                         ::   ji                                    ! dummy loop indices
-      INTEGER                         ::   idtime, istatus
-      INTEGER , DIMENSION(3)          ::   iareasum, iareamin, iareamax
-      INTEGER , DIMENSION(3,4)        ::   iloc                                  ! min/max loc indices
-      REAL(wp)                        ::   zzz                                   ! local real
-      REAL(wp), DIMENSION(3)          ::   zmax, zmaxlocal
-      LOGICAL                         ::   ll_wrtstp, ll_colruns, ll_wrtruns, ll_0oce
-      LOGICAL, DIMENSION(jpi,jpj,jpk) ::   llmsk
-      CHARACTER(len=20)               ::   clname
-      !!----------------------------------------------------------------------
+      !
-      IF( nstop > 0 .AND. ngrdstop > -1 )   RETURN   !   stpctl was already called by a child grid
+      !
-      ll_wrtstp  = ( MOD( kt-nit000, sn_cfctl%ptimincr ) == 0 ) .OR. ( kt == nitend )
-      ll_colruns = ll_wrtstp .AND. sn_cfctl%l_runstat .AND. jpnij > 1
-      ll_wrtruns = ( ll_colruns .OR. jpnij == 1 ) .AND. lwm
+      !
-      IF( kt == nit000 ) THEN
+         !
-         IF( lwp ) THEN
-            WRITE(numout,*)
-            WRITE(numout,*) 'stp_ctl_SWE : time-stepping control'
-            WRITE(numout,*) '~~~~~~~~~~~'
-         ENDIF
-         !                                ! open time.step    ascii file, done only by 1st subdomain
-         IF( lwm )   CALL ctl_opn( numstp, 'time.step', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp, narea )
+         !
-         IF( ll_wrtruns ) THEN
-            !                             ! open run.stat     ascii file, done only by 1st subdomain
-            CALL ctl_opn( numrun, 'run.stat', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout, lwp, narea )
-            !                             ! open run.stat.nc netcdf file, done only by 1st subdomain
-            clname = 'run.stat.nc'
-            IF( .NOT. Agrif_Root() )   clname = TRIM(Agrif_CFixed())//"_"//TRIM(clname)
-            istatus = NF90_CREATE( TRIM(clname), NF90_CLOBBER, nrunid )
-            istatus = NF90_DEF_DIM( nrunid, 'time', NF90_UNLIMITED, idtime )
-            istatus = NF90_DEF_VAR( nrunid, 'abs_ssh_max', NF90_DOUBLE, (/ idtime /), nvarid_SWE(1) )
-            istatus = NF90_DEF_VAR( nrunid,   'abs_u_max', NF90_DOUBLE, (/ idtime /), nvarid_SWE(2) )
-            istatus = NF90_ENDDEF(nrunid)
-         ENDIF
+         !
-      ENDIF
+      !
-      !                                   !==              write current time step              ==!
-      !                                   !==  done only by 1st subdomain at writting timestep  ==!
-      IF( lwm .AND. ll_wrtstp ) THEN
-         WRITE ( numstp, '(1x, i8)' )   kt
-         REWIND( numstp )
-      ENDIF
-      !                                   !==            test of local extrema           ==!
-      !                                   !==  done by all processes at every time step  ==!
+      !
-      llmsk(   1:Nis1,:,:) = .FALSE.                                              ! exclude halos from the checked region
-      llmsk(Nie1: jpi,:,:) = .FALSE.
-      llmsk(:,   1:Njs1,:) = .FALSE.
-      llmsk(:,Nje1: jpj,:) = .FALSE.
+      !
-      llmsk(Nis0:Nie0,Njs0:Nje0,1) = ssmask(Nis0:Nie0,Njs0:Nje0) == 1._wp         ! define only the inner domain
+      !
-      ll_0oce = .NOT. ANY( llmsk(:,:,1) )                                         ! no ocean point in the inner domain?
+      !
-      zmax(1) = MINVAL( -e3t_0(:,:,1)-ssh(:,:,Kmm)  , mask = llmsk(:,:,1)  )       ! e3t_Kmm min
+      !
-      llmsk(Nis0:Nie0,Njs0:Nje0,:) = umask(Nis0:Nie0,Njs0:Nje0,:) == 1._wp        ! define only the inner domain
-      zmax(2) = MAXVAL(  ABS( uu(:,:,:,Kmm) )      , mask = llmsk(:,:,:) )        ! velocity max (zonal only)
-      zmax(3) = REAL( nstop , wp )                                                ! stop indicator
-      !                                   !==               get global extrema             ==!
-      !                                   !==  done by all processes if writting run.stat  ==!
-      IF( ll_colruns ) THEN
-         zmaxlocal(:) = zmax(:)
-         CALL mpp_max( "stpctl", zmax )          ! max over the global domain
-         nstop = NINT( zmax(3) )                 ! update nstop indicator (now sheared among all local domains)
-      ELSE
-         ! if no ocean point: MAXVAL returns -HUGE => we must overwrite this value to avoid error handling bellow.
-         IF( ll_0oce )   zmax(1:4) = (/ 0._wp, 0._wp, -1._wp, 1._wp /)   ! default "valid" values...
-      ENDIF
+      !
-      zmax(1) = -zmax(1)                         ! move back from max(-zz) to min(zz) : easier to manage!
+      !
-      !                                   !==              write "run.stat" files              ==!
-      !                                   !==  done only by 1st subdomain at writting timestep  ==!
-      IF( ll_wrtruns ) THEN
-         WRITE(numrun,9500) kt, zmax(1), zmax(2)
-         istatus = NF90_PUT_VAR( nrunid, nvarid_SWE(1), (/ zmax(1)/), (/kt/), (/1/) )
-         istatus = NF90_PUT_VAR( nrunid, nvarid_SWE(2), (/ zmax(2)/), (/kt/), (/1/) )
-         IF( kt == nitend )   istatus = NF90_CLOSE(nrunid)
-      ENDIF
-      !                                   !==               error handling               ==!
-      !                                   !==  done by all processes at every time step  ==!
+      !
-!!SWE specific : start
-      IF(   zmax(1) <=   0._wp .OR.           &               ! negative e3t_Kmm
-         &  zmax(2) >   10._wp .OR.           &               ! too large velocity ( > 10 m/s)
-         &  ISNAN( zmax(1) + zmax(2) ) .OR.   &               ! NaN encounter in the tests
-         &  ABS(   zmax(1) + zmax(2) ) > HUGE(1._wp) ) THEN   ! Infinity encounter in the tests
+         !
-         iloc(:,:) = 0
-         IF( ll_colruns ) THEN   ! zmax is global, so it is the same on all subdomains -> no dead lock with mpp_maxloc
-            ! first: close the netcdf file, so we can read it
-            IF( lwm .AND. kt /= nitend )   istatus = NF90_CLOSE(nrunid)
-            ! get global loc on the min/max
-            llmsk(Nis0:Nie0,Njs0:Nje0,1) = ssmask(Nis0:Nie0,Njs0:Nje0 ) == 1._wp         ! define only the inner domain
-            CALL mpp_minloc( 'stpctl', e3t_0(:,:,1) + ssh(:,:,Kmm), llmsk(:,:,1), zzz, iloc(1:2,1) )   ! mpp_maxloc ok if mask = F
-            llmsk(Nis0:Nie0,Njs0:Nje0,:) = tmask(Nis0:Nie0,Njs0:Nje0,:) == 1._wp        ! define only the inner domain
-            CALL mpp_maxloc( 'stpctl', ABS( uu(:,:,:,Kmm))        , llmsk(:,:,:), zzz, iloc(1:3,2) )
-            ! find which subdomain has the max.
-            iareamin(:) = jpnij+1   ;   iareamax(:) = 0   ;   iareasum(:) = 0
-            DO ji = 1, 3
-               IF( zmaxlocal(ji) == zmax(ji) ) THEN
-                  iareamin(ji) = narea   ;   iareamax(ji) = narea   ;   iareasum(ji) = 1
-               ENDIF
-            END DO
-            CALL mpp_min( "stpctl", iareamin )         ! min over the global domain
-            CALL mpp_max( "stpctl", iareamax )         ! max over the global domain
-            CALL mpp_sum( "stpctl", iareasum )         ! sum over the global domain
-         ELSE                    ! find local min and max locations:
-            ! if we are here, this means that the subdomain contains some oce points -> no need to test the mask used in maxloc
-            llmsk(Nis0:Nie0,Njs0:Nje0,1) = ssmask(Nis0:Nie0,Njs0:Nje0 ) == 1._wp        ! define only the inner domain
-            iloc(1:2,1) = MINLOC( e3t_0(:,:,1) + ssh(:,:,Kmm), mask = llmsk(:,:,1) )
+            !
-            llmsk(Nis0:Nie0,Njs0:Nje0,:) = umask(Nis0:Nie0,Njs0:Nje0,:) == 1._wp        ! define only the inner domain
-            iloc(1:3,2) = MAXLOC( ABS(  uu(:,:,:,       Kmm)), mask = llmsk(:,:,:) )
-            iareamin(:) = narea   ;   iareamax(:) = narea   ;   iareasum(:) = 1         ! this is local information
-         ENDIF
+         !
-         WRITE(ctmp1,*) ' stp_ctl_SWE:  e3t0+ssh < 0 m  or  |U| > 10 m/s  or  NaN encounter in the tests'
-         CALL wrt_line( ctmp2, kt, 'e3t0+ssh min',  zmax(1), iloc(:,1), iareasum(1), iareamin(1), iareamax(1) )
-         CALL wrt_line( ctmp3, kt, '|U|   max'   ,  zmax(2), iloc(:,2), iareasum(2), iareamin(2), iareamax(2) )
-         IF( Agrif_Root() ) THEN
-            WRITE(ctmp6,*) '      ===> output of last computed fields in output.abort* files'
-         ELSE
-            WRITE(ctmp6,*) '      ===> output of last computed fields in '//TRIM(Agrif_CFixed())//'_output.abort* files'
-         ENDIF
+         !
-         CALL dia_wri_state( Kmm, 'output.abort' )     ! create an output.abort file
+         !
-         IF( ll_colruns .or. jpnij == 1 ) THEN   ! all processes synchronized -> use lwp to print in opened ocean.output files
-            IF(lwp) THEN   ;   CALL ctl_stop( ctmp1, ' ', ctmp2, ctmp3, ' ', ctmp6 )
-            ELSE           ;   nstop = MAX(1, nstop)   ! make sure nstop > 0 (automatically done when calling ctl_stop)
-            ENDIF
-         ELSE                                    ! only mpi subdomains with errors are here -> STOP now
-            CALL ctl_stop( 'STOP', ctmp1, ' ', ctmp2, ctmp3, ' ', ctmp6 )
-         ENDIF
+         !
-      ENDIF
-!!SWE specific : end
+      !
-      IF( nstop > 0 ) THEN                                                  ! an error was detected and we did not abort yet...
-         ngrdstop = Agrif_Fixed()                                           ! store which grid got this error
-         IF( .NOT. ll_colruns .AND. jpnij > 1 )   CALL ctl_stop( 'STOP' )   ! we must abort here to avoid MPI deadlock
-      ENDIF
+      !
-  FORMAT(' it :', i8, '      e3t_min: ', D23.16, ' |U|_max: ', D23.16)
+      !
-   END SUBROUTINE stp_ctl_SWE

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OCE/stpmlf.F90

-                      r14227
+                      r14328
       ENDIF
       IF( kstp == nit000 + 1 )   lk_agrif_fstep = .FALSE.
 # if defined key_iomput
+# if defined key_xios
       IF( Agrif_Nbstepint() == 0 )   CALL iom_swap( cxios_context )
 # endif
 …
       IF( lk_oasis .AND. nstop == 0 )   CALL sbc_cpl_snd( kstp, Nbb, Nnn )     ! coupled mode : field exchanges
+      !
 #if defined key_iomput
+#if defined key_xios
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
       ! Finalize contextes if end of simulation or error detected

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OFF/dtadyn.F90

-                      r14053
+                      r14328
    PUBLIC   dta_dyn_init       ! called by nemo_init
    PUBLIC   dta_dyn            ! called by nemo_gcm
-   PUBLIC   dta_dyn_sed_init   ! called by nemo_init
-   PUBLIC   dta_dyn_sed        ! called by nemo_gcm
    PUBLIC   dta_dyn_atf        ! called by nemo_gcm
 #if ! defined key_qco
    PUBLIC   dta_dyn_sf_interp  ! called by nemo_gcm
 #endif
+#if defined key_sed_off
+   PUBLIC   dta_dyn_sed_init   ! called by nemo_init
+   PUBLIC   dta_dyn_sed        ! called by nemo_gcm
+#endif
    CHARACTER(len=100) ::   cn_dir          !: Root directory for location of ssr files
    LOGICAL            ::   ln_dynrnf       !: read runoff data in file (T) or set to zero (F)
    LOGICAL            ::   ln_dynrnf_depth       !: read runoff data in file (T) or set to zero (F)
-   REAL(wp)           ::   fwbcorr
 …
       ts(:,:,:,jp_tem,Kmm) = sf_dyn(jf_tem)%fnow(:,:,:)  * tmask(:,:,:)    ! temperature
       ts(:,:,:,jp_sal,Kmm) = sf_dyn(jf_sal)%fnow(:,:,:)  * tmask(:,:,:)    ! salinity
       wndm(:,:)         = sf_dyn(jf_wnd)%fnow(:,:,1)  * tmask(:,:,1)    ! wind speed - needed for gas exchange
       fmmflx(:,:)       = sf_dyn(jf_fmf)%fnow(:,:,1)  * tmask(:,:,1)    ! downward salt flux (v3.5+)
       fr_i(:,:)         = sf_dyn(jf_ice)%fnow(:,:,1)  * tmask(:,:,1)    ! Sea-ice fraction
       qsr (:,:)         = sf_dyn(jf_qsr)%fnow(:,:,1)  * tmask(:,:,1)    ! solar radiation
       emp (:,:)         = sf_dyn(jf_emp)%fnow(:,:,1)  * tmask(:,:,1)    ! E-P
+      wndm(:,:)            = sf_dyn(jf_wnd)%fnow(:,:,1)  * tmask(:,:,1)    ! wind speed - needed for gas exchange
+      fmmflx(:,:)          = sf_dyn(jf_fmf)%fnow(:,:,1)  * tmask(:,:,1)    ! downward salt flux (v3.5+)
+      fr_i(:,:)            = sf_dyn(jf_ice)%fnow(:,:,1)  * tmask(:,:,1)    ! Sea-ice fraction
+      qsr (:,:)            = sf_dyn(jf_qsr)%fnow(:,:,1)  * tmask(:,:,1)    ! solar radiation
+      emp (:,:)            = sf_dyn(jf_emp)%fnow(:,:,1)  * tmask(:,:,1)    ! E-P
       IF( ln_dynrnf ) THEN
          rnf (:,:)      = sf_dyn(jf_rnf)%fnow(:,:,1) * tmask(:,:,1)    ! E-P
          IF( ln_dynrnf_depth .AND. .NOT. ln_linssh )    CALL  dta_dyn_hrnf(Kmm)
+         rnf (:,:)         = sf_dyn(jf_rnf)%fnow(:,:,1) * tmask(:,:,1)    ! E-P
+         IF( ln_dynrnf_depth .AND. .NOT. ln_linssh )    CALL  dta_dyn_rnf( Kmm )
       ENDIF
+      !
       uu(:,:,:,Kmm)        = sf_dyn(jf_uwd)%fnow(:,:,:) * umask(:,:,:)    ! effective u-transport
       vv(:,:,:,Kmm)        = sf_dyn(jf_vwd)%fnow(:,:,:) * vmask(:,:,:)    ! effective v-transport
       ww(:,:,:)        = sf_dyn(jf_wwd)%fnow(:,:,:) * tmask(:,:,:)    ! effective v-transport
+      ww(:,:,:)            = sf_dyn(jf_wwd)%fnow(:,:,:) * tmask(:,:,:)    ! effective v-transport
+      !
       IF( .NOT.ln_linssh ) THEN
 …
          zhdivtr(:,:,:) = sf_dyn(jf_div)%fnow(:,:,:)  * tmask(:,:,:)    ! effective u-transport
          emp_b  (:,:)   = sf_dyn(jf_empb)%fnow(:,:,1) * tmask(:,:,1)    ! E-P
          zemp   (:,:)   = ( 0.5_wp * ( emp(:,:) + emp_b(:,:) ) + rnf(:,:) + fwbcorr ) * tmask(:,:,1)
+         zemp   (:,:)   = ( 0.5_wp * ( emp(:,:) + emp_b(:,:) ) + rnf(:,:) ) * tmask(:,:,1)
 #if defined key_qco
          CALL dta_dyn_ssh( kt, zhdivtr, ssh(:,:,Kbb), zemp, ssh(:,:,Kaa) )
 …
       INTEGER  :: ios                                ! Local integer output status for namelist read
       INTEGER  :: ji, jj, jk
-      REAL(wp) :: zcoef
-      INTEGER  :: nkrnf_max
-      REAL(wp) :: hrnf_max
       !!
       CHARACTER(len=100)            ::  cn_dir        !   Root directory for location of core files
 …
       TYPE(FLD_N) :: sn_div  ! informations about the fields to be read
       !!
       NAMELIST/namdta_dyn/cn_dir, ln_dynrnf, ln_dynrnf_depth,  fwbcorr, &
+      NAMELIST/namdta_dyn/cn_dir, ln_dynrnf, ln_dynrnf_depth, &
          &                sn_uwd, sn_vwd, sn_wwd, sn_emp,               &
          &                sn_avt, sn_tem, sn_sal, sn_mld , sn_qsr ,     &
 …
          WRITE(numout,*) '      runoffs option enabled (T) or not (F)            ln_dynrnf        = ', ln_dynrnf
          WRITE(numout,*) '      runoffs is spread in vertical                    ln_dynrnf_depth  = ', ln_dynrnf_depth
-         WRITE(numout,*) '      annual global mean of empmr for ssh correction   fwbcorr          = ', fwbcorr
          WRITE(numout,*)
       ENDIF
 …
         DO jk = 1, jpkm1
            e3t(:,:,jk,Kmm) = e3t_0(:,:,jk) * ( 1._wp + ssh(:,:,Kmm) * r1_ht_0(:,:) * tmask(:,:,jk) )
+           e3t(:,:,jk,Kbb) = e3t_0(:,:,jk) * ( 1._wp + ssh(:,:,Kbb) * r1_ht_0(:,:) * tmask(:,:,jk) )
         ENDDO
+        e3t(:,:,jpk,Kaa) = e3t_0(:,:,jpk)
+        ! Horizontal scale factor interpolations
+        ! --------------------------------------
+        CALL dom_vvl_interpol( e3t(:,:,:,Kmm), e3u(:,:,:,Kmm), 'U' )
+        CALL dom_vvl_interpol( e3t(:,:,:,Kmm), e3v(:,:,:,Kmm), 'V' )
+        ! Vertical scale factor interpolations
+        ! ------------------------------------
+        CALL dom_vvl_interpol( e3t(:,:,:,Kmm), e3w(:,:,:,Kmm), 'W' )
+!!gm this should be computed from ssh(Kbb)
+        e3t(:,:,:,Kbb)  = e3t(:,:,:,Kmm)
+        e3u(:,:,:,Kbb)  = e3u(:,:,:,Kmm)
+        e3v(:,:,:,Kbb)  = e3v(:,:,:,Kmm)
+        ! t- and w- points depth
+        ! ----------------------
+        gdept(:,:,1,Kmm) = 0.5_wp * e3w(:,:,1,Kmm)
+        gdepw(:,:,1,Kmm) = 0.0_wp
+        DO_3D( 1, 1, 1, 1, 2, jpk )
+          !    zcoef = (tmask(ji,jj,jk) - wmask(ji,jj,jk))   ! 0 everywhere
+          !    tmask = wmask, ie everywhere expect at jk = mikt
+                                                             ! 1 for jk =
+                                                             ! mikt
+           zcoef = (tmask(ji,jj,jk) - wmask(ji,jj,jk))
+           gdepw(ji,jj,jk,Kmm) = gdepw(ji,jj,jk-1,Kmm) + e3t(ji,jj,jk-1,Kmm)
+           gdept(ji,jj,jk,Kmm) =      zcoef  * ( gdepw(ji,jj,jk  ,Kmm) + 0.5 * e3w(ji,jj,jk,Kmm))  &
+               &                + (1-zcoef) * ( gdept(ji,jj,jk-1,Kmm) + e3w(ji,jj,jk,Kmm))
+        END_3D
+        gdept(:,:,:,Kbb) = gdept(:,:,:,Kmm)
+        gdepw(:,:,:,Kbb) = gdepw(:,:,:,Kmm)
+        !
+        CALL dta_dyn_sf_interp( nit000, Kmm )
+        CALL dta_dyn_sf_interp( nit000, Kbb )
 #endif
       ENDIF
+      !
+      CALL dta_dyn_rnf_init( Kmm )
+      !
+      CALL dta_dyn( nit000, Kbb, Kmm, Kaa )
+      !
+   END SUBROUTINE dta_dyn_init
+   SUBROUTINE dta_dyn_atf( kt, Kbb, Kmm, Kaa )
+     !!---------------------------------------------------------------------
+      !!                    ***  ROUTINE dta_dyn_swp  ***
+      !!
+      !! ** Purpose :   Asselin time filter of now SSH
+      !!---------------------------------------------------------------------
+      INTEGER, INTENT(in) :: kt             ! time step
+      INTEGER, INTENT(in) :: Kbb, Kmm, Kaa  ! ocean time level indices
+      !
+      !!---------------------------------------------------------------------
+      IF( kt == nit000 ) THEN
+         IF(lwp) WRITE(numout,*)
+         IF(lwp) WRITE(numout,*) 'dta_dyn_atf : Asselin time filter of sea surface height'
+         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~ '
+      ENDIF
+      ssh(:,:,Kmm) = ssh(:,:,Kmm) + rn_atfp * ( ssh(:,:,Kbb) - 2 * ssh(:,:,Kmm) + ssh(:,:,Kaa))
+      !
+   END SUBROUTINE dta_dyn_atf
+#if ! defined key_qco
+   SUBROUTINE dta_dyn_sf_interp( kt, Kmm )
+      !!---------------------------------------------------------------------
+      !!                    ***  ROUTINE dta_dyn_sf_interp  ***
+      !!
+      !! ** Purpose :   Calculate scale factors at U/V/W points and depths
+      !!                given the after e3t field
+      !!---------------------------------------------------------------------
+      INTEGER, INTENT(in) :: kt   ! time step
+      INTEGER, INTENT(in) :: Kmm  ! ocean time level indices
+      !
+      INTEGER             :: ji, jj, jk
+      REAL(wp)            :: zcoef
+      !!---------------------------------------------------------------------
+      ! Horizontal scale factor interpolations
+      ! --------------------------------------
+      CALL dom_vvl_interpol( e3t(:,:,:,Kmm), e3u(:,:,:,Kmm), 'U' )
+      CALL dom_vvl_interpol( e3t(:,:,:,Kmm), e3v(:,:,:,Kmm), 'V' )
+      ! Vertical scale factor interpolations
+      ! ------------------------------------
+      CALL dom_vvl_interpol( e3t(:,:,:,Kmm), e3w (:,:,:,Kmm), 'W' )
+      ! t- and w- points depth
+      ! ----------------------
+      gdept(:,:,1,Kmm) = 0.5_wp * e3w(:,:,1,Kmm)
+      gdepw(:,:,1,Kmm) = 0.0_wp
+      !
+      DO_3D( 1, 1, 1, 1, 2, jpk )
+         zcoef = (tmask(ji,jj,jk) - wmask(ji,jj,jk))
+         gdepw(ji,jj,jk,Kmm) = gdepw(ji,jj,jk-1,Kmm) + e3t(ji,jj,jk-1,Kmm)
+         gdept(ji,jj,jk,Kmm) =      zcoef  * ( gdepw(ji,jj,jk  ,Kmm) + 0.5 * e3w(ji,jj,jk,Kmm))  &
+            &                + (1-zcoef) * ( gdept(ji,jj,jk-1,Kmm) + e3w(ji,jj,jk,Kmm))
+      END_3D
+      !
+   END SUBROUTINE dta_dyn_sf_interp
+#endif
+   SUBROUTINE dta_dyn_ssh( kt, phdivtr, psshb,  pemp, pssha, pe3ta )
+      !!----------------------------------------------------------------------
+      !!                ***  ROUTINE dta_dyn_wzv  ***
+      !!
+      !! ** Purpose :   compute the after ssh (ssh(:,:,Kaa)) and the now vertical velocity
+      !!
+      !! ** Method  : Using the incompressibility hypothesis,
+      !!        - the ssh increment is computed by integrating the horizontal divergence
+      !!          and multiply by the time step.
+      !!
+      !!        - compute the after scale factor : repartition of ssh INCREMENT proportionnaly
+      !!                                           to the level thickness ( z-star case )
+      !!
+      !!        - the vertical velocity is computed by integrating the horizontal divergence
+      !!          from the bottom to the surface minus the scale factor evolution.
+      !!          The boundary conditions are w=0 at the bottom (no flux)
+      !!
+      !! ** action  :   ssh(:,:,Kaa) / e3t(:,:,k,Kaa) / ww
+      !!
+      !! Reference  : Leclair, M., and G. Madec, 2009, Ocean Modelling.
+      !!----------------------------------------------------------------------
+      INTEGER,                                   INTENT(in )    :: kt        !  time-step
+      REAL(wp), DIMENSION(jpi,jpj,jpk)          , INTENT(in )   :: phdivtr   ! horizontal divergence transport
+      REAL(wp), DIMENSION(jpi,jpj)    , OPTIONAL, INTENT(in )   :: psshb     ! now ssh
+      REAL(wp), DIMENSION(jpi,jpj)    , OPTIONAL, INTENT(in )   :: pemp      ! evaporation minus precipitation
+      REAL(wp), DIMENSION(jpi,jpj)    , OPTIONAL, INTENT(inout) :: pssha     ! after ssh
+      REAL(wp), DIMENSION(jpi,jpj,jpk), OPTIONAL, INTENT(out)   :: pe3ta     ! after vertical scale factor
+      !
+      INTEGER                       :: jk
+      REAL(wp), DIMENSION(jpi,jpj)  :: zhdiv
+      REAL(wp)  :: z2dt
+      !!----------------------------------------------------------------------
+      !
+      z2dt = 2._wp * rn_Dt
+      !
+      zhdiv(:,:) = 0._wp
+      DO jk = 1, jpkm1
+         zhdiv(:,:) = zhdiv(:,:) +  phdivtr(:,:,jk) * tmask(:,:,jk)
+      END DO
+      !                                                ! Sea surface  elevation time-stepping
+      pssha(:,:) = ( psshb(:,:) - z2dt * ( r1_rho0 * pemp(:,:)  + zhdiv(:,:) ) ) * ssmask(:,:)
+      !
+      IF( PRESENT( pe3ta ) ) THEN                      ! After acale factors at t-points ( z_star coordinate )
+      DO jk = 1, jpkm1
+            pe3ta(:,:,jk) = e3t_0(:,:,jk) * ( 1._wp + pssha(:,:) * r1_ht_0(:,:) * tmask(:,:,jk) )
+      END DO
+      ENDIF
+      !
+   END SUBROUTINE dta_dyn_ssh
+   SUBROUTINE dta_dyn_rnf_init( Kmm )
+      !!----------------------------------------------------------------------
+      !!                  ***  ROUTINE dta_dyn_rnf_init  ***
+      !!
+      !! ** Purpose :   Initialisation of the runoffs if (ln_rnf=T)
+      !!
+      !!----------------------------------------------------------------------
+      INTEGER, INTENT(in) :: Kmm  ! ocean time level indices
+      !
+      INTEGER  :: inum                   ! local integer
+      INTEGER  :: ji, jj, jk
+      REAL(wp) :: zcoef
+      INTEGER  :: nkrnf_max
+      REAL(wp) :: hrnf_max
       IF( ln_dynrnf .AND. ln_dynrnf_depth ) THEN       ! read depht over which runoffs are distributed
          IF(lwp) WRITE(numout,*)
 …
       IF(lwp) WRITE(numout,*) ' '
+      !
+      CALL dta_dyn( nit000, Kbb, Kmm, Kaa )
+      !
+   END SUBROUTINE dta_dyn_init
+   SUBROUTINE dta_dyn_sed( kt, Kmm )
+      !!----------------------------------------------------------------------
+      !!                  ***  ROUTINE dta_dyn  ***
+      !!
+      !! ** Purpose :  Prepares dynamics and physics fields from a NEMO run
+      !!               for an off-line simulation of passive tracers
+      !!
+      !! ** Method : calculates the position of data
+      !!             - computes slopes if needed
+      !!             - interpolates data if needed
+      !!----------------------------------------------------------------------
+      INTEGER, INTENT(in) ::   kt   ! ocean time-step index
+      INTEGER, INTENT(in) ::   Kmm  ! ocean time level index
+      !
+      !!----------------------------------------------------------------------
+      !
+      IF( ln_timing )   CALL timing_start( 'dta_dyn_sed')
+      !
+      nsecdyn = nsec_year + nsec1jan000   ! number of seconds between Jan. 1st 00h of nit000 year and the middle of time step
+      !
+      IF( kt == nit000 ) THEN    ;    nprevrec = 0
+      ELSE                       ;    nprevrec = sf_dyn(jf_tem)%nrec(2,sf_dyn(jf_tem)%naa)
+      ENDIF
+      CALL fld_read( kt, 1, sf_dyn )      !=  read data at kt time step   ==!
+      !
+      ts(:,:,:,jp_tem,Kmm) = sf_dyn(jf_tem)%fnow(:,:,:)  * tmask(:,:,:)    ! temperature
+      ts(:,:,:,jp_sal,Kmm) = sf_dyn(jf_sal)%fnow(:,:,:)  * tmask(:,:,:)    ! salinity
+      !
+      CALL eos    ( ts(:,:,:,:,Kmm), rhd, rhop, gdept_0(:,:,:) ) ! In any case, we need rhop
+      IF(sn_cfctl%l_prtctl) THEN                     ! print control
+         CALL prt_ctl(tab3d_1=ts(:,:,:,jp_tem,Kmm), clinfo1=' tn      - : ', mask1=tmask,  kdim=jpk   )
+         CALL prt_ctl(tab3d_1=ts(:,:,:,jp_sal,Kmm), clinfo1=' sn      - : ', mask1=tmask,  kdim=jpk   )
+      ENDIF
+      !
+      IF( ln_timing )   CALL timing_stop( 'dta_dyn_sed')
+      !
+   END SUBROUTINE dta_dyn_sed
+   SUBROUTINE dta_dyn_sed_init( Kmm )
+      !!----------------------------------------------------------------------
+      !!                  ***  ROUTINE dta_dyn_init  ***
+      !!
+      !! ** Purpose :   Initialisation of the dynamical data
+      !! ** Method  : - read the data namdta_dyn namelist
+      !!----------------------------------------------------------------------
+      INTEGER, INTENT( in ) :: Kmm                   ! ocean time level index
+      !
+      INTEGER  :: ierr, ierr0, ierr1, ierr2, ierr3   ! return error code
+      INTEGER  :: ifpr                               ! dummy loop indice
+      INTEGER  :: jfld                               ! dummy loop arguments
+      INTEGER  :: inum, idv, idimv                   ! local integer
+      INTEGER  :: ios                                ! Local integer output status for namelist read
+      !!
+      CHARACTER(len=100)            ::  cn_dir        !   Root directory for location of core files
+      TYPE(FLD_N), DIMENSION(2) ::  slf_d         ! array of namelist informations on the fields to read
+      TYPE(FLD_N) :: sn_tem , sn_sal   !   "                 "
+      !!
+      NAMELIST/namdta_dyn/cn_dir, ln_dynrnf, ln_dynrnf_depth,  fwbcorr, &
+         &                sn_tem, sn_sal
+      !!----------------------------------------------------------------------
+      !
+      READ  ( numnam_ref, namdta_dyn, IOSTAT = ios, ERR = 901)
+   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namdta_dyn in reference namelist' )
+      READ  ( numnam_cfg, namdta_dyn, IOSTAT = ios, ERR = 902 )
+   IF( ios >  0 )   CALL ctl_nam ( ios , 'namdta_dyn in configuration namelist' )
+      IF(lwm) WRITE ( numond, namdta_dyn )
+      !                                         ! store namelist information in an array
+      !                                         ! Control print
+      IF(lwp) THEN
+         WRITE(numout,*)
+         WRITE(numout,*) 'dta_dyn : offline dynamics '
+         WRITE(numout,*) '~~~~~~~ '
+         WRITE(numout,*) '   Namelist namdta_dyn'
+         WRITE(numout,*) '      runoffs option enabled (T) or not (F)            ln_dynrnf        = ', ln_dynrnf
+         WRITE(numout,*) '      runoffs is spread in vertical                    ln_dynrnf_depth  = ', ln_dynrnf_depth
+         WRITE(numout,*) '      annual global mean of empmr for ssh correction   fwbcorr          = ', fwbcorr
+         WRITE(numout,*)
+      ENDIF
+      !
+      jf_tem  = 1     ;   jf_sal  = 2    ;   jfld   = jf_sal
+      !
+      slf_d(jf_tem)  = sn_tem    ;   slf_d(jf_sal)  = sn_sal
+      !
+      ALLOCATE( sf_dyn(jfld), STAT=ierr )         ! set sf structure
+      IF( ierr > 0 )  THEN
+         CALL ctl_stop( 'dta_dyn: unable to allocate sf structure' )   ;   RETURN
+      ENDIF
+      !                                         ! fill sf with slf_i and control print
+      CALL fld_fill( sf_dyn, slf_d, cn_dir, 'dta_dyn_init', 'Data in file', 'namdta_dyn' )
+      !
+      ! Open file for each variable to get his number of dimension
+      DO ifpr = 1, jfld
+         CALL fld_def( sf_dyn(ifpr) )
+         CALL iom_open( sf_dyn(ifpr)%clname, sf_dyn(ifpr)%num )
+         idv   = iom_varid( sf_dyn(ifpr)%num , slf_d(ifpr)%clvar )        ! id of the variable sdjf%clvar
+         idimv = iom_file ( sf_dyn(ifpr)%num )%ndims(idv)                 ! number of dimension for variable sdjf%clvar
+         CALL iom_close( sf_dyn(ifpr)%num )                               ! close file if already open
+         ierr1=0
+         IF( idimv == 3 ) THEN    ! 2D variable
+                                      ALLOCATE( sf_dyn(ifpr)%fnow(jpi,jpj,1)    , STAT=ierr0 )
+            IF( slf_d(ifpr)%ln_tint ) ALLOCATE( sf_dyn(ifpr)%fdta(jpi,jpj,1,2)  , STAT=ierr1 )
+         ELSE                     ! 3D variable
+                                      ALLOCATE( sf_dyn(ifpr)%fnow(jpi,jpj,jpk)  , STAT=ierr0 )
+            IF( slf_d(ifpr)%ln_tint ) ALLOCATE( sf_dyn(ifpr)%fdta(jpi,jpj,jpk,2), STAT=ierr1 )
+         ENDIF
+         IF( ierr0 + ierr1 > 0 ) THEN
+            CALL ctl_stop( 'dta_dyn_init : unable to allocate sf_dyn array structure' )   ;   RETURN
+         ENDIF
+      END DO
+      !
+      CALL dta_dyn_sed( nit000, Kmm )
+      !
+   END SUBROUTINE dta_dyn_sed_init
+   SUBROUTINE dta_dyn_atf( kt, Kbb, Kmm, Kaa )
+     !!---------------------------------------------------------------------
+      !!                    ***  ROUTINE dta_dyn_swp  ***
+      !!
+      !! ** Purpose :   Asselin time filter of now SSH
+      !!---------------------------------------------------------------------
+      INTEGER, INTENT(in) :: kt             ! time step
+      INTEGER, INTENT(in) :: Kbb, Kmm, Kaa  ! ocean time level indices
+      !
+      !!---------------------------------------------------------------------
+      IF( kt == nit000 ) THEN
+         IF(lwp) WRITE(numout,*)
+         IF(lwp) WRITE(numout,*) 'dta_dyn_atf : Asselin time filter of sea surface height'
+         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~ '
+      ENDIF
+      ssh(:,:,Kmm) = ssh(:,:,Kmm) + rn_atfp * ( ssh(:,:,Kbb) - 2 * ssh(:,:,Kmm) + ssh(:,:,Kaa))
+      !! Do we also need to time filter e3t??
+      !
+   END SUBROUTINE dta_dyn_atf
+#if ! defined key_qco
+   SUBROUTINE dta_dyn_sf_interp( kt, Kmm )
+      !!---------------------------------------------------------------------
+      !!                    ***  ROUTINE dta_dyn_sf_interp  ***
+      !!
+      !! ** Purpose :   Calculate scale factors at U/V/W points and depths
+      !!                given the after e3t field
+      !!---------------------------------------------------------------------
+      INTEGER, INTENT(in) :: kt   ! time step
+      INTEGER, INTENT(in) :: Kmm  ! ocean time level indices
+      !
+      INTEGER             :: ji, jj, jk
+      REAL(wp)            :: zcoef
+      !!---------------------------------------------------------------------
+      ! Horizontal scale factor interpolations
+      ! --------------------------------------
+      CALL dom_vvl_interpol( e3t(:,:,:,Kmm), e3u(:,:,:,Kmm), 'U' )
+      CALL dom_vvl_interpol( e3t(:,:,:,Kmm), e3v(:,:,:,Kmm), 'V' )
+      ! Vertical scale factor interpolations
+      ! ------------------------------------
+      CALL dom_vvl_interpol( e3t(:,:,:,Kmm), e3w (:,:,:,Kmm), 'W' )
+      ! t- and w- points depth
+      ! ----------------------
+      gdept(:,:,1,Kmm) = 0.5_wp * e3w(:,:,1,Kmm)
+      gdepw(:,:,1,Kmm) = 0.0_wp
+      !
+      DO_3D( 1, 1, 1, 1, 2, jpk )
+         zcoef = (tmask(ji,jj,jk) - wmask(ji,jj,jk))
+         gdepw(ji,jj,jk,Kmm) = gdepw(ji,jj,jk-1,Kmm) + e3t(ji,jj,jk-1,Kmm)
+         gdept(ji,jj,jk,Kmm) =      zcoef  * ( gdepw(ji,jj,jk  ,Kmm) + 0.5 * e3w(ji,jj,jk,Kmm))  &
+            &                + (1-zcoef) * ( gdept(ji,jj,jk-1,Kmm) + e3w(ji,jj,jk,Kmm))
+      END_3D
+      !
+   END SUBROUTINE dta_dyn_sf_interp
+#endif
+   SUBROUTINE dta_dyn_ssh( kt, phdivtr, psshb,  pemp, pssha, pe3ta )
+      !!----------------------------------------------------------------------
+      !!                ***  ROUTINE dta_dyn_wzv  ***
+      !!
+      !! ** Purpose :   compute the after ssh (ssh(:,:,Kaa)) and the now vertical velocity
+      !!
+      !! ** Method  : Using the incompressibility hypothesis,
+      !!        - the ssh increment is computed by integrating the horizontal divergence
+      !!          and multiply by the time step.
+      !!
+      !!        - compute the after scale factor : repartition of ssh INCREMENT proportionnaly
+      !!                                           to the level thickness ( z-star case )
+      !!
+      !!        - the vertical velocity is computed by integrating the horizontal divergence
+      !!          from the bottom to the surface minus the scale factor evolution.
+      !!          The boundary conditions are w=0 at the bottom (no flux)
+      !!
+      !! ** action  :   ssh(:,:,Kaa) / e3t(:,:,k,Kaa) / ww
+      !!
+      !! Reference  : Leclair, M., and G. Madec, 2009, Ocean Modelling.
+      !!----------------------------------------------------------------------
+      INTEGER,                                   INTENT(in )    :: kt        !  time-step
+      REAL(wp), DIMENSION(jpi,jpj,jpk)          , INTENT(in )   :: phdivtr   ! horizontal divergence transport
+      REAL(wp), DIMENSION(jpi,jpj)    , OPTIONAL, INTENT(in )   :: psshb     ! now ssh
+      REAL(wp), DIMENSION(jpi,jpj)    , OPTIONAL, INTENT(in )   :: pemp      ! evaporation minus precipitation
+      REAL(wp), DIMENSION(jpi,jpj)    , OPTIONAL, INTENT(inout) :: pssha     ! after ssh
+      REAL(wp), DIMENSION(jpi,jpj,jpk), OPTIONAL, INTENT(out)   :: pe3ta     ! after vertical scale factor
+      !
+      INTEGER                       :: jk
+      REAL(wp), DIMENSION(jpi,jpj)  :: zhdiv
+      REAL(wp)  :: z2dt
+      !!----------------------------------------------------------------------
+      !
+      z2dt = 2._wp * rn_Dt
+      !
+      zhdiv(:,:) = 0._wp
+      DO jk = 1, jpkm1
+         zhdiv(:,:) = zhdiv(:,:) +  phdivtr(:,:,jk) * tmask(:,:,jk)
+      END DO
+      !                                                ! Sea surface  elevation time-stepping
+      pssha(:,:) = ( psshb(:,:) - z2dt * ( r1_rho0 * pemp(:,:)  + zhdiv(:,:) ) ) * ssmask(:,:)
+      !
+      IF( PRESENT( pe3ta ) ) THEN                      ! After acale factors at t-points ( z_star coordinate )
+      DO jk = 1, jpkm1
+            pe3ta(:,:,jk) = e3t_0(:,:,jk) * ( 1._wp + pssha(:,:) * r1_ht_0(:,:) * tmask(:,:,jk) )
+      END DO
+      ENDIF
+      !
+   END SUBROUTINE dta_dyn_ssh
+   SUBROUTINE dta_dyn_hrnf( Kmm )
+      !!----------------------------------------------------------------------
+      !!                  ***  ROUTINE sbc_rnf  ***
+   END SUBROUTINE dta_dyn_rnf_init
+   SUBROUTINE dta_dyn_rnf( Kmm )
+      !!----------------------------------------------------------------------
+      !!                  ***  ROUTINE dta_dyn_rnf  ***
       !!
       !! ** Purpose :   update the horizontal divergence with the runoff inflow
       !!
-      !! ** Method  :
-      !!                CAUTION : rnf is positive (inflow) decreasing the
-      !!                          divergence and expressed in m/s
-      !!
-      !! ** Action  :   phdivn   decreased by the runoff inflow
       !!----------------------------------------------------------------------
       !!
 …
       END_2D
+      !
+   END SUBROUTINE dta_dyn_hrnf
+   END SUBROUTINE dta_dyn_rnf
    SUBROUTINE dta_dyn_slp( kt, Kbb, Kmm )
 …
    END SUBROUTINE dta_dyn_slp
    SUBROUTINE compute_slopes( kt, pts, puslp, pvslp, pwslpi, pwslpj, Kbb, Kmm )
       !!---------------------------------------------------------------------
 …
    END SUBROUTINE compute_slopes
+#if defined key_sed_off
+   SUBROUTINE dta_dyn_sed( kt, Kmm )
+      !!----------------------------------------------------------------------
+      !!                  ***  ROUTINE dta_dyn  ***
+      !!
+      !! ** Purpose :  Prepares dynamics and physics fields from a NEMO run
+      !!               for an off-line simulation of passive tracers
+      !!
+      !! ** Method : calculates the position of data
+      !!             - computes slopes if needed
+      !!             - interpolates data if needed
+      !!----------------------------------------------------------------------
+      INTEGER, INTENT(in) ::   kt   ! ocean time-step index
+      INTEGER, INTENT(in) ::   Kmm  ! ocean time level index
+      !
+      !!----------------------------------------------------------------------
+      !
+      IF( ln_timing )   CALL timing_start( 'dta_dyn_sed')
+      !
+      nsecdyn = nsec_year + nsec1jan000   ! number of seconds between Jan. 1st 00h of nit000 year and the middle of time step
+      !
+      IF( kt == nit000 ) THEN    ;    nprevrec = 0
+      ELSE                       ;    nprevrec = sf_dyn(jf_tem)%nrec(2,sf_dyn(jf_tem)%naa)
+      ENDIF
+      CALL fld_read( kt, 1, sf_dyn )      !=  read data at kt time step   ==!
+      !
+      ts(:,:,:,jp_tem,Kmm) = sf_dyn(jf_tem)%fnow(:,:,:)  * tmask(:,:,:)    ! temperature
+      ts(:,:,:,jp_sal,Kmm) = sf_dyn(jf_sal)%fnow(:,:,:)  * tmask(:,:,:)    ! salinity
+      !
+      CALL eos    ( ts(:,:,:,:,Kmm), rhd, rhop, gdept_0(:,:,:) ) ! In any case, we need rhop
+      IF(sn_cfctl%l_prtctl) THEN                     ! print control
+         CALL prt_ctl(tab3d_1=ts(:,:,:,jp_tem,Kmm), clinfo1=' tn      - : ', mask1=tmask,  kdim=jpk   )
+         CALL prt_ctl(tab3d_1=ts(:,:,:,jp_sal,Kmm), clinfo1=' sn      - : ', mask1=tmask,  kdim=jpk   )
+      ENDIF
+      !
+      IF( ln_timing )   CALL timing_stop( 'dta_dyn_sed')
+      !
+   END SUBROUTINE dta_dyn_sed
+   SUBROUTINE dta_dyn_sed_init( Kmm )
+      !!----------------------------------------------------------------------
+      !!                  ***  ROUTINE dta_dyn_init  ***
+      !!
+      !! ** Purpose :   Initialisation of the dynamical data
+      !! ** Method  : - read the data namdta_dyn namelist
+      !!----------------------------------------------------------------------
+      INTEGER, INTENT( in ) :: Kmm                   ! ocean time level index
+      !
+      INTEGER  :: ierr, ierr0, ierr1, ierr2, ierr3   ! return error code
+      INTEGER  :: ifpr                               ! dummy loop indice
+      INTEGER  :: jfld                               ! dummy loop arguments
+      INTEGER  :: inum, idv, idimv                   ! local integer
+      INTEGER  :: ios                                ! Local integer output status for namelist read
+      !!
+      CHARACTER(len=100)            ::  cn_dir        !   Root directory for location of core files
+      TYPE(FLD_N), DIMENSION(2) ::  slf_d         ! array of namelist informations on the fields to read
+      TYPE(FLD_N) :: sn_tem , sn_sal   !   "                 "
+      !!
+      NAMELIST/namdta_dyn/cn_dir, ln_dynrnf, ln_dynrnf_depth,  &
+         &                sn_tem, sn_sal
+      !!----------------------------------------------------------------------
+      !
+      READ  ( numnam_ref, namdta_dyn, IOSTAT = ios, ERR = 901)
+   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namdta_dyn in reference namelist' )
+      READ  ( numnam_cfg, namdta_dyn, IOSTAT = ios, ERR = 902 )
+   IF( ios >  0 )   CALL ctl_nam ( ios , 'namdta_dyn in configuration namelist' )
+      IF(lwm) WRITE ( numond, namdta_dyn )
+      !                                         ! store namelist information in an array
+      !                                         ! Control print
+      IF(lwp) THEN
+         WRITE(numout,*)
+         WRITE(numout,*) 'dta_dyn : offline dynamics '
+         WRITE(numout,*) '~~~~~~~ '
+         WRITE(numout,*) '   Namelist namdta_dyn'
+         WRITE(numout,*) '      runoffs option enabled (T) or not (F)            ln_dynrnf        = ', ln_dynrnf
+         WRITE(numout,*) '      runoffs is spread in vertical                    ln_dynrnf_depth  = ', ln_dynrnf_depth
+         WRITE(numout,*)
+      ENDIF
+      !
+      jf_tem  = 1     ;   jf_sal  = 2    ;   jfld   = jf_sal
+      !
+      slf_d(jf_tem)  = sn_tem    ;   slf_d(jf_sal)  = sn_sal
+      !
+      ALLOCATE( sf_dyn(jfld), STAT=ierr )         ! set sf structure
+      IF( ierr > 0 )  THEN
+         CALL ctl_stop( 'dta_dyn: unable to allocate sf structure' )   ;   RETURN
+      ENDIF
+      !                                         ! fill sf with slf_i and control print
+      CALL fld_fill( sf_dyn, slf_d, cn_dir, 'dta_dyn_init', 'Data in file', 'namdta_dyn' )
+      !
+      ! Open file for each variable to get his number of dimension
+      DO ifpr = 1, jfld
+         CALL fld_def( sf_dyn(ifpr) )
+         CALL iom_open( sf_dyn(ifpr)%clname, sf_dyn(ifpr)%num )
+         idv   = iom_varid( sf_dyn(ifpr)%num , slf_d(ifpr)%clvar )        ! id of the variable sdjf%clvar
+         idimv = iom_file ( sf_dyn(ifpr)%num )%ndims(idv)                 ! number of dimension for variable sdjf%clvar
+         CALL iom_close( sf_dyn(ifpr)%num )                               ! close file if already open
+         ierr1=0
+         IF( idimv == 3 ) THEN    ! 2D variable
+                                      ALLOCATE( sf_dyn(ifpr)%fnow(jpi,jpj,1)    , STAT=ierr0 )
+            IF( slf_d(ifpr)%ln_tint ) ALLOCATE( sf_dyn(ifpr)%fdta(jpi,jpj,1,2)  , STAT=ierr1 )
+         ELSE                     ! 3D variable
+                                      ALLOCATE( sf_dyn(ifpr)%fnow(jpi,jpj,jpk)  , STAT=ierr0 )
+            IF( slf_d(ifpr)%ln_tint ) ALLOCATE( sf_dyn(ifpr)%fdta(jpi,jpj,jpk,2), STAT=ierr1 )
+         ENDIF
+         IF( ierr0 + ierr1 > 0 ) THEN
+            CALL ctl_stop( 'dta_dyn_init : unable to allocate sf_dyn array structure' )   ;   RETURN
+         ENDIF
+      END DO
+      !
+      CALL dta_dyn_sed( nit000, Kmm )
+      !
+   END SUBROUTINE dta_dyn_sed_init
+#endif
    !!======================================================================
 END MODULE dtadyn

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/OFF/nemogcm.F90

-                      r14229
+                      r14328
    USE mppini         ! shared/distributed memory setting (mpp_init routine)
    USE lib_mpp        ! distributed memory computing
 #if defined key_iomput
+#if defined key_xios
    USE xios           ! xIOserver
 #endif
 …
          IF( istp /= nit000 )   CALL day        ( istp )         ! Calendar (day was already called at nit000 in day_init)
                                 CALL iom_setkt  ( istp - nit000 + 1, cxios_context )   ! say to iom that we are at time step kstp
+#if defined key_sed_off
+                                CALL dta_dyn_sed( istp,      Nnn      )       ! Interpolation of the dynamical fields
+#else
+#if ! defined key_sed_off
                                 CALL dta_dyn    ( istp, Nbb, Nnn, Naa )       ! Interpolation of the dynamical fields
-#endif
-#if ! defined key_sed_off
          IF( .NOT.ln_linssh ) THEN
                                 CALL dta_dyn_atf( istp, Nbb, Nnn, Naa )       ! time filter of sea  surface height and vertical scale factors
 …
          ENDIF
                                 CALL trc_stp    ( istp, Nbb, Nnn, Nrhs, Naa ) ! time-stepping
-# if defined key_qco
-                                !r3t(:,:,Nnn) = r3t_f(:,:)                     ! update ssh to h0 ratio
-                                !r3u(:,:,Nnn) = r3u_f(:,:)
-                                !r3v(:,:,Nnn) = r3v_f(:,:)
-# endif
-#endif
          ! Swap time levels
          Nrhs = Nbb
          Nbb = Nnn
          Nnn = Naa
          Naa = Nrhs
+         Nbb  = Nnn
+         Nnn  = Naa
+         Naa  = Nrhs
+         !
 #if ! defined key_qco
-# if ! defined key_sed_off
          IF( .NOT.ln_linssh )   CALL dta_dyn_sf_interp( istp, Nnn )  ! calculate now grid parameters
+# endif
+#endif
+#endif
+#else
+                                CALL dta_dyn_sed( istp,      Nnn      )       ! Interpolation of the dynamical fields
+#endif
          CALL stp_ctl    ( istp )             ! Time loop: control and print
          istp = istp + 1
 …
       END DO
+      !
 #if defined key_iomput
+#if defined key_xios
       CALL iom_context_finalize( cxios_context ) ! needed for XIOS+AGRIF
 #endif
 …
       CALL nemo_closefile
+      !
 #if defined key_iomput
+#if defined key_xios
                      CALL xios_finalize   ! end mpp communications with xios
 #else
 …
       !                             !-------------------------------------------------!
+      !
 #if defined key_iomput
+#if defined key_xios
       CALL xios_initialize( "for_xios_mpi_id", return_comm=ilocal_comm )   ! nemo local communicator given by xios
       CALL mpp_start( ilocal_comm )

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/SAO/nemogcm.F90

-                      r14227
+                      r14328
    USE lbcnfd  , ONLY : isendto, nsndto ! Setup of north fold exchanges
    USE lib_fortran    ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined)
 #if defined key_iomput
+#if defined key_xios
    USE xios           ! xIOserver
 #endif
 …
       !                             !-------------------------------------------------!
+      !
 #if defined key_iomput
+#if defined key_xios
       IF( Agrif_Root() ) THEN
          IF( lk_oasis ) THEN

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/SAS/diawri.F90

-                      r12933
+                      r14328
    PUBLIC   dia_wri_state
    PUBLIC   dia_wri_alloc           ! Called by nemogcm module
 #if ! defined key_iomput
+#if ! defined key_xios
    PUBLIC   dia_wri_alloc_abl       ! Called by sbcabl  module (if ln_abl = .true.)
 #endif
 …
 CONTAINS
 # if defined key_iomput
    !!----------------------------------------------------------------------
    !!   'key_iomput'                                        use IOM library
+# if defined key_xios
+   !!----------------------------------------------------------------------
+   !!   'key_xios'                                        use IOM library
    !!----------------------------------------------------------------------
    INTEGER FUNCTION dia_wri_alloc()

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/SAS/nemogcm.F90

-                      r14229
+                      r14328
    USE lbcnfd  , ONLY : isendto, nsndto ! Setup of north fold exchanges
    USE lib_fortran    ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined)
 #if defined key_iomput
+#if defined key_xios
    USE xios           ! xIOserver
 #endif
 …
       CALL nemo_closefile
+      !
 #if defined key_iomput
+#if defined key_xios
                                     CALL xios_finalize  ! end mpp communications with xios
       IF( lk_oasis     )            CALL cpl_finalize   ! end coupling and mpp communications with OASIS
 …
       !                             !-------------------------------------------------!
+      !
 #if defined key_iomput
+#if defined key_xios
       IF( Agrif_Root() ) THEN
          IF( lk_oasis ) THEN

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/SAS/step.F90

-                      r14227
+                      r14328
    USE lbclnk           !
    USE timing           ! Timing
 #if defined key_iomput
+#if defined key_xios
    USE xios
 #endif
 …
       ENDIF
       IF( kstp == nit000 + 1 )   lk_agrif_fstep = .FALSE.
 # if defined key_iomput
+# if defined key_xios
       IF( Agrif_Nbstepint() == 0 )   CALL iom_swap( cxios_context )
 # endif
 …
       IF( lk_oasis .AND. nstop == 0 ) CALL sbc_cpl_snd( kstp, Nbb, Nnn )       ! coupled mode : field exchanges if OASIS-coupled ice
 #if defined key_iomput
+#if defined key_xios
       IF( kstp == nitrst ) THEN
          IF(.NOT.lwxios) THEN

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/SAS/stpctl.F90

-                      r13616
+                      r14328
    PUBLIC stp_ctl           ! routine called by step.F90
+   INTEGER                ::   nrunid   ! netcdf file id
+   INTEGER, DIMENSION(3)  ::   nvarid   ! netcdf variable id
+   INTEGER, PARAMETER         ::   jpvar = 3
+   INTEGER                    ::   nrunid   ! netcdf file id
+   INTEGER, DIMENSION(jpvar)  ::   nvarid   ! netcdf variable id
    !!----------------------------------------------------------------------
    !! NEMO/SAS 4.0 , NEMO Consortium (2018)
 …
       !!----------------------------------------------------------------------
       !!                    ***  ROUTINE stp_ctl  ***
       !!
+      !!
       !! ** Purpose :   Control the run
       !!
 …
       INTEGER, INTENT(in   ) ::   Kmm      ! ocean time level index
       !!
+      INTEGER, PARAMETER              ::   jptst = 3
       INTEGER                         ::   ji                                    ! dummy loop indices
       INTEGER                         ::   idtime, istatus
       INTEGER , DIMENSION(4)          ::   iareasum, iareamin, iareamax
       INTEGER , DIMENSION(3,3)        ::   iloc                                  ! min/max loc indices
+      INTEGER , DIMENSION(jptst)      ::   iareasum, iareamin, iareamax
+      INTEGER , DIMENSION(3,jptst)    ::   iloc                                  ! min/max loc indices
       REAL(wp)                        ::   zzz                                   ! local real
+      REAL(wp), DIMENSION(4)          ::   zmax, zmaxlocal
+      REAL(wp), DIMENSION(jpvar+1)    ::   zmax
+      REAL(wp), DIMENSION(jptst)      ::   zmaxlocal
       LOGICAL                         ::   ll_wrtstp, ll_colruns, ll_wrtruns, ll_0oce
       LOGICAL, DIMENSION(jpi,jpj)     ::   llmsk
 …
+      !
       ll_wrtstp  = ( MOD( kt-nit000, sn_cfctl%ptimincr ) == 0 ) .OR. ( kt == nitend )
       ll_colruns = ll_wrtstp .AND. sn_cfctl%l_runstat .AND. jpnij > 1
+      ll_colruns = ll_wrtstp .AND. sn_cfctl%l_runstat .AND. jpnij > 1
       ll_wrtruns = ( ll_colruns .OR. jpnij == 1 ) .AND. lwm
+      !
 …
             istatus = NF90_ENDDEF(nrunid)
          ENDIF
+         !
+         !
       ENDIF
+      !
 …
       zmax(2) = MAXVAL( ABS( u_ice(:,:) )    , mask = llmsk )                   ! max ice velocity (zonal only)
       zmax(3) = MAXVAL(     -tm_i (:,:) + rt0, mask = llmsk )                   ! min ice temperature (in degC)
       zmax(4) = REAL( nstop, wp )                                               ! stop indicator
+      zmax(jpvar+1) = REAL( nstop, wp )                                         ! stop indicator
+      !
       !                                   !==               get global extrema             ==!
       !                                   !==  done by all processes if writting run.stat  ==!
       IF( ll_colruns ) THEN
          zmaxlocal(:) = zmax(:)
+         zmaxlocal(:) = zmax(1:jptst)
          CALL mpp_max( "stpctl", zmax )          ! max over the global domain: ok even of ll_0oce = .true.
          nstop = NINT( zmax(4) )                 ! update nstop indicator (now sheared among all local domains)
+         nstop = NINT( zmax(jpvar+1) )           ! update nstop indicator (now sheared among all local domains)
       ELSE
          ! if no ocean point: MAXVAL returns -HUGE => we must overwrite this value to avoid error handling bellow.
          IF( ll_0oce )   zmax(1:3) = 0._wp       ! default "valid" values...
+         IF( ll_0oce )   zmax(1:jptst) = 0._wp        ! default "valid" values...
       ENDIF
+      !
 …
       !                                   !==  done only by 1st subdomain at writting timestep  ==!
       IF( ll_wrtruns ) THEN
          WRITE(numrun,9500) kt, zmax(1), zmax(2), zmax(3)
          DO ji = 1, 3
+         WRITE(numrun,9500) kt, zmax(1:jptst)
+         DO ji = 1, jpvar
             istatus = NF90_PUT_VAR( nrunid, nvarid(ji), (/zmax(ji)/), (/kt/), (/1/) )
          END DO
 …
       !                                   !==  done by all processes at every time step  ==!
+      !
       IF(   zmax(1) >  100._wp .OR.   &                   ! too large ice thickness maximum ( > 100 m)
          &  zmax(2) >   10._wp .OR.   &                   ! too large ice velocity ( > 10 m/s)
          &  zmax(3) < -101._wp .OR.   &                   ! too cold ice temperature ( < -100 degC)
          &  ISNAN( zmax(1) + zmax(2) + zmax(3) ) .OR.   &               ! NaN encounter in the tests
          &  ABS(   zmax(1) + zmax(2) + zmax(3) ) > HUGE(1._wp) ) THEN   ! Infinity encounter in the tests
+      IF(   zmax(1) >  100._wp .OR.   &                       ! too large ice thickness maximum ( > 100 m)
+         &  zmax(2) >   10._wp .OR.   &                       ! too large ice velocity ( > 10 m/s)
+         &  zmax(3) < -101._wp .OR.   &                       ! too cold ice temperature ( < -100 degC)
+         & ISNAN( SUM(zmax(1:jptst)) ) .OR.   &               ! NaN encounter in the tests
+         & ABS(   SUM(zmax(1:jptst)) ) > HUGE(1._wp) ) THEN   ! Infinity encounter in the tests
+         !
          iloc(:,:) = 0
 …
             ! find which subdomain has the max.
             iareamin(:) = jpnij+1   ;   iareamax(:) = 0   ;   iareasum(:) = 0
             DO ji = 1, 4
+            DO ji = 1, jptst
                IF( zmaxlocal(ji) == zmax(ji) ) THEN
                   iareamin(ji) = narea   ;   iareamax(ji) = narea   ;   iareasum(ji) = 1
 …
             iloc(1:2,2) = MAXLOC( ABS( u_ice(:,:) )    , mask = llmsk )
             iloc(1:2,3) = MINLOC(       tm_i(:,:) - rt0, mask = llmsk )
             DO ji = 1, 3   ! local domain indices ==> global domain indices, excluding halos
+            DO ji = 1, jptst   ! local domain indices ==> global domain indices, excluding halos
                iloc(1:2,ji) = (/ mig0(iloc(1,ji)), mjg0(iloc(2,ji)) /)
             END DO
 …
          CALL dia_wri_state( Kmm, 'output.abort' )     ! create an output.abort file
+         !
          IF( ll_colruns .or. jpnij == 1 ) THEN   ! all processes synchronized -> use lwp to print in opened ocean.output files
+         IF( ll_colruns .OR. jpnij == 1 ) THEN   ! all processes synchronized -> use lwp to print in opened ocean.output files
             IF(lwp) THEN   ;   CALL ctl_stop( ctmp1, ' ', ctmp2, ctmp3, ctmp4, ctmp5, ' ', ctmp6 )
             ELSE           ;   nstop = MAX(1, nstop)   ! make sure nstop > 0 (automatically done when calling ctl_stop)
 …
       !!----------------------------------------------------------------------
       WRITE(clkt , '(i9)') kt
       WRITE(clfmt, '(i1)') INT(LOG10(REAL(jpnij  ,wp))) + 1     ! how many digits to we need to write ? (we decide max = 9)
       !!! WRITE(clsum, '(i'//clfmt//')') ksum                   ! this is creating a compilation error with AGRIF

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/SWE/nemogcm.F90

-                      r14229
+                      r14328
       CALL nemo_closefile
+      !
 #if defined key_iomput
+#if defined key_xios
                        CALL xios_finalize  ! end mpp communications with xios
 #else
 …
       !                             !-------------------------------------------------!
+      !
 #if defined key_iomput
+#if defined key_xios
       CALL xios_initialize( "for_xios_mpi_id", return_comm=ilocal_comm )   ! nemo local communicator given by xios
       CALL mpp_start( ilocal_comm )

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/SWE/stp_oce.F90

-                      r14137
+                      r14328
    !                                                   (dyn_asm_inc routine)
    USE asmbkg          ! writing out state trajectory
    USE stpctl          ! time stepping control            (stp_ctl_SWE routine)
+   USE stpctl          ! time stepping control            (stp_ctl routine)
    USE restart         ! ocean restart                    (rst_wri routine)
    USE prtctl          ! Print control                    (prt_ctl routine)
 …
    USE timing          ! Timing
 #if defined key_iomput
+#if defined key_xios
    USE xios            ! I/O server
 #endif

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/SWE/stpmlf.F90

-                      r14137
+                      r14328
       ! Control
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
                          CALL stp_ctl_SWE   ( kstp, Nnn )
+                         CALL stp_ctl  ( kstp, Nnn )
       IF( kstp == nit000 ) THEN                          ! 1st time step only
 …
+      !
 #if defined key_iomput
+#if defined key_xios
       IF( kstp == nitend .OR. indic < 0 ) THEN
 !!st : cxios_context needed ? because opened earlier ???

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/SWE/stprk3.F90

-                      r14179
+                      r14328
       ! Control
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
                          CALL stp_ctl_SWE  ( kstp     , Nbb )
+                         CALL stp_ctl      ( kstp     , Nbb )
       IF( kstp == nit000 ) THEN                          ! 1st time step only
 …
+      !
 #if defined key_iomput
+#if defined key_xios
       IF( kstp == nitend .OR. indic < 0 ) THEN
          CALL iom_context_finalize( cxios_context )

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/TOP/AGE/trcwri_age.F90

r12377	r14328
6	6	!! History : 1.0 ! 2009-05 (C. Ethe) Original code
7	7	!!----------------------------------------------------------------------
8		#if defined key_top && defined key_~~iomput~~
	8	#if defined key_top && defined key_xios
9	9	!!----------------------------------------------------------------------
10	10	!! trc_wri_age : outputs of concentration fields

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/TOP/C14/trcwri_c14.F90

r13295	r14328
7	7	!! History : 2.0 ! 2015 (A. Mouchet) adapted code for C14
8	8	!!----------------------------------------------------------------------
9		#if defined key_top && defined key_~~iomput~~
	9	#if defined key_top && defined key_xios
10	10	!!----------------------------------------------------------------------
11	11	!! trc_wri_c14 : outputs of ventilation fields

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/TOP/CFC/trcwri_cfc.F90

r12377	r14328
6	6	!! History : 1.0 ! 2009-05 (C. Ethe) Original code
7	7	!!----------------------------------------------------------------------
8		#if defined key_top && defined key_~~iomput~~
	8	#if defined key_top && defined key_xios
9	9	!!----------------------------------------------------------------------
10	10	!! trc_wri_cfc : outputs of concentration fields

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/TOP/MY_TRC/trcwri_my_trc.F90

r12377	r14328
4	4	!! trc_wri_my_trc : outputs of concentration fields
5	5	!!======================================================================
6		#if defined key_top && defined key_~~iomput~~
	6	#if defined key_top && defined key_xios
7	7	!!----------------------------------------------------------------------
8	8	!! History : ! 2007 (C. Ethe, G. Madec) Original code

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/TOP/PISCES/SED/sedrst.F90

r14039	r14328
84	84	CALL iom_open( TRIM(clpath)//TRIM(clname), numrsw, ldwrt = .TRUE., kdlev = jpksed, cdcomp = 'SED' )
85	85	ELSE
86		#if defined key_~~iomput~~
	86	#if defined key_xios
87	87	cw_sedrst_cxt = "rstws_"//TRIM(ADJUSTL(clkt))
88	88	IF( TRIM(Agrif_CFixed()) == '0' ) THEN

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/TOP/PISCES/trcwri_pisces.F90

r13295	r14328
6	6	!! History : 1.0 ! 2009-05 (C. Ethe) Original code
7	7	!!----------------------------------------------------------------------
8		#if defined key_top && defined key_~~iomput~~
	8	#if defined key_top && defined key_xios
9	9	!!----------------------------------------------------------------------
10	10	!! trc_wri_pisces : outputs of concentration fields

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/TOP/README.rst

-                      r14229
+                      r14328
 Here below the list of preprocessing keys that applies to the TOP interface (beside ``key_top``):
 ``key_iomput``
+``key_xios``
    use XIOS I/O
 …
 .. code-block:: perl
    bld::tool::fppkeys key_iomput key_top
+   bld::tool::fppkeys key_xios key_top
 the compilation with :file:`makenemo` will be executed through the following syntax
 …
 .. code-block:: perl
    bld::tool::fppkeys  key_iomput key_top
+   bld::tool::fppkeys  key_xios key_top
    src::MYBGC::initialization         <MYBGCPATH>/initialization
 …
    .. code-block:: perl
       bld::tool::fppkeys  key_zdftke key_dynspg_ts key_iomput key_top
+      bld::tool::fppkeys  key_zdftke key_dynspg_ts key_xios key_top
       inc <MYBGCPATH>/MYBGC.fcm

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/TOP/TRP/trdtrc_oce.F90

r10425	r14328
24	24	LOGICAL, DIMENSION(:), ALLOCATABLE :: ln_trdtrc !: large trends diagnostic to write or not (namelist)
25	25
26		# if defined key_trdtrc && defined key_~~iomput~~
	26	# if defined key_trdtrc && defined key_xios
27	27	LOGICAL, PARAMETER :: lk_trdtrc = .TRUE.
28	28	# else

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/TOP/trcnam.F90

r14086	r14328
31	31	PUBLIC trc_nam ! called in trcini
32	32
33		TYPE(PTRACER), DIMENSION(jpmaxtrc), PUBLIC :: sn_tracer !: type of tracer for saving if not key_~~iomput~~
	33	TYPE(PTRACER), DIMENSION(jpmaxtrc), PUBLIC :: sn_tracer !: type of tracer for saving if not key_xios
34	34
35	35	!!----------------------------------------------------------------------

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/TOP/trcrst.F90

r14086	r14328
96	96	CALL iom_open( TRIM(clpath)//TRIM(clname), numrtw, ldwrt = .TRUE. )
97	97	ELSE
98		#if defined key_~~iomput~~
	98	#if defined key_xios
99	99	cw_toprst_cxt = "rstwt_"//TRIM(ADJUSTL(clkt))
100	100	IF( TRIM(Agrif_CFixed()) == '0' ) THEN

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/src/TOP/trcwri.F90

-                      r13237
+                      r14328
    !! History :   1.0  !  2009-05 (C. Ethe)  Original code
    !!----------------------------------------------------------------------
 #if defined key_top && defined key_iomput
+#if defined key_top && defined key_xios
    !!----------------------------------------------------------------------
    !!   'key_top'                                           TOP models
 …
    PUBLIC trc_wri
+   !! * Substitutions
+#  include "do_loop_substitute.h90"
+#  include "domzgr_substitute.h90"
 CONTAINS
 …
       INTEGER, INTENT( in )     :: Kmm  ! time level indices
+      !
       INTEGER                   :: jn
+      INTEGER                   :: jk, jn
       CHARACTER (len=20)        :: cltra
       CHARACTER (len=40)        :: clhstnam
       INTEGER ::   inum = 11            ! temporary logical unit
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   z3d   ! 3D workspace
       !!---------------------------------------------------------------------
+      !
 …
            WRITE(inum,*) clhstnam
            CLOSE(inum)
         ENDIF
+         ENDIF
+       ! Output of initial vertical scale factor
+       CALL iom_put( "e3t_0", e3t_0(:,:,:) )
+       CALL iom_put( "e3u_0", e3u_0(:,:,:) )
+       CALL iom_put( "e3v_0", e3v_0(:,:,:) )
+       !
+#if ! defined key_qco
+       CALL iom_put( "e3t" , e3t(:,:,:,Kmm) )
+       CALL iom_put( "e3u" , e3u(:,:,:,Kmm) )
+       CALL iom_put( "e3v" , e3v(:,:,:,Kmm) )
+#endif
+       !
+         ! Output of initial vertical scale factor
+         CALL iom_put( "e3t_0", e3t_0(:,:,:) )
+         CALL iom_put( "e3u_0", e3u_0(:,:,:) )
+         CALL iom_put( "e3v_0", e3v_0(:,:,:) )
+         !
+         IF( .NOT.ln_linssh )  CALL iom_put( "ssh" , ssh(:,:,Kmm) )              ! sea surface height
+         !
+         IF ( iom_use("e3t") ) THEN  ! time-varying e3t
+            DO jk = 1, jpk
+               z3d(:,:,jk) =  e3t(:,:,jk,Kmm)
+            END DO
+            CALL iom_put( "e3t", z3d(:,:,:) )
+         ENDIF
+         IF ( iom_use("e3u") ) THEN                         ! time-varying e3u
+            DO jk = 1, jpk
+               z3d(:,:,jk) =  e3u(:,:,jk,Kmm)
+            END DO
+            CALL iom_put( "e3u", z3d(:,:,:) )
+         ENDIF
+         IF ( iom_use("e3v") ) THEN                         ! time-varying e3v
+            DO jk = 1, jpk
+               z3d(:,:,jk) =  e3v(:,:,jk,Kmm)
+            END DO
+            CALL iom_put( "e3v", z3d(:,:,:) )
+         ENDIF
+         !
       ENDIF
+      !
       ! write the tracer concentrations in the file
       ! ---------------------------------------

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/BENCH/MY_SRC/usrdef_istate.F90

-                      r14223
+                      r14328
          zfact = REAL(jk-1,wp) / REAL(jpk-1,wp)   ! 0 to 1 to add a basic stratification
          ! temperature choosen to lead to ~50% ice at the beginning if rn_thres_sst = 0.5
          pts(:,:,jk,jp_tem) = 20._wp*z2d(:,:) - 1._wp - 0.5_wp * zfact    ! -1 to -1.5 +/- 1.0 degG
+         pts(ji,jj,jk,jp_tem) = 20._wp*z2d(ji,jj) - 1._wp - 0.5_wp * zfact    ! -1 to -1.5 +/- 1.0 degG
          ! salinity:
          pts(:,:,jk,jp_sal) = 30._wp + 1._wp * zfact + z2d(:,:)           ! 30 to 31   +/- 0.05 psu
+         pts(ji,jj,jk,jp_sal) = 30._wp + 1._wp * zfact + z2d(ji,jj)           ! 30 to 31   +/- 0.05 psu
          ! velocities:
          pu(:,:,jk) = z2d(:,:) *  0.1_wp * umask(:,:,jk)                  ! +/- 0.005  m/s
          pv(:,:,jk) = z2d(:,:) * 0.01_wp * vmask(:,:,jk)                  ! +/- 0.0005 m/s
+         pu(ji,jj,jk) = z2d(ji,jj) *  0.1_wp * umask(ji,jj,jk)                ! +/- 0.005  m/s
+         pv(ji,jj,jk) = z2d(ji,jj) * 0.01_wp * vmask(ji,jj,jk)                ! +/- 0.0005 m/s
       END_3D
       pts(:,:,jpk,:) = 0._wp

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/BENCH/MY_SRC/usrdef_sbc.F90

-                      r14223
+                      r14328
    PRIVATE
    PUBLIC   usrdef_sbc_oce      ! routine called in sbcmod module
    PUBLIC   usrdef_sbc_ice_tau  ! routine called by sbcice_lim.F90 for ice dynamics
    PUBLIC   usrdef_sbc_ice_flx  ! routine called by sbcice_lim.F90 for ice thermo
+   PUBLIC   usrdef_sbc_oce      ! routine called by sbcmod.F90 for sbc ocean
+   PUBLIC   usrdef_sbc_ice_tau  ! routine called by icestp.F90 for ice dynamics
+   PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo
    !! * Substitutions
 …
+         !
       ENDIF
+      !
    END SUBROUTINE usrdef_sbc_oce
 …
       INTEGER, INTENT(in) ::   kt   ! ocean time step
+      !
       REAL(wp), DIMENSION(jpi,jpj) ::   z2d   ! 2D workspace
+      REAL(wp) ::   zztmp
       INTEGER  ::   ji, jj
       !!---------------------------------------------------------------------
 …
+      !
       DO_2D( 0, 0, 0, 0 )
+         z2d(ji,jj) = 0.1 * ( 0.5 - REAL( mig0(ji) + (mjg0(jj)-1) * Ni0glo, wp ) / REAL( Ni0glo * Nj0glo, wp ) )
+         zztmp = 0.1 * ( 0.5 - REAL( mig0(ji) + (mjg0(jj)-1) * Ni0glo, wp ) / REAL( Ni0glo * Nj0glo, wp ) )
+         utau_ice(ji,jj) = 0.1_wp + zztmp
+         vtau_ice(ji,jj) = 0.1_wp + zztmp
       END_2D
-      utau_ice(:,:) = 0.1_wp + z2d(:,:)
-      vtau_ice(:,:) = 0.1_wp + z2d(:,:)
       CALL lbc_lnk_multi( 'usrdef_sbc', utau_ice, 'U', -1., vtau_ice, 'V', -1. )
 …
       !!                     ***  ROUTINE usrdef_sbc_ice_flx  ***
       !!
+      !! ** Purpose :   provide the surface boundary (flux) condition over
+      !sea-ice
+      !! ** Purpose :   provide the surface boundary (flux) condition over sea-ice
       !!---------------------------------------------------------------------
       INTEGER, INTENT(in) ::   kt   ! ocean time step
 …
       REAL(wp), DIMENSION(jpi,jpj) ::   zsnw   ! snw distribution after wind blowing
       !!---------------------------------------------------------------------
+#if defined key_si3
+      !
-#if defined key_si3
       IF( kt==nit000 .AND. lwp)   WRITE(numout,*)' usrdef_sbc_ice : BENCH case: NO flux forcing'
+      !
 …
       emp_oce (:,:)   = 0._wp   ! uniform value for freshwater budget (E-P)
       qsr_oce (:,:)   = 0._wp   ! uniform value for     solar radiation
       qns_oce (:,:)   = 0._wp   ! uniform value for non-solar radiation
+      qns_oce (:,:)   = 0._wp   ! uniform value for non-solar heat flux
       ! ice variables
       alb_ice (:,:,:) = 0.7_wp  ! useless
       qsr_ice (:,:,:) = 0._wp   ! uniform value for     solar radiation
+      qns_ice (:,:,:) = 0._wp   ! uniform value for non-solar radiation
+      qns_ice (:,:,:) = 0._wp   ! uniform value for non-solar heat flux
+      dqns_ice(:,:,:) = 0._wp   ! uniform value for non solar heat flux sensitivity for ice
       sprecip (:,:)   = 0._wp   ! uniform value for snow precip
       evap_ice(:,:,:) = 0._wp   ! uniform value for sublimation
 …
       ! ice fields deduced from above
       zsnw(:,:) = 1._wp
+      !!CALL lim_thd_snwblow( at_i_b, zsnw )  ! snow distribution over ice after
+      !wind blowing
+      !!CALL lim_thd_snwblow( at_i_b, zsnw )  ! snow distribution over ice after wind blowing
       emp_ice  (:,:)   = SUM( a_i_b(:,:,:) * evap_ice(:,:,:), dim=3 ) - sprecip(:,:) * zsnw(:,:)
       emp_oce  (:,:)   = emp_oce(:,:) - sprecip(:,:) * (1._wp - zsnw(:,:) )
 …
       ! --- shortwave radiation transmitted thru the surface scattering layer (W/m2) --- !
       qtr_ice_top(:,:,:) = 0._wp
 #endif

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/C1D_ASICS/cpp_C1D_ASICS.fcm

r14229	r14328
1		bld::tool::fppkeys key_c1d key_qco key_~~iomput~~
	1	bld::tool::fppkeys key_c1d key_qco key_xios

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/CANAL/cpp_CANAL.fcm

r14229	r14328
1		bld::tool::fppkeys key_~~iomput~~ key_qco
	1	bld::tool::fppkeys key_xios key_qco

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/CPL_OASIS/cpp_CPL_OASIS.fcm

r14229	r14328
1		bld::tool::fppkeys key_si3 key_top key_~~iomput~~ key_oasis3 key_qco
	1	bld::tool::fppkeys key_si3 key_top key_xios key_oasis3 key_qco

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/DOME/EXPREF/1_namelist_cfg

-                      r14216
+                      r14328
+/
 !-----------------------------------------------------------------------
+&namusr_def    !   User defined :   OVERFLOW configuration
+!-----------------------------------------------------------------------
+   !                       !  type of vertical coordinate
+   ln_zco      = .false.      ! z-coordinate
+   ln_zps      = .true.       ! z-partial-step coordinate
+   ln_sco      = .false.      ! s-coordinate
+   rn_dx       =   5000.   !  horizontal resolution   [meters]
+   rn_dz       =     60.   !  vertical   resolution   [meters]
+   rn_f0       =  1.e-4    !  coriolis [s-1]
+/
+!-----------------------------------------------------------------------
 &namrun        !   parameters of the run
 !-----------------------------------------------------------------------
 …
 !-----------------------------------------------------------------------
    ln_traadv_fct = .true. !  FCT scheme
       nn_fct_h   =  4            !  =2/4, horizontal 2nd / 4th order
+      nn_fct_h   =  2            !  =2/4, horizontal 2nd / 4th order
       nn_fct_v   =  2            !  =2/4, vertical   2nd / COMPACT 4th order
+/

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/DOME/EXPREF/file_def_nemo-oce.xml

-                      r14216
+                      r14328
     -->
     <file_definition type="one_file" name="@expname@" sync_freq="12h" min_digits="4">
       <file_group id="12h" output_freq="12h"  output_level="10" enabled=".TRUE." >  <!-- 12h files -->
+    <file_definition type="one_file" name="@expname@" sync_freq="1d" min_digits="4">
+      <file_group id="1d" output_freq="1d"  output_level="10" enabled=".TRUE." >  <!-- 1d files -->
    <file id="file1" name_suffix="_grid_T" description="ocean T grid variables" >

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/DOME/EXPREF/namelist_cfg

-                      r14216
+                      r14328
 !!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+!
+!
+!-----------------------------------------------------------------------
+&namusr_def    !   User defined :   OVERFLOW configuration
+!-----------------------------------------------------------------------
+   !                       !  type of vertical coordinate
+   ln_zco      = .false.      ! z-coordinate
+   ln_zps      = .true.       ! z-partial-step coordinate
+   ln_sco      = .false.      ! s-coordinate
+   rn_dx       =   5000.   !  horizontal resolution   [meters]
+   rn_dz       =     60.   !  vertical   resolution   [meters]
+   rn_f0       =  1.e-4    !  coriolis [s-1]
+/
 !-----------------------------------------------------------------------
 &namrun        !   parameters of the run
 …
 !-----------------------------------------------------------------------
 &namtra_adv    !   advection scheme for tracer
 !-----------------------------------------------------------------------
+!----------------------------------------------------------------------
    ln_traadv_fct = .true. !  FCT scheme
       nn_fct_h   =  4            !  =2/4, horizontal 2nd / 4th order
+      nn_fct_h   =  2            !  =2/4, horizontal 2nd / 4th order
       nn_fct_v   =  2            !  =2/4, vertical   2nd / COMPACT 4th order
+/

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/DOME/MY_SRC/usrdef_istate.F90

r14133	r14328
16	16	USE phycst ! physical constants
17	17	USE eosbn2, ONLY: rn_a0
	18	USE dom_oce
18	19	!
19	20	USE in_out_manager ! I/O manager

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/DOME/cpp_DOME.fcm

r14229	r14328
1		bld::tool::fppkeys key_~~iomput~~ key_agrif key_linssh
	1	bld::tool::fppkeys key_xios key_agrif key_linssh

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/DONUT/EXPREF/file_def_nemo-ice.xml

-                      r14226
+                      r14328
        <field field_ref="normstr"          name="normstr" />
        <field field_ref="sheastr"          name="sheastr" />
+       <field field_ref="isig1"            name="isig1"   />
+       <field field_ref="isig2"            name="isig2"   />
+       <field field_ref="isig3"            name="isig3"   />
+       <field field_ref="sig1_pnorm"       name="sig1_pnorm"/>
+       <field field_ref="sig2_pnorm"       name="sig2_pnorm"/>
        <!-- heat fluxes -->
 …
        <field field_ref="albedo"           name="albedo"     />
+     <!-- heat fluxes -->
+          <field id="hfxbog"       long_name="heat flux used for bottom ice growth (neg.)"                  unit="W/m2" />
+          <field id="hfxbom"       long_name="heat flux used for bottom ice melt (pos.)"                    unit="W/m2" />
+          <field id="hfxsum"       long_name="heat flux used for surface ice melt"                          unit="W/m2" />
+          <field id="hfxopw"       long_name="heat flux used for open water ice formation"                  unit="W/m2" />
+          <field id="hfxdif"       long_name="heat flux used for ice temperature change"                    unit="W/m2" />
+          <field id="hfxsnw"       long_name="heat flux used for snow melt"                                 unit="W/m2" />
+          <field id="hfxerr"       long_name="heat flux error after heat diffusion"                         unit="W/m2" />
+          <!-- heat fluxes associated with mass exchange -->
+          <field id="hfxthd"       long_name="heat fluxes from ice-ocean mass exchange during thermo"       unit="W/m2" />
+          <field id="hfxdyn"       long_name="heat fluxes from ice-ocean mass exchange during dynamic"      unit="W/m2" />
+          <field id="hfxres"       long_name="heat fluxes from undiagnosed processes"                       unit="W/m2" />
+          <field id="hfxsub"       long_name="heat fluxes from ice-atm. mass exchange during sublimation"   unit="W/m2" />
+          <field id="hfxspr"       long_name="heat fluxes from ice-atm. mass exchange during snow precip"   unit="W/m2" />
+          <field id="hfxdhc"       long_name="Heat content variation in snow and ice (neg = ice cooling)"   unit="W/m2" />
+     <field field_ref="hfxcndtop"        name="hfxcndtop"  />
+       <field field_ref="hfxcndtop"        name="hfxcndtop"  />
        <field field_ref="hfxcndbot"        name="hfxcndbot"  />
        <field field_ref="hfxsensib"        name="hfxsensib"  />
 …
        <field field_ref="vfxice"           name="vfxice" />
        <field field_ref="vfxsnw"           name="vfxsnw" />
        <!-- categories -->
        <field field_ref="icemask_cat"      name="simskcat"/>

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/DONUT/cpp_DONUT.fcm

r14229	r14328
1		bld::tool::fppkeys key_si3 key_qco key_~~iomput~~
	1	bld::tool::fppkeys key_si3 key_qco key_xios

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/ICB/MY_SRC/step.F90

-                      r14227
+                      r14328
       ENDIF
       IF( kstp == nit000 + 1 )   lk_agrif_fstep = .FALSE.
 # if defined key_iomput
+# if defined key_xios
       IF( Agrif_Nbstepint() == 0 )   CALL iom_swap( cxios_context )
 # endif
 …
       ENDIF
+      !
 #if defined key_iomput
+#if defined key_xios
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
       ! Finalize contextes if end of simulation or error detected

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/ICB/cpp_ICB.fcm

r14229	r14328
1		bld::tool::fppkeys key_~~iomput~~ key_qco
	1	bld::tool::fppkeys key_xios key_qco

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/ICE_ADV1D/MY_SRC/usrdef_sbc.F90

-                      r14072
+                      r14328
       emp_oce (:,:)   = 0._wp   ! uniform value for freshwater budget (E-P)
       qsr_oce (:,:)   = 0._wp   ! uniform value for     solar radiation
       qns_oce (:,:)   = 0._wp   ! uniform value for non-solar radiation
+      qns_oce (:,:)   = 0._wp   ! uniform value for non-solar heat flux
       ! ice variables
       alb_ice (:,:,:) = 0.7_wp  ! useless
       qsr_ice (:,:,:) = 0._wp   ! uniform value for     solar radiation
+      qns_ice (:,:,:) = 0._wp   ! uniform value for non-solar radiation
+      qns_ice (:,:,:) = 0._wp   ! uniform value for non-solar heat flux
+      dqns_ice(:,:,:) = 0._wp   ! uniform value for non solar heat flux sensitivity for ice
       sprecip (:,:)   = 0._wp   ! uniform value for snow precip
       evap_ice(:,:,:) = 0._wp   ! uniform value for sublimation

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/ICE_ADV1D/cpp_ICE_ADV1D.fcm

r14232	r14328
1		bld::tool::fppkeys key_si3 key_~~iomput~~ key_linssh
	1	bld::tool::fppkeys key_si3 key_xios key_linssh

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/ICE_ADV2D/MY_SRC/usrdef_sbc.F90

-                      r13999
+                      r14328
       emp_oce (:,:)   = 0._wp   ! uniform value for freshwater budget (E-P)
       qsr_oce (:,:)   = 0._wp   ! uniform value for     solar radiation
       qns_oce (:,:)   = 0._wp   ! uniform value for non-solar radiation
+      qns_oce (:,:)   = 0._wp   ! uniform value for non-solar heat flux
       ! ice variables
       alb_ice (:,:,:) = 0.7_wp  ! useless
       qsr_ice (:,:,:) = 0._wp   ! uniform value for     solar radiation
+      qns_ice (:,:,:) = 0._wp   ! uniform value for non-solar radiation
+      qns_ice (:,:,:) = 0._wp   ! uniform value for non-solar heat flux
+      dqns_ice(:,:,:) = 0._wp   ! uniform value for non solar heat flux sensitivity for ice
       sprecip (:,:)   = 0._wp   ! uniform value for snow precip
       evap_ice(:,:,:) = 0._wp   ! uniform value for sublimation

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/ICE_ADV2D/cpp_ICE_ADV2D.fcm

r14232	r14328
1		bld::tool::fppkeys key_si3 key_linssh key_~~iomput~~
	1	bld::tool::fppkeys key_si3 key_linssh key_xios

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/ICE_AGRIF/MY_SRC/usrdef_sbc.F90

-                      r14072
+                      r14328
       emp_oce (:,:)   = 0._wp   ! uniform value for freshwater budget (E-P)
       qsr_oce (:,:)   = 0._wp   ! uniform value for     solar radiation
       qns_oce (:,:)   = 0._wp   ! uniform value for non-solar radiation
+      qns_oce (:,:)   = 0._wp   ! uniform value for non-solar heat flux
       ! ice variables
       alb_ice (:,:,:) = 0.7_wp  ! useless
       qsr_ice (:,:,:) = 0._wp   ! uniform value for     solar radiation
+      qns_ice (:,:,:) = 0._wp   ! uniform value for non-solar radiation
+      qns_ice (:,:,:) = 0._wp   ! uniform value for non-solar heat flux
+      dqns_ice(:,:,:) = 0._wp   ! uniform value for non solar heat flux sensitivity for ice
       sprecip (:,:)   = 0._wp   ! uniform value for snow precip
       evap_ice(:,:,:) = 0._wp   ! uniform value for sublimation

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/ICE_AGRIF/cpp_ICE_AGRIF.fcm

r14229	r14328
1		bld::tool::fppkeys key_agrif key_si3 key_linssh key_~~iomput~~
	1	bld::tool::fppkeys key_agrif key_si3 key_linssh key_xios

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/ICE_RHEO/MY_SRC/usrdef_sbc.F90

-                      r14063
+                      r14328
       emp_oce (:,:)   = 0._wp   ! uniform value for freshwater budget (E-P)
       qsr_oce (:,:)   = 0._wp   ! uniform value for     solar radiation
       qns_oce (:,:)   = 0._wp   ! uniform value for non-solar radiation
+      qns_oce (:,:)   = 0._wp   ! uniform value for non-solar heat flux
       ! ice variables
       alb_ice (:,:,:) = 0.7_wp  ! useless
       qsr_ice (:,:,:) = 0._wp   ! uniform value for     solar radiation
+      qns_ice (:,:,:) = 0._wp   ! uniform value for non-solar radiation
+      qns_ice (:,:,:) = 0._wp   ! uniform value for non-solar heat flux
+      dqns_ice(:,:,:) = 0._wp   ! uniform value for non solar heat flux sensitivity for ice
       sprecip (:,:)   = 0._wp   ! uniform value for snow precip
       evap_ice(:,:,:) = 0._wp   ! uniform value for sublimation

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/ICE_RHEO/cpp_ICE_RHEO.fcm

r14232	r14328
1		bld::tool::fppkeys key_si3 key_linssh key_~~iomput~~
	1	bld::tool::fppkeys key_si3 key_linssh key_xios

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/ISOMIP+/cpp_ISOMIP+.fcm

r14229	r14328
1		bld::tool::fppkeys key_~~iomput~~
	1	bld::tool::fppkeys key_xios

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/ISOMIP/cpp_ISOMIP.fcm

r14229	r14328
1		bld::tool::fppkeys key_~~iomput~~
	1	bld::tool::fppkeys key_xios

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/LOCK_EXCHANGE/cpp_LOCK_EXCHANGE.fcm

r14229	r14328
1		bld::tool::fppkeys key_qco key_~~iomput~~
	1	bld::tool::fppkeys key_qco key_xios

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/OVERFLOW/cpp_OVERFLOW.fcm

r14229	r14328
1		bld::tool::fppkeys key_qco key_~~iomput~~
	1	bld::tool::fppkeys key_qco key_xios

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/STATION_ASF/MY_SRC/diawri.F90

-                      r14072
+                      r14328
 CONTAINS
 #if defined key_iomput
    !!----------------------------------------------------------------------
    !!   'key_iomput'                                        use IOM library
+#if defined key_xios
+   !!----------------------------------------------------------------------
+   !!   'key_xios'                                        use IOM library
    !!----------------------------------------------------------------------
    INTEGER FUNCTION dia_wri_alloc()

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/STATION_ASF/MY_SRC/nemogcm.F90

-                      r14229
+                      r14328
    USE mppini         ! shared/distributed memory setting (mpp_init routine)
    USE lib_fortran    ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined)
 #if defined key_iomput
+#if defined key_xios
    USE xios           ! xIOserver
 #endif
 …
       CALL nemo_closefile
+      !
 #if defined key_iomput
+#if defined key_xios
       CALL xios_finalize  ! end mpp communications with xios
 #else
 …
       !                             !-------------------------------------------------!
+      !
 #if defined key_iomput
+#if defined key_xios
       IF( Agrif_Root() ) THEN
          CALL xios_initialize( "for_xios_mpi_id", return_comm=ilocal_comm )   ! nemo local communicator given by xios

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/STATION_ASF/MY_SRC/step_c1d.F90

r14227	r14328
79	79	IF( lrst_oce ) CALL rst_write( kstp, Nbb, Nnn ) ! write output ocean restart file
80	80	!
81		#if defined key_~~iomput~~
	81	#if defined key_xios
82	82	IF( kstp == nitend .OR. nstop > 0 ) CALL xios_context_finalize() ! needed for XIOS
83	83	!

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/STATION_ASF/MY_SRC/stpctl.F90

-                      r14072
+                      r14328
    PUBLIC stp_ctl           ! routine called by step.F90
+   INTEGER                ::   nrunid   ! netcdf file id
+   INTEGER, DIMENSION(3)  ::   nvarid   ! netcdf variable id
+   INTEGER, PARAMETER         ::   jpvar = 3
+   INTEGER                    ::   nrunid   ! netcdf file id
+   INTEGER, DIMENSION(jpvar)  ::   nvarid   ! netcdf variable id
    !!----------------------------------------------------------------------
    !! NEMO/SAS 4.0 , NEMO Consortium (2018)
 …
       INTEGER, INTENT(in   ) ::   Kmm      ! ocean time level index
       !!
+      INTEGER, PARAMETER              ::   jptst = 3
       INTEGER                         ::   ji                                    ! dummy loop indices
       INTEGER                         ::   idtime, istatus
+      INTEGER , DIMENSION(4)          ::   iareasum, iareamin, iareamax
+      INTEGER , DIMENSION(3,3)        ::   iloc                                  ! min/max loc indices
+      REAL(wp)                        ::   zzz                                   ! local real
+      REAL(wp), DIMENSION(4)          ::   zmax, zmaxlocal
+      INTEGER , DIMENSION(jptst)      ::   iareasum, iareamin, iareamax
+      INTEGER , DIMENSION(3,jptst)    ::   iloc                                  ! min/max loc indices
+      REAL(wp)                        ::   zzz                                   ! local real
+      REAL(wp), DIMENSION(jpvar+1)    ::   zmax
+      REAL(wp), DIMENSION(jptst)      ::   zmaxlocal
       LOGICAL                         ::   ll_wrtstp, ll_colruns, ll_wrtruns, ll_0oce
       LOGICAL, DIMENSION(jpi,jpj)     ::   llmsk
 …
       zmax(2) = MAXVAL( ABS( qns(:,:) ), mask = llmsk )                         ! max non-solar heat flux
       zmax(3) = MAXVAL( ABS( emp(:,:) ), mask = llmsk )                         ! max E-P
       zmax(4) = REAL( nstop, wp )                                               ! stop indicator
+      zmax(jpvar+1) = REAL( nstop, wp )                                         ! stop indicator
+      !
       !                                   !==               get global extrema             ==!
       !                                   !==  done by all processes if writting run.stat  ==!
       IF( ll_colruns ) THEN
          zmaxlocal(:) = zmax(:)
          CALL mpp_max( "stpctl", zmax )          ! max over the global domain
          nstop = NINT( zmax(4) )                 ! update nstop indicator (now sheared among all local domains)
+         zmaxlocal(:) = zmax(1:jptst)
+         CALL mpp_max( "stpctl", zmax )          ! max over the global domain: ok even of ll_0oce = .true.
+         nstop = NINT( zmax(jpvar+1) )           ! update nstop indicator (now sheared among all local domains)
       ELSE
          ! if no ocean point: MAXVAL returns -HUGE => we must overwrite this value to avoid error handling bellow.
+         IF( ll_0oce )   zmax(1:3) = 0._wp       ! default "valid" values...
+      ENDIF
+      !                                   !==               error handling               ==!
+         IF( ll_0oce )   zmax(1:jptst) = 0._wp        ! default "valid" values...
+      ENDIF
       !                                   !==              write "run.stat" files              ==!
       !                                   !==  done only by 1st subdomain at writting timestep  ==!
       IF( ll_wrtruns ) THEN
          WRITE(numrun,9500) kt, zmax(1), zmax(2), zmax(3)
          DO ji = 1, 3
+         WRITE(numrun,9500) kt, zmax(1:jptst)
+         DO ji = 1, jpvar
             istatus = NF90_PUT_VAR( nrunid, nvarid(ji), (/zmax(ji)/), (/kt/), (/1/) )
          END DO
          IF( kt == nitend ) istatus = NF90_CLOSE(nrunid)
+         IF( kt == nitend )   istatus = NF90_CLOSE(nrunid)
       END IF
       !                                   !==               error handling               ==!
       !                                   !==  done by all processes at every time step  ==!
+      !
       IF(   zmax(1) >    5._wp .OR.   &                   ! too large wind stress         ( > 5 N/m^2 )
          &  zmax(2) > 2000._wp .OR.   &                   ! too large non-solar heat flux ( > 2000 W/m^2 )
          &  zmax(3) > 1.E-3_wp .OR.   &                   ! too large net freshwater flux ( > 1.E-3 kg/m^2/s )
          &  ISNAN( zmax(1) + zmax(2) + zmax(3) ) .OR.   &               ! NaN encounter in the tests
          &  ABS(   zmax(1) + zmax(2) + zmax(3) ) > HUGE(1._wp) ) THEN   ! Infinity encounter in the tests
+      IF(   zmax(1) >    5._wp .OR.   &                       ! too large wind stress         ( > 5 N/m^2 )
+         &  zmax(2) > 2000._wp .OR.   &                       ! too large non-solar heat flux ( > 2000 W/m^2 )
+         &  zmax(3) > 1.E-3_wp .OR.   &                       ! too large net freshwater flux ( > 1.E-3 kg/m^2/s )
+         & ISNAN( SUM(zmax(1:jptst)) ) .OR.   &               ! NaN encounter in the tests
+         & ABS(   SUM(zmax(1:jptst)) ) > HUGE(1._wp) ) THEN   ! Infinity encounter in the tests
+         !
          iloc(:,:) = 0
 …
             ! find which subdomain has the max.
             iareamin(:) = jpnij+1   ;   iareamax(:) = 0   ;   iareasum(:) = 0
             DO ji = 1, 4
+            DO ji = 1, jptst
                IF( zmaxlocal(ji) == zmax(ji) ) THEN
                   iareamin(ji) = narea   ;   iareamax(ji) = narea   ;   iareasum(ji) = 1
 …
             iloc(1:2,2) = MAXLOC( ABS( qns(:,:) ), mask = llmsk )
             iloc(1:2,3) = MINLOC( ABS( emp(:,:) ), mask = llmsk )
             DO ji = 1, 3   ! local domain indices ==> global domain indices, excluding halos
+            DO ji = 1, jptst   ! local domain indices ==> global domain indices, excluding halos
                iloc(1:2,ji) = (/ mig0(iloc(1,ji)), mjg0(iloc(2,ji)) /)
             END DO
 …
+         !
          IF( ll_colruns .OR. jpnij == 1 ) THEN   ! all processes synchronized -> use lwp to print in opened ocean.output files
+            IF(lwp) THEN
+               CALL ctl_stop( ctmp1, ' ', ctmp2, ctmp3, ctmp4, ctmp5, ' ', ctmp6 )
+            ELSE
+               nstop = MAX(1, nstop)   ! make sure nstop > 0 (automatically done when calling ctl_stop)
+            IF(lwp) THEN   ;   CALL ctl_stop( ctmp1, ' ', ctmp2, ctmp3, ctmp4, ctmp5, ' ', ctmp6 )
+            ELSE           ;   nstop = MAX(1, nstop)   ! make sure nstop > 0 (automatically done when calling ctl_stop)
             ENDIF
          ELSE                                    ! only mpi subdomains with errors are here -> STOP now
 …
       WRITE(clfmt, '(i1)') INT(LOG10(REAL(jpnij  ,wp))) + 1     ! how many digits to we need to write ? (we decide max = 9)
 !!! WRITE(clsum, '(i'//clfmt//')') ksum                   ! this is creating a compilation error with AGRIF
+      !!! WRITE(clsum, '(i'//clfmt//')') ksum                   ! this is creating a compilation error with AGRIF
       cl4 = '(i'//clfmt//')'   ;   WRITE(clsum, cl4) ksum
       WRITE(clfmt, '(i1)') INT(LOG10(REAL(MAX(1,jpnij-1),wp))) + 1    ! how many digits to we need to write ? (we decide max = 9)
       cl4 = '(i'//clfmt//')'   ;   WRITE(clmin, cl4) kmin-1
       WRITE(clmax, cl4) kmax-1
+                                   WRITE(clmax, cl4) kmax-1
+      !
       WRITE(clfmt, '(i1)') INT(LOG10(REAL(jpiglo,wp))) + 1      ! how many digits to we need to write jpiglo? (we decide max = 9)
 …
       ELSE
          WRITE(clfmt, '(i1)') INT(LOG10(REAL(jpk,wp))) + 1      ! how many digits to we need to write jpk? (we decide max = 9)
 !!! WRITE(clk, '(i'//clfmt//')') kloc(3)               ! this is creating a compilation error with AGRIF
+         !!! WRITE(clk, '(i'//clfmt//')') kloc(3)               ! this is creating a compilation error with AGRIF
          cl4 = '(i'//clfmt//')'   ;   WRITE(clk, cl4) kloc(3)   ! this is ok with AGRIF
          WRITE(cdline,9400) TRIM(ADJUSTL(clkt)), TRIM(ADJUSTL(cdprefix)), pval, TRIM(cli), TRIM(clj),    TRIM(clk), TRIM(clsuff)

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/STATION_ASF/cpp_STATION_ASF.fcm

r14229	r14328
1		bld::tool::fppkeys key_si3 key_c1d key_qco key_~~iomput~~
	1	bld::tool::fppkeys key_si3 key_c1d key_qco key_xios

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/SWG/cpp_SWG.fcm

r14229	r14328
1		bld::tool::fppkeys key_~~iomput~~ key_qco key_RK3
	1	bld::tool::fppkeys key_xios key_qco key_RK3

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/TSUNAMI/EXPREF/namelist_cfg

-                      r14225
+                      r14328
    rn_dx       =     10.   !  x horizontal resolution   [km]
    rn_dy       =     10.   !  y horizontal resolution   [km]
-   rn_dz       =    100.   !  z vertical resolution      [m]
    rn_0xratio  =      0.2  !  x-domain ratio of the 0
    rn_0yratio  =      0.4  !  y-domain ratio of the 0
    nn_fcase    =      0    !  F computation (0:f0, 1:Beta, 2:real)
+   nn_fcase    =      0    !  Coriolis frequency(f) computation (0:f0, 1:Beta plan, 2:real)
    rn_ppgphi0  =    38.5   !  Reference latitude      [degrees]
    nn_perio    =      7

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/TSUNAMI/MY_SRC/stpmlf.F90

-                      r14225
+                      r14328
       ENDIF
       IF( kstp == nit000 + 1 )   lk_agrif_fstep = .FALSE.
 # if defined key_iomput
+# if defined key_xios
       IF( Agrif_Nbstepint() == 0 )   CALL iom_swap( cxios_context )
 # endif
 …
       ENDIF
 #if defined key_iomput
+#if defined key_xios
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
       ! Finalize contextes if end of simulation or error detected

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/TSUNAMI/MY_SRC/usrdef_nam.F90

-                      r14225
+                      r14328
    REAL(wp), PUBLIC ::   rn_dx      =   30.  ! x horizontal resolution   [km]
    REAL(wp), PUBLIC ::   rn_dy      =   30.  ! y horizontal resolution   [km]
-   REAL(wp), PUBLIC ::   rn_dz      =  500.  ! vertical resolution        [m]
    REAL(wp), PUBLIC ::   rn_0xratio =    0.5 ! x domain ratio of the 0
    REAL(wp), PUBLIC ::   rn_0yratio =    0.5 ! x domain ratio of the 0
 …
+      !
       INTEGER ::   ios      ! Local integer
-      REAL(wp)::   zh       ! Local scalars
       !!
       NAMELIST/namusr_def/  rn_domszx, rn_domszy, rn_domszz, rn_dx, rn_dy, rn_dz, rn_0xratio, rn_0yratio   &
+      NAMELIST/namusr_def/  rn_domszx, rn_domszy, rn_domszz, rn_dx, rn_dy, rn_0xratio, rn_0yratio   &
          &                 , nn_fcase, rn_ppgphi0, nn_perio
       !!----------------------------------------------------------------------
 …
          rn_dx = Agrif_Parent(rn_dx)/Agrif_Rhox()
          rn_dy = Agrif_Parent(rn_dy)/Agrif_Rhoy()
-         rn_dz = Agrif_Parent(rn_dz)
          rn_ppgphi0 = Agrif_Parent(rn_ppgphi0)
       ENDIF
       rn_0xratio = 0.5
+      rn_0xratio = 0.5   ! not really working I guess...
       rn_0yratio = 0.5
 #endif
 …
          kpj  = nbcellsy + nbghostcells_y_s + nbghostcells_y_n + 2
       ENDIF
+      kpk = MAX( 2, NINT( rn_domszz / rn_dz ) + 1 )
+      !
+      zh  = (kpk-1)*rn_dz
+      kpk = 2
       !                             ! Set the lateral boundary condition of the global domain
       kperio = 1                    ! TSUNAMI configuration : closed basin
 …
          WRITE(numout,*) '      horizontal x-resolution           rn_dx      = ',     rn_dx, ' km'
          WRITE(numout,*) '      horizontal y-resolution           rn_dy      = ',     rn_dy, ' km'
-         WRITE(numout,*) '      vertical resolution               rn_dz      = ',     rn_dz, '  m'
          WRITE(numout,*) '      x-domain ratio of the 0           rn_0xratio = ', rn_0xratio
          WRITE(numout,*) '      y-domain ratio of the 0           rn_0yratio = ', rn_0yratio
-         WRITE(numout,*) '          H [m] : ', zh
          WRITE(numout,*) '      F computation                     nn_fcase   = ',   nn_fcase
          WRITE(numout,*) '      Reference latitude                rn_ppgphi0 = ', rn_ppgphi0

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/TSUNAMI/cpp_TSUNAMI.fcm

r14229	r14328
1		bld::tool::fppkeys key_qco key_~~iomput~~
	1	bld::tool::fppkeys key_qco key_xios

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/VORTEX/cpp_VORTEX.fcm

r14229	r14328
1		bld::tool::fppkeys key_~~iomput~~ key_agrif key_qco
	1	bld::tool::fppkeys key_xios key_agrif key_qco

NEMO/branches/2020/dev_14237_KERNEL-01_IMMERSE_SEAMOUNT/tests/WAD/cpp_WAD.fcm

r14229	r14328
1		bld::tool::fppkeys key_~~iomput~~ key_qco
	1	bld::tool::fppkeys key_xios key_qco

New URL for NEMO forge! http://forge.nemo-ocean.eu

Context Navigation

Legend: