diff --git a/doc/latex/SI3/namelists/namsbc b/doc/latex/SI3/namelists/namsbc
index 0e0462211b9b7659114381c4882c635004e37329..9416da4c57dfc0bab6f8b403957b0f89bc37268c 100644
--- a/doc/latex/SI3/namelists/namsbc
+++ b/doc/latex/SI3/namelists/namsbc
@@ -15,7 +15,7 @@
! = 2 Redistribute a single flux over categories
ln_cndflx = .false. ! Use conduction flux as surface boundary conditions (i.e. for Jules coupling)
ln_cndemulate = .false. ! emulate conduction flux (if not provided in the inputs)
- nn_qtrice = 1 ! Solar flux transmitted thru the surface scattering layer:
+ nn_qtrice = 0 ! Solar flux transmitted thru the surface scattering layer:
! = 0 Grenfell and Maykut 1977 (depends on cloudiness and is 0 when there is snow)
! = 1 Lebrun 2019 (equals 0.3 anytime with different melting/dry snw conductivities)
/
diff --git a/doc/namelists/nam_btb b/doc/namelists/nam_btb
new file mode 100644
index 0000000000000000000000000000000000000000..4e5901197ed11d1ba60169d322468a62f567728b
--- /dev/null
+++ b/doc/namelists/nam_btb
@@ -0,0 +1,11 @@
+!-----------------------------------------------------------------------
+&nam_btb ! parameters for bioturbation and bioirrigation
+!-----------------------------------------------------------------------
+ dbiot = 8. ! Bioturbation coefficient (in cm2/yr)
+ ln_btbz = .true. ! Depth varying bioturbation
+ dbtbzsc = 5.0 ! coefficient for btb attenuation. If no variation, depth of the mixed layer
+ adsnh4 = 4.16 ! Adsorption coefficient of NH4
+ adsfe2 = 697.0 ! Adsorption coefficient of Fe2
+ ln_irrig = .true. ! Bioirrigation in sediment
+ xirrzsc = 2.0 ! Vertical scale of the attentuation of bioirrigation [cm]
+/
diff --git a/doc/namelists/nam_diased b/doc/namelists/nam_diased
new file mode 100644
index 0000000000000000000000000000000000000000..e3600f67a3c3fb681a67f46c3e265886071f59c4
--- /dev/null
+++ b/doc/namelists/nam_diased
@@ -0,0 +1,30 @@
+!-----------------------------------------------------------------------
+&nam_diased ! Diagnostic arrays
+!-----------------------------------------------------------------------
+!
+ seddiag3d(1) = 'SedpH ' , 'pH ', '- '
+ seddiag3d(2) = 'SedCO3por ' , 'Dissolved CO3 concentration ', 'mol/L'
+ seddiag3d(3) = 'SaturCO3 ' , 'CO3 saturation ', '-'
+ seddiag2d(1) = 'FlxO2 ' , 'Dissolved Oxygen Flux ', 'mol/L'
+ seddiag2d(2) = 'FlxNO3 ' , 'Nitrates flux ', 'mol/cm2/s'
+ seddiag2d(3) = 'FlxPO4 ' , 'Phosphate flux ', 'mol/cm2/s'
+ seddiag2d(4) = 'FlxNH4 ' , 'Total Ammonium flux ', 'mol/cm2/s'
+ seddiag2d(5) = 'FlxH2S ' , 'Total H2S flux ', 'mol/cm2/s'
+ seddiag2d(6) = 'FlxSO4 ' , 'Total SO4 flux ', 'mol/cm2/s'
+ seddiag2d(7) = 'FlxFe2 ' , 'Total Fe2+ flux ', 'mol/cm2/s'
+ seddiag2d(8) = 'FlxAlkalini' , 'Total Alkalinity flux ', 'mol/cm2/s'
+ seddiag2d(9) = 'FlxLig ' , 'Total Ligand flux ', 'mol/cm2/s'
+ seddiag2d(10) = 'FlxDIC ' , 'Dissolved inorganic carbon flux ', 'mol/cm2/s'
+ seddiag2d(11) = 'FlxSi ' , 'Silicate flux ', 'mol/cm2/s'
+ seddiag2d(12) = 'FlxFeO ' , 'FeO burial flux ', 'mol/cm2/s'
+ seddiag2d(13) = 'FlxFeS ' , 'FeS burial flux ', 'mol/cm2/s'
+ seddiag2d(14) = 'FlxPOC ' , 'POC burial flux ', 'mol/cm2/s'
+ seddiag2d(15) = 'FlxPOS ' , 'POS burial flux ', 'mol/cm2/s'
+ seddiag2d(16) = 'FlxPOR ' , 'POR burial flux ', 'mol/cm2/s'
+ seddiag2d(17) = 'FlxCaCO3 ' , 'Calcite burial flux ', 'mol/cm2/s'
+ seddiag2d(18) = 'FlxBSi ' , 'BSi burial flux ', 'mol/cm2/s'
+ seddiag2d(19) = 'FlxClay ' , 'Clay burial flux ', 'mol/cm2/s'
+ seddiag2d(20) = 'Flxtot ' , 'Total burial flux ', 'mol/cm2/s'
+ seddiag2d(21) = 'dzdep ' , 'Sedimentation rate ', 'cm/s'
+ seddiag2d(22) = 'Rstepros ' , 'Number of iterations ', '-'
+/
diff --git a/doc/namelists/nam_geom b/doc/namelists/nam_geom
new file mode 100644
index 0000000000000000000000000000000000000000..c76a7cec9fd10ac931af3380b3545f488f1c7772
--- /dev/null
+++ b/doc/namelists/nam_geom
@@ -0,0 +1,12 @@
+!-----------------------------------------------------------------------
+&nam_geom ! Characteristics of the sediment columns
+!-----------------------------------------------------------------------
+ jpksed = 18 ! Number of vertical layers
+ sedzmin = 0.1 ! Minimum vertical spacing
+ sedhmax = 15.0 ! Maximum depth of the sediment
+ sedkth = 9.0 ! Default parameters
+ sedacr = 2.0 ! Default parameters
+ porsurf = 0.9 ! Sediment porosity at the surface
+ porinf = 0.75 ! Sediment porosity at infinite depth
+ rhox = 0.25 ! Length scale of porosity variation (cm)
+/
diff --git a/doc/namelists/nam_inorg b/doc/namelists/nam_inorg
new file mode 100644
index 0000000000000000000000000000000000000000..fbb2efacc1198fd6896402180197eef97bcc1d5a
--- /dev/null
+++ b/doc/namelists/nam_inorg
@@ -0,0 +1,8 @@
+!-----------------------------------------------------------------------
+&nam_inorg ! Inorganic chemistry in sediments (CacO3, Si)
+!-----------------------------------------------------------------------
+ rcopal = 1.25 ! Reactivity for clay [l.mol-1.an-1]
+ rccal = 0.1 ! Dissolution rate of calcite [in yr-1]
+ rcligc = 0.1 ! Degradation rate of ligands [in yr-1]
+ ratligc = 1.E-4 ! L/C ratio in POC
+/
diff --git a/doc/namelists/nam_poc b/doc/namelists/nam_poc
new file mode 100644
index 0000000000000000000000000000000000000000..c82bc55b33db45e34426b91f3f1b9ef405e11c90
--- /dev/null
+++ b/doc/namelists/nam_poc
@@ -0,0 +1,23 @@
+!-----------------------------------------------------------------------
+&nam_poc ! parameters for the redox reactions of the sediment module
+!-----------------------------------------------------------------------
+ redO2 = 138. ! Redfield coef for Oxygen
+ redNo3 = 16. ! Redfield coef for Nitrate
+ redPo4 = 1. ! Redfield coef for Phosphate
+ redC = 117. ! Redfield coef for Carbon
+ redfep = 0.05 ! Ration of Fe bound P
+ rcorgl = 10. ! Reactivity for labile POC [an-1]
+ rcorgs = 0.1 ! Reactivity for semi-refractory POC [an-1]
+ rcorgr = 1.E-4 ! Reactivity for refractory POC [an-1]
+ rcnh4 = 1E7 ! Reactivity for O2/NH4 [l.mol-1.an-1]
+ rch2s = 1E8 ! Reactivity for O2/H2S [l.mol-1.an-1]
+ rcfe2 = 5E8 ! Reactivity for O2/Fe2+ [l.mol-1.an-1]
+ rcfeh2s = 1E4 ! Reactivity for FEOH/H2S [l.mol-1.an-1]
+ rcfeso = 2E6 ! Reactivity for FES/O2 [l.mol-1.an-1]
+ rcfesp = 1E-4 ! Precipitation of FeS [mol.l-1.an-1]
+ rcfesd = 1.E-3 ! Dissolution of FeS [an-1]
+ xksedo2 = 1.E-6 ! Half-saturation constant for oxic remin [mol/l]
+ xksedno3 = 5.E-6 ! Half-saturation constant for denitrification [mol/l]
+ xksedfeo = 0.006 ! Half-saturation constant for iron remin [%]
+ xksedso4 = 5E-4 ! Half-saturation constant for SO4 remin [mol/l]
+/
diff --git a/doc/namelists/nam_rst b/doc/namelists/nam_rst
new file mode 100644
index 0000000000000000000000000000000000000000..c52bbe905872f4553a59f0b8ae23c10ad31c0a2a
--- /dev/null
+++ b/doc/namelists/nam_rst
@@ -0,0 +1,9 @@
+!-----------------------------------------------------------------------
+&nam_rst ! parameters for restarting the sediment module
+!-----------------------------------------------------------------------
+ ln_rst_sed = .false. ! restart flag
+ cn_sedrst_in = "restart_sed" ! name of the input restart file name of the sediment module
+ cn_sedrst_indir = "." ! directory from which to read input sediment restarts
+ cn_sedrst_out = "restart_sed" ! suffix of pass. [sediment] restart name (output)
+ cn_sedrst_outdir = "." ! directory to which to write output sediment restarts
+/
diff --git a/doc/namelists/nam_run b/doc/namelists/nam_run
new file mode 100644
index 0000000000000000000000000000000000000000..6a4ddff04037f1f819b6f44433dea63da156a08b
--- /dev/null
+++ b/doc/namelists/nam_run
@@ -0,0 +1,8 @@
+!-----------------------------------------------------------------------
+&nam_run ! Characteristics of the simulation
+!-----------------------------------------------------------------------
+ ln_sed_2way = .false. ! 2 way coupling with pisces
+ nrosorder = 3 ! Order of the rosenbrock methode (3,4)
+ rosatol = 1.E-4 ! Tolerance for the absolute error
+ rosrtol = 1.E-4 ! Tolerance for the relative error
+/
diff --git a/doc/namelists/nam_trased b/doc/namelists/nam_trased
new file mode 100644
index 0000000000000000000000000000000000000000..9b7cd155df4035a99ab177b8318678d5ac5d33ad
--- /dev/null
+++ b/doc/namelists/nam_trased
@@ -0,0 +1,26 @@
+!-----------------------------------------------------------------------
+&nam_trased ! Prognostic variables
+!-----------------------------------------------------------------------
+! ! ! ! !
+! ! name ! title of the field ! units ! initial data from file or not !
+! ! ! ! !
+ sedsol(1) = 'SedFeO ' , 'Fe(OH)3 Concentration ', '%'
+ sedsol(2) = 'SedFeS ' , 'FeS Concentration ', '%'
+ sedsol(3) = 'SedPOC ' , 'POC Concentration ', '%'
+ sedsol(4) = 'SedPOS ' , 'Semi-ref POC Concentration ', '%'
+ sedsol(5) = 'SedPOR ' , 'Refractory POC Concentration ', '%'
+ sedsol(6) = 'SedCaCO3' , 'Calcite Concentration ', '%'
+ sedsol(7) = 'SedBSi ' , 'Biogenic Silicate Concentration ', '%'
+ sedsol(8) = 'SedClay ' , 'Clay Concentration ', '%'
+ sedwat(1) = 'SedO2 ' , 'Dissolved Oxygen Concentration ', 'mol/L'
+ sedwat(2) = 'SedNO3 ' , 'Nitrates Concentration ', 'mol/L'
+ sedwat(3) = 'SedPO4 ' , 'Phosphate Concentration ', 'mol/L'
+ sedwat(4) = 'SedNH4 ' , 'Total Ammonium Concentration ', 'mol/L '
+ sedwat(5) = 'SedH2S ' , 'Total H2S Concentration ', 'mol/L '
+ sedwat(6) = 'SedSO4 ' , 'Total SO4 Concentration ', 'mol/L '
+ sedwat(7) = 'SedFe2 ' , 'Total Fe2+ Concentration ', 'mol/L '
+ sedwat(8) = 'SedAlkalini' , 'Total Alkalinity Concentration ', 'eq/L '
+ sedwat(9) = 'Sedligand ' , 'Total ligand Concentration ', 'mol/L '
+ sedwat(10) = 'SedDIC ' , 'Dissolved inorganic Concentration ', 'mol/L'
+ sedwat(11) = 'SedSil ' , 'Silicate Concentration ', 'mol/L'
+/
diff --git a/doc/namelists/nam_vvl b/doc/namelists/nam_vvl
index 55ca57eb38b2c4e3916c4e80d8a9834d14af763e..581bc7acbaa98cc31c09171816bc0e4e337a24e2 100644
--- a/doc/namelists/nam_vvl
+++ b/doc/namelists/nam_vvl
@@ -10,5 +10,5 @@
rn_rst_e3t = 30.0 ! ztilde to zstar restoration timescale [days]
rn_lf_cutoff = 5.0 ! cutoff frequency for low-pass filter [days]
rn_zdef_max = 0.9 ! maximum fractional e3t deformation
- ln_vvl_dbg = .true. ! debug prints (T/F)
+ ln_vvl_dbg = .false. ! debug prints (T/F)
/
diff --git a/doc/namelists/namagrif b/doc/namelists/namagrif
index 3dc25bcd25afb89b43c35852f1c79384d7542851..743476dd9247a121b1467e75cc29add90c89ef74 100644
--- a/doc/namelists/namagrif
+++ b/doc/namelists/namagrif
@@ -1,8 +1,13 @@
!-----------------------------------------------------------------------
&namagrif ! AGRIF zoom ("key_agrif")
!-----------------------------------------------------------------------
- ln_spc_dyn = .true. ! use 0 as special value for dynamics
- rn_sponge_tra = 2880. ! coefficient for tracer sponge layer [m2/s]
- rn_sponge_dyn = 2880. ! coefficient for dynamics sponge layer [m2/s]
- ln_chk_bathy = .false. ! =T check the parent bathymetry
+ ln_agrif_2way = .true. ! activate two way nesting
+ ln_init_chfrpar = .false. ! initialize child grids from parent
+ ln_vert_remap = .false. ! use vertical remapping
+ ln_spc_dyn = .true. ! use 0 as special value for dynamics
+ ln_chk_bathy = .true. ! =T check the parent bathymetry
+ rn_sponge_tra = 0.002 ! coefficient for tracer sponge layer []
+ rn_sponge_dyn = 0.002 ! coefficient for dynamics sponge layer []
+ rn_trelax_tra = 0.01 ! inverse of relaxation time (in steps) for tracers []
+ rn_trelax_dyn = 0.01 ! inverse of relaxation time (in steps) for dynamics []
/
diff --git a/doc/namelists/namalb b/doc/namelists/namalb
index 1d9c6017e9149c9f87c9a0f04772c9fe4b146aac..6b1519c3f5e95296a3e196c7346f948b6a9f9071 100644
--- a/doc/namelists/namalb
+++ b/doc/namelists/namalb
@@ -7,4 +7,5 @@
rn_alb_idry = 0.60 ! dry ice albedo : 0.54 -- 0.65
rn_alb_imlt = 0.50 ! bare puddled ice albedo : 0.49 -- 0.58
rn_alb_dpnd = 0.27 ! ponded ice albedo : 0.10 -- 0.30
+ rn_alb_hpiv = 1.00 ! pivotal ice thickness in m (above which albedo is constant)
/
diff --git a/doc/namelists/namberg b/doc/namelists/namberg
index 74f8264cebf39b1542f4ffe224852fd53035605a..d42469a407916b2d6d7200d3a148e44c3f5fa192 100644
--- a/doc/namelists/namberg
+++ b/doc/namelists/namberg
@@ -3,6 +3,12 @@
!-----------------------------------------------------------------------
ln_icebergs = .false. ! activate iceberg floats (force =F with "key_agrif")
!
+ ! ! restart
+ cn_icbrst_in = "restart_icb" ! suffix of iceberg restart name (input)
+ cn_icbrst_indir = "./" ! directory from which to read input ocean restarts
+ cn_icbrst_out = "restart_icb" ! suffix of ocean restart name (output)
+ cn_icbrst_outdir = "./" ! directory from which to read output ocean restarts
+ !
! ! diagnostics:
ln_bergdia = .true. ! Calculate budgets
nn_verbose_level = 0 ! Turn on more verbose output if level > 0
@@ -30,11 +36,11 @@
! ! Put a test iceberg at each gridpoint in box (lon1,lon2,lat1,lat2)
rn_test_box = 108.0, 116.0, -66.0, -58.0
ln_use_calving = .false. ! Use calving data even when nn_test_icebergs > 0
- rn_speed_limit = 0. ! CFL speed limit for a berg
-
+ rn_speed_limit = 0. ! CFL speed limit for a berg (safe value is 0.4, see #2581)
+ !
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
!___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
diff --git a/doc/namelists/namc1d b/doc/namelists/namc1d
index d48806334677b0bd86d428d1ab91ccbaec786766..6bdcd380bf7d485274b40156b66c9dda248b0796 100644
--- a/doc/namelists/namc1d
+++ b/doc/namelists/namc1d
@@ -1,7 +1,6 @@
!-----------------------------------------------------------------------
-&namc1d ! 1D configuration options ("key_c1d" default: PAPA station)
+&namc1d ! 1D configuration options (ln_c1d =T default: PAPA station)
!-----------------------------------------------------------------------
- rn_lat1d = 50 ! Column latitude
- rn_lon1d = -145 ! Column longitude
- ln_c1d_locpt = .true. ! Localization of 1D config in a grid (T) or independant point (F)
+ rn_lat1d = 50.1 ! Column latitude
+ rn_lon1d = -144.9 ! Column longitude
/
diff --git a/doc/namelists/namc1d_dyndmp b/doc/namelists/namc1d_dyndmp
index 2cdafe1f2c153b8cba930b2953d01fc9ea6eb81f..bcecd670d09829c9e303ad07da21e1c450558ffe 100644
--- a/doc/namelists/namc1d_dyndmp
+++ b/doc/namelists/namc1d_dyndmp
@@ -1,5 +1,5 @@
!-----------------------------------------------------------------------
-&namc1d_dyndmp ! U & V newtonian damping ("key_c1d" default: OFF)
+&namc1d_dyndmp ! U & V newtonian damping (ln_c1d =T default: OFF)
!-----------------------------------------------------------------------
ln_dyndmp = .false. ! add a damping term (T) or not (F)
/
diff --git a/doc/namelists/namc1d_uvd b/doc/namelists/namc1d_uvd
index aca19bf9307c3550acfcfeb45a4dbe486acbd095..d64acf416fffbd553accdd5ebe7b8d2733e54397 100644
--- a/doc/namelists/namc1d_uvd
+++ b/doc/namelists/namc1d_uvd
@@ -1,5 +1,5 @@
!-----------------------------------------------------------------------
-&namc1d_uvd ! data: U & V currents ("key_c1d" default: OFF)
+&namc1d_uvd ! data: U & V currents (ln_c1d =T default: OFF)
!-----------------------------------------------------------------------
! ! =T read U-V fields for:
ln_uvd_init = .false. ! ocean initialisation
diff --git a/doc/namelists/namcfg b/doc/namelists/namcfg
index 2b8a029654ece7522ce79d5b191222ef0892f7a6..7272a361d05c996cb2cbbe530c65ecc184d16c29 100644
--- a/doc/namelists/namcfg
+++ b/doc/namelists/namcfg
@@ -1,19 +1,16 @@
!-----------------------------------------------------------------------
&namcfg ! parameters of the configuration (default: use namusr_def in namelist_cfg)
!-----------------------------------------------------------------------
- ln_read_cfg = .false. ! (=T) read the domain configuration file
- ! ! (=F) user defined configuration (F => create/check namusr_def)
+ ln_read_cfg = .false. ! (=T) read the domain configuration file
+ ! ! (=F) user defined configuration (F => create/check namusr_def)
cn_domcfg = "domain_cfg" ! domain configuration filename
!
- ln_closea = .false. ! T => keep closed seas (defined by closea_mask field) in the
- ! ! domain and apply special treatment of freshwater fluxes.
- ! ! F => suppress closed seas (defined by closea_mask field)
- ! ! from the bathymetry at runtime.
- ! ! If closea_mask field doesn't exist in the domain_cfg file
- ! ! then this logical does nothing.
- ln_write_cfg = .false. ! (=T) create the domain configuration file
+ ln_closea = .false. ! (=T => fill namclo)
+ ! ! (=F) no control of net precip/evap over closed sea
+ !
+ ln_write_cfg = .false. ! (=T) create the domain configuration file
cn_domcfg_out = "domain_cfg_out" ! newly created domain configuration filename
!
- ln_use_jattr = .false. ! use (T) the file attribute: open_ocean_jstart, if present
- ! ! in netcdf input files, as the start j-row for reading
+ ln_use_jattr = .false. ! use (T) the file attribute: open_ocean_jstart, if present
+ ! ! in netcdf input files, as the start j-row for reading
/
diff --git a/doc/namelists/namctl b/doc/namelists/namctl
index ac33f808aeff1cb3984e8a5d911676ef62a47668..299048d4ec03a3308c96f91ab5fb73ecf8ff6ed7 100644
--- a/doc/namelists/namctl
+++ b/doc/namelists/namctl
@@ -1,27 +1,23 @@
!-----------------------------------------------------------------------
&namctl ! Control prints (default: OFF)
!-----------------------------------------------------------------------
- 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
- nn_print = 0 ! level of print (0 no extra print)
- nn_ictls = 0 ! start i indice of control sum (use to compare mono versus
- nn_ictle = 0 ! end i indice of control sum multi processor runs
- nn_jctls = 0 ! start j indice of control over a subdomain)
- nn_jctle = 0 ! end j indice of control
- nn_isplt = 1 ! number of processors in i-direction
- nn_jsplt = 1 ! number of processors in j-direction
- ln_timing = .false. ! timing by routine write out in timing.output file
- ln_diacfl = .false. ! CFL diagnostics write out in cfl_diagnostics.ascii
+ sn_cfctl%l_runstat = .TRUE. ! 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
+ nn_ictls = 0 ! start i indice of control sum (use to compare mono versus
+ nn_ictle = 0 ! end i indice of control sum multi processor runs
+ nn_jctls = 0 ! start j indice of control over a subdomain)
+ nn_jctle = 0 ! end j indice of control
+ nn_isplt = 1 ! number of processors in i-direction
+ nn_jsplt = 1 ! number of processors in j-direction
+ ln_timing = .false. ! timing by routine write out in timing.output file
+ ln_diacfl = .false. ! CFL diagnostics write out in cfl_diagnostics.ascii
/
diff --git a/doc/namelists/namdia b/doc/namelists/namdia
index 7553ce3c2c8904bf6a5eebe84a228b2ab994f036..dee20ec4d9688dcc78f011877c05dd6e8b2edb5b 100644
--- a/doc/namelists/namdia
+++ b/doc/namelists/namdia
@@ -3,8 +3,8 @@
!------------------------------------------------------------------------------
ln_icediachk = .false. ! check online heat, mass & salt budgets
! ! rate of ice spuriously gained/lost at each time step => rn_icechk=1 <=> 1.e-6 m/hour
- rn_icechk_cel = 100. ! check at each gridcell (1.e-4m/h)=> stops the code if violated (and writes a file)
- rn_icechk_glo = 1. ! check over the entire ice cover (1.e-6m/h)=> only prints warnings
+ rn_icechk_cel = 1. ! check at each gridcell (1.e-06m/h)=> stops the code if violated (and writes a file)
+ rn_icechk_glo = 1.e-04 ! check over the entire ice cover (1.e-10m/h)=> only prints warnings
ln_icediahsb = .false. ! output the heat, mass & salt budgets (T) or not (F)
ln_icectl = .false. ! ice points output for debug (T or F)
iiceprt = 10 ! i-index for debug
diff --git a/doc/namelists/namdom b/doc/namelists/namdom
index 5e25a9656cefc32e97f427b9c9b3c22505000e40..edd958b1c5496eafa081c1d9d7a3599b608c4790 100644
--- a/doc/namelists/namdom
+++ b/doc/namelists/namdom
@@ -2,12 +2,12 @@
&namdom ! time and space domain
!-----------------------------------------------------------------------
ln_linssh = .false. ! =T linear free surface ==>> model level are fixed in time
- rn_isfhmin = 1.00 ! treshold [m] to discriminate grounding ice from floating ice
!
- rn_rdt = 5400. ! time step for the dynamics and tracer
+ rn_Dt = 5400. ! time step for the dynamics and tracer
rn_atfp = 0.1 ! asselin time filter parameter
!
ln_crs = .false. ! Logical switch for coarsening module (T => fill namcrs)
+ ln_c1d = .false. ! Single column domain (1x1pt) (T => fill namc1d)
!
- ln_meshmask = .false. ! =T create a mesh file
+ ln_meshmask = .true. ! =T create a mesh file
/
diff --git a/doc/namelists/namdrg b/doc/namelists/namdrg
index dc9b0c8828f9d62b5ef37c0420e29c099b24d15f..f4069bf789f07fd9b56ac43ac13b7634be5edf7b 100644
--- a/doc/namelists/namdrg
+++ b/doc/namelists/namdrg
@@ -7,5 +7,5 @@
ln_loglayer = .false. ! logarithmic drag: Cd = vkarmn/log(z/z0) |U|
!
ln_drgimp = .true. ! implicit top/bottom friction flag
- ln_drgice_imp = .false. ! implicit ice-ocean drag
+ ln_drgice_imp = .true. ! implicit ice-ocean drag
/
diff --git a/doc/namelists/namdrg_bot b/doc/namelists/namdrg_bot
index aa297f4bb876ebe042016cd863969f9e1eb43191..be88e2f035e95444a4bd9a50c222575cb45eb348 100644
--- a/doc/namelists/namdrg_bot
+++ b/doc/namelists/namdrg_bot
@@ -2,7 +2,7 @@
&namdrg_bot ! BOTTOM friction (ln_drg_OFF =F)
!-----------------------------------------------------------------------
rn_Cd0 = 1.e-3 ! drag coefficient [-]
- rn_Uc0 = 0.4 ! ref. velocity [m/s] (linear drag=Cd0*Uc0)
+ rn_Uc0 = 0.4 ! ref. velocity [m/s] (linear drag=Cd0*Uc0)
rn_Cdmax = 0.1 ! drag value maximum [-] (logarithmic drag)
rn_ke0 = 2.5e-3 ! background kinetic energy [m2/s2] (non-linear cases)
rn_z0 = 3.e-3 ! roughness [m] (ln_loglayer=T)
diff --git a/doc/namelists/namdrg_top b/doc/namelists/namdrg_top
index f505e8295ef7ffa18d07b0ac618a20e70d6db07b..338c56d758e257db3c215d6d3771c50a0216e9b3 100644
--- a/doc/namelists/namdrg_top
+++ b/doc/namelists/namdrg_top
@@ -2,7 +2,7 @@
&namdrg_top ! TOP friction (ln_drg_OFF =F & ln_isfcav=T)
!-----------------------------------------------------------------------
rn_Cd0 = 1.e-3 ! drag coefficient [-]
- rn_Uc0 = 0.4 ! ref. velocity [m/s] (linear drag=Cd0*Uc0)
+ rn_Uc0 = 0.4 ! ref. velocity [m/s] (linear drag=Cd0*Uc0)
rn_Cdmax = 0.1 ! drag value maximum [-] (logarithmic drag)
rn_ke0 = 2.5e-3 ! background kinetic energy [m2/s2] (non-linear cases)
rn_z0 = 3.0e-3 ! roughness [m] (ln_loglayer=T)
diff --git a/doc/namelists/namdta_dyn b/doc/namelists/namdta_dyn
new file mode 100644
index 0000000000000000000000000000000000000000..4a28fd0f8cce36c2d47ad17688b479f6fdae7570
--- /dev/null
+++ b/doc/namelists/namdta_dyn
@@ -0,0 +1,25 @@
+!-----------------------------------------------------------------------
+&namdta_dyn ! offline ocean input files (OFF_SRC only)
+!-----------------------------------------------------------------------
+ ln_dynrnf = .false. ! runoffs option enabled (T) or not (F)
+ ln_dynrnf_depth = .false. ! runoffs is spread in vertical (T) or not (F)
+ !
+ 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' , '' , '' , ''
+/
diff --git a/doc/namelists/namdyn b/doc/namelists/namdyn
index b9c336ed93bb19288148f77fea586b457a739c77..803f8bf0f1909853c8c729345f04d3967f5d8546 100644
--- a/doc/namelists/namdyn
+++ b/doc/namelists/namdyn
@@ -14,4 +14,10 @@
rn_lf_bfr = 15. ! maximum bottom stress per unit volume [N/m3]
rn_lf_relax = 1.e-5 ! relaxation time scale to reach static friction [s-1]
rn_lf_tensile = 0.05 ! isotropic tensile strength [0-0.5??]
+
+ cn_dir = './' ! root directory for the grounded icebergs mask data location
+ !___________!________________!___________________!___________!_____________!________!___________!__________!__________!_______________!
+ ! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights ! rotation ! land/sea mask !
+ ! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! filename ! pairing ! filename !
+ sn_icbmsk = 'NOT USED' , -12. , 'icb_mask', .false. , .true. , 'yearly' , '' , '' , ''
/
diff --git a/doc/namelists/namdyn_hpg b/doc/namelists/namdyn_hpg
index 39715e84994f0f1b6c201424fe4d3dfa2b7a3cd0..08bab2c1f19537d2ba4a9c83df9d82aef89abbd3 100644
--- a/doc/namelists/namdyn_hpg
+++ b/doc/namelists/namdyn_hpg
@@ -6,5 +6,7 @@
ln_hpg_sco = .false. ! s-coordinate (standard jacobian formulation)
ln_hpg_isf = .false. ! s-coordinate (sco ) adapted to isf
ln_hpg_djc = .false. ! s-coordinate (Density Jacobian with Cubic polynomial)
+ ln_hpg_djc_vnh = .true. ! hor. bc type for djc scheme (T=von Neumann, F=linear extrapolation)
+ ln_hpg_djc_vnv = .true. ! vert. bc type for djc scheme (T=von Neumann, F=linear extrapolation)
ln_hpg_prj = .false. ! s-coordinate (Pressure Jacobian scheme)
/
diff --git a/doc/namelists/namdyn_ldf b/doc/namelists/namdyn_ldf
index fbf9d5356aea904fad648d53cef696605abe8859..a382f196d9dd24fa2c69432f0cfa1edca720d000 100644
--- a/doc/namelists/namdyn_ldf
+++ b/doc/namelists/namdyn_ldf
@@ -3,6 +3,7 @@
!-----------------------------------------------------------------------
! ! Type of the operator :
ln_dynldf_OFF = .false. ! No operator (i.e. no explicit diffusion)
+ nn_dynldf_typ = 0 ! =0 div-rot (default) ; =1 symmetric
ln_dynldf_lap = .false. ! laplacian operator
ln_dynldf_blp = .false. ! bilaplacian operator
! ! Direction of action :
@@ -13,13 +14,13 @@
nn_ahm_ijk_t = 0 ! space/time variation of eddy coefficient :
! ! =-30 read in eddy_viscosity_3D.nc file
! ! =-20 read in eddy_viscosity_2D.nc file
- ! ! = 0 constant
+ ! ! = 0 constant
! ! = 10 F(k)=c1d
! ! = 20 F(i,j)=F(grid spacing)=c2d
! ! = 30 F(i,j,k)=c2d*c1d
! ! = 31 F(i,j,k)=F(grid spacing and local velocity)
! ! = 32 F(i,j,k)=F(local gridscale and deformation rate)
- ! ! time invariant coefficients : ahm = 1/2 Uv*Lv (lap case)
+ ! ! time invariant coefficients : ahm = 1/2 Uv*Lv (lap case)
! ! or = 1/12 Uv*Lv^3 (blp case)
rn_Uv = 0.1 ! lateral viscous velocity [m/s] (nn_ahm_ijk_t= 0, 10, 20, 30)
rn_Lv = 10.e+3 ! lateral viscous length [m] (nn_ahm_ijk_t= 0, 10)
diff --git a/doc/namelists/namdyn_rdgrft b/doc/namelists/namdyn_rdgrft
index 435cb68091823a810da70562d91f2973ec332cd5..3cedb9733709b0163fa6804dd324148ecc50b573 100644
--- a/doc/namelists/namdyn_rdgrft
+++ b/doc/namelists/namdyn_rdgrft
@@ -2,10 +2,18 @@
&namdyn_rdgrft ! Ice ridging/rafting
!------------------------------------------------------------------------------
! -- ice_rdgrft_strength -- !
- ln_str_H79 = .true. ! ice strength param.: Hibler_79 => P = pstar*<h>*exp(-c_rhg*A)
+ ln_str_H79 = .true. ! ice strength param.: Hibler_79 => P = pstar*<h>*exp(-c_rhg*A)
rn_pstar = 2.0e+04 ! ice strength thickness parameter [N/m2]
- rn_crhg = 20.0 ! ice strength conc. parameter (-)
+ rn_crhg = 20.0 ! ice strength conc. parameter (-)
+ ln_str_R75 = .false. ! ice strength param.: Rothrock_75 => P = fn of potential energy
+ rn_pe_rdg = 17.0 ! coef accouting for frictional dissipation
+ ln_str_CST = .false. ! ice strength param.: Constant
+ rn_str = 0.0 ! ice strength value
+ ln_str_smooth = .true. ! spatial smoothing of the ice strength
! -- ice_rdgrft -- !
+ ln_distf_lin = .true. ! redistribution function of ridged ice: linear (Hibler 1980)
+ ln_distf_exp = .false. ! redistribution function of ridged ice: exponential => not coded yet
+ rn_murdg = 3.0 ! e-folding scale of ridged ice (m**.5)
rn_csrdg = 0.5 ! fraction of shearing energy contributing to ridging
! -- ice_rdgrft_prep -- !
ln_partf_lin = .false. ! Linear ridging participation function (Thorndike et al, 1975)
diff --git a/doc/namelists/namdyn_rhg b/doc/namelists/namdyn_rhg
index 06a6b57d0d33173e630959c908537e76ff242b0d..6d94cd1b6cbc4870c9382065540476571b13ce1a 100644
--- a/doc/namelists/namdyn_rhg
+++ b/doc/namelists/namdyn_rhg
@@ -2,12 +2,20 @@
&namdyn_rhg ! Ice rheology
!------------------------------------------------------------------------------
ln_rhg_EVP = .true. ! EVP rheology
- ln_rhg_EAP = .false. ! EAP rheology
- ln_aEVP = .false. ! adaptive rheology (Kimmritz et al. 2016 & 2017)
+ ln_rhg_EAP = .false. ! EAP rheology
+ ln_aEVP = .true. ! adaptive rheology (Kimmritz et al. 2016 & 2017)
rn_creepl = 2.0e-9 ! creep limit [1/s]
rn_ecc = 2.0 ! eccentricity of the elliptical yield curve
- nn_nevp = 120 ! number of EVP subcycles
+ nn_nevp = 100 ! number of EVP subcycles
rn_relast = 0.333 ! ratio of elastic timescale to ice time step: Telast = dt_ice * rn_relast
- ! advised value: 1/3 (rn_nevp=120) or 1/9 (rn_nevp=300)
- ln_rhg_chkcvg = .false. ! check convergence of rheology (outputs: file ice_cvg.nc & variable uice_cvg)
+ ! advised value: 1/3 (nn_nevp=100) or 1/9 (nn_nevp=300)
+ nn_rhg_chkcvg = 0 ! check convergence of rheology
+ ! = 0 no check
+ ! = 1 check at the main time step (output xml: uice_cvg)
+ ! = 2 check at both main and rheology time steps (additional output: ice_cvg.nc)
+ ! this option 2 asks a lot of communications between cpu
+ ln_rhg_VP = .false. ! VP rheology
+ nn_vp_nout = 10 ! number of outer iterations
+ nn_vp_ninn = 1500 ! number of inner iterations
+ nn_vp_chkcvg = 5 ! iteration step for convergence check
/
diff --git a/doc/namelists/namdyn_spg b/doc/namelists/namdyn_spg
index 84bac30472757c9ae119335b50e3f77c386bba62..057b41fc57486e0e3d2c32a363910facd5c96014 100644
--- a/doc/namelists/namdyn_spg
+++ b/doc/namelists/namdyn_spg
@@ -6,10 +6,10 @@
ln_bt_fw = .true. ! Forward integration of barotropic Eqs.
ln_bt_av = .true. ! Time filtering of barotropic variables
nn_bt_flt = 1 ! Time filter choice = 0 None
- ! ! = 1 Boxcar over nn_baro sub-steps
- ! ! = 2 Boxcar over 2*nn_baro " "
+ ! ! = 1 Boxcar over nn_e sub-steps
+ ! ! = 2 Boxcar over 2*nn_e " "
ln_bt_auto = .true. ! Number of sub-step defined from:
rn_bt_cmax = 0.8 ! =T : the Maximum Courant Number allowed
- nn_baro = 30 ! =F : the number of sub-step in rn_rdt seconds
+ nn_e = 30 ! =F : the number of sub-step in rn_Dt seconds
rn_bt_alpha = 0. ! Temporal diffusion parameter (if ln_bt_av=F)
/
diff --git a/doc/namelists/namdyn_vor b/doc/namelists/namdyn_vor
index 549117aea66acc9a071897b359167e184bc0390f..9bf5ff9607f76e3a00495a31404d7af0d0c5a449 100644
--- a/doc/namelists/namdyn_vor
+++ b/doc/namelists/namdyn_vor
@@ -7,8 +7,10 @@
ln_dynvor_enT = .false. ! energy conserving scheme (T-point)
ln_dynvor_eeT = .false. ! energy conserving scheme (een using e3t)
ln_dynvor_een = .false. ! energy & enstrophy scheme
- nn_een_e3f = 0 ! =0 e3f = mi(mj(e3t))/4
- ! ! =1 e3f = mi(mj(e3t))/mi(mj( tmask))
+ !
ln_dynvor_msk = .false. ! vorticity multiplied by fmask (=T) ==>>> PLEASE DO NOT ACTIVATE
- ! ! (f-point vorticity schemes only)
+ ! ! (f-point vorticity schemes only)
+ !
+ nn_e3f_typ = 0 ! type of e3f (EEN, ENE, ENS, MIX only) =0 e3f = mi(mj(e3t))/4
+ ! ! =1 e3f = mi(mj(e3t))/mi(mj( tmask))
/
diff --git a/doc/namelists/namini b/doc/namelists/namini
index b3f4295ae9922284282b11b4f2fd2e7a8bb7ab80..0f49724e670678b5625b2420a6b74ec2bed7283b 100644
--- a/doc/namelists/namini
+++ b/doc/namelists/namini
@@ -27,16 +27,16 @@
rn_hld_ini_n = 0.0 ! initial pond lid depth (m), North
rn_hld_ini_s = 0.0 ! " " South
! -- for nn_iceini_file = 1
- sn_hti = 'Ice_initialization' , -12 ,'hti' , .false. , .true., 'yearly' , '' , '', ''
- sn_hts = 'Ice_initialization' , -12 ,'hts' , .false. , .true., 'yearly' , '' , '', ''
- sn_ati = 'Ice_initialization' , -12 ,'ati' , .false. , .true., 'yearly' , '' , '', ''
- sn_smi = 'Ice_initialization' , -12 ,'smi' , .false. , .true., 'yearly' , '' , '', ''
- sn_tmi = 'Ice_initialization' , -12 ,'tmi' , .false. , .true., 'yearly' , '' , '', ''
- sn_tsu = 'Ice_initialization' , -12 ,'tsu' , .false. , .true., 'yearly' , '' , '', ''
- sn_tms = 'NOT USED' , -12 ,'tms' , .false. , .true., 'yearly' , '' , '', ''
+ sn_hti = 'Ice_initialization' , -12. ,'hti' , .false. , .true., 'yearly' , '' , '', ''
+ sn_hts = 'Ice_initialization' , -12. ,'hts' , .false. , .true., 'yearly' , '' , '', ''
+ sn_ati = 'Ice_initialization' , -12. ,'ati' , .false. , .true., 'yearly' , '' , '', ''
+ sn_smi = 'Ice_initialization' , -12. ,'smi' , .false. , .true., 'yearly' , '' , '', ''
+ sn_tmi = 'Ice_initialization' , -12. ,'tmi' , .false. , .true., 'yearly' , '' , '', ''
+ sn_tsu = 'Ice_initialization' , -12. ,'tsu' , .false. , .true., 'yearly' , '' , '', ''
+ sn_tms = 'NOT USED' , -12. ,'tms' , .false. , .true., 'yearly' , '' , '', ''
! melt ponds (be careful, sn_apd is the pond concentration (not fraction), so it differs from rn_apd)
- sn_apd = 'NOT USED' , -12 ,'apd' , .false. , .true., 'yearly' , '' , '', ''
- sn_hpd = 'NOT USED' , -12 ,'hpd' , .false. , .true., 'yearly' , '' , '', ''
- sn_hld = 'NOT USED' , -12 ,'hld' , .false. , .true., 'yearly' , '' , '', ''
+ sn_apd = 'NOT USED' , -12. ,'apd' , .false. , .true., 'yearly' , '' , '', ''
+ sn_hpd = 'NOT USED' , -12. ,'hpd' , .false. , .true., 'yearly' , '' , '', ''
+ sn_hld = 'NOT USED' , -12. ,'hld' , .false. , .true., 'yearly' , '' , '', ''
cn_dir='./'
/
diff --git a/doc/namelists/namisf b/doc/namelists/namisf
index 51128d378ac289f62376f3bea9d95c1bef3c55d5..2ef7ecc96f6ad5cb9258f1a134d24aa741cfcd82 100644
--- a/doc/namelists/namisf
+++ b/doc/namelists/namisf
@@ -18,7 +18,7 @@
!
ln_isfcav_mlt = .false. ! ice shelf melting into the cavity (need ln_isfcav = .true. in domain_cfg.nc)
cn_isfcav_mlt = '3eq' ! ice shelf melting formulation (spe/2eq/3eq/oasis)
- ! ! spe = fwfisf is read from a forcing field
+ ! ! spe = fwfisf is read from a forcing field ( melt > 0; freezing < 0 )
! ! 2eq = ISOMIP like: 2 equations formulation (Hunter et al., 2006 for a short description)
! ! 3eq = ISOMIP+ like: 3 equations formulation (Asay-Davis et al., 2016 for a short description)
! ! oasis = fwfisf is given by oasis and pattern by file sn_isfcav_fwf
@@ -43,19 +43,27 @@
!
ln_isfpar_mlt = .false. ! ice shelf melting parametrised
cn_isfpar_mlt = 'spe' ! ice shelf melting parametrisation (spe/bg03/oasis)
- ! ! spe = fwfisf is read from a forcing field
+ ! ! spe = fwfisf is read from a forcing field ( melt > 0; freezing < 0 )
! ! bg03 = melt computed using Beckmann and Goosse parametrisation
! ! oasis = fwfisf is given by oasis and pattern by file sn_isfpar_fwf
!
+ !* bg03 case
+ rn_isfpar_bg03_gt0 = 1.0e-4 ! gamma coeficient used in bg03 paper [m/s]
+ !
+ !*** File definition ***
+ !
!* all cases
!___________!_____________!___________________!___________!_____________!_________!___________!__________!__________!_______________!
! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights ! rotation ! land/sea mask !
! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! filename ! pairing ! filename !
sn_isfpar_zmax = 'isfmlt_par', 0. ,'sozisfmax', .false. , .true. , 'yearly' , '' , '' , ''
sn_isfpar_zmin = 'isfmlt_par', 0. ,'sozisfmin', .false. , .true. , 'yearly' , '' , '' , ''
+ !
!* 'spe' and 'oasis' case
sn_isfpar_fwf = 'isfmlt_par' , -12. ,'sofwfisf' , .false. , .true. , 'yearly' , '' , '' , ''
+ !
!* 'bg03' case
+ !* Leff is in [km]
sn_isfpar_Leff = 'isfmlt_par', 0. ,'Leff' , .false. , .true. , 'yearly' , '' , '' , ''
!
! ---------------- ice sheet coupling -------------------------------
diff --git a/doc/namelists/namitd b/doc/namelists/namitd
index 382aa279155491c01a1f506585734f7af366ff78..c2abd05c2a375e1f0df1ed0b0e1c77b1ce32bfd1 100644
--- a/doc/namelists/namitd
+++ b/doc/namelists/namitd
@@ -5,5 +5,6 @@
rn_himean = 2.0 ! expected domain-average ice thickness (m)
ln_cat_usr = .false. ! ice categories are defined by rn_catbnd below (m)
rn_catbnd = 0.,0.45,1.1,2.1,3.7,6.0
- rn_himin = 0.1 ! minimum ice thickness (m) used in remapping
+ rn_himin = 0.1 ! minimum ice thickness (m) allowed
+ rn_himax = 99.0 ! maximum ice thickness (m) allowed
/
diff --git a/doc/namelists/nammpp b/doc/namelists/nammpp
index 75b928df474252ef5b380216901ff7e9699177cb..f199b7240d15009853250d025d11641329c769e1 100644
--- a/doc/namelists/nammpp
+++ b/doc/namelists/nammpp
@@ -6,4 +6,6 @@
ln_nnogather = .true. ! activate code to avoid mpi_allgather use at the northfold
jpni = 0 ! number of processors following i (set automatically if < 1), see also ln_listonly = T
jpnj = 0 ! number of processors following j (set automatically if < 1), see also ln_listonly = T
+ nn_hls = 1 ! halo width (applies to both rows and columns)
+ nn_comm = 1 ! comm choice
/
diff --git a/doc/namelists/namobs b/doc/namelists/namobs
index 1ac45bb754fc800b16e86f339017c8457bd661f5..4c4ad003da18901f6b79342ae4030894286446a1 100644
--- a/doc/namelists/namobs
+++ b/doc/namelists/namobs
@@ -35,12 +35,12 @@
cn_sstbiasfiles = 'sstbias.nc' ! SST bias input file name
cn_gridsearchfile ='gridsearch.nc' ! Grid search file name
rn_gridsearchres = 0.5 ! Grid search resolution
+ rn_default_avglamscl = 0. ! Default E/W diameter of observation footprint (metres/degrees)
+ rn_default_avgphiscl = 0. ! Default N/S diameter of observation footprint (metres/degrees)
rn_mdtcorr = 1.61 ! MDT correction
rn_mdtcutoff = 65.0 ! MDT cutoff for computed correction
rn_dobsini = 00010101.000000 ! Initial date in window YYYYMMDD.HHMMSS
rn_dobsend = 00010102.000000 ! Final date in window YYYYMMDD.HHMMSS
- rn_default_avglamscl = 0. ! Default E/W diameter of observation footprint (metres/degrees)
- rn_default_avgphiscl = 0. ! Default N/S diameter of observation footprint (metres/degrees)
rn_sla_avglamscl = 0. ! E/W diameter of SLA observation footprint (metres/degrees)
rn_sla_avgphiscl = 0. ! N/S diameter of SLA observation footprint (metres/degrees)
rn_sst_avglamscl = 0. ! E/W diameter of SST observation footprint (metres/degrees)
diff --git a/doc/namelists/namosm_mle b/doc/namelists/namosm_mle
index c22ae38782732868145cbd2ead343f5fb3adbbaa..f902f1346a2b2215c6b7cc31c0391a59bbba1b79 100644
--- a/doc/namelists/namosm_mle
+++ b/doc/namelists/namosm_mle
@@ -4,11 +4,11 @@
rn_osm_mle_ce = 0.06 ! magnitude of the MLE (typical value: 0.06 to 0.08)
nn_osm_mle = 0 ! MLE type: =0 standard Fox-Kemper ; =1 new formulation
rn_osm_mle_lf = 5.e+3 ! typical scale of mixed layer front (meters) (case rn_osm_mle=0)
- rn_osm_mle_time = 172800. ! time scale for mixing momentum across the mixed layer (seconds) (case rn_osm_mle=0)
+ rn_osm_mle_time = 43200. ! time scale for mixing momentum across the mixed layer (seconds) (case rn_osm_mle=0)
rn_osm_mle_lat = 20. ! reference latitude (degrees) of MLE coef. (case rn_mle=1)
- rn_osm_mle_rho_c = 0.01 ! delta rho criterion used to calculate MLD for FK
- rn_osm_mle_thresh = 0.0005 ! delta b criterion used for FK MLE criterion
- rn_osm_mle_tau = 172800. ! time scale for FK-OSM (seconds) (case rn_osm_mle=0)
- ln_osm_hmle_limit = .false. ! limit hmle to rn_osm_hmle_limit*hbl
- rn_osm_hmle_limit = 1.2
+ rn_osm_mle_rho_c = 0.03 ! delta rho criterion used to calculate MLD for FK
+ rn_osm_mle_thresh = 0.0001 ! delta b criterion used for FK MLE criterion
+ rn_osm_mle_tau = 172800. ! time scale for FK-OSM (seconds) (case rn_osm_mle=0)
+ ln_osm_hmle_limit = .true. ! If true, limit hmle to rn_osm_hmle_limit*hbl
+ rn_osm_hmle_limit = 1.5
/
diff --git a/doc/namelists/namp4zlim b/doc/namelists/namp4zlim
index a4ae54228063c5fe84fc370250cf907eb361b7cc..e1f69af3e04bda5acaea42d3283993c276782544 100644
--- a/doc/namelists/namp4zlim
+++ b/doc/namelists/namp4zlim
@@ -3,22 +3,22 @@
!-----------------------------------------------------------------------
concnno3 = 1.e-6 ! Nitrate half saturation of nanophytoplankton
concdno3 = 3.E-6 ! Nitrate half saturation for diatoms
- concnnh4 = 1.E-7 ! NH4 half saturation for phyto
- concdnh4 = 3.E-7 ! NH4 half saturation for diatoms
- concnfer = 1.E-9 ! Iron half saturation for phyto
- concdfer = 3.E-9 ! Iron half saturation for diatoms
- concbfe = 1.E-11 ! Iron half-saturation for DOC remin.
- concbnh4 = 2.E-8 ! NH4 half saturation for DOC remin.
- concbno3 = 2.E-7 ! Nitrate half saturation for DOC remin.
+ concnnh4 = 1.E-6 ! NH4 half saturation for phyto
+ concdnh4 = 3.E-6 ! NH4 half saturation for diatoms
+ concnfer = 1.7E-9 ! Iron half saturation for phyto
+ concdfer = 5.E-9 ! Iron half saturation for diatoms
+ concbfe = 3.E-11 ! Iron half-saturation for DOC remin.
+ concbnh4 = 3.E-7 ! NH4 half saturation for DOC remin.
+ concbno3 = 3.E-7 ! Nitrate half saturation for DOC remin.
xsizedia = 1.E-6 ! Minimum size criteria for diatoms
xsizephy = 1.E-6 ! Minimum size criteria for phyto
xsizern = 3.0 ! Size ratio for nanophytoplankton
- xsizerd = 3.0 ! Size ratio for diatoms
- xksi1 = 2.E-6 ! half saturation constant for Si uptake
+ xsizerd = 4.0 ! Size ratio for diatoms
+ xksi1 = 8.E-6 ! half saturation constant for Si uptake
xksi2 = 20E-6 ! half saturation constant for Si/C
xkdoc = 417.E-6 ! half-saturation constant of DOC remineralization
- qnfelim = 7.E-6 ! Optimal quota of phyto
- qdfelim = 7.E-6 ! Optimal quota of diatoms
- caco3r = 0.3 ! mean rain ratio
+ qnfelim = 10.E-6 ! Optimal quota of phyto
+ qdfelim = 10.E-6 ! Optimal quota of diatoms
+ caco3r = 0.2 ! mean rain ratio
oxymin = 1.E-6 ! Half-saturation constant for anoxia
/
diff --git a/doc/namelists/namp4zmes b/doc/namelists/namp4zmes
index b78327f2177a31fc625192c583880b46723832a3..3dce00b6ecc53b3a8b28bd91cf07f9d7ed3d8244 100644
--- a/doc/namelists/namp4zmes
+++ b/doc/namelists/namp4zmes
@@ -1,23 +1,27 @@
!-----------------------------------------------------------------------
&namp4zmes ! parameters for mesozooplankton for PISCES std - ln_p4z
!-----------------------------------------------------------------------
- part2 = 0.75 ! part of calcite not dissolved in mesozoo guts
- grazrat2 = 0.75 ! maximal mesozoo grazing rate
- resrat2 = 0.005 ! exsudation rate of mesozooplankton
- mzrat2 = 0.03 ! mesozooplankton mortality rate
- xpref2d = 1. ! mesozoo preference for diatoms
- xpref2n = 0.3 ! mesozoo preference for nanophyto.
- xpref2z = 1. ! mesozoo preference for microzoo.
- xpref2c = 0.3 ! mesozoo preference for poc
- xthresh2zoo = 1E-8 ! zoo feeding threshold for mesozooplankton
- xthresh2dia = 1E-8 ! diatoms feeding threshold for mesozooplankton
- xthresh2phy = 1E-8 ! nanophyto feeding threshold for mesozooplankton
- xthresh2poc = 1E-8 ! poc feeding threshold for mesozooplankton
- xthresh2 = 3E-7 ! Food threshold for grazing
- xkgraz2 = 20.E-6 ! half saturation constant for meso grazing
- epsher2 = 0.35 ! Efficicency of Mesozoo growth
- epsher2min = 0.35 ! Minimum efficiency of mesozoo growth
- sigma2 = 0.6 ! Fraction of mesozoo excretion as DOM
- unass2 = 0.3 ! non assimilated fraction of P by mesozoo
- grazflux = 3.e3 ! flux-feeding rate
+ part2 = 0.75 ! part of calcite not dissolved in mesozoo guts
+ grazrat2 = 0.5 ! maximal mesozoo grazing rate
+ resrat2 = 0.005 ! exsudation rate of mesozooplankton
+ mzrat2 = 0.01 ! mesozooplankton mortality rate
+ xpref2d = 1. ! mesozoo preference for diatoms
+ xpref2n = 0.3 ! mesozoo preference for nanophyto.
+ xpref2z = 1. ! mesozoo preference for microzoo.
+ xpref2c = 0.3 ! mesozoo preference for poc
+ xthresh2zoo = 1E-8 ! zoo feeding threshold for mesozooplankton
+ xthresh2dia = 1E-8 ! diatoms feeding threshold for mesozooplankton
+ xthresh2phy = 1E-8 ! nanophyto feeding threshold for mesozooplankton
+ xthresh2poc = 1E-8 ! poc feeding threshold for mesozooplankton
+ xthresh2 = 3E-7 ! Food threshold for grazing
+ xkgraz2 = 20.E-6 ! half saturation constant for meso grazing
+ epsher2 = 0.4 ! Efficicency of Mesozoo growth
+ epsher2min = 0.4 ! Minimum efficiency of mesozoo growth
+ sigma2 = 0.6 ! Fraction of mesozoo excretion as DOM
+ unass2 = 0.3 ! non assimilated fraction of P by mesozoo
+ grazflux = 3.e3 ! flux-feeding rate
+ xsigma2 = 0.5 ! Predation window size
+ xsigma2del = 1.0 ! Predation window size scaling
+ ln_dvm_meso = .false. ! Activates DVM for mesozooplankton
+ xfracmig = 0.3 ! Fraction of mesozooplankton performing DVM
/
diff --git a/doc/namelists/namp4zmort b/doc/namelists/namp4zmort
index 1480d7521016bd1bf92d1bba3ad52fa72b69a533..35dc171a2a26bceb5c62fb4538c31d7fd98acbb6 100644
--- a/doc/namelists/namp4zmort
+++ b/doc/namelists/namp4zmort
@@ -1,9 +1,8 @@
!-----------------------------------------------------------------------
&namp4zmort ! parameters for phytoplankton sinks for PISCES std - ln_p4z
!-----------------------------------------------------------------------
- wchl = 0.01 ! quadratic mortality of phytoplankton
- wchld = 0.01 ! maximum quadratic mortality of diatoms
- wchldm = 0.03 ! maximum quadratic mortality of diatoms
- mprat = 0.01 ! phytoplankton mortality rate
- mprat2 = 0.01 ! Diatoms mortality rate
+ wchln = 0.01 ! quadratic mortality of phytoplankton
+ wchld = 0.03 ! maximum quadratic mortality of diatoms
+ mpratn = 0.01 ! phytoplankton mortality rate
+ mpratd = 0.01 ! Diatoms mortality rate
/
diff --git a/doc/namelists/namp4zprod b/doc/namelists/namp4zprod
index eb931dfd6a3322153574649e180bfe14b70e1104..ff8f846e82ddffef10ccc7c788a35e2b0160c862 100644
--- a/doc/namelists/namp4zprod
+++ b/doc/namelists/namp4zprod
@@ -9,8 +9,8 @@
bresp = 0.033 ! Basal respiration rate
chlcnm = 0.033 ! Maximum Chl/C in nanophytoplankton
chlcdm = 0.05 ! Maximum Chl/C in diatoms
- chlcmin = 0.004 ! Minimum Chl/c in phytoplankton
- fecnm = 40E-6 ! Maximum Fe/C in nanophytoplankton
- fecdm = 40E-6 ! Maximum Fe/C in diatoms
- grosip = 0.159 ! mean Si/C ratio
+ chlcmin = 0.003 ! Minimum Chl/c in phytoplankton
+ fecnm = 60E-6 ! Maximum Fe/C in nanophytoplankton
+ fecdm = 60E-6 ! Maximum Fe/C in diatoms
+ grosip = 0.13 ! mean Si/C ratio
/
diff --git a/doc/namelists/namp4zzoo b/doc/namelists/namp4zzoo
index d718f91c31f7ae23cda3c942ff0ce61e59bae481..b041d0cb302de27b451a6cfd545efa86154be515 100644
--- a/doc/namelists/namp4zzoo
+++ b/doc/namelists/namp4zzoo
@@ -1,20 +1,22 @@
!-----------------------------------------------------------------------
&namp4zzoo ! parameters for microzooplankton for PISCES std - ln_p4z
!-----------------------------------------------------------------------
- part = 0.5 ! part of calcite not dissolved in microzoo guts
- grazrat = 3.0 ! maximal zoo grazing rate
- resrat = 0.03 ! exsudation rate of zooplankton
- mzrat = 0.004 ! zooplankton mortality rate
- xprefc = 0.1 ! Microzoo preference for POM
+ part = 0.75 ! part of calcite not dissolved in microzoo guts
+ grazrat = 2.0 ! maximal zoo grazing rate
+ resrat = 0.02 ! Linear mortality rate of zooplankton
+ mzrat = 0.005 ! zooplankton mortality rate
+ xprefc = 0.15 ! Microzoo preference for POM
xprefn = 1. ! Microzoo preference for Nanophyto
- xprefd = 0.6 ! Microzoo preference for Diatoms
+ xprefd = 0.8 ! Microzoo preference for Diatoms
xthreshdia = 1.E-8 ! Diatoms feeding threshold for microzooplankton
xthreshphy = 1.E-8 ! Nanophyto feeding threshold for microzooplankton
xthreshpoc = 1.E-8 ! POC feeding threshold for microzooplankton
xthresh = 3.E-7 ! Food threshold for feeding
xkgraz = 20.E-6 ! half sturation constant for grazing
- epsher = 0.3 ! Efficiency of microzoo growth
- epshermin = 0.3 ! Minimum efficiency of microzoo growth
+ epsher = 0.4 ! Efficiency of microzoo growth
+ epshermin = 0.4 ! Minimum efficiency of microzoo growth
sigma1 = 0.6 ! Fraction of microzoo excretion as DOM
unass = 0.3 ! non assimilated fraction of phyto by zoo
+ xsigma = 0.5 ! Predation window size
+ xsigmadel = 1.0 ! Predation window size scaling
/
diff --git a/doc/namelists/namp5zlim b/doc/namelists/namp5zlim
index 725beecda971e32b719073cbc2f01afdb1ba163d..b2a371c1c58a179cd371ec5d0bc3f25b561b8f28 100644
--- a/doc/namelists/namp5zlim
+++ b/doc/namelists/namp5zlim
@@ -1,31 +1,31 @@
!-----------------------------------------------------------------------
&namp5zlim ! parameters for nutrient limitations PISCES QUOTA - ln_p5z
!-----------------------------------------------------------------------
- concnno3 = 3e-6 ! Nitrate half saturation of nanophytoplankton
- concpno3 = 1e-6
- concdno3 = 4E-6 ! Phosphate half saturation for diatoms
- concnnh4 = 1.5E-6 ! NH4 half saturation for phyto
- concpnh4 = 4E-7
- concdnh4 = 2E-6 ! NH4 half saturation for diatoms
- concnpo4 = 3E-6 ! PO4 half saturation for phyto
- concppo4 = 1.5E-6
- concdpo4 = 4E-6 ! PO4 half saturation for diatoms
- concnfer = 3E-9 ! Iron half saturation for phyto
- concpfer = 1.5E-9
- concdfer = 4E-9 ! Iron half saturation for diatoms
- concbfe = 1.E-11 ! Half-saturation for Fe limitation of Bacteria
- concbnh4 = 1.E-7 ! NH4 half saturation for phyto
- concbno3 = 5.E-7 ! Phosphate half saturation for diatoms
- concbpo4 = 1E-7 ! Phosphate half saturation for bacteria
+ concnno3 = 2e-6 ! Nitrate half saturation of nanophytoplankton
+ concpno3 = 7e-7 ! Nitrate half saturation of picophytoplankton
+ concdno3 = 3E-6 ! Phosphate half saturation for diatoms
+ concnnh4 = 2E-6 ! NH4 half saturation for phyto
+ concpnh4 = 7E-7 ! NH4 half saturation for picophytoplankton
+ concdnh4 = 3E-6 ! NH4 half saturation for diatoms
+ concnpo4 = 2E-6 ! PO4 half saturation for phyto
+ concppo4 = 7E-7 ! PO4 half saturation for picophytoplankton
+ concdpo4 = 3E-6 ! PO4 half saturation for diatoms
+ concnfer = 3E-9 ! Iron half saturation for phyto
+ concpfer = 1E-9 ! Iron half saturation for picophytoplankton
+ concdfer = 4.5E-9 ! Iron half saturation for diatoms
+ concbfe = 3E-11 ! Half-saturation for Fe limitation of Bacteria
+ concbnh4 = 4.E-7 ! NH4 half saturation for phyto
+ concbno3 = 4.E-7 ! Phosphate half saturation for diatoms
+ concbpo4 = 4.E-7 ! Phosphate half saturation for bacteria
xsizedia = 1.E-6 ! Minimum size criteria for diatoms
xsizephy = 1.E-6 ! Minimum size criteria for phyto
- xsizepic = 1.E-6
- xsizern = 1.0 ! Size ratio for nanophytoplankton
- xsizerp = 1.0
+ xsizepic = 5.E-7 ! Minimum size criteria for picophyto
+ xsizern = 3.0 ! Size ratio for nanophytoplankton
+ xsizerp = 2.0 ! Size ratio for picophytoplankton
xsizerd = 4.0 ! Size ratio for diatoms
- xksi1 = 2.E-6 ! half saturation constant for Si uptake
- xksi2 = 20E-6 ! half saturation constant for Si/C
+ xksi1 = 8.E-6 ! half saturation constant for Si uptake
+ xksi2 = 20E-6 ! half saturation constant for Si/C
xkdoc = 417.E-6 ! half-saturation constant of DOC remineralization
- caco3r = 0.35 ! mean rain ratio
+ caco3r = 0.3 ! mean rain ratio
oxymin = 1.E-6 ! Half-saturation constant for anoxia
/
diff --git a/doc/namelists/namp5zmes b/doc/namelists/namp5zmes
index 3aae800ec91325e20c571197d5ad670f94b91cfe..1431fa73ff918b0f0257a29a3415d53f2e4dbc3d 100644
--- a/doc/namelists/namp5zmes
+++ b/doc/namelists/namp5zmes
@@ -1,29 +1,33 @@
!-----------------------------------------------------------------------
&namp5zmes ! parameters for mesozooplankton
!-----------------------------------------------------------------------
- part2 = 0.75 ! part of calcite not dissolved in mesozoo guts
- grazrat2 = 0.85 ! maximal mesozoo grazing rate
- bmetexc2 = .true. ! Metabolic use of excess carbon
- resrat2 = 0.005 ! exsudation rate of mesozooplankton
- mzrat2 = 0.02 ! mesozooplankton mortality rate
- xpref2d = 1. ! zoo preference for phyto
- xpref2p = 1. ! zoo preference for POC
- xpref2z = 1. ! zoo preference for zoo
- xpref2m = 0.2 ! meso preference for zoo
- xpref2c = 0.3 ! zoo preference for poc
- xthresh2zoo = 1E-8 ! zoo feeding threshold for mesozooplankton
- xthresh2dia = 1E-8 ! diatoms feeding threshold for mesozooplankton
- xthresh2phy = 1E-8 ! nanophyto feeding threshold for mesozooplankton
- xthresh2mes = 1E-8 ! meso feeding threshold for mesozooplankton
- xthresh2poc = 1E-8 ! poc feeding threshold for mesozooplankton
+ part2 = 0.75 ! part of calcite not dissolved in mesozoo guts
+ grazrat2 = 0.5 ! maximal mesozoo grazing rate
+ bmetexc2 = .true. ! Metabolic use of excess carbon
+ resrat2 = 0.005 ! exsudation rate of mesozooplankton
+ mzrat2 = 0.01 ! mesozooplankton mortality rate
+ xpref2d = 1. ! meso preference for diatoms
+ xpref2n = 0.3 ! meso preference for nano
+ xpref2z = 1. ! meso preference for zoo
+ xpref2m = 0. ! meso preference for zoo
+ xpref2c = 0.3 ! meso preference for poc
+ xthresh2zoo = 1E-8 ! zoo feeding threshold for mesozooplankton
+ xthresh2dia = 1E-8 ! diatoms feeding threshold for mesozooplankton
+ xthresh2phy = 1E-8 ! nanophyto feeding threshold for mesozooplankton
+ xthresh2mes = 1E-8 ! meso feeding threshold for mesozooplankton
+ xthresh2poc = 1E-8 ! poc feeding threshold for mesozooplankton
xthresh2 = 3E-7 ! Food threshold for grazing
xkgraz2 = 20.E-6 ! half sturation constant for meso grazing
epsher2 = 0.5 ! Efficicency of Mesozoo growth
- epsher2min = 0.2 ! Minimum efficiency of mesozoo growth
- ssigma2 = 0.5 ! Fraction excreted as semi-labile DOM
- srespir2 = 0.2 ! Active respiration
- unass2c = 0.3 ! non assimilated fraction of P by mesozoo
- unass2n = 0.3 ! non assimilated fraction of N by mesozoo
- unass2p = 0.3 ! non assimilated fraction of P by mesozoo
- grazflux = 3.e3 ! flux-feeding rate
+ epsher2min = 0.5 ! Minimum efficiency of mesozoo growth
+ ssigma2 = 0.5 ! Fraction excreted as semi-labile DOM
+ srespir2 = 0.2 ! Active respiration
+ unass2c = 0.3 ! non assimilated fraction of C by mesozoo
+ unass2n = 0.3 ! non assimilated fraction of N by mesozoo
+ unass2p = 0.3 ! non assimilated fraction of P by mesozoo
+ xsigma2 = 0.5 ! Predation window size
+ xsigma2del = 1.0 ! Predation window size scaling
+ grazflux = 3.e3 ! flux-feeding rate
+ ln_dvm_meso = .false. ! Activates DVM for mesozooplankton
+ xfracmig = 0.25 ! Fraction of mesozooplankton performing DVM
/
diff --git a/doc/namelists/namp5zmort b/doc/namelists/namp5zmort
index 2a41cf9746fb4fc7eaac84ee50d11b524d2fc052..c5585e54e5b74daee9969e0279de6930fc3eb04c 100644
--- a/doc/namelists/namp5zmort
+++ b/doc/namelists/namp5zmort
@@ -3,9 +3,8 @@
!-----------------------------------------------------------------------
wchln = 0.01 ! quadratic mortality of nanophytoplankton
wchlp = 0.01 ! quadratic mortality of picophytoplankton
- wchld = 0.01 ! maximum quadratic mortality of diatoms
- wchldm = 0.02 ! maximum quadratic mortality of diatoms
+ wchld = 0.03 ! maximum quadratic mortality of diatoms
mpratn = 0.01 ! nanophytoplankton mortality rate
mpratp = 0.01 ! picophytoplankton mortality rate
- mprat2 = 0.01 ! Diatoms mortality rate
+ mpratd = 0.01 ! Diatoms mortality rate
/
diff --git a/doc/namelists/namp5zprod b/doc/namelists/namp5zprod
index 23a2b53abafc637b1290b70766c2688423f4de6f..81e10d472c6275df6250ff050737796eb8e13a93 100644
--- a/doc/namelists/namp5zprod
+++ b/doc/namelists/namp5zprod
@@ -1,17 +1,17 @@
!-----------------------------------------------------------------------
&namp5zprod ! parameters for phytoplankton growth for PISCES quota- ln_p5z
!-----------------------------------------------------------------------
- pislopen = 3. ! P-I slope
- pislopep = 3. ! P-I slope for picophytoplankton
- pisloped = 3. ! P-I slope for diatoms
+ pislopen = 5 ! P-I slope of nanophytoplankton
+ pislopep = 5 ! P-I slope for picophytoplankton
+ pisloped = 5 ! P-I slope for diatoms
excretn = 0.05 ! excretion ratio of phytoplankton
excretp = 0.05 ! excretion ratio of picophytoplankton
excretd = 0.05 ! excretion ratio of diatoms
xadap = 0. ! Adaptation factor to low light
bresp = 0.02 ! Basal respiration rate
- thetannm = 0.25 ! Maximum Chl/N in nanophytoplankton
- thetanpm = 0.25 ! Maximum Chl/N in picophytoplankton
- thetandm = 0.3 ! Maximum Chl/N in diatoms
- chlcmin = 0.004 ! Minimum Chl/c in phytoplankton
- grosip = 0.131 ! mean Si/C ratio
+ thetannm = 0.3 ! Maximum Chl/N in nanophytoplankton
+ thetanpm = 0.3 ! Maximum Chl/N in picophytoplankton
+ thetandm = 0.4 ! Maximum Chl/N in diatoms
+ chlcmin = 0.003 ! Minimum Chl/c in phytoplankton
+ grosip = 0.12 ! mean Si/C ratio
/
diff --git a/doc/namelists/namp5zquota b/doc/namelists/namp5zquota
index a52e2e23a0f8ac83688c18f0bd1b0f4f9338c4d9..04f965c2df15506ccd706c6c134925962548e128 100644
--- a/doc/namelists/namp5zquota
+++ b/doc/namelists/namp5zquota
@@ -1,22 +1,22 @@
!-----------------------------------------------------------------------
&namp5zquota ! parameters for nutrient limitations PISCES quota - ln_p5z
!-----------------------------------------------------------------------
- qfnopt = 7.E-6 ! Optimal Fe quota of nanophyto
- qfpopt = 7.E-6 ! Optimal Fe quota of picophyto
- qfdopt = 7.E-6 ! Optimal quota of diatoms
- qnnmin = 0.29 ! Minimal N quota for nano
- qnnmax = 1.39 ! Maximal N quota for nano
- qpnmin = 0.28 ! Minimal P quota for nano
- qpnmax = 1.06 ! Maximal P quota for nano
- qnpmin = 0.42 ! Minimal N quota for pico
+ qfnopt = 12.E-6 ! Optimal Fe quota of nanophyto
+ qfpopt = 12.E-6 ! Optimal Fe quota of picophyto
+ qfdopt = 12.E-6 ! Optimal quota of diatoms
+ qnnmin = 0.61 ! Minimal N quota for nano
+ qnnmax = 1.25 ! Maximal N quota for nano
+ qpnmin = 0.24 ! Minimal P quota for nano
+ qpnmax = 1.35 ! Maximal P quota for nano
+ qnpmin = 1.02 ! Minimal N quota for pico
qnpmax = 1.39 ! Maximal N quota for pico
- qppmin = 0.25 ! Minimal P quota for pico
- qppmax = 0.7 ! Maximal P quota for pico
- qndmin = 0.25 ! Minimal N quota for diatoms
- qndmax = 1.39 ! Maximal N quota for diatoms
- qpdmin = 0.29 ! Minimal P quota for diatoms
- qpdmax = 1.32 ! Maximal P quota for diatoms
- qfnmax = 40E-6 ! Maximal Fe quota for nano
- qfpmax = 40E-6 ! Maximal Fe quota for pico
- qfdmax = 40E-6 ! Maximal Fe quota for diatoms
+ qppmin = 0.19 ! Minimal P quota for pico
+ qppmax = 1.15 ! Maximal P quota for pico
+ qndmin = 0.51 ! Minimal N quota for diatoms
+ qndmax = 1.25 ! Maximal N quota for diatoms
+ qpdmin = 0.24 ! Minimal P quota for diatoms
+ qpdmax = 1.525 ! Maximal P quota for diatoms
+ qfnmax = 60E-6 ! Maximal Fe quota for nano
+ qfpmax = 60E-6 ! Maximal Fe quota for pico
+ qfdmax = 60E-6 ! Maximal Fe quota for diatoms
/
diff --git a/doc/namelists/namp5zzoo b/doc/namelists/namp5zzoo
index 5c2ec3166691a6c7599976a1e89e5749da8bb7a2..5e9781fc934f2bc0584a913376e98c8573c4afb2 100644
--- a/doc/namelists/namp5zzoo
+++ b/doc/namelists/namp5zzoo
@@ -1,28 +1,30 @@
!-----------------------------------------------------------------------
&namp5zzoo ! parameters for microzooplankton
!-----------------------------------------------------------------------
- part = 0.5 ! part of calcite not dissolved in microzoo gutsa
- grazrat = 2.75 ! maximal zoo grazing rate
+ part = 0.75 ! part of calcite not dissolved in microzoo gutsa
+ grazrat = 2.0 ! maximal zoo grazing rate
bmetexc = .true. ! Metabolic use of excess carbon
- resrat = 0.03 ! exsudation rate of zooplankton
+ resrat = 0.02 ! exsudation rate of zooplankton
mzrat = 0.005 ! zooplankton mortality rate
- xprefc = 0.1 ! Microzoo preference for POM
- xprefn = 1. ! Microzoo preference for Nanophyto
- xprefp = 1.6 ! Microzoo preference for picophyto
+ xprefc = 0.15 ! Microzoo preference for POM
+ xprefn = 1.0 ! Microzoo preference for Nanophyto
+ xprefp = 1.0 ! Microzoo preference for picophyto
xprefd = 1.0 ! Microzoo preference for Diatoms
- xprefz = 0.3 ! Microzoo preference for microzooplankton
+ xprefz = 0. ! Microzoo preference for microzooplankton
xthreshdia = 1.E-8 ! Diatoms feeding threshold for microzooplankton
xthreshphy = 1.E-8 ! Nanophyto feeding threshold for microzooplankton
- xthreshpic = 1.E-8
- xthreshzoo = 1.E-8 ! Nanophyto feeding threshold for microzooplankton
+ xthreshpic = 1.E-8 ! Picophyto feeding threshold for microzooplankton
+ xthreshzoo = 1.E-8 ! Microzoo feeding threshold for microzooplankton
xthreshpoc = 1.E-8 ! POC feeding threshold for microzooplankton
xthresh = 3.E-7 ! Food threshold for feeding
- xkgraz = 20.E-6 ! half sturation constant for grazing
+ xkgraz = 20.E-6 ! half saturation constant for grazing
epsher = 0.5 ! Efficiency of microzoo growth
- epshermin = 0.2 ! Minimum efficiency of microzoo growth
+ epshermin = 0.5 ! Minimum efficiency of microzoo growth
ssigma = 0.5 ! Fraction excreted as semi-labile DOM
srespir = 0.2 ! Active respiration
unassc = 0.3 ! non assimilated fraction of C by zoo
- unassn = 0.3 ! non assimilated fraction of C by zoo
- unassp = 0.3 ! non assimilated fraction of C by zoo
+ unassn = 0.3 ! non assimilated fraction of N by zoo
+ unassp = 0.3 ! non assimilated fraction of P by zoo
+ xsigma = 0.5 ! Predation window size
+ xsigmadel = 1.0 ! Predation window size scaling
/
diff --git a/doc/namelists/nampar b/doc/namelists/nampar
index 5e7cc45729e915e1589ab92235e8f888f6334369..b595ea0dd3a70bbb7b7b58a505b318b41cb47dfc 100644
--- a/doc/namelists/nampar
+++ b/doc/namelists/nampar
@@ -3,7 +3,7 @@
!------------------------------------------------------------------------------
jpl = 5 ! number of ice categories
nlay_i = 2 ! number of ice layers
- nlay_s = 1 ! number of snow layers (only 1 is working)
+ nlay_s = 2 ! number of snow layers
ln_virtual_itd = .false. ! virtual ITD mono-category parameterization (jpl=1 only)
! i.e. enhanced thermal conductivity & virtual thin ice melting
ln_icedyn = .true. ! ice dynamics (T) or not (F)
diff --git a/doc/namelists/nampisatm b/doc/namelists/nampisatm
index a28b2b1d7472602f2a6fdcdbf1aa474cbdccb37e..d9bdc3c060d27f09468b2464082c1449dbca4411 100644
--- a/doc/namelists/nampisatm
+++ b/doc/namelists/nampisatm
@@ -3,7 +3,7 @@
!-----------------------------------------------------------------------
! ! file name ! frequency (hours) ! variable ! time interp. ! clim ! 'yearly'/ ! weights ! rotation ! land/sea mask !
! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! filename ! pairing ! filename !
- sn_patm = 'presatm' , -1. , 'patm' , .true. , .true. , 'yearly' , '' , '' , ''
+ sn_patm = 'presatm.orca2' , 24. , 'presatm' , .true. , .true. , 'yearly' , '' , '' , ''
sn_atmco2 = 'presatmco2' , -1. , 'xco2' , .true. , .true. , 'yearly' , '' , '' , ''
cn_dir = './' ! root directory for the location of the dynamical files
!
diff --git a/doc/namelists/nampisbc b/doc/namelists/nampisbc
index 8ea0178144aab3c5fa7d4a44535ef42423142577..852daa61f8969e2530f126fb81ca700f36fb5fac 100644
--- a/doc/namelists/nampisbc
+++ b/doc/namelists/nampisbc
@@ -14,9 +14,9 @@
sedfeinput = 2.e-9 ! Coastal release of Iron
distcoast = 5.e3 ! Distance off the coast for Iron from sediments
mfrac = 0.035 ! Fe mineral fraction of dust
- wdust = 2.0 ! Dust sinking speed
+ wdust = 2.0 ! Dust sinking speed
icefeinput = 15.e-9 ! Iron concentration in sea ice
- hratio = 1.e+7 ! Fe to 3He ratio assumed for vent iron supply
+ hratio = 1.e+7 ! Fe to 3He ratio assumed for vent iron supply
! ! ln_ligand
- lgw_rath = 0.5 ! Weak ligand ratio from sed hydro sources
+ lgw_rath = 0.2 ! Weak ligand ratio from sed hydro sources
/
diff --git a/doc/namelists/nampisbio b/doc/namelists/nampisbio
index 14afcd71ac18e5144bd7910a8d113b9afa2117e6..4515825252547e394a45953b64123d1dbc42e238 100644
--- a/doc/namelists/nampisbio
+++ b/doc/namelists/nampisbio
@@ -1,18 +1,19 @@
!-----------------------------------------------------------------------
&nampisbio ! biological parameters
!-----------------------------------------------------------------------
- nrdttrc = 1 ! time step frequency for biology
- wsbio = 2. ! POC sinking speed
- xkmort = 2.E-7 ! half saturation constant for mortality
- ferat3 = 10.E-6 ! Fe/C in zooplankton
- wsbio2 = 50. ! Big particles sinking speed
- wsbio2max = 50. ! Big particles maximum sinking speed
- wsbio2scale = 5000. ! Big particles length scale of sinking
+ nrdttrc = 1 ! time step frequency for biology
+ wsbio = 2. ! POC sinking speed
+ xkmort = 1.E-7 ! half saturation constant for mortality
+ feratz = 10.E-6 ! Fe/C in zooplankton
+ feratm = 15.E-6 ! Fe/C in mesozooplankton
+ wsbio2 = 50. ! Big particles sinking speed
+ wsbio2max = 50. ! Big particles maximum sinking speed
+ wsbio2scale = 5000. ! Big particles length scale of sinking
! ! ln_ligand enabled
- ldocp = 1.E-4 ! Phyto ligand production per unit doc
- ldocz = 1.E-4 ! Zoo ligand production per unit doc
- lthet = 1.0 ! Proportional loss of ligands due to Fe uptake
+ ldocp = 1.E-4 ! Phyto ligand production per unit doc
+ ldocz = 1.E-4 ! Zoo ligand production per unit doc
+ lthet = 1.0 ! Proportional loss of ligands due to Fe uptake
! ! ln_p5z enabled
- no3rat3 = 0.182 ! N/C ratio in zooplankton
- po4rat3 = 0.0094 ! P/C ratio in zooplankton
+ no3rat3 = 0.151 ! N/C ratio in zooplankton
+ po4rat3 = 0.00943 ! P/C ratio in zooplankton
/
diff --git a/doc/namelists/nampiscal b/doc/namelists/nampiscal
index 351b49f8c455c2c6bc9bae405610e0c8a0b81714..716a82eb41de5e46ee3e97476d8a0c20cf0e2624 100644
--- a/doc/namelists/nampiscal
+++ b/doc/namelists/nampiscal
@@ -1,6 +1,6 @@
!-----------------------------------------------------------------------
&nampiscal ! parameters for Calcite chemistry
!-----------------------------------------------------------------------
- kdca = 6. ! calcite dissolution rate constant (1/time)
- nca = 1. ! order of dissolution reaction (dimensionless)
+ kdca = 100. ! calcite dissolution rate constant (1/time)
+ nca = 4.7 ! order of dissolution reaction (dimensionless)
/
diff --git a/doc/namelists/nampisfer b/doc/namelists/nampisfer
index 3c6b03dc72b2a4f64700c60d9ac2b3372dbc469f..b0e89e9eb0c90a7e046e6d52a7f6d8af9e28963d 100644
--- a/doc/namelists/nampisfer
+++ b/doc/namelists/nampisfer
@@ -1,9 +1,10 @@
!-----------------------------------------------------------------------
&nampisfer ! parameters for iron chemistry
!-----------------------------------------------------------------------
- ln_ligvar = .false. ! variable ligand concentration
- xlam1 = 0.005 ! scavenging rate of Iron
- xlamdust = 150.0 ! Scavenging rate of dust
- ligand = 0.7E-9 ! Ligands concentration
+ ln_ligvar = .false. ! variable ligand concentration
+ xlam1 = 0.02 ! scavenging rate of Iron by biogenic particles
+ xlamdust = 150.0 ! Scavenging rate of Iron by dust
+ ligand = 1E-9 ! Ligands concentration
kfep = 0.01 ! Nanoparticle formation rate constant
+ scaveff = 1.0 ! Fraction of scavenged Fe that goes to POFe
/
diff --git a/doc/namelists/nampislig b/doc/namelists/nampislig
index c6b2167b2e3df021d5558ef9260a2f8b820b2161..5333390d5cfbfb9b7166707907647b4dddc1410d 100644
--- a/doc/namelists/nampislig
+++ b/doc/namelists/nampislig
@@ -1,8 +1,9 @@
!-----------------------------------------------------------------------
&nampislig ! Namelist parameters for ligands, nampislig
!-----------------------------------------------------------------------
- rlgw = 100. ! Lifetime (years) of weak ligands
+ rlgw = 300. ! Lifetime (years) of weak ligands
rlig = 1.E-4 ! Remin ligand production per unit C
- prlgw = 1.E-4 ! Photolysis of weak ligand
+ prlgw = 3.E-4 ! Photolysis of weak ligand
rlgs = 1. ! Lifetime (years) of strong ligands
+ xklig = 1.E-9 ! 1/2 saturation constant of photolysis
/
diff --git a/doc/namelists/nampismod b/doc/namelists/nampismod
index c79abacab5c8f5a31a495bdbefb949d6f17716a1..e2c0a10f770dd7e88504b139cae8ac7f7ca07f0b 100644
--- a/doc/namelists/nampismod
+++ b/doc/namelists/nampismod
@@ -2,8 +2,8 @@
&nampismod ! Model used
!-----------------------------------------------------------------------
ln_p2z = .false. ! LOBSTER model used
- ln_p4z = .true. ! PISCES model used
- ln_p5z = .false. ! PISCES QUOTA model used
+ ln_p4z = .true. ! PISCES model used
+ ln_p5z = .false. ! PISCES QUOTA model used
ln_ligand = .false. ! Enable organic ligands
ln_sediment = .false. ! Enable sediment module
/
diff --git a/doc/namelists/nampisopt b/doc/namelists/nampisopt
index b70c7d969d7fe672a37c01c4cc0104a8480c35a7..a0330dbdfc5f9927fad41a1ddbe6206427d82f7d 100644
--- a/doc/namelists/nampisopt
+++ b/doc/namelists/nampisopt
@@ -7,4 +7,5 @@
cn_dir = './' ! root directory for the location of the dynamical files
ln_varpar = .true. ! boolean for PAR variable
parlux = 0.43 ! Fraction of shortwave as PAR
+ ln_p4z_dcyc = .false. ! Diurnal cycle in PISCES
/
diff --git a/doc/namelists/nampispoc b/doc/namelists/nampispoc
index e52c7960a74c63698141f96e8673a6abc839b872..bd5e706e5d99373a3183d311a26ce449e83fa984 100644
--- a/doc/namelists/nampispoc
+++ b/doc/namelists/nampispoc
@@ -1,11 +1,11 @@
!-----------------------------------------------------------------------
&nampispoc ! parameters for organic particles
!-----------------------------------------------------------------------
- xremip = 0.035 ! remineralisation rate of PON
+ xremip = 0.035 ! remineralisation rate of POC
jcpoc = 15 ! Number of lability classes
rshape = 1.0 ! Shape of the gamma function
! ! ln_p5z
- xremipc = 0.02 ! remineralisation rate of POC
- xremipn = 0.025 ! remineralisation rate of PON
- xremipp = 0.03 ! remineralisation rate of POP
+ xremipc = 0.028 ! remineralisation rate of POC
+ xremipn = 0.03 ! remineralisation rate of PON
+ xremipp = 0.035 ! remineralisation rate of POP
/
diff --git a/doc/namelists/nampisrem b/doc/namelists/nampisrem
index 261684e3aa9640bea31667c5e3c782b3010cbb35..51467ffefc90c64656fc97303178f1831c9deedc 100644
--- a/doc/namelists/nampisrem
+++ b/doc/namelists/nampisrem
@@ -1,17 +1,14 @@
!-----------------------------------------------------------------------
&nampisrem ! parameters for remineralization
!-----------------------------------------------------------------------
- xremik = 0.3 ! remineralization rate of DOC
nitrif = 0.05 ! NH4 nitrification rate
xsirem = 0.003 ! remineralization rate of Si
xsiremlab = 0.03 ! fast remineralization rate of Si
xsilab = 0.5 ! Fraction of labile biogenic silica
- feratb = 10.E-6 ! Fe/C quota in bacteria
- xkferb = 3E-10 ! Half-saturation constant for bacteria Fe/C
+ feratb = 60.E-6 ! Fe/C quota in bacteria
+ xkferb = 4E-10 ! Half-saturation constant for bacteria Fe/C
! ! ln_p5z
- xremikc = 0.25 ! remineralization rate of DOC
- xremikn = 0.35 ! remineralization rate of DON
- xremikp = 0.4 ! remineralization rate of DOP
-! feratb = 20E-6 ! Bacterial Fe/C ratio
-! xkferb = 3E-10 ! Half-saturation constant for bact. Fe/C
+ xremikc = 0.4 ! remineralization rate of DOC
+ xremikn = 0.4 ! remineralization rate of DON
+ xremikp = 0.5 ! remineralization rate of DOP
/
diff --git a/doc/namelists/nampissed b/doc/namelists/nampissed
index c89bd87084e33c3436ab84e9321d33d36233e158..e98c0a9775d50d3a92c9d7edda755fae75546d68 100644
--- a/doc/namelists/nampissed
+++ b/doc/namelists/nampissed
@@ -1,7 +1,7 @@
!-----------------------------------------------------------------------
-&nampissed ! parameters for sediments mobilization
+&nampissed ! Namelist parameters for sediment mobilisation
!-----------------------------------------------------------------------
- nitrfix = 1.e-7 ! Nitrogen fixation rate
- diazolight = 50. ! Diazotrophs sensitivity to light (W/m2)
+ nitrfix = 2.e-7 ! Nitrogen fixation rate
+ diazolight = 30. ! Diazotrophs sensitivity to light (W/m2)
concfediaz = 1.e-10 ! Diazotrophs half-saturation Cste for Iron
/
diff --git a/doc/namelists/namrun b/doc/namelists/namrun
index 0b13e23d90c62a665c5483b7b68acc584bf778d3..eb9623901aedaba531a7aabdbbe89bd0c71d9600 100644
--- a/doc/namelists/namrun
+++ b/doc/namelists/namrun
@@ -9,8 +9,8 @@
nn_time0 = 0 ! initial time of day in hhmm
nn_leapy = 0 ! Leap year calendar (1) or not (0)
ln_rstart = .false. ! start from rest (F) or from a restart file (T)
- nn_euler = 1 ! = 0 : start with forward time step if ln_rstart=T
- nn_rstctl = 0 ! restart control ==> activated only if ln_rstart=T
+ ln_1st_euler = .false. ! =T force a start with forward time step (ln_rstart=T)
+ nn_rstctl = 0 ! restart control ==> activated only if ln_rstart=T
! ! = 0 nn_date0 read in namelist ; nn_it000 : read in namelist
! ! = 1 nn_date0 read in namelist ; nn_it000 : check consistancy between namelist and restart
! ! = 2 nn_date0 read in restart ; nn_it000 : check consistancy between namelist and restart
@@ -18,7 +18,6 @@
cn_ocerst_indir = "." ! directory from which to read input ocean restarts
cn_ocerst_out = "restart" ! suffix of ocean restart name (output)
cn_ocerst_outdir = "." ! directory in which to write output ocean restarts
- ln_iscpl = .false. ! cavity evolution forcing or coupling to ice sheet model
nn_istate = 0 ! output the initial state (1) or not (0)
ln_rst_list = .false. ! output restarts at list of times using nn_stocklist (T) or at set frequency with nn_stock (F)
nn_stock = 0 ! used only if ln_rst_list = F: output restart freqeuncy (modulo referenced to 1)
@@ -32,6 +31,6 @@
ln_cfmeta = .false. ! output additional data to netCDF files required for compliance with the CF metadata standard
ln_clobber = .true. ! clobber (overwrite) an existing file
nn_chunksz = 0 ! chunksize (bytes) for NetCDF file (works only with iom_nf90 routines)
- ln_xios_read = .FALSE. ! use XIOS to read restart file (only for a single file restart)
+ ln_xios_read = .false. ! use XIOS to read restart file (only for a single file restart)
nn_wxios = 0 ! use XIOS to write restart file 0 - no, 1 - single file output, 2 - multiple file output
/
diff --git a/doc/namelists/namsbc b/doc/namelists/namsbc
index 5c6f953ed651d5f3e8ec8746e1e7481b6255433b..32af4b0bff6218f59438a6429d065e859180e062 100644
--- a/doc/namelists/namsbc
+++ b/doc/namelists/namsbc
@@ -3,25 +3,25 @@
!-----------------------------------------------------------------------
nn_fsbc = 2 ! frequency of SBC module call
! ! (control sea-ice & iceberg model call)
- ! Type of air-sea fluxes
+ ! Type of air-sea fluxes
ln_usr = .false. ! user defined formulation (T => check usrdef_sbc)
ln_flx = .false. ! flux formulation (T => fill namsbc_flx )
ln_blk = .false. ! Bulk formulation (T => fill namsbc_blk )
+ ln_abl = .false. ! ABL formulation (T => fill namsbc_abl )
! ! Type of coupling (Ocean/Ice/Atmosphere) :
ln_cpl = .false. ! atmosphere coupled formulation ( requires key_oasis3 )
ln_mixcpl = .false. ! forced-coupled mixed formulation ( requires key_oasis3 )
nn_components = 0 ! configuration of the opa-sas OASIS coupling
! ! =0 no opa-sas OASIS coupling: default single executable config.
- ! ! =1 opa-sas OASIS coupling: multi executable config., OPA component
- ! ! =2 opa-sas OASIS coupling: multi executable config., SAS component
+ ! ! =1 opa-sas OASIS coupling: multi executable config., OCE component
+ ! ! =2 opa-sas OASIS coupling: multi executable config., SAS component
! Sea-ice :
- nn_ice = 0 ! =0 no ice boundary condition
+ nn_ice = 0 ! =0 no ice boundary condition
! ! =1 use observed ice-cover ( => fill namsbc_iif )
- ! ! =2 or 3 automatically for SI3 or CICE ("key_si3" or "key_cice")
- ! ! except in AGRIF zoom where it has to be specified
+ ! ! =2 or 3 for SI3 and CICE, respectively
ln_ice_embd = .false. ! =T embedded sea-ice (pressure + mass and salt exchanges)
! ! =F levitating ice (no pressure, mass and salt exchanges)
- ! Misc. options of sbc :
+ ! Misc. options of sbc :
ln_traqsr = .false. ! Light penetration in the ocean (T => fill namtra_qsr)
ln_dm2dc = .false. ! daily mean to diurnal cycle on short wave
ln_ssr = .false. ! Sea Surface Restoring on T and/or S (T => fill namsbc_ssr)
@@ -30,7 +30,6 @@
! ! =2 annual global mean of e-p-r set to zero
ln_rnf = .false. ! runoffs (T => fill namsbc_rnf)
ln_apr_dyn = .false. ! Patm gradient added in ocean & ice Eqs. (T => fill namsbc_apr )
- ln_isf = .false. ! ice shelf (T => fill namsbc_isf & namsbc_iscpl)
ln_wave = .false. ! Activate coupling with wave (T => fill namsbc_wave)
nn_lsm = 0 ! =0 land/sea mask for input fields is not applied (keep empty land/sea mask filename field) ,
! =1:n number of iterations of land/sea mask application for input fields (fill land/sea mask filename field)
diff --git a/doc/namelists/namsbc_blk b/doc/namelists/namsbc_blk
index 55f2bca8bc26a352c0dc49871778faa01a230040..ce9ff511ae187a9e1d4f2562f9d2d3efbee3b935 100644
--- a/doc/namelists/namsbc_blk
+++ b/doc/namelists/namsbc_blk
@@ -2,27 +2,37 @@
&namsbc_blk ! namsbc_blk generic Bulk formula (ln_blk =T)
!-----------------------------------------------------------------------
! ! bulk algorithm :
- ln_NCAR = .true. ! "NCAR" algorithm (Large and Yeager 2008)
- ln_COARE_3p0 = .false. ! "COARE 3.0" algorithm (Fairall et al. 2003)
- ln_COARE_3p6 = .false. ! "COARE 3.6" algorithm (Edson et al. 2013)
- ln_ECMWF = .false. ! "ECMWF" algorithm (IFS cycle 45r1)
- !
- rn_zqt = 10. ! Air temperature & humidity reference height (m)
- rn_zu = 10. ! Wind vector reference height (m)
- ln_Cd_L12 = .false. ! air-ice drags = F(ice conc.) (Lupkes et al. 2012)
- ln_Cd_L15 = .false. ! air-ice drags = F(ice conc.) (Lupkes et al. 2015)
- ! ! - module of the mean stress" data
- rn_pfac = 1. ! multipl. factor for precipitation (total & snow)
- rn_efac = 1. ! multipl. factor for evaporation (0. or 1.)
- rn_vfac = 0. ! multipl. factor for ocean & ice velocity
- ! ! used to calculate the wind stress
- ! ! (0. => absolute or 1. => relative winds)
- ln_skin_cs = .false. ! use the cool-skin parameterization
- ln_skin_wl = .false. ! use the warm-layer parameterization
- ! ! ==> only available in ECMWF and COARE algorithms
- ln_humi_sph = .true. ! humidity "sn_humi" is specific humidity [kg/kg]
- ln_humi_dpt = .false. ! humidity "sn_humi" is dew-point temperature [K]
- ln_humi_rlh = .false. ! humidity "sn_humi" is relative humidity [%]
+ ln_NCAR = .true. ! "NCAR" algorithm (Large and Yeager 2008)
+ ln_COARE_3p0 = .false. ! "COARE 3.0" algorithm (Fairall et al. 2003)
+ ln_COARE_3p6 = .false. ! "COARE 3.6" algorithm (Edson et al. 2013)
+ ln_ECMWF = .false. ! "ECMWF" algorithm (IFS cycle 45r1)
+ ln_ANDREAS = .false. ! "ANDREAS" algorithm (Andreas et al. 2015)
+ rn_zqt = 10. ! Air temperature & humidity reference height (m)
+ rn_zu = 10. ! Wind vector reference height (m)
+ nn_iter_algo = 5 ! Number of iterations in bulk param. algo ("stable ABL + weak wind" requires more)
+ ln_skin_cs = .false. ! use the cool-skin parameterization => use at least nn_iter_algo > 10
+ ln_skin_wl = .false. ! use the warm-layer parameterization => use at least nn_iter_algo > 10
+ !
+ rn_pfac = 1. ! multipl. factor for precipitation (total & snow)
+ rn_efac = 1. ! multipl. factor for evaporation (0. or 1.)
+ !
+ ln_crt_fbk = .false. ! Add surface current feedback to the wind stress (Renault et al. 2020, doi: 10.1029/2019MS001715)
+ rn_stau_a = -2.9e-3 ! Alpha from eq. 10: Stau = Alpha * Wnd + Beta
+ rn_stau_b = 8.0e-3 ! Beta
+ !
+ ln_humi_sph = .true. ! humidity "sn_humi" is specific humidity [kg/kg]
+ ln_humi_dpt = .false. ! humidity "sn_humi" is dew-point temperature [K]
+ ln_humi_rlh = .false. ! humidity "sn_humi" is relative humidity [%]
+ ln_tair_pot = .false. ! air temperature read in "sn_tair" is already POTENTIAL TEMPERATURE, NOT ABSOLUTE (ECMWF => ln_tair_pot=.false.)
+ !!
+ !! Bulk transfer coefficients over sea-ice: (relevant IF: nn_ice >=1 )
+ ln_Cx_ice_cst = .true. ! use constant ice-air bulk transfer coefficients (value given below)
+ rn_Cd_i = 1.4e-3 ! sea-ice drag coefficient
+ rn_Ce_i = 1.4e-3 ! " sublimation coefficient
+ rn_Ch_i = 1.4e-3 ! " sensible heat flux coefficient
+ ln_Cx_ice_AN05 = .false. ! (Andreas et al. 2005)
+ ln_Cx_ice_LU12 = .false. ! (Lupkes et al. 2012)
+ ln_Cx_ice_LG15 = .false. ! (Lupkes & Gryanik 2015)
!
cn_dir = './' ! root directory for the bulk data location
!___________!_________________________!___________________!___________!_____________!________!___________!______________________________________!__________!_______________!
diff --git a/doc/namelists/namsbc_cpl b/doc/namelists/namsbc_cpl
index 9263ea236a5982bc0e7de8b51ccc243fad3b6076..759320acd492360d66b9f749487b290783a363cd 100644
--- a/doc/namelists/namsbc_cpl
+++ b/doc/namelists/namsbc_cpl
@@ -34,23 +34,22 @@
sn_rcv_rnf = 'coupled' , 'no' , '' , '' , ''
sn_rcv_cal = 'coupled' , 'no' , '' , '' , ''
sn_rcv_co2 = 'coupled' , 'no' , '' , '' , ''
- sn_rcv_hsig = 'none' , 'no' , '' , '' , ''
sn_rcv_iceflx = 'none' , 'no' , '' , '' , ''
sn_rcv_mslp = 'none' , 'no' , '' , '' , ''
- sn_rcv_phioc = 'none' , 'no' , '' , '' , ''
- sn_rcv_sdrfx = 'none' , 'no' , '' , '' , ''
- sn_rcv_sdrfy = 'none' , 'no' , '' , '' , ''
- sn_rcv_wper = 'none' , 'no' , '' , '' , ''
- sn_rcv_wnum = 'none' , 'no' , '' , '' , ''
- sn_rcv_wstrf = 'none' , 'no' , '' , '' , ''
- sn_rcv_wdrag = 'none' , 'no' , '' , '' , ''
sn_rcv_ts_ice = 'none' , 'no' , '' , '' , ''
sn_rcv_isf = 'none' , 'no' , '' , '' , ''
sn_rcv_icb = 'none' , 'no' , '' , '' , ''
- sn_rcv_wdrag = 'none' , 'no' , '' , '' , ''
- sn_rcv_charn = 'none' , 'no' , '' , '' , ''
+ sn_rcv_hsig = 'none' , 'no' , '' , '' , 'T'
+ sn_rcv_phioc = 'none' , 'no' , '' , '' , 'T'
+ sn_rcv_sdrfx = 'none' , 'no' , '' , '' , 'T'
+ sn_rcv_sdrfy = 'none' , 'no' , '' , '' , 'T'
+ sn_rcv_wper = 'none' , 'no' , '' , '' , 'T'
+ sn_rcv_wnum = 'none' , 'no' , '' , '' , 'T'
+ sn_rcv_wstrf = 'none' , 'no' , '' , '' , 'T'
+ sn_rcv_wdrag = 'none' , 'no' , '' , '' , 'T'
+ sn_rcv_charn = 'none' , 'no' , '' , '' , 'T'
sn_rcv_taw = 'none' , 'no' , '' , '' , 'U,V'
- sn_rcv_bhd = 'none' , 'no' , '' , '' , ''
- sn_rcv_tusd = 'none' , 'no' , '' , '' , ''
- sn_rcv_tvsd = 'none' , 'no' , '' , '' , ''
+ sn_rcv_bhd = 'none' , 'no' , '' , '' , 'T'
+ sn_rcv_tusd = 'none' , 'no' , '' , '' , 'T'
+ sn_rcv_tvsd = 'none' , 'no' , '' , '' , 'T'
/
diff --git a/doc/namelists/namsbc_rnf b/doc/namelists/namsbc_rnf
index 3eadda663a3c3dead61ef13f89ac993d6937db54..2e5646bb09a54e249601d6e41bacb4b77421858b 100644
--- a/doc/namelists/namsbc_rnf
+++ b/doc/namelists/namsbc_rnf
@@ -2,24 +2,26 @@
&namsbc_rnf ! runoffs (ln_rnf =T)
!-----------------------------------------------------------------------
ln_rnf_mouth = .false. ! specific treatment at rivers mouths
- rn_hrnf = 15.e0 ! depth over which enhanced vertical mixing is used (ln_rnf_mouth=T)
- rn_avt_rnf = 1.e-3 ! value of the additional vertical mixing coef. [m2/s] (ln_rnf_mouth=T)
- rn_rfact = 1.e0 ! multiplicative factor for runoff
+ rn_hrnf = 15.e0 ! depth over which enhanced vertical mixing is used (ln_rnf_mouth=T)
+ rn_avt_rnf = 1.e-3 ! value of the additional vertical mixing coef. [m2/s] (ln_rnf_mouth=T)
+ rn_rfact = 1.e0 ! multiplicative factor for runoff
ln_rnf_depth = .false. ! read in depth information for runoff
- ln_rnf_tem = .false. ! read in temperature information for runoff
- ln_rnf_sal = .false. ! read in salinity information for runoff
- ln_rnf_depth_ini = .false. ! compute depth at initialisation from runoff file
- rn_rnf_max = 5.735e-4 ! max value of the runoff climatologie over global domain ( ln_rnf_depth_ini = .true )
- rn_dep_max = 150. ! depth over which runoffs is spread ( ln_rnf_depth_ini = .true )
- nn_rnf_depth_file = 0 ! create (=1) a runoff depth file or not (=0)
+ ln_rnf_tem = .false. ! read in temperature information for runoff
+ ln_rnf_sal = .false. ! read in salinity information for runoff
+ ln_rnf_icb = .false. ! read iceberg flux
+ ln_rnf_depth_ini = .false. ! compute depth at initialisation from runoff file
+ rn_rnf_max = 5.735e-4 ! max value of the runoff climatologie over global domain ( ln_rnf_depth_ini = .true )
+ rn_dep_max = 150. ! depth over which runoffs is spread ( ln_rnf_depth_ini = .true )
+ nn_rnf_depth_file = 0 ! create (=1) a runoff depth file or not (=0)
- cn_dir = './' ! root directory for the runoff data location
+ cn_dir = './' ! root directory for the runoff 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_rnf = 'runoff_core_monthly' , -1. , 'sorunoff', .true. , .true. , 'yearly' , '' , '' , ''
- sn_cnf = 'runoff_core_monthly' , 0. , 'socoefr0', .false. , .true. , 'yearly' , '' , '' , ''
+ sn_cnf = 'runoff_core_monthly' , -12. , 'socoefr0', .false. , .true. , 'yearly' , '' , '' , ''
sn_s_rnf = 'runoffs' , 24. , 'rosaline', .true. , .true. , 'yearly' , '' , '' , ''
sn_t_rnf = 'runoffs' , 24. , 'rotemper', .true. , .true. , 'yearly' , '' , '' , ''
- sn_dep_rnf = 'runoffs' , 0. , 'rodepth' , .false. , .true. , 'yearly' , '' , '' , ''
+ sn_i_rnf = 'NOT USED' , 24. , 'xxxxxxxx', .true. , .true. , 'yearly' , '' , '' , ''
+ sn_dep_rnf = 'runoffs' , -12. , 'rodepth' , .false. , .true. , 'yearly' , '' , '' , ''
/
diff --git a/doc/namelists/namsbc_sas b/doc/namelists/namsbc_sas
index b3915de3bec963a3ae6f91f59f8c5bcbde62807a..f57fac6de716cc8f68d7142a3ee6f0b2a1c81490 100644
--- a/doc/namelists/namsbc_sas
+++ b/doc/namelists/namsbc_sas
@@ -16,4 +16,9 @@
sn_ssh = 'sas_grid_T' , 120. , 'sossheig', .true. , .true. , 'yearly' , '' , '' , ''
sn_e3t = 'sas_grid_T' , 120. , 'e3t_m' , .true. , .true. , 'yearly' , '' , '' , ''
sn_frq = 'sas_grid_T' , 120. , 'frq_m' , .true. , .true. , 'yearly' , '' , '' , ''
+ !!
+ !! Following only needed with STATION_ASF compiled with "sea-ice" support: "key_si3" (ice fraction, ice surface temperature and sea-ice albedo:
+ sn_ifr = 'NOT USED' , 1. , 'siconc' , .true. , .false. , 'yearly' , '' , '' , ''
+ sn_tic = 'NOT USED' , 1. , 'istl1' , .true. , .false. , 'yearly' , '' , '' , ''
+ sn_ial = 'NOT USED' , 1. , 'fal' , .true. , .false. , 'yearly' , '' , '' , ''
/
diff --git a/doc/namelists/namsbc_ssr b/doc/namelists/namsbc_ssr
index 934cf6472aef7a13235808ca61b690ff348e19a3..2407e065c2636d6be474beccee774011af62e5e3 100644
--- a/doc/namelists/namsbc_ssr
+++ b/doc/namelists/namsbc_ssr
@@ -8,6 +8,10 @@
rn_deds = -166.67 ! magnitude of the damping on salinity [mm/day]
ln_sssr_bnd = .true. ! flag to bound erp term (associated with nn_sssr=2)
rn_sssr_bnd = 4.e0 ! ABS(Max/Min) value of the damping erp term [mm/day]
+ nn_sssr_ice = 1 ! control of sea surface restoring under sea-ice
+ ! 0 = no restoration under ice : * (1-icefrac)
+ ! 1 = restoration everywhere
+ ! >1 = enhanced restoration under ice : 1+(nn_icedmp-1)*icefrac
cn_dir = './' ! root directory for the SST/SSS data location
!___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
diff --git a/doc/namelists/namsbc_wave b/doc/namelists/namsbc_wave
index f299501c3c4088fc0cdcebaf124a95d42d785ce0..08b7e038175800fcf87b45202d1a24b025f20596 100644
--- a/doc/namelists/namsbc_wave
+++ b/doc/namelists/namsbc_wave
@@ -12,7 +12,7 @@
ln_phioc = .false. ! TKE flux from wave model
ln_bern_srfc= .false. ! wave induced pressure. Bernoulli head J term
ln_breivikFV_2016 = .false. ! breivik 2016 vertical stokes profile
- ln_vortex_force = .false. ! Vortex Force term
+ ln_vortex_force = .false. ! Vortex Force term
ln_stshear = .false. ! include stokes shear in EKE computation
!
cn_dir = './' ! root directory for the waves data location
diff --git a/doc/namelists/namthd b/doc/namelists/namthd
index bfb624850bf35682768addd8707c8ad472019dd5..562f19fb143de311f7ca4721c23ef034bf0d4250 100644
--- a/doc/namelists/namthd
+++ b/doc/namelists/namthd
@@ -5,6 +5,6 @@
ln_icedA = .true. ! activate lateral melting param. (T) or not (F)
ln_icedO = .true. ! activate ice growth in open-water (T) or not (F)
ln_icedS = .true. ! activate brine drainage (T) or not (F)
- !
+ !
ln_leadhfx = .true. ! heat in the leads is used to melt sea-ice before warming the ocean
/
diff --git a/doc/namelists/namthd_pnd b/doc/namelists/namthd_pnd
index 45355d17a41b22eaa27d88016d297d026fcb25f3..cc0f8f3cfc4067da33ec28db578c11cbf3ace9c5 100644
--- a/doc/namelists/namthd_pnd
+++ b/doc/namelists/namthd_pnd
@@ -1,10 +1,12 @@
!------------------------------------------------------------------------------
&namthd_pnd ! Melt ponds
!------------------------------------------------------------------------------
- ln_pnd = .false. ! activate melt ponds or not
- ln_pnd_LEV = .false. ! level ice melt ponds (from Flocco et al 2007,2010 & Holland et al 2012)
- rn_apnd_min = 0.15 ! minimum ice fraction that contributes to melt pond. range: 0.0 -- 0.15 ??
- rn_apnd_max = 0.85 ! maximum ice fraction that contributes to melt pond. range: 0.7 -- 0.85 ??
+ ln_pnd = .true. ! activate melt ponds or not
+ ln_pnd_TOPO = .false. ! topographic melt ponds
+ ln_pnd_LEV = .true. ! level ice melt ponds
+ rn_apnd_min = 0.15 ! minimum meltwater fraction contributing to pond growth (TOPO and LEV)
+ rn_apnd_max = 0.85 ! maximum meltwater fraction contributing to pond growth (TOPO and LEV)
+ rn_pnd_flush= 0.1 ! pond flushing efficiency (tuning parameter) (LEV)
ln_pnd_CST = .false. ! constant melt ponds
rn_apnd = 0.2 ! prescribed pond fraction, at Tsu=0 degC
rn_hpnd = 0.05 ! prescribed pond depth, at Tsu=0 degC
diff --git a/doc/namelists/namthd_zdf b/doc/namelists/namthd_zdf
index 006aedfe6ddb1355833d367aff0596b868a02cdd..b2bc11995561b33ba7fb013fd4dfc035dbbf7206 100644
--- a/doc/namelists/namthd_zdf
+++ b/doc/namelists/namthd_zdf
@@ -10,5 +10,5 @@
rn_kappa_s = 10.0 ! nn_qtrice = 0: radiation attenuation coefficient in snow [1/m]
rn_kappa_smlt = 7.0 ! nn_qtrice = 1: radiation attenuation coefficient in melting snow [1/m]
rn_kappa_sdry = 10.0 ! radiation attenuation coefficient in dry snow [1/m]
- ln_zdf_chkcvg = .false. ! check convergence of heat diffusion scheme (output variable: tice_cvg)
+ ln_zdf_chkcvg = .false. ! check convergence of heat diffusion scheme (outputs: tice_cvgerr, tice_cvgstp)
/
diff --git a/doc/namelists/namtile b/doc/namelists/namtile
index 06c1cbbb99c36d897606d4aba3e16b7a22877b7f..57be45b194e688fde73a9ab170bdf4c26ef2b77d 100644
--- a/doc/namelists/namtile
+++ b/doc/namelists/namtile
@@ -2,6 +2,6 @@
&namtile ! parameters of the tiling
!-----------------------------------------------------------------------
ln_tile = .false. ! Use tiling (T) or not (F)
- nn_ltile_i = 10 ! Length of tiles in i
+ nn_ltile_i = 99999 ! Length of tiles in i
nn_ltile_j = 10 ! Length of tiles in j
/
diff --git a/doc/namelists/namtra_adv b/doc/namelists/namtra_adv
index 9466f186bfd5d1b65fe519181a64ee62849cb729..8d1993654a866507e5423c7f450e8c9b6ad5acbf 100644
--- a/doc/namelists/namtra_adv
+++ b/doc/namelists/namtra_adv
@@ -6,8 +6,8 @@
nn_cen_h = 4 ! =2/4, horizontal 2nd order CEN / 4th order CEN
nn_cen_v = 4 ! =2/4, vertical 2nd order CEN / 4th order COMPACT
ln_traadv_fct = .false. ! FCT scheme
- nn_fct_h = 2 ! =2/4, horizontal 2nd / 4th order
- nn_fct_v = 2 ! =2/4, vertical 2nd / COMPACT 4th order
+ nn_fct_h = 2 ! =2/4, horizontal 2nd / 4th order
+ nn_fct_v = 2 ! =2/4, vertical 2nd / COMPACT 4th order
ln_traadv_mus = .false. ! MUSCL scheme
ln_mus_ups = .false. ! use upstream scheme near river mouths
ln_traadv_ubs = .false. ! UBS scheme
diff --git a/doc/namelists/namtra_eiv b/doc/namelists/namtra_eiv
index 4db0671862e096264cf426bc19341c7562d2c060..93ea23bb65554e72b93c07b9931d1686a52ff01c 100644
--- a/doc/namelists/namtra_eiv
+++ b/doc/namelists/namtra_eiv
@@ -6,12 +6,12 @@
! ! Coefficients:
nn_aei_ijk_t = 0 ! space/time variation of eddy coefficient:
! ! =-20 (=-30) read in eddy_induced_velocity_2D.nc (..._3D.nc) file
- ! ! = 0 constant
- ! ! = 10 F(k) =ldf_c1d
- ! ! = 20 F(i,j) =ldf_c2d
+ ! ! = 0 constant
+ ! ! = 10 F(k) =ldf_c1d
+ ! ! = 20 F(i,j) =ldf_c2d
! ! = 21 F(i,j,t) =Treguier et al. JPO 1997 formulation
! ! = 30 F(i,j,k) =ldf_c2d * ldf_c1d
- ! ! time invariant coefficients: aei0 = 1/2 Ue*Le
+ ! ! time invariant coefficients: aei0 = 1/2 Ue*Le
rn_Ue = 0.02 ! lateral diffusive velocity [m/s] (nn_aht_ijk_t= 0, 10, 20, 30)
rn_Le = 200.e+3 ! lateral diffusive length [m] (nn_aht_ijk_t= 0, 10)
!
diff --git a/doc/namelists/namtra_ldf b/doc/namelists/namtra_ldf
index d92e913de3c07bd88b7c374aadec81bf98ab5122..ea2a0459fcbfbc7c8395e42d759152a3158fdcb4 100644
--- a/doc/namelists/namtra_ldf
+++ b/doc/namelists/namtra_ldf
@@ -12,7 +12,7 @@
ln_traldf_iso = .false. ! iso-neutral (standard operator)
ln_traldf_triad = .false. ! iso-neutral (triad operator)
!
- ! ! iso-neutral options:
+ ! ! iso-neutral options:
ln_traldf_msc = .false. ! Method of Stabilizing Correction (both operators)
rn_slpmax = 0.01 ! slope limit (both operators)
ln_triad_iso = .false. ! pure horizontal mixing in ML (triad only)
@@ -22,13 +22,13 @@
! ! Coefficients:
nn_aht_ijk_t = 0 ! space/time variation of eddy coefficient:
! ! =-20 (=-30) read in eddy_diffusivity_2D.nc (..._3D.nc) file
- ! ! = 0 constant
- ! ! = 10 F(k) =ldf_c1d
- ! ! = 20 F(i,j) =ldf_c2d
+ ! ! = 0 constant
+ ! ! = 10 F(k) =ldf_c1d
+ ! ! = 20 F(i,j) =ldf_c2d
! ! = 21 F(i,j,t) =Treguier et al. JPO 1997 formulation
! ! = 30 F(i,j,k) =ldf_c2d * ldf_c1d
! ! = 31 F(i,j,k,t)=F(local velocity and grid-spacing)
- ! ! time invariant coefficients: aht0 = 1/2 Ud*Ld (lap case)
+ ! ! time invariant coefficients: aht0 = 1/2 Ud*Ld (lap case)
! ! or = 1/12 Ud*Ld^3 (blp case)
rn_Ud = 0.01 ! lateral diffusive velocity [m/s] (nn_aht_ijk_t= 0, 10, 20, 30)
rn_Ld = 200.e+3 ! lateral diffusive length [m] (nn_aht_ijk_t= 0, 10)
diff --git a/doc/namelists/namtra_qsr b/doc/namelists/namtra_qsr
index e147d3103fd4e1c4a643c797c038c9cfac37fed6..2b610c761063dadc2a87bd223e9b4678d90b4697 100644
--- a/doc/namelists/namtra_qsr
+++ b/doc/namelists/namtra_qsr
@@ -10,7 +10,7 @@
rn_si0 = 0.35 ! RGB & 2BD: shortess depth of extinction
nn_chldta = 0 ! RGB : Chl data (=1) or cst value (=0)
rn_si1 = 23.0 ! 2BD : longest depth of extinction
-
+
cn_dir = './' ! root directory for the chlorophyl data location
!___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
diff --git a/doc/namelists/namtrc b/doc/namelists/namtrc
index 6f62aff070e954ae27bf18092853a109179aa20f..972c5c2c272ff8ccbf788f506247b30b75499cd2 100644
--- a/doc/namelists/namtrc
+++ b/doc/namelists/namtrc
@@ -14,6 +14,8 @@
ln_trcdta = .false. ! Initialisation from data input file (T) or not (F)
ln_trcdmp = .false. ! add a damping termn (T) or not (F)
ln_trcdmp_clo = .false. ! damping term (T) or not (F) on closed seas
+ ln_trcbc = .false. ! Surface, Lateral or Open Boundaries conditions
+ ln_trcais = .false. ! Antarctic Ice Sheet nutrient supply
!
jp_dia3d = 0 ! Number of 3D diagnostic variables
jp_dia2d = 0 ! Number of 2D diagnostic variables
diff --git a/doc/namelists/namtrc_bc b/doc/namelists/namtrc_bc
index 6855f40974e6318adb263ced68db05d1038683da..458769f3fc568c27ebce94d4936005a8b777a2f7 100644
--- a/doc/namelists/namtrc_bc
+++ b/doc/namelists/namtrc_bc
@@ -5,5 +5,6 @@
cn_dir_cbc = './' ! root directory for the location of COASTAL data files
cn_dir_obc = './' ! root directory for the location of OPEN data files
ln_rnf_ctl = .false. ! Remove runoff dilution on tracers with absent river load
- rn_bc_time = 86400. ! Time scaling factor for SBC and CBC data (seconds in a day)
+ rn_sbc_time = 86400. ! Time scaling factor for SBC data (seconds in a day)
+ rn_cbc_time = 86400. ! Time scaling factor for CBC data (seconds in a day)
/
diff --git a/doc/namelists/namtrc_opt b/doc/namelists/namtrc_opt
new file mode 100644
index 0000000000000000000000000000000000000000..24ed9988e29b97f8b49ee66a1a91f28755e39bd1
--- /dev/null
+++ b/doc/namelists/namtrc_opt
@@ -0,0 +1,11 @@
+!-----------------------------------------------------------------------
+&namtrc_opt ! light availability in the water column
+!-----------------------------------------------------------------------
+! ! file name ! frequency (hours) ! variable ! time interp. ! clim ! 'yearly'/ ! weights ! rotation ! land/sea mask !
+! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! filename ! pairing ! filename !
+ sn_par = 'par.orca' , 24 , 'fr_par' , .true. , .true. , 'yearly' , '' , '' , ''
+ cn_dir = './' ! root directory for the location of the dynamical files
+ ln_varpar = .true. ! Read PAR from file
+ parlux = 0.43 ! Fraction of shortwave as PAR
+ light_loc = 'center' ! Light location in the water cell ('center', 'integral')
+/
diff --git a/doc/namelists/namtrc_run b/doc/namelists/namtrc_run
index 06b00925c4196966acb7afa52cad4fe1403a913f..dab2f4016ebae7488b98673a04c1bc6d0fae77f9 100644
--- a/doc/namelists/namtrc_run
+++ b/doc/namelists/namtrc_run
@@ -1,7 +1,6 @@
!-----------------------------------------------------------------------
&namtrc_run ! run information
!-----------------------------------------------------------------------
- nn_dttrc = 1 ! time step frequency for passive sn_tracers
ln_top_euler = .false. ! use Euler time-stepping for TOP
ln_rsttr = .false. ! start from a restart file (T) or not (F)
nn_rsttr = 0 ! restart control = 0 initial time step is not compared to the restart file value
diff --git a/doc/namelists/namtsd b/doc/namelists/namtsd
index 73b672358e3740489f1e974ada54e2bb5597c1a4..f67b52da68d68cf56b572e0780b3bb84ffbf752f 100644
--- a/doc/namelists/namtsd
+++ b/doc/namelists/namtsd
@@ -4,7 +4,7 @@
! ! =T read T-S fields for:
ln_tsd_init = .false. ! ocean initialisation
ln_tsd_dmp = .false. ! T-S restoring (see namtra_dmp)
-
+
cn_dir = './' ! root directory for the T-S data location
!___________!_________________________!___________________!___________!_____________!________!___________!__________________!__________!_______________!
! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
diff --git a/doc/namelists/namzdf b/doc/namelists/namzdf
index b3a6da1e76e48ddf8fd6b6aeccfdf11ac886140d..6b298c2bb9f22672da9a7baa8b49f280c036f464 100644
--- a/doc/namelists/namzdf
+++ b/doc/namelists/namzdf
@@ -18,6 +18,7 @@
ln_zdfnpc = .false. ! Non-Penetrative Convective algorithm
nn_npc = 1 ! frequency of application of npc
nn_npcp = 365 ! npc control print frequency
+ ln_zdfmfc = .false. ! Mass Flux Convection
!
ln_zdfddm = .false. ! double diffusive mixing
rn_avts = 1.e-4 ! maximum avs (vertical mixing on salinity)
diff --git a/doc/namelists/namzdf_gls b/doc/namelists/namzdf_gls
index 00ceb386f803d07ee8fc5a697723514320e4f009..f5c0cee04f30c0912ee557081383fadcdcb81ac3 100644
--- a/doc/namelists/namzdf_gls
+++ b/doc/namelists/namzdf_gls
@@ -9,14 +9,20 @@
rn_crban = 100. ! Craig and Banner 1994 constant for wb tke flux
rn_charn = 70000. ! Charnock constant for wb induced roughness length
rn_hsro = 0.02 ! Minimum surface roughness
+ rn_hsri = 0.03 ! Ice-ocean roughness
rn_frac_hs = 1.3 ! Fraction of wave height as roughness (if nn_z0_met>1)
nn_z0_met = 2 ! Method for surface roughness computation (0/1/2/3)
- ! ! =3 requires ln_wave=T
+ ! ! = 3 requires ln_wave=T
nn_z0_ice = 1 ! attenutaion of surface wave breaking under ice
! ! = 0 no impact of ice cover
! ! = 1 roughness uses rn_hsri and is weigthed by 1-TANH(10*fr_i)
! ! = 2 roughness uses rn_hsri and is weighted by 1-fr_i
! ! = 3 roughness uses rn_hsri and is weighted by 1-MIN(1,4*fr_i)
+ nn_mxlice = 1 ! mixing under sea ice
+ ! = 0 No scaling under sea-ice
+ ! = 1 scaling with constant Ice-ocean roughness (rn_hsri)
+ ! = 2 scaling with mean sea-ice thickness
+ ! = 3 scaling with max sea-ice thickness
nn_bc_surf = 1 ! surface condition (0/1=Dir/Neum)
nn_bc_bot = 1 ! bottom condition (0/1=Dir/Neum)
nn_stab_func = 2 ! stability function (0=Galp, 1= KC94, 2=CanutoA, 3=CanutoB)
diff --git a/doc/namelists/namzdf_iwm b/doc/namelists/namzdf_iwm
index af9004cd268df746b5e0207fefb6f3046fea408b..06f25943d59e51a79aedcd4a8c95d1f797573e68 100644
--- a/doc/namelists/namzdf_iwm
+++ b/doc/namelists/namzdf_iwm
@@ -1,7 +1,17 @@
!-----------------------------------------------------------------------
&namzdf_iwm ! internal wave-driven mixing parameterization (ln_zdfiwm =T)
!-----------------------------------------------------------------------
- nn_zpyc = 1 ! pycnocline-intensified dissipation scales as N (=1) or N^2 (=2)
- ln_mevar = .true. ! variable (T) or constant (F) mixing efficiency
+ ln_mevar = .false. ! variable (T) or constant (F) mixing efficiency
ln_tsdiff = .true. ! account for differential T/S mixing (T) or not (F)
+
+ cn_dir = './' ! root directory for the iwm 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_mpb = 'NOT USED' , -12. , 'power_bot' , .false. , .true. , 'yearly' , '' , '' , ''
+ sn_mpc = 'NOT USED' , -12. , 'power_cri' , .false. , .true. , 'yearly' , '' , '' , ''
+ sn_mpn = 'NOT USED' , -12. , 'power_nsq' , .false. , .true. , 'yearly' , '' , '' , ''
+ sn_mps = 'NOT USED' , -12. , 'power_sho' , .false. , .true. , 'yearly' , '' , '' , ''
+ sn_dsb = 'NOT USED' , -12. , 'scale_bot' , .false. , .true. , 'yearly' , '' , '' , ''
+ sn_dsc = 'NOT USED' , -12. , 'scale_cri' , .false. , .true. , 'yearly' , '' , '' , ''
/
diff --git a/doc/namelists/namzdf_osm b/doc/namelists/namzdf_osm
index 5712ca3bd61bbc6d710d7d102f9027118ac2a771..3f6109253e96fcefe47da6bcacc059f535bf4f2b 100644
--- a/doc/namelists/namzdf_osm
+++ b/doc/namelists/namzdf_osm
@@ -1,9 +1,11 @@
!-----------------------------------------------------------------------
&namzdf_osm ! OSM vertical diffusion (ln_zdfosm =T)
!-----------------------------------------------------------------------
- ln_use_osm_la = .false. ! Use namelist rn_osm_la
+ ln_use_osm_la = .false. ! Use rn_osm_la
rn_osm_la = 0.3 ! Turbulent Langmuir number
- rn_osm_dstokes = 5. ! Depth scale of Stokes drift (m)
+ rn_zdfosm_adjust_sd = 1.0 ! Stokes drift reduction factor
+ rn_osm_hblfrac = 0.1 ! specify top part of hbl for nn_osm_wave = 3 or 4
+ rn_osm_bl_thresh = 5.e-5 !Threshold buoyancy for deepening of OSBL base
nn_ave = 0 ! choice of horizontal averaging on avt, avmu, avmv
ln_dia_osm = .true. ! output OSMOSIS-OBL variables
rn_osm_hbl0 = 10. ! initial hbl value
@@ -11,9 +13,16 @@
rn_riinfty = 0.7 ! Highest local Ri_g permitting shear instability
rn_difri = 0.005 ! max Ri# diffusivity at Ri_g = 0 (m^2/s)
ln_convmix = .true. ! Use convective instability mixing below BL
- rn_difconv = 1. ! diffusivity when unstable below BL (m2/s)
+ rn_difconv = 1. !0.01 !1. ! diffusivity when unstable below BL (m2/s)
+ rn_osm_dstokes = 5. ! Depth scale of Stokes drift (m)
nn_osm_wave = 0 ! Method used to calculate Stokes drift
! ! = 2: Use ECMWF wave fields
! ! = 1: Pierson Moskowitz wave spectrum
! ! = 0: Constant La# = 0.3
+ nn_osm_SD_reduce = 0 ! Method used to get active Stokes drift from surface value
+ ! ! = 0: No reduction
+ ! = 1: use SD avged over top 10% hbl
+ ! = 2:use surface value of SD fit to slope at rn_osm_hblfrac*hbl below surface
+ ln_zdfosm_ice_shelter = .true. ! reduce surface SD and depth scale under ice
+ ln_osm_mle = .true. ! Use integrated FK-OSM model
/
diff --git a/doc/namelists/namzdf_tke b/doc/namelists/namzdf_tke
index 4f8d233f95da46ae3fb8e34a8dd4a2e8cda254a3..85990fe702a48f44706e7551821e6dfb73671634 100644
--- a/doc/namelists/namzdf_tke
+++ b/doc/namelists/namzdf_tke
@@ -8,27 +8,34 @@
rn_emin0 = 1.e-4 ! surface minimum value of tke [m2/s2]
rn_bshear = 1.e-20 ! background shear (>0) currently a numerical threshold (do not change it)
nn_pdl = 1 ! Prandtl number function of richarson number (=1, avt=pdl(Ri)*avm) or not (=0, avt=avm)
- nn_mxl = 2 ! mixing length: = 0 bounded by the distance to surface and bottom
+ nn_mxl = 3 ! mixing length: = 0 bounded by the distance to surface and bottom
! ! = 1 bounded by the local vertical scale factor
! ! = 2 first vertical derivative of mixing length bounded by 1
! ! = 3 as =2 with distinct dissipative an mixing length scale
ln_mxl0 = .true. ! surface mixing length scale = F(wind stress) (T) or not (F)
+ nn_mxlice = 2 ! type of scaling under sea-ice
+ ! ! = 0 no scaling under sea-ice
+ ! ! = 1 scaling with constant sea-ice thickness
+ ! ! = 2 scaling with mean sea-ice thickness ( only with SI3 sea-ice model )
+ ! ! = 3 scaling with maximum sea-ice thickness
+ rn_mxlice = 10. ! max constant ice thickness value when scaling under sea-ice ( nn_mxlice=1)
rn_mxl0 = 0.04 ! surface buoyancy lenght scale minimum value
+ ln_mxhsw = .false. ! surface mixing length scale = F(wave height)
ln_lc = .true. ! Langmuir cell parameterisation (Axell 2002)
rn_lc = 0.15 ! coef. associated to Langmuir cells
nn_etau = 1 ! penetration of tke below the mixed layer (ML) due to NIWs
- ! = 0 none ; = 1 add a tke source below the ML
- ! = 2 add a tke source just at the base of the ML
- ! = 3 as = 1 applied on HF part of the stress (ln_cpl=T)
+ ! ! = 0 none ; = 1 add a tke source below the ML
+ ! ! = 2 add a tke source just at the base of the ML
+ ! ! = 3 as = 1 applied on HF part of the stress (ln_cpl=T)
rn_efr = 0.05 ! fraction of surface tke value which penetrates below the ML (nn_etau=1 or 2)
nn_htau = 1 ! type of exponential decrease of tke penetration below the ML
- ! = 0 constant 10 m length scale
- ! = 1 0.5m at the equator to 30m poleward of 40 degrees
+ ! ! = 0 constant 10 m length scale
+ ! ! = 1 0.5m at the equator to 30m poleward of 40 degrees
nn_eice = 1 ! attenutaion of langmuir & surface wave breaking under ice
! ! = 0 no impact of ice cover on langmuir & surface wave breaking
! ! = 1 weigthed by 1-TANH(10*fr_i)
! ! = 2 weighted by 1-fr_i
- ! ! = 3 weighted by 1-MIN(1,4*fr_i)
+ ! ! = 3 weighted by 1-MIN(1,4*fr_i)
nn_bc_surf = 1 ! surface condition (0/1=Dir/Neum) ! Only applicable for wave coupling (ln_cplwave=1)
nn_bc_bot = 1 ! bottom condition (0/1=Dir/Neum) ! Only applicable for wave coupling (ln_cplwave=1)
/