Context Navigation

← Previous Changeset
Next Changeset →

Changeset 13703

Timestamp:

2020-10-29T15:29:09+01:00 (3 years ago)

Author:

techene

Message:

#2555 remove nn_een_e3f parameter from name list this parameter is now used for EEN, ENE and ENS vorticity schemes then its name is turned into nn_e3f_typ

Location:

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3

Files:

: 18 edited

cfgs/AGRIF_DEMO/EXPREF/1_namelist_cfg (modified) (1 diff)
cfgs/AGRIF_DEMO/EXPREF/namelist_cfg (modified) (1 diff)
cfgs/ORCA2_ICE_ABL/EXPREF/namelist_cfg (modified) (1 diff)
cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_cfg (modified) (1 diff)
tests/CANAL/EXPREF/namelist_cfg (modified) (1 diff)
tests/CPL_OASIS/EXPREF/namelist_cfg (modified) (1 diff)
tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_ubs_cfg (modified) (1 diff)
tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_ens_cfg (modified) (1 diff)
tests/OVERFLOW/EXPREF/namelist_sco_FCT2_flux_cen-ahm1000_cfg (modified) (1 diff)
tests/OVERFLOW/EXPREF/namelist_sco_FCT2_flux_ubs_cfg (modified) (1 diff)
tests/OVERFLOW/EXPREF/namelist_sco_FCT4_flux_cen-ahm1000_cfg (modified) (1 diff)
tests/OVERFLOW/EXPREF/namelist_sco_FCT4_flux_ubs_cfg (modified) (1 diff)
tests/OVERFLOW/EXPREF/namelist_zps_FCT2_flux_ubs_cfg (modified) (1 diff)
tests/OVERFLOW/EXPREF/namelist_zps_FCT4_flux_ubs_cfg (modified) (1 diff)
tests/OVERFLOW/EXPREF/namelist_zps_FCT4_vect_een_cfg (modified) (1 diff)
tests/VORTEX/EXPREF/1_namelist_cfg (modified) (1 diff)
tests/VORTEX/EXPREF/namelist_cfg (modified) (1 diff)
tests/WAD/EXPREF/namelist_cfg (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/cfgs/AGRIF_DEMO/EXPREF/1_namelist_cfg

r13208	r13703
299	299	!-----------------------------------------------------------------------
300	300	ln_dynvor_een = .true. ! energy & enstrophy scheme
301		~~nn_een_e3f = 0 ! =0 e3f = mean masked e3t divided by 4~~
302	301	/
303	302	!-----------------------------------------------------------------------

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/cfgs/AGRIF_DEMO/EXPREF/namelist_cfg

r13286	r13703
300	300	!-----------------------------------------------------------------------
301	301	ln_dynvor_een = .true. ! energy & enstrophy scheme
302		~~nn_een_e3f = 0 ! =0 e3f = mean masked e3t divided by 4~~
303	302	/
304	303	!-----------------------------------------------------------------------

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/cfgs/ORCA2_ICE_ABL/EXPREF/namelist_cfg

r13208	r13703
330	330	!-----------------------------------------------------------------------
331	331	ln_dynvor_een = .true. ! energy & enstrophy scheme
332		~~nn_een_e3f = 0 ! =0 e3f = mean masked e3t divided by 4~~
333	332	/
334	333	!-----------------------------------------------------------------------

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_cfg

r13286	r13703
320	320	!-----------------------------------------------------------------------
321	321	ln_dynvor_een = .true. ! energy & enstrophy scheme
322		~~nn_een_e3f = 0 ! =0 e3f = mean masked e3t divided by 4~~
323	322	/
324	323	!-----------------------------------------------------------------------

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/tests/CANAL/EXPREF/namelist_cfg

r12489	r13703
192	192	ln_dynvor_mix = .false. ! mixed scheme
193	193	ln_dynvor_een = .false. ! energy & enstrophy scheme
194		~~nn_een_e3f = 0 ! e3f = masked averaging of e3t divided by 4 (=0) or by the sum of mask (=1)~~
195	194	/
196	195	!-----------------------------------------------------------------------

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/tests/CPL_OASIS/EXPREF/namelist_cfg

r12663	r13703
367	367	!-----------------------------------------------------------------------
368	368	ln_dynvor_een = .true. ! energy & enstrophy scheme
369		~~nn_een_e3f = 0 ! =0 e3f = mean masked e3t divided by 4~~
370	369	/
371	370	!-----------------------------------------------------------------------

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_ubs_cfg

r12489	r13703
201	201	ln_dynvor_mix = .false. ! mixed scheme
202	202	ln_dynvor_een = .false. ! energy & enstrophy scheme
203		~~nn_een_e3f = 0 ! e3f = masked averaging of e3t divided by 4 (=0) or by the sum of mask (=1)~~
204	203	/
205	204	!-----------------------------------------------------------------------

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_vect_ens_cfg

r12489	r13703
129	129	ln_dynvor_mix = .false. ! mixed scheme
130	130	ln_dynvor_een = .false. ! energy & enstrophy scheme
131		~~nn_een_e3f = 0 ! e3f = masked averaging of e3t divided by 4 (=0) or by the sum of mask (=1)~~
132	131	/
133	132	!-----------------------------------------------------------------------

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/tests/OVERFLOW/EXPREF/namelist_sco_FCT2_flux_cen-ahm1000_cfg

r12489	r13703
140	140	ln_dynvor_mix = .false. ! mixed scheme
141	141	ln_dynvor_een = .false. ! energy & enstrophy scheme
142		~~nn_een_e3f = 0 ! e3f = masked averaging of e3t divided by 4 (=0) or by the sum of mask (=1)~~
143	142	/
144	143	!-----------------------------------------------------------------------

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/tests/OVERFLOW/EXPREF/namelist_sco_FCT2_flux_ubs_cfg

r12489	r13703
140	140	ln_dynvor_mix = .false. ! mixed scheme
141	141	ln_dynvor_een = .false. ! energy & enstrophy scheme
142		~~nn_een_e3f = 0 ! e3f = masked averaging of e3t divided by 4 (=0) or by the sum of mask (=1)~~
143	142	/
144	143	!-----------------------------------------------------------------------

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/tests/OVERFLOW/EXPREF/namelist_sco_FCT4_flux_cen-ahm1000_cfg

r12489	r13703
140	140	ln_dynvor_mix = .false. ! mixed scheme
141	141	ln_dynvor_een = .false. ! energy & enstrophy scheme
142		~~nn_een_e3f = 0 ! e3f = masked averaging of e3t divided by 4 (=0) or by the sum of mask (=1)~~
143	142	/
144	143	!-----------------------------------------------------------------------

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/tests/OVERFLOW/EXPREF/namelist_sco_FCT4_flux_ubs_cfg

r12489	r13703
140	140	ln_dynvor_mix = .false. ! mixed scheme
141	141	ln_dynvor_een = .false. ! energy & enstrophy scheme
142		~~nn_een_e3f = 0 ! e3f = masked averaging of e3t divided by 4 (=0) or by the sum of mask (=1)~~
143	142	/
144	143	!-----------------------------------------------------------------------

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/tests/OVERFLOW/EXPREF/namelist_zps_FCT2_flux_ubs_cfg

r12489	r13703
140	140	ln_dynvor_mix = .false. ! mixed scheme
141	141	ln_dynvor_een = .false. ! energy & enstrophy scheme
142		~~nn_een_e3f = 0 ! e3f = masked averaging of e3t divided by 4 (=0) or by the sum of mask (=1)~~
143	142	/
144	143	!-----------------------------------------------------------------------

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/tests/OVERFLOW/EXPREF/namelist_zps_FCT4_flux_ubs_cfg

r12489	r13703
201	201	ln_dynvor_mix = .false. ! mixed scheme
202	202	ln_dynvor_een = .false. ! energy & enstrophy scheme
203		~~nn_een_e3f = 0 ! e3f = masked averaging of e3t divided by 4 (=0) or by the sum of mask (=1)~~
204	203	/
205	204	!-----------------------------------------------------------------------

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/tests/OVERFLOW/EXPREF/namelist_zps_FCT4_vect_een_cfg

r12489	r13703
140	140	ln_dynvor_mix = .false. ! mixed scheme
141	141	ln_dynvor_een = .true. ! energy & enstrophy scheme
142		~~nn_een_e3f = 0 ! e3f = masked averaging of e3t divided by 4 (=0) or by the sum of mask (=1)~~
143	142	/
144	143	!-----------------------------------------------------------------------

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/tests/VORTEX/EXPREF/1_namelist_cfg

r13216	r13703
195	195	ln_dynvor_mix = .false. ! mixed scheme
196	196	ln_dynvor_een = .true. ! energy & enstrophy scheme
197		~~nn_een_e3f = 0 ! e3f = masked averaging of e3t divided by 4 (=0) or by the sum of mask (=1)~~
198	197	/
199	198	!-----------------------------------------------------------------------

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/tests/VORTEX/EXPREF/namelist_cfg

r12489	r13703
188	188	ln_dynvor_mix = .false. ! mixed scheme
189	189	ln_dynvor_een = .true. ! energy & enstrophy scheme
190		~~nn_een_e3f = 0 ! e3f = masked averaging of e3t divided by 4 (=0) or by the sum of mask (=1)~~
191	190	/
192	191	!-----------------------------------------------------------------------

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/tests/WAD/EXPREF/namelist_cfg

r12489	r13703
330	330	ln_dynvor_mix = .false. ! mixed scheme
331	331	ln_dynvor_een = .true. ! energy & enstrophy scheme
332		~~nn_een_e3f = 0 ! e3f = masked averaging of e3t divided by 4 (=0) or by the sum of mask (=1)~~
333	332	/
334	333	!-----------------------------------------------------------------------

Note: See TracChangeset for help on using the changeset viewer.

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