diff --git a/icedyn_adv b/icedyn_adv
deleted file mode 100644
index 9497753620efb10064e16fbd8c89238f539d6dc4..0000000000000000000000000000000000000000
--- a/icedyn_adv
+++ /dev/null
@@ -1,7 +0,0 @@
-!------------------------------------------------------------------------------
-&namdyn_adv ! Ice advection
-!------------------------------------------------------------------------------
- ln_adv_Pra = .true. ! Advection scheme (Prather)
- ln_adv_UMx = .false. ! Advection scheme (Ultimate-Macho)
- nn_UMx = 5 ! order of the scheme for UMx (1-5 ; 20=centered 2nd order)
-/
diff --git a/icesbc b/icesbc
deleted file mode 100644
index 9416da4c57dfc0bab6f8b403957b0f89bc37268c..0000000000000000000000000000000000000000
--- a/icesbc
+++ /dev/null
@@ -1,21 +0,0 @@
-!------------------------------------------------------------------------------
-&namsbc ! Ice surface boundary conditions
-!------------------------------------------------------------------------------
- rn_cio = 5.0e-03 ! ice-ocean drag coefficient (-)
- nn_snwfra = 2 ! calculate the fraction of ice covered by snow (for zdf and albedo)
- ! = 0 fraction = 1 (if snow) or 0 (if no snow)
- ! = 1 fraction = 1-exp(-0.2*rhos*hsnw) [MetO formulation]
- ! = 2 fraction = hsnw / (hsnw+0.02) [CICE formulation]
- rn_snwblow = 0.66 ! mesure of snow blowing into the leads
- ! = 1 => no snow blowing, < 1 => some snow blowing
- nn_flxdist = -1 ! Redistribute heat flux over ice categories
- ! =-1 Do nothing (needs N(cat) fluxes)
- ! = 0 Average N(cat) fluxes then apply the average over the N(cat) ice
- ! = 1 Average N(cat) fluxes then redistribute over the N(cat) ice using T-ice and albedo sensitivity
- ! = 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 = 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/nam_trc_age b/nam_trc_age
deleted file mode 100644
index 74e945e62d654a1706cbf597586434d842ce676a..0000000000000000000000000000000000000000
--- a/nam_trc_age
+++ /dev/null
@@ -1,8 +0,0 @@
- ! Variable setting
- ctrcnm (jp_age) = 'Age'
- ctrcln (jp_age) = 'Sea water age since surface contact'
- ctrcun (jp_age) = 'year'
- ln_trc_ini(jp_age) = .false.
- ln_trc_sbc(jp_age) = .false.
- ln_trc_cbc(jp_age) = .false.
- ln_trc_obc(jp_age) = .false.
diff --git a/namberg b/namberg
index d42469a407916b2d6d7200d3a148e44c3f5fa192..857ce6c9c0276c0428abc286a7fe938b02439591 100644
--- a/namberg
+++ b/namberg
@@ -12,8 +12,10 @@
! ! diagnostics:
ln_bergdia = .true. ! Calculate budgets
nn_verbose_level = 0 ! Turn on more verbose output if level > 0
- nn_verbose_write = 15 ! Timesteps between verbose messages
- nn_sample_rate = 1 ! Timesteps between sampling for trajectory storage
+ !
+ ! nn_verbose_write and nn_sample_rate need to be a multiple of nn_fsbc
+ nn_verbose_write = 16 ! Timesteps between verbose messages
+ nn_sample_rate = 16 ! Timesteps between sampling for trajectory storage
!
! ! iceberg setting:
! ! Initial mass required for an iceberg of each class
diff --git a/namdta_dyn_linssh b/namdta_dyn_linssh
deleted file mode 100644
index 8a41238965711ebd701fef0b806659158cb0bf22..0000000000000000000000000000000000000000
--- a/namdta_dyn_linssh
+++ /dev/null
@@ -1,23 +0,0 @@
-!-----------------------------------------------------------------------
-&namdta_dyn ! offline ocean input files (OFF_SRC only)
-!-----------------------------------------------------------------------
-
- cn_dir = './' ! root directory for the ocean data location
- !___________!_________________________!___________________!___________!_____________!________!___________!
- ! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ !
- ! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' !
- 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/namdta_dyn_nolinssh b/namdta_dyn_nolinssh
deleted file mode 100644
index 0660f2436fb671c1b1bb02c6871ed0bbdc8247d3..0000000000000000000000000000000000000000
--- a/namdta_dyn_nolinssh
+++ /dev/null
@@ -1,28 +0,0 @@
-!-----------------------------------------------------------------------
-&namdta_dyn ! offline ocean input files (OFF_SRC only)
-!-----------------------------------------------------------------------
- ln_dynrnf = .true. ! 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'/ !
- ! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' !
- sn_tem = 'dyna_grid_T' , 120. , 'thetao' , .true. , .true. , 'yearly'
- sn_sal = 'dyna_grid_T' , 120. , 'so' , .true. , .true. , 'yearly'
- sn_div = 'dyna_grid_T' , 120. , 'hdivtr' , .true. , .true. , 'yearly'
- sn_mld = 'dyna_grid_T' , 120. , 'mldr10_1' , .true. , .true. , 'yearly'
- sn_emp = 'dyna_grid_T' , 120. , 'wfo' , .true. , .true. , 'yearly'
- sn_empb = 'dyna_grid_T' , 120. , 'wfob' , .true. , .true. , 'yearly'
- sn_fmf = 'dyna_grid_T' , 120. , 'fmmflx' , .true. , .true. , 'yearly'
- sn_rnf = 'dyna_grid_T' , 120. , 'runoffs' , .true. , .true. , 'yearly'
- sn_ice = 'dyna_grid_T' , 120. , 'siconc' , .true. , .true. , 'yearly'
- sn_qsr = 'dyna_grid_T' , 120. , 'rsntds' , .true. , .true. , 'yearly'
- sn_wnd = 'dyna_grid_T' , 120. , 'windsp' , .true. , .true. , 'yearly'
- sn_uwd = 'dyna_grid_U' , 120. , 'uocetr_eff', .true. , .true. , 'yearly'
- sn_vwd = 'dyna_grid_V' , 120. , 'vocetr_eff', .true. , .true. , 'yearly'
- sn_wwd = 'dyna_grid_W' , 120. , 'wocetr_eff', .true. , .true. , 'yearly'
- sn_avt = 'dyna_grid_W' , 120. , 'difvsolog' , .true. , .true. , 'yearly'
- sn_ubl = 'dyna_grid_U' , 120. , 'ahu_bbl' , .true. , .true. , 'yearly'
- sn_vbl = 'dyna_grid_V' , 120. , 'ahv_bbl' , .true. , .true. , 'yearly'
-/
diff --git a/namelist_abl_tools b/namelist_abl_tools
deleted file mode 100644
index 42b2a4cfa5f1cd36578bba9c7b6c81da49eddbd1..0000000000000000000000000000000000000000
--- a/namelist_abl_tools
+++ /dev/null
@@ -1,53 +0,0 @@
-:
-:-----------------------------------------------------------------------------
-: Atmospheric Boundary Layer preprocessing tool
-:-----------------------------------------------------------------------------
-:
-&nml_dom
- jpka = 50, ! ABL vertical levels number
- hmax = 2000., ! ABL last level altitude
- theta_s = 2., ! vertical grid stretching parameters
- hc = 100., !
- ln_impose_z1 = .true., ! force ABL first level altitude
- z1 = 10., ! ABL firt level imposed altitude [m]
-/
-
-&nml_opt
- ptemp_method = 3 , ! potential temperature computation method
- ln_slp_smth = .true. , ! smooth slp and ghw at high latitudes only
- ln_drw_smth = .false. , ! smooth after drowning
- ln_slp_log = .false. , ! read log(slp)
- ln_read_zsurf = .false. , ! read surface geopotential
- ln_hpg_frc = .true. , ! compute horizontal pressure gradient
- ln_geo_wnd = .false. , ! compute geostrophic wind
- ln_c1d = .false. , ! 1D case
- ln_read_mask = .true. , ! read mask file
- ln_lsm_land = .false. , ! inverse land & sea masks
- ln_perio_latbc = .true. , ! periodic lateral boundary conditions
-/
-
-&nml_fld
- cn_dir = '',
- mask_var = 'LSM',
- file_m = 'MASK.nc',
- file_u = 'U3D.nc',
- file_v = 'V3D.nc',
- file_t = 'T3D.nc',
- file_q = 'Q3D.nc',
- file_p = 'P2D.nc',
- file_z = 'Z2D.nc',
- file_geos = 'UVG_OUT.nc',
- file_hpg = 'HPG_OUT.nc',
-/
-
-&nml_out
- grd_file = 'dom_cfg_abl_L50Z10.nc',
- abl_file = 'ABL_L50Z10_OUT.nc',
- drwn_file = 'ABL_DRWN_L50Z10_OUT.nc',
- var_name = '',
-/
-
-&nml_c1d
- iloc = 283,
- jloc = 52,
-/
diff --git a/namisf_cfg_eORCA1 b/namisf_cfg_eORCA1
deleted file mode 100644
index 8cd49301118bb29c61ab35f31be20d71c863e26f..0000000000000000000000000000000000000000
--- a/namisf_cfg_eORCA1
+++ /dev/null
@@ -1,37 +0,0 @@
-!-----------------------------------------------------------------------
-&namisf ! Top boundary layer (ISF) (default: OFF)
-!-----------------------------------------------------------------------
- !
- ! ---------------- ice shelf melt formulation -------------------------------
- !
- ln_isf = .true. ! activate ice shelf module
- !
- ! ---------------- cavities opened -------------------------------
- !
- 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
- ! ! 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
- rn_htbl = 30. ! thickness of the top boundary layer (Losh et al. 2008)
- ! ! 0 => thickness of the tbl = thickness of the first wet cell
- !
- !* 'spe' and 'oasis' case
- !---------------------------------------------------------------------------------------------
- ! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ !
- ! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' !
- sn_isfcav_fwf = 'isfmlt_cav', -12. , 'fwflisf' , .false. , .true. , 'yearly'
- !
- ! ---------------- cavities parametrised -------------------------------
- !
- ln_isfpar_mlt = .true. ! ice shelf melting parametrised
- cn_isfpar_mlt = 'spe' ! ice shelf melting parametrisation (spe/bg03/oasis)
- ! ! spe = fwfisf is read from a forcing field
- !
- !---------------------------------------------------------------------------------------------
- ! ! file name ! frequency (hours) ! variable ! time interp.! clim ! 'yearly'/ !
- ! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' !
- sn_isfpar_zmax = 'runoff-icb_DaiTrenberth_Depoorter_eORCA1_JD.nc' , -12 ,'sodepmax_isf' , .false. , .true. , 'yearly'
- sn_isfpar_zmin = 'runoff-icb_DaiTrenberth_Depoorter_eORCA1_JD.nc' , -12 ,'sodepmin_isf' , .false. , .true. , 'yearly'
- !* 'spe' and 'oasis' case
- sn_isfpar_fwf = 'runoff-icb_DaiTrenberth_Depoorter_eORCA1_JD.nc' , -12 ,'sornfisf', .false. , .true. , 'yearly'
diff --git a/namldf_eke b/namldf_eke
deleted file mode 100644
index f085ab9af39ac7d9bf1366f6bea0df7f6bef6350..0000000000000000000000000000000000000000
--- a/namldf_eke
+++ /dev/null
@@ -1,28 +0,0 @@
-!----------------------------------------------------------------------------------
-&namldf_eke ! GEOMETRIC param. (total EKE equation) (nn_aei_ijk_t = 32)
-!----------------------------------------------------------------------------------
- rn_ekedis = 100. ! dissipation time scale of EKE [days]
- nn_eke_dis = 0 ! dissipation option
- ! ! = 0 constant in space
- ! ! =-20 read in geom_diss_2D.nc file
- rn_geom = 0.04 ! geometric parameterization master coefficient (>0 & <1)
- rn_eke_init = 1.e-1 ! initial total EKE value
- rn_eke_min = 1.e+0 ! background value of total EKE
- rn_ross_min = 4.e+3 ! tapering of aeiv based on min Rossby radius [m]
- ! ! set to zero to not taper it
- rn_eke_lap = 500. ! Laplacian diffusion coefficient of EKE
- ! ! this is in all options below, so set it to zero and nothing is done
- rn_aeiv_min = 1.e+1 ! minimum bound of eiv coefficient
- rn_aeiv_max = 1.5e+4 ! maximum bound of eiv coefficient
- rn_SFmin = 1.0 ! minimum bound of Structure Function
- rn_SFmax = 1.0 ! maximum bound of Structure Function
- nn_eke_opt = 1 ! options for terms to include in EKE budget
- ! ! = 0 PE->EKE conversion, dissipation only
- ! ! = 1 as 0 but with advection
- ! ! = 2 as 1 but with additional KE->EKE conversion
- ! ! for testing purposes:
- ! ! = 88 only advection by depth-averaged flow
- ! ! = 99 only Laplacian diffusion
- ln_adv_wav = .false. ! include advection at long Rossby speed
- ln_beta_plane = .false. ! beta plane option for computing long Rossby speed (default: sphere option)
-/
diff --git a/namopt b/namopt
deleted file mode 100644
index 5f8b7febff6a47bd2e6a8121bba79aa12c57fd67..0000000000000000000000000000000000000000
--- a/namopt
+++ /dev/null
@@ -1,11 +0,0 @@
-!-----------------------------------------------------------------------
-&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/namp4zprod b/namp4zprod
index ff8f846e82ddffef10ccc7c788a35e2b0160c862..f1859d45244676093fe9104a730f810fdcdff953 100644
--- a/namp4zprod
+++ b/namp4zprod
@@ -3,7 +3,6 @@
!-----------------------------------------------------------------------
pislopen = 2. ! P-I slope
pisloped = 2. ! P-I slope for diatoms
- xadap = 0. ! Adaptation factor to low light
excretn = 0.05 ! excretion ratio of phytoplankton
excretd = 0.05 ! excretion ratio of diatoms
bresp = 0.033 ! Basal respiration rate
diff --git a/namp5zprod b/namp5zprod
index 81e10d472c6275df6250ff050737796eb8e13a93..09699c2fa6d5610d0ba4cdaf31f546dc92a4b5ff 100644
--- a/namp5zprod
+++ b/namp5zprod
@@ -7,7 +7,6 @@
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.3 ! Maximum Chl/N in nanophytoplankton
thetanpm = 0.3 ! Maximum Chl/N in picophytoplankton
diff --git a/namsbc_rnf_cfg_eORCA1 b/namsbc_rnf_cfg_eORCA1
deleted file mode 100644
index 1847997d6d170d0db4e8bf186ae58335532f4884..0000000000000000000000000000000000000000
--- a/namsbc_rnf_cfg_eORCA1
+++ /dev/null
@@ -1,19 +0,0 @@
-!-----------------------------------------------------------------------
-&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
- ln_rnf_icb = .true. ! read iceberg flux
-
- cn_dir = './' ! root directory for the location of the runoff files
- !---------------------------------------------------------------------------------------------
- ! ! file name ! frequency (hours) ! variable ! time interp. ! clim ! 'yearly'/ !
- ! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' !
- sn_rnf = 'runoff-icb_DaiTrenberth_Depoorter_eORCA1_JD.nc', -1 , 'sorunoff', .true. , .true. , 'yearly'
- sn_i_rnf = 'runoff-icb_DaiTrenberth_Depoorter_eORCA1_JD.nc', -1 , 'Icb_flux', .true. , .true. , 'yearly'
- sn_cnf = 'runoff-icb_DaiTrenberth_Depoorter_eORCA1_JD.nc', 0 , 'socoefr' , .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'
diff --git a/namtra_eiv b/namtra_eiv
index cc764253dac14c70216862aa899a8d4c62ae7fbb..93ea23bb65554e72b93c07b9931d1686a52ff01c 100644
--- a/namtra_eiv
+++ b/namtra_eiv
@@ -11,7 +11,6 @@
! ! = 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
- ! ! = 32 F(i,j,t) = GEOMETRIC parameterization (=> fill namldf_eke)
! ! 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/namtrc b/namtrc
index 7ab18a03cbb44cc3c13d30e2bf080b5d74c111c9..972c5c2c272ff8ccbf788f506247b30b75499cd2 100644
--- a/namtrc
+++ b/namtrc
@@ -19,7 +19,7 @@
!
jp_dia3d = 0 ! Number of 3D diagnostic variables
jp_dia2d = 0 ! Number of 2D diagnostic variables
-
+ !_____________!___________!_________________________________________!____________!________________!
! ! name ! title of the field ! units ! init from file !
! sn_tracer(1) = 'tracer ', 'Tracer Concentration ', ' - ' , .false.
/
diff --git a/namtrc_ais_cfg b/namtrc_ais_cfg
deleted file mode 100644
index 209991e6ffc447cda207164ff759a68b70c3a571..0000000000000000000000000000000000000000
--- a/namtrc_ais_cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-!-----------------------------------------------------------------------
-&namtrc_ais ! Representation of Antarctic Ice Sheet tracers supply
-!-----------------------------------------------------------------------
- rn_trafac(3) = 4.476e-07 ! ( 0.5e-3 / 55.85 * 0.05 )
-!
- nn_ais_tr = 1 ! tracer concentration in iceberg and ice shelf
- ! = 0 (null concentrations)
- ! = 1 prescribed concentrations
- rn_icbdep = 120. ! Mean underwater depth of iceberg (m)
diff --git a/namtrc_bc b/namtrc_bc
index 458769f3fc568c27ebce94d4936005a8b777a2f7..59905df26ef41516988dbc6cb029f333249587b5 100644
--- a/namtrc_bc
+++ b/namtrc_bc
@@ -1,5 +1,13 @@
!----------------------------------------------------------------------
&namtrc_bc ! data for boundary conditions
+!----------------------------------------------------------------------
+! Surface and coastal input data must be specified individually for each tracer.
+! Lateral open boundary inputs are specified for each BDY segment and related inputfiles
+! must contain data for the variables with active open boundary (set through &namtrc).
+! By default, variable names of BDY inputfiles are the same as in &namtrc, but using
+! cn_tronam it is possible to specify alternative variable names to match with inputfiles.
+! ! file name ! freq ! variable ! time interp. ! clim !'yearly' ! weights ! rotation | land/sea
+! sn_trcobc(1) = 'bdy_dta_trc_North_y1980', -1 , 'dummy' , .false. , .true. ,'yearly' , '', '', ''
!-----------------------------------------------------------------------
cn_dir_sbc = './' ! root directory for the location of SURFACE data files
cn_dir_cbc = './' ! root directory for the location of COASTAL data files
@@ -7,4 +15,5 @@
ln_rnf_ctl = .false. ! Remove runoff dilution on tracers with absent river load
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)
+! cn_tronam(1) = 'var1' ! Tracer-name to variable-name translation
/
diff --git a/namtrc_bc_cfg b/namtrc_bc_cfg
deleted file mode 100644
index 6d7bbb01c551401834b4454fac8adf07ef8eb9f0..0000000000000000000000000000000000000000
--- a/namtrc_bc_cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-!----------------------------------------------------------------------
-&namtrc_bc ! data for boundary conditions
-!-----------------------------------------------------------------------
-! ! file name ! frequency (hours) ! variable ! time interp. ! clim ! 'yearly'/ !
-! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' !
- sn_trcsbc(2) = 'dust.orca.new' , -1 , 'dustfer' , .true. , .true. , 'yearly'
- sn_trcsbc(3) = 'ndeposition.orca', -12 , 'ndep' , .false. , .true. , 'yearly'
- rn_trsfac(2) = 6.266e-04 ! Multiplicative factor
- rn_trsfac(3) = 5.4464e-01 !
-!
- sn_trccbc(1) = 'river.orca' , -12 , 'riverdic' , .true. , .true. , 'yearly'
- sn_trccbc(2) = 'river.orca' , -12 , 'riverdfe' , .true. , .true. , 'yearly'
- sn_trccbc(3) = 'river.orca' , -12 , 'riverdin' , .true. , .true. , 'yearly'
- rn_trcfac(1) = 1.0 ! Multiplicative factor
- rn_trcfac(2) = 1.0 !
- rn_trcfac(3) = 1.0 !
- rn_cbc_time = 3.1536e+7 ! Time scaling factor for CBC data (seconds in a year)
diff --git a/namtrc_bdy b/namtrc_bdy
index f14fcfa0ae814688b0979f9a02eb98a283203c91..0d24ca9adedd846429a9e572a1f52e716d9f75f8 100644
--- a/namtrc_bdy
+++ b/namtrc_bdy
@@ -8,4 +8,6 @@
! = 0 NO damping of tracers at open boudaries
! = 1 Only for tracers forced with external data
! = 2 Damping applied to all tracers
+ ln_zintobc = .false. ! T if a vertical interpolation is required. Variables gdep[t] and e3[t] must exist in the file
+ ! automatically defined to T if the number of vertical levels in bdy dta /= jpk
/
diff --git a/namtrc_cfg b/namtrc_cfg
deleted file mode 100644
index d94f021dbcf117fa1a6d364923f13ed66620b693..0000000000000000000000000000000000000000
--- a/namtrc_cfg
+++ /dev/null
@@ -1,25 +0,0 @@
-!-----------------------------------------------------------------------
-&namtrc ! tracers definition
-!-----------------------------------------------------------------------
- jp_bgc = 24
-!
- ln_pisces = .true.
- ln_my_trc = .false.
- ln_age = .false.
- ln_cfc11 = .false.
- ln_cfc12 = .false.
- ln_c14 = .false.
-!
- !
- ln_trcdta = .true. ! 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 = .true. ! Surface, Lateral or Open Boundaries conditions
- ln_trcais = .true. ! Antarctic Ice Sheet nutrient supply
-! ! ! ! ! !
-! ! name ! title of the field ! units ! init ! sbc ! cbc ! obc ! ais
- sn_tracer(1) = 'DIC ' , 'Dissolved inorganic Concentration ', 'mol-C/L' , .true. , .false., .true. , .false. , .false.
- sn_tracer(2) = 'Fer ' , 'Dissolved Iron Concentration ', 'mol-C/L' , .true. , .true. , .true. , .false. , .true.
- sn_tracer(3) = 'NO3 ' , 'Nitrates Concentration ', 'mol-C/L' , .true. , .true. , .true. , .false. , .false.
- sn_tracer(4) = 'PHY ' , 'Nanophytoplankton Concentration ', 'mol-C/L' , .false. , .false., .false., .false. , .false.
-
diff --git a/namtrc_dta_cfg b/namtrc_dta_cfg
deleted file mode 100644
index 2b612e6911190babe76005a43f172235a5e8cbe0..0000000000000000000000000000000000000000
--- a/namtrc_dta_cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-!-----------------------------------------------------------------------
-&namtrc_dta ! Initialisation from data input file
-!-----------------------------------------------------------------------
-! ! file name ! frequency (hours) ! variable ! time interp. ! clim ! 'yearly'/ !
-! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' !
- sn_trcdta(1) = 'data_DIC_nomask.nc', -12 , 'PiDIC' , .false. , .true. , 'yearly' ,
- sn_trcdta(2) = 'data_FER_nomask.nc', -1 , 'Fer' , .true. , .true. , 'yearly' ,
- sn_trcdta(3) = 'data_NO3_nomask.nc', -1 , 'NO3' , .true. , .true. , 'yearly' ,
-!
- rn_trfac(1) = 1.028e-06 ! multiplicative factor
- rn_trfac(2) = 1.0e-06 ! - - - -
- rn_trfac(3) = 7.6e-06 ! - - - -
diff --git a/namzdf_gls b/namzdf_gls
index f5c0cee04f30c0912ee557081383fadcdcb81ac3..b24528bbe7d4ff39b02e34d1a30d5b034467d36f 100644
--- a/namzdf_gls
+++ b/namzdf_gls
@@ -18,7 +18,7 @@
! ! = 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
+ nn_mxlice = 0 ! 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