diff --git a/applications/jedi_lfric_tests/example/configuration.nml b/applications/jedi_lfric_tests/example/configuration.nml
index 4a16b6de..2f6a4428 100644
--- a/applications/jedi_lfric_tests/example/configuration.nml
+++ b/applications/jedi_lfric_tests/example/configuration.nml
@@ -1,13 +1,13 @@
&base_mesh
-file_prefix='mesh_C12',
+file_prefix='mesh_C12_MG',
geometry='spherical',
prepartitioned=.false.,
-prime_mesh_name='C12',
+prime_mesh_name='dynamics',
topology='fully_periodic',
/
&boundaries
limited_area=.false.,
-transport_overwrite_freq='final'
+transport_overwrite_freq='final',
/
&checks
limit_cfl=.false.,
@@ -29,16 +29,25 @@ spectral_gwd='none',
stochastic_physics='none',
surface='none',
/
+&convection
+dx_ref=50000.0,
+l_cvdiag_ctop_qmax=.false.,
+qlmin=4.0e-4,
+resdep_precipramp=.false.,
+/
+&cosp
+l_cosp=.false.,
+/
&damping_layer
dl_base=40000.0,
dl_str=0.05,
-dl_type='latitude',
+dl_type='standard',
/
&departure_points
horizontal_limit='cap',
horizontal_method='ffsl',
n_dep_pt_iterations=1,
-share_stencil_extent=.true.
+share_stencil_extent=.true.,
vertical_limit='exponential',
vertical_method='timeaverage',
vertical_sorting=.false.,
@@ -56,13 +65,13 @@ stretching_height=17507.0,
stretching_method='smooth',
/
&files
-ancil_directory='/data/users/lfric/data/ancils/basic-gal/Quagga/C12/n96e_l70',
+ancil_directory='/data/users/lfricadmin/data/ancils/basic-gal/yak/C12',
checkpoint_stem_name='restart',
diag_stem_name='diagGungho',
-ls_directory='/data/users/lfric/data/tangent-linear/Ticket46',
+ls_directory='/data/users/lfricadmin/data/tangent-linear/Ticket354',
ls_filename='final_ls',
-orography_mean_ancil_path='orography/gmted_ramp2/qrparm.orog.ugrid',
-start_dump_directory='/data/users/lfric/data/tangent-linear/Ticket3590',
+orography_mean_ancil_path='orography/gmted_ramp2/qrparm.orog',
+start_dump_directory='/data/users/lfricadmin/data/tangent-linear/Ticket354',
start_dump_filename='final_pert',
/
&finite_element
@@ -79,10 +88,10 @@ dlayer_on=.true.,
dry_static_adjust=.true.,
eos_method='sampled',
exner_from_eos=.false.,
-horizontal_physics_predictor=.false.
-horizontal_transport_predictor=.false.
+horizontal_physics_predictor=.false.,
+horizontal_transport_predictor=.false.,
init_exner_bt=.true.,
-l_multigrid=.false.,
+l_multigrid=.true.,
lagged_orog=.true.,
moisture_formulation='traditional',
moisture_in_solver=.true.,
@@ -90,7 +99,7 @@ p2theta_vert=.true.,
rotating=.true.,
shallow=.true.,
si_momentum_equation=.false.,
-theta_moist_source=.false.
+theta_moist_source=.false.,
use_multires_coupling=.false.,
use_physics=.true.,
use_wavedynamics=.true.,
@@ -101,15 +110,27 @@ gcrk=8,
method='prec_only',
monitor_convergence=.false.,
normalise=.true.,
-preconditioner='tridiagonal',
+preconditioner='multigrid',
si_pressure_a_tol=1.0e-8,
si_pressure_maximum_iterations=400,
si_pressure_tolerance=1.0e-4,
/
+&iau_addinf_io
+/
+&iau_addinf_io
+/
+&iau_ainc_io
+/
+&iau_ainc_io
+/
+&iau_bcorr_io
+/
+&iau
+/
&idealised
f_lon_deg=0.0,
-perturb_init=.false.
-test='gravity_wave',
+perturb_init=.false.,
+test='none',
/
&ideal_surface
canopy_height=19.01,16.38,0.79,1.26,1.0,
@@ -144,10 +165,10 @@ zero_w2v_wind=.false.,
&initial_density
density_background=0.1,
density_max=2.0,
-r1=0.0,
-r2=0.0,
-x1=0.0,
-x2=0.0,
+r1=0.4,
+r2=0.4,
+x1=0.4,
+x2=-0.4,
y1=0.0,
y2=0.0,
z1=0.0,
@@ -159,7 +180,7 @@ surface_pressure=1000.0e2,
/
&initial_temperature
bvf_square=0.0001,
-pert_centre=120.0,
+pert_centre=60.0,
pert_width_scaling=1.0,
perturb='none',
theta_surf=300.0,
@@ -168,22 +189,25 @@ theta_surf=300.0,
/
&initial_wind
nl_constant=0.0,
-profile='none',
+profile='constant_uv',
sbr_angle_lat=0.0,
sbr_angle_lon=0.0,
-smp_init_wind=.false.,
-u0=0.0,
+smp_init_wind=.true.,
+u0=2.0,
v0=0.0,
wind_time_period=0.0,
/
&io
checkpoint_read=.false.,
+checkpoint_times=,
checkpoint_write=.false.,
counter_output_suffix='counter.txt',
diag_active_files='lfric_diag',
diag_always_on_sampling=.false.,
diagnostic_frequency=8,
+end_of_run_checkpoint=.true.,
file_convention='UGRID',
+multifile_io=.false.,
nodal_output_on_w3=.false.,
subroutine_counters=.false.,
subroutine_timers=.true.,
@@ -196,11 +220,15 @@ write_fluxes=.false.,
write_minmax_tseries=.false.,
/
&linear
-fixed_ls=.true.
+fixed_ls=.true.,
+l_stabilise_bl=.true.,
ls_read_w2h=.false.,
+max_bl_stabilisation=0.75,
+n_bl_levels_to_stabilise=15,
pert_option='file',
/
&logging
+log_to_rank_zero_only=.false.,
run_log_level='info',
/
&mixed_solver
@@ -211,7 +239,7 @@ guess_np1=.false.,
mixed_solver_a_tol=1.0e-3,
monitor_convergence=.true.,
normalise=.true.,
-reference_reset_time=3600.,
+reference_reset_time=3600.0,
si_maximum_iterations=10,
si_method='block_gcr',
si_preconditioner='pressure',
@@ -224,6 +252,14 @@ smagorinsky=.false.,
viscosity=.false.,
viscosity_mu=0.0,
/
+&multigrid
+chain_mesh_tags='dynamics','multigrid_l1','multigrid_l2',
+multigrid_chain_nitems=3,
+n_coarsesmooth=4,
+n_postsmooth=2,
+n_presmooth=2,
+smooth_relaxation=0.8,
+/
&esm_couple
l_esm_couple_test=.false.,
/
@@ -231,16 +267,18 @@ l_esm_couple_test=.false.,
orog_init_option='ancil',
/
&partitioning
+generate_inner_halos=.false.,
panel_decomposition='auto',
-panel_xproc=6,
+panel_xproc=1,
panel_yproc=1,
partitioner='cubedsphere',
/
&physics
+configure_segments=.false.,
limit_drag_incs=.false.,
sample_physics_scalars=.true.,
sample_physics_winds=.true.,
-configure_segments=.false.
+sample_physics_winds_correction=.false.,
/
&planet
cp=1005.0,
@@ -252,10 +290,14 @@ scaling_factor=1.0,
/
&radiative_gases
cfc113_rad_opt='off',
-cfc11_rad_opt='off',
-cfc12_rad_opt='off',
-ch4_rad_opt='off',
-co2_rad_opt='off',
+cfc11_mix_ratio=1.110e-09,
+cfc11_rad_opt='constant',
+cfc12_mix_ratio=2.187e-09,
+cfc12_rad_opt='constant',
+ch4_mix_ratio=1.006e-06,
+ch4_rad_opt='constant',
+co2_mix_ratio=6.002e-04,
+co2_rad_opt='constant',
co_rad_opt='off',
cs_rad_opt='off',
h2_rad_opt='off',
@@ -268,11 +310,13 @@ k_rad_opt='off',
l_cts_fcg_rates=.false.,
li_rad_opt='off',
n2_rad_opt='off',
-n2o_rad_opt='off',
+n2o_mix_ratio=4.945e-07,
+n2o_rad_opt='constant',
na_rad_opt='off',
nh3_rad_opt='off',
-o2_rad_opt='off',
-o3_rad_opt='off',
+o2_mix_ratio=0.2314,
+o2_rad_opt='constant',
+o3_rad_opt='ancil',
rb_rad_opt='off',
so2_rad_opt='off',
tio_rad_opt='off',
@@ -286,6 +330,8 @@ monitor_convergence=.false.,
preconditioner='diagonal',
tolerance=1.0e-6,
/
+&specified_surface
+/
&time
calendar='timestep',
calendar_origin='2016-01-01 15:00:00',
@@ -297,7 +343,7 @@ timestep_start='1',
×tepping
alpha=0.55,
dt=1800,
-inner_iterations=2,
+inner_iterations=1,
method='semi_implicit',
outer_iterations=2,
runge_kutta_method='forward_euler',
@@ -342,8 +388,8 @@ min_val_method='iterative',
min_value=0.0,0.0,-99999999.0,0.0,0.0,
oned_reconstruction=.false.,
operators='fv',
-panel_edge_high_order=.false.,
-panel_edge_treatment='none'
+panel_edge_high_order=.true.,
+panel_edge_treatment='none',
profile_size=5,
reversible=.true.,.true.,.false.,.true.,.true.,
runge_kutta_method='ssp3',
@@ -361,8 +407,7 @@ vertical_method=5*1,
vertical_monotone=5*1,
vertical_monotone_order=5*3,
vertical_sl_order='cubic',
-wind_mono_top=.false.
-wind_mono_top_depth=5
+wind_mono_top=.false.,
/
&validity_test
number_gamma_values=2,
diff --git a/applications/jedi_lfric_tests/example/mesh_C12.nc b/applications/jedi_lfric_tests/example/mesh_C12.nc
deleted file mode 100644
index f7ea6988..00000000
Binary files a/applications/jedi_lfric_tests/example/mesh_C12.nc and /dev/null differ
diff --git a/applications/jedi_lfric_tests/example_id_tlm_tests/configuration.nml b/applications/jedi_lfric_tests/example_id_tlm_tests/configuration.nml
index e1f89373..08db65a7 100644
--- a/applications/jedi_lfric_tests/example_id_tlm_tests/configuration.nml
+++ b/applications/jedi_lfric_tests/example_id_tlm_tests/configuration.nml
@@ -1,13 +1,10 @@
&jedi_lfric_tests
test_field='theta',
/
-
-#### Configure JEDI-LFRIC
-
&jedi_geometry
io_calender_start='2018-04-14T21:00:00',
-io_path_inc_read='/data/users/lfric/data/jedi-lfric/Ticket354/pert_fields/lfric_diag',
-io_path_state_read='/data/users/lfric/data/jedi-lfric/Ticket354/ls_fields/jedi_trajectory',
+io_path_inc_read='/data/users/lfricadmin/data/jedi-lfric/Ticket354/pert_fields/lfric_diag',
+io_path_state_read='/data/users/lfricadmin/data/jedi-lfric/Ticket354/ls_fields/jedi_trajectory',
io_path_state_write='write_file',
io_setup_increment=.false.,
io_time_step='P0DT1H0M0S',
@@ -36,19 +33,16 @@ time_step='P0DT1H0M0S',
&jedi_lfric_settings
forecast_length='P0DT6H0M0S',
/
-
-#### Configure LFRic
-
&base_mesh
-file_prefix='mesh_C12',
+file_prefix='mesh_C12_MG',
geometry='spherical',
prepartitioned=.false.,
-prime_mesh_name='C12',
+prime_mesh_name='dynamics',
topology='fully_periodic',
/
&boundaries
limited_area=.false.,
-transport_overwrite_freq='final'
+transport_overwrite_freq='final',
/
&checks
limit_cfl=.false.,
@@ -70,6 +64,15 @@ spectral_gwd='none',
stochastic_physics='none',
surface='none',
/
+&convection
+dx_ref=50000.0,
+l_cvdiag_ctop_qmax=.false.,
+qlmin=4.0e-4,
+resdep_precipramp=.false.,
+/
+&cosp
+l_cosp=.false.,
+/
&damping_layer
dl_base=40000.0,
dl_str=0.05,
@@ -79,6 +82,7 @@ dl_type='standard',
horizontal_limit='cap',
horizontal_method='ffsl',
n_dep_pt_iterations=1,
+share_stencil_extent=.true.,
vertical_limit='exponential',
vertical_method='timeaverage',
vertical_sorting=.false.,
@@ -96,7 +100,7 @@ stretching_height=17507.0,
stretching_method='smooth',
/
&files
-ancil_directory='/data/users/lfric/data/ancils/basic-gal/yak/C12',
+ancil_directory='/data/users/lfricadmin/data/ancils/basic-gal/yak/C12',
checkpoint_stem_name='',
diag_stem_name='',
orography_mean_ancil_path='orography/gmted_ramp2/qrparm.orog',
@@ -117,10 +121,10 @@ dlayer_on=.true.,
dry_static_adjust=.true.,
eos_method='sampled',
exner_from_eos=.false.,
-horizontal_physics_predictor=.false.
-horizontal_transport_predictor=.false.
+horizontal_physics_predictor=.false.,
+horizontal_transport_predictor=.false.,
init_exner_bt=.true.,
-l_multigrid=.false.,
+l_multigrid=.true.,
lagged_orog=.true.,
moisture_formulation='traditional',
moisture_in_solver=.true.,
@@ -130,27 +134,36 @@ shallow=.true.,
si_momentum_equation=.false.,
theta_moist_source=.false.,
use_multires_coupling=.false.,
-use_physics=.false.,
+use_physics=.true.,
use_wavedynamics=.true.,
vector_invariant=.false.,
/
&helmholtz_solver
-fail_on_non_converged=.false.,
-gcrk=18,
-method='bicgstab',
-monitor_convergence=.true.,
+gcrk=8,
+method='prec_only',
+monitor_convergence=.false.,
normalise=.true.,
-preconditioner='tridiagonal',
-si_pressure_a_tol=0,
-si_pressure_maximum_iterations=40,
-si_pressure_tolerance=1.0e-15,
+preconditioner='multigrid',
+si_pressure_a_tol=1.0e-8,
+si_pressure_maximum_iterations=400,
+si_pressure_tolerance=1.0e-4,
+/
+&iau_addinf_io
+/
+&iau_addinf_io
+/
+&iau_ainc_io
+/
+&iau_ainc_io
+/
+&iau_bcorr_io
+/
+&iau
/
&idealised
f_lon_deg=0.0,
-perturb_init=.false.
-perturb_magnitude=0
-perturb_seed=0
-test='gravity_wave',
+perturb_init=.false.,
+test='none',
/
&ideal_surface
canopy_height=19.01,16.38,0.79,1.26,1.0,
@@ -174,7 +187,6 @@ coarse_ozone_ancil=.false.,
init_option='analytic',
lbc_option='none',
ls_option='analytic',
-model_eos_height=100,
n_orog_smooth=0,
read_w2h_wind=.true.,
sea_ice_source='ancillary',
@@ -185,10 +197,10 @@ zero_w2v_wind=.false.,
&initial_density
density_background=0.1,
density_max=2.0,
-r1=0.0,
-r2=0.0,
-x1=0.0,
-x2=0.0,
+r1=0.4,
+r2=0.4,
+x1=0.4,
+x2=-0.4,
y1=0.0,
y2=0.0,
z1=0.0,
@@ -200,7 +212,7 @@ surface_pressure=1000.0e2,
/
&initial_temperature
bvf_square=0.0001,
-pert_centre=120.0,
+pert_centre=60.0,
pert_width_scaling=1.0,
perturb='none',
theta_surf=300.0,
@@ -209,22 +221,25 @@ theta_surf=300.0,
/
&initial_wind
nl_constant=0.0,
-profile='none',
+profile='constant_uv',
sbr_angle_lat=0.0,
sbr_angle_lon=0.0,
-smp_init_wind=.false.,
-u0=0.0,
+smp_init_wind=.true.,
+u0=2.0,
v0=0.0,
wind_time_period=0.0,
/
&io
checkpoint_read=.false.,
+checkpoint_times=,
checkpoint_write=.false.,
counter_output_suffix='counter.txt',
diag_active_files='lfric_diag',
diag_always_on_sampling=.false.,
diagnostic_frequency=8,
+end_of_run_checkpoint=.true.,
file_convention='UGRID',
+multifile_io=.false.,
nodal_output_on_w3=.false.,
subroutine_counters=.false.,
subroutine_timers=.true.,
@@ -237,26 +252,30 @@ write_fluxes=.false.,
write_minmax_tseries=.false.,
/
&linear
-fixed_ls=.true.
+fixed_ls=.true.,
+l_stabilise_bl=.true.,
ls_read_w2h=.false.,
-pert_option='analytic',
+max_bl_stabilisation=0.75,
+n_bl_levels_to_stabilise=15,
+pert_option='file',
/
&logging
+log_to_rank_zero_only=.false.,
run_log_level='info',
/
&mixed_solver
eliminate_variables='discrete',
-fail_on_non_converged=.false.,
-gcrk=10,
+fail_on_non_converged=.true.,
+gcrk=4,
guess_np1=.false.,
-mixed_solver_a_tol=1.0e-21,
+mixed_solver_a_tol=1.0e-3,
monitor_convergence=.true.,
normalise=.true.,
reference_reset_time=3600.0,
-si_maximum_iterations=7,
+si_maximum_iterations=10,
si_method='block_gcr',
si_preconditioner='pressure',
-si_tolerance=1.0e-21,
+si_tolerance=1.0e-1,
split_w=.true.,
/
&mixing
@@ -265,6 +284,14 @@ smagorinsky=.false.,
viscosity=.false.,
viscosity_mu=0.0,
/
+&multigrid
+chain_mesh_tags='dynamics','multigrid_l1','multigrid_l2',
+multigrid_chain_nitems=3,
+n_coarsesmooth=4,
+n_postsmooth=2,
+n_presmooth=2,
+smooth_relaxation=0.8,
+/
&esm_couple
l_esm_couple_test=.false.,
/
@@ -272,15 +299,18 @@ l_esm_couple_test=.false.,
orog_init_option='ancil',
/
&partitioning
+generate_inner_halos=.false.,
panel_decomposition='auto',
panel_xproc=1,
panel_yproc=1,
partitioner='cubedsphere',
/
&physics
+configure_segments=.false.,
limit_drag_incs=.false.,
sample_physics_scalars=.true.,
sample_physics_winds=.true.,
+sample_physics_winds_correction=.false.,
/
&planet
cp=1005.0,
@@ -292,10 +322,14 @@ scaling_factor=1.0,
/
&radiative_gases
cfc113_rad_opt='off',
-cfc11_rad_opt='off',
-cfc12_rad_opt='off',
-ch4_rad_opt='off',
-co2_rad_opt='off',
+cfc11_mix_ratio=1.110e-09,
+cfc11_rad_opt='constant',
+cfc12_mix_ratio=2.187e-09,
+cfc12_rad_opt='constant',
+ch4_mix_ratio=1.006e-06,
+ch4_rad_opt='constant',
+co2_mix_ratio=6.002e-04,
+co2_rad_opt='constant',
co_rad_opt='off',
cs_rad_opt='off',
h2_rad_opt='off',
@@ -308,24 +342,27 @@ k_rad_opt='off',
l_cts_fcg_rates=.false.,
li_rad_opt='off',
n2_rad_opt='off',
-n2o_rad_opt='off',
+n2o_mix_ratio=4.945e-07,
+n2o_rad_opt='constant',
na_rad_opt='off',
nh3_rad_opt='off',
-o2_rad_opt='off',
-o3_rad_opt='off',
+o2_mix_ratio=0.2314,
+o2_rad_opt='constant',
+o3_rad_opt='ancil',
rb_rad_opt='off',
so2_rad_opt='off',
tio_rad_opt='off',
vo_rad_opt='off',
/
&solver
-fail_on_non_converged=.false.,
gcrk=18,
-maximum_iterations=50,
+maximum_iterations=7,
method='chebyshev',
monitor_convergence=.false.,
preconditioner='diagonal',
-tolerance=1.0e-18,
+tolerance=1.0e-6,
+/
+&specified_surface
/
&time
calendar='timestep',
@@ -337,8 +374,8 @@ timestep_start='1',
/
×tepping
alpha=0.55,
-dt=3600,
-inner_iterations=2,
+dt=1800,
+inner_iterations=1,
method='semi_implicit',
outer_iterations=2,
runge_kutta_method='forward_euler',
@@ -350,10 +387,11 @@ tau_u=0.55,
&transport
adjust_theta=.false.,
adjust_tracer_equation=.false.
-adjust_vhv_wind=.false.
+adjust_vhv_wind=.false.,
+ageofair_reset_level=10,
broken_w2_projection=.false.,
calculate_detj='upwind',
-cap_density_predictor=0.01,
+cap_density_predictor=0.5,
cfl_mol_1d_stab=1.0,
cfl_mol_2d_stab=1.0,
cfl_mol_3d_stab=1.0,
@@ -363,43 +401,45 @@ dep_pt_stencil_extent=3,
dry_field_name='density',
enforce_min_value=5*.false.,
equation_form=1,2,2,2,2,
-ffsl_inner_order=2,
-ffsl_outer_order=2,
+ffsl_inner_order=0,
+ffsl_outer_order=1,
ffsl_splitting=5*1,
-ffsl_unity_3d=.false.
-ffsl_vertical_order=5*2
-field_names='density','potential_temperature','wind','moisture','cloud',
+ffsl_unity_3d=.false.,
+ffsl_vertical_order=2,2,1,2,2,
+field_names='density','potential_temperature','wind','moisture',
+'con_tracer',
fv_horizontal_order=2,
fv_vertical_order=2,
horizontal_method=5*1,
horizontal_monotone=5*1,
-log_space=5*.false.,
-max_vert_cfl_calc='uniform',
+log_space=.true.,.true.,.false.,.false.,.false.,
+max_vert_cfl_calc='dep_point',
min_val_abs_tol=-1.0e-12,
min_val_max_iterations=10,
min_val_method='iterative',
min_value=0.0,0.0,-99999999.0,0.0,0.0,
oned_reconstruction=.false.,
operators='fv',
-panel_edge_high_order=.false.
-panel_edge_treatment='none'
+panel_edge_high_order=.true.,
+panel_edge_treatment='none',
profile_size=5,
-reversible=5*.false.,
+reversible=.true.,.true.,.false.,.true.,.true.,
runge_kutta_method='ssp3',
scheme=5*1,
si_outer_transport='none',
slice_order='parabola',
+special_edges_monotone=5*1,
splitting=5*1,
substep_transport='off',
theta_dispersion_correction=.false.,
theta_variable='dry',
+transport_ageofair=.false.,
use_density_predictor=.false.,
vertical_method=5*1,
vertical_monotone=5*1,
-vertical_monotone_order=5*1,
+vertical_monotone_order=5*3,
vertical_sl_order='cubic',
-wind_mono_top=.false.
-wind_mono_top_depth=5
+wind_mono_top=.false.,
/
&validity_test
number_gamma_values=2,
diff --git a/applications/jedi_lfric_tests/example_id_tlm_tests/iodef.xml b/applications/jedi_lfric_tests/example_id_tlm_tests/iodef.xml
index fade05b8..808f8ef9 100644
--- a/applications/jedi_lfric_tests/example_id_tlm_tests/iodef.xml
+++ b/applications/jedi_lfric_tests/example_id_tlm_tests/iodef.xml
@@ -47,7 +47,7 @@
-
+
@@ -61,7 +61,7 @@
-
+
@@ -74,7 +74,7 @@
-
+
@@ -396,7 +396,7 @@
-
+
diff --git a/applications/jedi_lfric_tests/example_id_tlm_tests/mesh_C12.nc b/applications/jedi_lfric_tests/example_id_tlm_tests/mesh_C12.nc
deleted file mode 100644
index f7ea6988..00000000
Binary files a/applications/jedi_lfric_tests/example_id_tlm_tests/mesh_C12.nc and /dev/null differ
diff --git a/applications/jedi_lfric_tests/example_tlm_forecast_tl/configuration.nml b/applications/jedi_lfric_tests/example_tlm_forecast_tl/configuration.nml
index b4b1b293..3d2116c3 100644
--- a/applications/jedi_lfric_tests/example_tlm_forecast_tl/configuration.nml
+++ b/applications/jedi_lfric_tests/example_tlm_forecast_tl/configuration.nml
@@ -1,13 +1,10 @@
&jedi_lfric_tests
test_field='theta',
/
-
-#### Configure JEDI-LFRIC
-
&jedi_geometry
io_calender_start='2018-04-14T21:00:00',
-io_path_inc_read='/data/users/lfric/data/jedi-lfric/Ticket354/pert_fields/lfric_diag',
-io_path_state_read='/data/users/lfric/data/jedi-lfric/Ticket354/ls_fields/jedi_trajectory',
+io_path_inc_read='/data/users/lfricadmin/data/jedi-lfric/Ticket354/pert_fields/lfric_diag',
+io_path_state_read='/data/users/lfricadmin/data/jedi-lfric/Ticket354/ls_fields/jedi_trajectory',
io_path_state_write='write_file',
io_setup_increment=.true.,
io_time_step='P0DT1H0M0S',
@@ -25,6 +22,7 @@ variables='theta','rho','exner','u_in_w3','v_in_w3','w_in_wth','m_v',
'm_cl','m_r','m_s',
/
&jedi_linear_model
+incremental_wind_interpolation=.false.,
nl_time_step='P0DT1H0M0S',
/
&jedi_pseudo_model
@@ -33,21 +31,19 @@ number_of_steps=9,
time_step='P0DT1H0M0S',
/
&jedi_lfric_settings
+adjoint_test_tolerance=1.0e-3,
forecast_length='P0DT6H0M0S',
/
-
-#### Configure LFRic
-
&base_mesh
-file_prefix='mesh_C12',
+file_prefix='mesh_C12_MG',
geometry='spherical',
prepartitioned=.false.,
-prime_mesh_name='C12',
+prime_mesh_name='dynamics',
topology='fully_periodic',
/
&boundaries
limited_area=.false.,
-transport_overwrite_freq='final'
+transport_overwrite_freq='final',
/
&checks
limit_cfl=.false.,
@@ -69,6 +65,15 @@ spectral_gwd='none',
stochastic_physics='none',
surface='none',
/
+&convection
+dx_ref=50000.0,
+l_cvdiag_ctop_qmax=.false.,
+qlmin=4.0e-4,
+resdep_precipramp=.false.,
+/
+&cosp
+l_cosp=.false.,
+/
&damping_layer
dl_base=40000.0,
dl_str=0.05,
@@ -78,7 +83,7 @@ dl_type='standard',
horizontal_limit='cap',
horizontal_method='ffsl',
n_dep_pt_iterations=1,
-share_stencil_extent=.true.
+share_stencil_extent=.true.,
vertical_limit='exponential',
vertical_method='timeaverage',
vertical_sorting=.false.,
@@ -96,7 +101,7 @@ stretching_height=17507.0,
stretching_method='smooth',
/
&files
-ancil_directory='/data/users/lfric/data/ancils/basic-gal/yak/C12',
+ancil_directory='/data/users/lfricadmin/data/ancils/basic-gal/yak/C12',
checkpoint_stem_name='',
diag_stem_name='',
orography_mean_ancil_path='orography/gmted_ramp2/qrparm.orog',
@@ -117,10 +122,10 @@ dlayer_on=.true.,
dry_static_adjust=.true.,
eos_method='sampled',
exner_from_eos=.false.,
-horizontal_physics_predictor=.false.
-horizontal_transport_predictor=.false.
+horizontal_physics_predictor=.false.,
+horizontal_transport_predictor=.false.,
init_exner_bt=.true.,
-l_multigrid=.false.,
+l_multigrid=.true.,
lagged_orog=.true.,
moisture_formulation='traditional',
moisture_in_solver=.true.,
@@ -128,29 +133,38 @@ p2theta_vert=.true.,
rotating=.true.,
shallow=.true.,
si_momentum_equation=.false.,
-theta_moist_source=.false.
+theta_moist_source=.false.,
use_multires_coupling=.false.,
-use_physics=.false.,
+use_physics=.true.,
use_wavedynamics=.true.,
vector_invariant=.false.,
/
&helmholtz_solver
-fail_on_non_converged=.false.,
-gcrk=18,
-method='bicgstab',
-monitor_convergence=.true.,
+gcrk=8,
+method='prec_only',
+monitor_convergence=.false.,
normalise=.true.,
-preconditioner='tridiagonal',
-si_pressure_a_tol=0,
-si_pressure_maximum_iterations=40,
-si_pressure_tolerance=1.0e-15,
+preconditioner='multigrid',
+si_pressure_a_tol=1.0e-8,
+si_pressure_maximum_iterations=400,
+si_pressure_tolerance=1.0e-4,
+/
+&iau_addinf_io
+/
+&iau_addinf_io
+/
+&iau_ainc_io
+/
+&iau_ainc_io
+/
+&iau_bcorr_io
+/
+&iau
/
&idealised
f_lon_deg=0.0,
-perturb_init=.false.
-perturb_magnitude=0
-perturb_seed=0
-test='gravity_wave',
+perturb_init=.false.,
+test='none',
/
&ideal_surface
canopy_height=19.01,16.38,0.79,1.26,1.0,
@@ -174,7 +188,6 @@ coarse_ozone_ancil=.false.,
init_option='analytic',
lbc_option='none',
ls_option='analytic',
-model_eos_height=100,
n_orog_smooth=0,
read_w2h_wind=.true.,
sea_ice_source='ancillary',
@@ -185,10 +198,10 @@ zero_w2v_wind=.false.,
&initial_density
density_background=0.1,
density_max=2.0,
-r1=0.0,
-r2=0.0,
-x1=0.0,
-x2=0.0,
+r1=0.4,
+r2=0.4,
+x1=0.4,
+x2=-0.4,
y1=0.0,
y2=0.0,
z1=0.0,
@@ -200,7 +213,7 @@ surface_pressure=1000.0e2,
/
&initial_temperature
bvf_square=0.0001,
-pert_centre=120.0,
+pert_centre=60.0,
pert_width_scaling=1.0,
perturb='none',
theta_surf=300.0,
@@ -209,22 +222,25 @@ theta_surf=300.0,
/
&initial_wind
nl_constant=0.0,
-profile='none',
+profile='constant_uv',
sbr_angle_lat=0.0,
sbr_angle_lon=0.0,
-smp_init_wind=.false.,
-u0=0.0,
+smp_init_wind=.true.,
+u0=2.0,
v0=0.0,
wind_time_period=0.0,
/
&io
checkpoint_read=.false.,
+checkpoint_times=,
checkpoint_write=.false.,
counter_output_suffix='counter.txt',
diag_active_files='lfric_diag',
diag_always_on_sampling=.false.,
diagnostic_frequency=8,
+end_of_run_checkpoint=.true.,
file_convention='UGRID',
+multifile_io=.false.,
nodal_output_on_w3=.false.,
subroutine_counters=.false.,
subroutine_timers=.true.,
@@ -237,26 +253,30 @@ write_fluxes=.false.,
write_minmax_tseries=.false.,
/
&linear
-fixed_ls=.true.
+fixed_ls=.true.,
+l_stabilise_bl=.true.,
ls_read_w2h=.false.,
-pert_option='analytic',
+max_bl_stabilisation=0.75,
+n_bl_levels_to_stabilise=15,
+pert_option='file',
/
&logging
+log_to_rank_zero_only=.false.,
run_log_level='info',
/
&mixed_solver
eliminate_variables='discrete',
-fail_on_non_converged=.false.,
-gcrk=10,
+fail_on_non_converged=.true.,
+gcrk=4,
guess_np1=.false.,
mixed_solver_a_tol=1.0e-21,
monitor_convergence=.true.,
normalise=.true.,
-reference_reset_time=3600.0,
-si_maximum_iterations=7,
+reference_reset_time=1800,
+si_maximum_iterations=10,
si_method='block_gcr',
si_preconditioner='pressure',
-si_tolerance=1.0e-21,
+si_tolerance=1.0e-3,
split_w=.true.,
/
&mixing
@@ -265,6 +285,14 @@ smagorinsky=.false.,
viscosity=.false.,
viscosity_mu=0.0,
/
+&multigrid
+chain_mesh_tags='dynamics','multigrid_l1','multigrid_l2',
+multigrid_chain_nitems=3,
+n_coarsesmooth=4,
+n_postsmooth=2,
+n_presmooth=2,
+smooth_relaxation=0.8,
+/
&esm_couple
l_esm_couple_test=.false.,
/
@@ -272,15 +300,18 @@ l_esm_couple_test=.false.,
orog_init_option='ancil',
/
&partitioning
+generate_inner_halos=.false.,
panel_decomposition='auto',
panel_xproc=1,
panel_yproc=1,
partitioner='cubedsphere',
/
&physics
+configure_segments=.false.,
limit_drag_incs=.false.,
sample_physics_scalars=.true.,
sample_physics_winds=.true.,
+sample_physics_winds_correction=.false.,
/
&planet
cp=1005.0,
@@ -292,10 +323,14 @@ scaling_factor=1.0,
/
&radiative_gases
cfc113_rad_opt='off',
-cfc11_rad_opt='off',
-cfc12_rad_opt='off',
-ch4_rad_opt='off',
-co2_rad_opt='off',
+cfc11_mix_ratio=1.110e-09,
+cfc11_rad_opt='constant',
+cfc12_mix_ratio=2.187e-09,
+cfc12_rad_opt='constant',
+ch4_mix_ratio=1.006e-06,
+ch4_rad_opt='constant',
+co2_mix_ratio=6.002e-04,
+co2_rad_opt='constant',
co_rad_opt='off',
cs_rad_opt='off',
h2_rad_opt='off',
@@ -308,24 +343,27 @@ k_rad_opt='off',
l_cts_fcg_rates=.false.,
li_rad_opt='off',
n2_rad_opt='off',
-n2o_rad_opt='off',
+n2o_mix_ratio=4.945e-07,
+n2o_rad_opt='constant',
na_rad_opt='off',
nh3_rad_opt='off',
-o2_rad_opt='off',
-o3_rad_opt='off',
+o2_mix_ratio=0.2314,
+o2_rad_opt='constant',
+o3_rad_opt='ancil',
rb_rad_opt='off',
so2_rad_opt='off',
tio_rad_opt='off',
vo_rad_opt='off',
/
&solver
-fail_on_non_converged=.false.,
gcrk=18,
-maximum_iterations=50,
+maximum_iterations=7,
method='chebyshev',
monitor_convergence=.false.,
preconditioner='diagonal',
-tolerance=1.0e-18,
+tolerance=1.0e-6,
+/
+&specified_surface
/
&time
calendar='timestep',
@@ -337,10 +375,10 @@ timestep_start='1',
/
×tepping
alpha=0.55,
-dt=3600,
-inner_iterations=2,
+dt=1800,
+inner_iterations=1,
method='semi_implicit',
-outer_iterations=2,
+outer_iterations=1,
runge_kutta_method='forward_euler',
spinup_alpha=.false.,
tau_r=1.0,
@@ -350,10 +388,11 @@ tau_u=0.55,
&transport
adjust_theta=.false.,
adjust_tracer_equation=.false.
-adjust_vhv_wind=.false.
+adjust_vhv_wind=.false.,
+ageofair_reset_level=10,
broken_w2_projection=.false.,
calculate_detj='upwind',
-cap_density_predictor=0.01,
+cap_density_predictor=0.5,
cfl_mol_1d_stab=1.0,
cfl_mol_2d_stab=1.0,
cfl_mol_3d_stab=1.0,
@@ -363,28 +402,29 @@ dep_pt_stencil_extent=3,
dry_field_name='density',
enforce_min_value=5*.false.,
equation_form=1,2,2,2,2,
-ffsl_inner_order=2,
-ffsl_outer_order=2,
+ffsl_inner_order=0,
+ffsl_outer_order=1,
ffsl_splitting=5*1,
-ffsl_unity_3d=.false.
-ffsl_vertical_order=5*2
-field_names='density','potential_temperature','wind','moisture','cloud',
+ffsl_unity_3d=.false.,
+ffsl_vertical_order=2,2,1,2,2,
+field_names='density','potential_temperature','wind','moisture',
+'con_tracer',
fv_horizontal_order=2,
fv_vertical_order=2,
horizontal_method=5*1,
horizontal_monotone=5*1,
-log_space=5*.false.,
-max_vert_cfl_calc='uniform',
+log_space=.true.,.true.,.false.,.false.,.false.,
+max_vert_cfl_calc='dep_point',
min_val_abs_tol=-1.0e-12,
min_val_max_iterations=10,
min_val_method='iterative',
min_value=0.0,0.0,-99999999.0,0.0,0.0,
oned_reconstruction=.false.,
operators='fv',
-panel_edge_high_order=.false.,
-panel_edge_treatment='none'
+panel_edge_high_order=.true.,
+panel_edge_treatment='none',
profile_size=5,
-reversible=5*.false.,
+reversible=.true.,.true.,.false.,.true.,.true.,
runge_kutta_method='ssp3',
scheme=5*1,
si_outer_transport='none',
@@ -394,13 +434,13 @@ splitting=5*1,
substep_transport='off',
theta_dispersion_correction=.false.,
theta_variable='dry',
+transport_ageofair=.false.,
use_density_predictor=.false.,
vertical_method=5*1,
vertical_monotone=5*1,
-vertical_monotone_order=5*1,
+vertical_monotone_order=5*3,
vertical_sl_order='cubic',
-wind_mono_top=.false.
-wind_mono_top_depth=5
+wind_mono_top=.false.,
/
&validity_test
number_gamma_values=2,
diff --git a/applications/jedi_lfric_tests/example_tlm_forecast_tl/mesh_C12.nc b/applications/jedi_lfric_tests/example_tlm_forecast_tl/mesh_C12.nc
deleted file mode 100644
index f7ea6988..00000000
Binary files a/applications/jedi_lfric_tests/example_tlm_forecast_tl/mesh_C12.nc and /dev/null differ
diff --git a/applications/jedi_lfric_tests/example_tlm_tests/configuration.nml b/applications/jedi_lfric_tests/example_tlm_tests/configuration.nml
index a8a55db8..0da97698 100644
--- a/applications/jedi_lfric_tests/example_tlm_tests/configuration.nml
+++ b/applications/jedi_lfric_tests/example_tlm_tests/configuration.nml
@@ -1,13 +1,10 @@
&jedi_lfric_tests
test_field='theta',
/
-
-#### Configure JEDI-LFRIC
-
&jedi_geometry
io_calender_start='2018-04-14T21:00:00',
-io_path_inc_read='/data/users/lfric/data/jedi-lfric/Ticket354/pert_fields/lfric_diag',
-io_path_state_read='/data/users/lfric/data/jedi-lfric/Ticket354/ls_fields/jedi_trajectory',
+io_path_inc_read='/data/users/lfricadmin/data/jedi-lfric/Ticket354/pert_fields/lfric_diag',
+io_path_state_read='/data/users/lfricadmin/data/jedi-lfric/Ticket354/ls_fields/jedi_trajectory',
io_path_state_write='write_file',
io_setup_increment=.false.,
io_time_step='P0DT1H0M0S',
@@ -25,7 +22,7 @@ variables='theta','rho','exner','u_in_w3','v_in_w3','w_in_wth','m_v',
'm_cl','m_r','m_s',
/
&jedi_linear_model
-incremental_wind_interpolation=.true.,
+incremental_wind_interpolation=.false.,
nl_time_step='P0DT1H0M0S',
/
&jedi_pseudo_model
@@ -34,22 +31,19 @@ number_of_steps=9,
time_step='P0DT1H0M0S',
/
&jedi_lfric_settings
-adjoint_test_tolerance=1.0e-4,
+adjoint_test_tolerance=1.0e-3,
forecast_length='P0DT6H0M0S',
/
-
-#### Configure LFRic
-
&base_mesh
-file_prefix='mesh_C12',
+file_prefix='mesh_C12_MG',
geometry='spherical',
prepartitioned=.false.,
-prime_mesh_name='C12',
+prime_mesh_name='dynamics',
topology='fully_periodic',
/
&boundaries
limited_area=.false.,
-transport_overwrite_freq='final'
+transport_overwrite_freq='final',
/
&checks
limit_cfl=.false.,
@@ -71,6 +65,15 @@ spectral_gwd='none',
stochastic_physics='none',
surface='none',
/
+&convection
+dx_ref=50000.0,
+l_cvdiag_ctop_qmax=.false.,
+qlmin=4.0e-4,
+resdep_precipramp=.false.,
+/
+&cosp
+l_cosp=.false.,
+/
&damping_layer
dl_base=40000.0,
dl_str=0.05,
@@ -80,7 +83,7 @@ dl_type='standard',
horizontal_limit='cap',
horizontal_method='ffsl',
n_dep_pt_iterations=1,
-share_stencil_extent=.true.
+share_stencil_extent=.true.,
vertical_limit='exponential',
vertical_method='timeaverage',
vertical_sorting=.false.,
@@ -98,7 +101,7 @@ stretching_height=17507.0,
stretching_method='smooth',
/
&files
-ancil_directory='/data/users/lfric/data/ancils/basic-gal/yak/C12',
+ancil_directory='/data/users/lfricadmin/data/ancils/basic-gal/yak/C12',
checkpoint_stem_name='',
diag_stem_name='',
orography_mean_ancil_path='orography/gmted_ramp2/qrparm.orog',
@@ -119,10 +122,10 @@ dlayer_on=.true.,
dry_static_adjust=.true.,
eos_method='sampled',
exner_from_eos=.false.,
-horizontal_physics_predictor=.false.
-horizontal_transport_predictor=.false.
+horizontal_physics_predictor=.false.,
+horizontal_transport_predictor=.false.,
init_exner_bt=.true.,
-l_multigrid=.false.,
+l_multigrid=.true.,
lagged_orog=.true.,
moisture_formulation='traditional',
moisture_in_solver=.true.,
@@ -130,29 +133,38 @@ p2theta_vert=.true.,
rotating=.true.,
shallow=.true.,
si_momentum_equation=.false.,
-theta_moist_source=.false.
+theta_moist_source=.false.,
use_multires_coupling=.false.,
-use_physics=.false.,
+use_physics=.true.,
use_wavedynamics=.true.,
vector_invariant=.false.,
/
&helmholtz_solver
-fail_on_non_converged=.false.,
-gcrk=18,
-method='bicgstab',
-monitor_convergence=.true.,
+gcrk=8,
+method='prec_only',
+monitor_convergence=.false.,
normalise=.true.,
-preconditioner='tridiagonal',
-si_pressure_a_tol=0,
-si_pressure_maximum_iterations=40,
-si_pressure_tolerance=1.0e-15,
+preconditioner='multigrid',
+si_pressure_a_tol=1.0e-8,
+si_pressure_maximum_iterations=400,
+si_pressure_tolerance=1.0e-4,
+/
+&iau_addinf_io
+/
+&iau_addinf_io
+/
+&iau_ainc_io
+/
+&iau_ainc_io
+/
+&iau_bcorr_io
+/
+&iau
/
&idealised
f_lon_deg=0.0,
-perturb_init=.false.
-perturb_magnitude=0
-perturb_seed=0
-test='gravity_wave',
+perturb_init=.false.,
+test='none',
/
&ideal_surface
canopy_height=19.01,16.38,0.79,1.26,1.0,
@@ -176,7 +188,6 @@ coarse_ozone_ancil=.false.,
init_option='analytic',
lbc_option='none',
ls_option='analytic',
-model_eos_height=100,
n_orog_smooth=0,
read_w2h_wind=.true.,
sea_ice_source='ancillary',
@@ -187,10 +198,10 @@ zero_w2v_wind=.false.,
&initial_density
density_background=0.1,
density_max=2.0,
-r1=0.0,
-r2=0.0,
-x1=0.0,
-x2=0.0,
+r1=0.4,
+r2=0.4,
+x1=0.4,
+x2=-0.4,
y1=0.0,
y2=0.0,
z1=0.0,
@@ -202,7 +213,7 @@ surface_pressure=1000.0e2,
/
&initial_temperature
bvf_square=0.0001,
-pert_centre=120.0,
+pert_centre=60.0,
pert_width_scaling=1.0,
perturb='none',
theta_surf=300.0,
@@ -211,22 +222,25 @@ theta_surf=300.0,
/
&initial_wind
nl_constant=0.0,
-profile='none',
+profile='constant_uv',
sbr_angle_lat=0.0,
sbr_angle_lon=0.0,
-smp_init_wind=.false.,
-u0=0.0,
+smp_init_wind=.true.,
+u0=2.0,
v0=0.0,
wind_time_period=0.0,
/
&io
checkpoint_read=.false.,
+checkpoint_times=,
checkpoint_write=.false.,
counter_output_suffix='counter.txt',
diag_active_files='lfric_diag',
diag_always_on_sampling=.false.,
diagnostic_frequency=8,
+end_of_run_checkpoint=.true.,
file_convention='UGRID',
+multifile_io=.false.,
nodal_output_on_w3=.false.,
subroutine_counters=.false.,
subroutine_timers=.true.,
@@ -239,26 +253,30 @@ write_fluxes=.false.,
write_minmax_tseries=.false.,
/
&linear
-fixed_ls=.true.
+fixed_ls=.true.,
+l_stabilise_bl=.true.,
ls_read_w2h=.false.,
-pert_option='analytic',
+max_bl_stabilisation=0.75,
+n_bl_levels_to_stabilise=15,
+pert_option='file',
/
&logging
+log_to_rank_zero_only=.false.,
run_log_level='info',
/
&mixed_solver
eliminate_variables='discrete',
-fail_on_non_converged=.false.,
-gcrk=10,
+fail_on_non_converged=.true.,
+gcrk=4,
guess_np1=.false.,
mixed_solver_a_tol=1.0e-21,
monitor_convergence=.true.,
normalise=.true.,
-reference_reset_time=3600.0,
-si_maximum_iterations=7,
+reference_reset_time=1800,
+si_maximum_iterations=10,
si_method='block_gcr',
si_preconditioner='pressure',
-si_tolerance=1.0e-21,
+si_tolerance=1.0e-3,
split_w=.true.,
/
&mixing
@@ -267,6 +285,14 @@ smagorinsky=.false.,
viscosity=.false.,
viscosity_mu=0.0,
/
+&multigrid
+chain_mesh_tags='dynamics','multigrid_l1','multigrid_l2',
+multigrid_chain_nitems=3,
+n_coarsesmooth=4,
+n_postsmooth=2,
+n_presmooth=2,
+smooth_relaxation=0.8,
+/
&esm_couple
l_esm_couple_test=.false.,
/
@@ -274,15 +300,18 @@ l_esm_couple_test=.false.,
orog_init_option='ancil',
/
&partitioning
+generate_inner_halos=.false.,
panel_decomposition='auto',
panel_xproc=1,
panel_yproc=1,
partitioner='cubedsphere',
/
&physics
+configure_segments=.false.,
limit_drag_incs=.false.,
sample_physics_scalars=.true.,
sample_physics_winds=.true.,
+sample_physics_winds_correction=.false.,
/
&planet
cp=1005.0,
@@ -294,10 +323,14 @@ scaling_factor=1.0,
/
&radiative_gases
cfc113_rad_opt='off',
-cfc11_rad_opt='off',
-cfc12_rad_opt='off',
-ch4_rad_opt='off',
-co2_rad_opt='off',
+cfc11_mix_ratio=1.110e-09,
+cfc11_rad_opt='constant',
+cfc12_mix_ratio=2.187e-09,
+cfc12_rad_opt='constant',
+ch4_mix_ratio=1.006e-06,
+ch4_rad_opt='constant',
+co2_mix_ratio=6.002e-04,
+co2_rad_opt='constant',
co_rad_opt='off',
cs_rad_opt='off',
h2_rad_opt='off',
@@ -310,24 +343,27 @@ k_rad_opt='off',
l_cts_fcg_rates=.false.,
li_rad_opt='off',
n2_rad_opt='off',
-n2o_rad_opt='off',
+n2o_mix_ratio=4.945e-07,
+n2o_rad_opt='constant',
na_rad_opt='off',
nh3_rad_opt='off',
-o2_rad_opt='off',
-o3_rad_opt='off',
+o2_mix_ratio=0.2314,
+o2_rad_opt='constant',
+o3_rad_opt='ancil',
rb_rad_opt='off',
so2_rad_opt='off',
tio_rad_opt='off',
vo_rad_opt='off',
/
&solver
-fail_on_non_converged=.false.,
gcrk=18,
-maximum_iterations=50,
+maximum_iterations=7,
method='chebyshev',
monitor_convergence=.false.,
preconditioner='diagonal',
-tolerance=1.0e-18,
+tolerance=1.0e-6,
+/
+&specified_surface
/
&time
calendar='timestep',
@@ -339,10 +375,10 @@ timestep_start='1',
/
×tepping
alpha=0.55,
-dt=3600,
-inner_iterations=2,
+dt=1800,
+inner_iterations=1,
method='semi_implicit',
-outer_iterations=2,
+outer_iterations=1,
runge_kutta_method='forward_euler',
spinup_alpha=.false.,
tau_r=1.0,
@@ -352,10 +388,11 @@ tau_u=0.55,
&transport
adjust_theta=.false.,
adjust_tracer_equation=.false.
-adjust_vhv_wind=.false.
+adjust_vhv_wind=.false.,
+ageofair_reset_level=10,
broken_w2_projection=.false.,
calculate_detj='upwind',
-cap_density_predictor=0.01,
+cap_density_predictor=0.5,
cfl_mol_1d_stab=1.0,
cfl_mol_2d_stab=1.0,
cfl_mol_3d_stab=1.0,
@@ -365,28 +402,29 @@ dep_pt_stencil_extent=3,
dry_field_name='density',
enforce_min_value=5*.false.,
equation_form=1,2,2,2,2,
-ffsl_inner_order=2,
-ffsl_outer_order=2,
+ffsl_inner_order=0,
+ffsl_outer_order=1,
ffsl_splitting=5*1,
-ffsl_unity_3d=.false.
-ffsl_vertical_order=5*2
-field_names='density','potential_temperature','wind','moisture','cloud',
+ffsl_unity_3d=.false.,
+ffsl_vertical_order=2,2,1,2,2,
+field_names='density','potential_temperature','wind','moisture',
+'con_tracer',
fv_horizontal_order=2,
fv_vertical_order=2,
horizontal_method=5*1,
horizontal_monotone=5*1,
-log_space=5*.false.,
-max_vert_cfl_calc='uniform',
+log_space=.true.,.true.,.false.,.false.,.false.,
+max_vert_cfl_calc='dep_point',
min_val_abs_tol=-1.0e-12,
min_val_max_iterations=10,
min_val_method='iterative',
min_value=0.0,0.0,-99999999.0,0.0,0.0,
oned_reconstruction=.false.,
operators='fv',
-panel_edge_high_order=.false.,
-panel_edge_treatment='none'
+panel_edge_high_order=.true.,
+panel_edge_treatment='none',
profile_size=5,
-reversible=5*.false.,
+reversible=.true.,.true.,.false.,.true.,.true.,
runge_kutta_method='ssp3',
scheme=5*1,
si_outer_transport='none',
@@ -396,13 +434,13 @@ splitting=5*1,
substep_transport='off',
theta_dispersion_correction=.false.,
theta_variable='dry',
+transport_ageofair=.false.,
use_density_predictor=.false.,
vertical_method=5*1,
vertical_monotone=5*1,
-vertical_monotone_order=5*1,
+vertical_monotone_order=5*3,
vertical_sl_order='cubic',
-wind_mono_top=.false.
-wind_mono_top_depth=5
+wind_mono_top=.false.,
/
&validity_test
number_gamma_values=2,
diff --git a/applications/jedi_lfric_tests/example_tlm_tests/configuration_dry.nml b/applications/jedi_lfric_tests/example_tlm_tests/configuration_dry.nml
deleted file mode 100644
index d4c95254..00000000
--- a/applications/jedi_lfric_tests/example_tlm_tests/configuration_dry.nml
+++ /dev/null
@@ -1,406 +0,0 @@
-&jedi_lfric_tests
-test_field='theta',
-/
-
-#### Configure JEDI-LFRIC
-
-&jedi_geometry
-io_calender_start='2018-04-14T21:00:00',
-io_path_inc_read='/data/users/lfric/data/jedi-lfric/Ticket354/pert_fields/lfric_diag',
-io_path_state_read='/data/users/lfric/data/jedi-lfric/Ticket354/ls_fields/jedi_trajectory',
-io_path_state_write='write_file',
-io_setup_increment=.false.,
-io_time_step='P0DT1H0M0S',
-/
-&jedi_state
-state_time='2018-04-14 21:00:00',
-use_pseudo_model=.true.,
-variables='theta','rho','u10m','exner','u_in_w3','v_in_w3','w_in_wth',
-'m_v','m_cl','m_r','m_s',
-/
-&jedi_increment
-inc_time='2018-04-14 21:00:00',
-initialise_via_read=.false.,
-variables='theta','rho','exner','u_in_w3','v_in_w3','w_in_wth','m_v',
-'m_cl','m_r','m_s',
-/
-&jedi_linear_model
-incremental_wind_interpolation=.true.,
-nl_time_step='P0DT1H0M0S',
-/
-&jedi_pseudo_model
-initial_time='2018-04-14T21:00:00',
-number_of_steps=9,
-time_step='P0DT1H0M0S',
-/
-&jedi_lfric_settings
-adjoint_test_tolerance=1.0e-4,
-forecast_length='P0DT6H0M0S',
-/
-
-#### Configure LFRic
-
-&base_mesh
-file_prefix='mesh_C12',
-geometry='spherical',
-prepartitioned=.false.,
-prime_mesh_name='C12',
-topology='fully_periodic',
-/
-&boundaries
-limited_area=.false.,
-transport_overwrite_freq='final'
-/
-&checks
-limit_cfl=.false.,
-/
-§ion_choice
-aerosol='none',
-boundary_layer='none',
-chemistry='none',
-cloud='none',
-dynamics='gungho',
-external_forcing=.false.,
-iau=.false.,
-iau_sst=.false.,
-iau_surf=.false.,
-methane_oxidation=.false.,
-orographic_drag='none',
-radiation='none',
-spectral_gwd='none',
-stochastic_physics='none',
-surface='none',
-/
-&damping_layer
-dl_base=40000.0,
-dl_str=0.05,
-dl_type='standard',
-/
-&departure_points
-horizontal_limit='cap',
-horizontal_method='ffsl',
-n_dep_pt_iterations=1,
-vertical_limit='exponential',
-vertical_method='timeaverage',
-vertical_sorting=.false.,
-/
-&energy_correction
-encorr_usage='none',
-integral_method='fd',
-/
-&extrusion
-domain_height=80000.0,
-method='um_L70_50t_20s_80km',
-number_of_layers=70,
-planet_radius=6371229.0,
-stretching_height=17507.0,
-stretching_method='smooth',
-/
-&files
-ancil_directory='/data/users/lfric/data/ancils/basic-gal/yak/C12',
-checkpoint_stem_name='',
-diag_stem_name='',
-orography_mean_ancil_path='orography/gmted_ramp2/qrparm.orog',
-start_dump_directory='',
-start_dump_filename='',
-/
-&finite_element
-cellshape='quadrilateral',
-coord_order=1,
-coord_system='native',
-element_order_h=0,
-element_order_v=0,
-rehabilitate=.true.,
-vorticity_in_w1=.false.,
-/
-&formulation
-dlayer_on=.true.,
-dry_static_adjust=.true.,
-eos_method='sampled',
-exner_from_eos=.false.,
-horizontal_physics_predictor=.false.
-horizontal_transport_predictor=.false.
-init_exner_bt=.true.,
-l_multigrid=.false.,
-lagged_orog=.true.,
-moisture_formulation='dry',
-moisture_in_solver=.false.,
-p2theta_vert=.true.,
-rotating=.true.,
-shallow=.true.,
-si_momentum_equation=.false.,
-use_multires_coupling=.false.,
-use_physics=.false.,
-use_wavedynamics=.true.,
-vector_invariant=.false.,
-/
-&helmholtz_solver
-fail_on_non_converged=.false.,
-gcrk=18,
-method='bicgstab',
-monitor_convergence=.true.,
-normalise=.true.,
-preconditioner='tridiagonal',
-si_pressure_a_tol=0,
-si_pressure_maximum_iterations=40,
-si_pressure_tolerance=1.0e-15,
-/
-&idealised
-f_lon_deg=0.0,
-perturb_init=.false.
-perturb_magnitude=0
-perturb_seed=0
-test='gravity_wave',
-/
-&ideal_surface
-canopy_height=19.01,16.38,0.79,1.26,1.0,
-leaf_area_index=5.0,4.0,1.5,1.5,1.5,
-n_snow_layers=11*0,
-snow_depth=11*0.0,
-snow_layer_ice_mass=27*0.0,
-snow_layer_temp=27*273.0,
-snow_layer_thickness=27*0.0,
-soil_moisture=15.86,98.861,274.35,862.27,
-soil_temperature=284.508,286.537,289.512,293.066,
-surf_tile_fracs=9*0.0,1.0,0.0,
-surf_tile_temps=9*295.0,300.0,265.0,
-tile_snow_mass=11*0.0,
-/
-&initialization
-ancil_option='none',
-coarse_aerosol_ancil=.false.,
-coarse_orography_ancil=.false.,
-coarse_ozone_ancil=.false.,
-init_option='analytic',
-lbc_option='none',
-ls_option='analytic',
-model_eos_height=100,
-n_orog_smooth=0,
-read_w2h_wind=.true.,
-sea_ice_source='ancillary',
-snow_source='start_dump',
-w0_orography_mapping=.false.,
-zero_w2v_wind=.false.,
-/
-&initial_density
-density_background=0.1,
-density_max=2.0,
-r1=0.0,
-r2=0.0,
-x1=0.0,
-x2=0.0,
-y1=0.0,
-y2=0.0,
-z1=0.0,
-z2=0.0,
-/
-&initial_pressure
-method='balanced',
-surface_pressure=1000.0e2,
-/
-&initial_temperature
-bvf_square=0.0001,
-pert_centre=120.0,
-pert_width_scaling=1.0,
-perturb='none',
-theta_surf=300.0,
-/
-&initial_vapour
-/
-&initial_wind
-nl_constant=0.0,
-profile='none',
-sbr_angle_lat=0.0,
-sbr_angle_lon=0.0,
-smp_init_wind=.false.,
-u0=0.0,
-v0=0.0,
-wind_time_period=0.0,
-/
-&io
-checkpoint_read=.false.,
-checkpoint_write=.false.,
-counter_output_suffix='counter.txt',
-diag_active_files='lfric_diag',
-diag_always_on_sampling=.false.,
-diagnostic_frequency=8,
-file_convention='UGRID',
-nodal_output_on_w3=.false.,
-subroutine_counters=.false.,
-subroutine_timers=.true.,
-timer_output_path='timer.txt',
-use_xios_io=.true.,
-write_conservation_diag=.false.,
-write_diag=.true.,
-write_dump=.false.,
-write_fluxes=.false.,
-write_minmax_tseries=.false.,
-/
-&linear
-fixed_ls=.true.
-ls_read_w2h=.false.,
-pert_option='analytic',
-/
-&logging
-run_log_level='info',
-/
-&mixed_solver
-eliminate_variables='discrete',
-fail_on_non_converged=.false.,
-gcrk=10,
-guess_np1=.false.,
-mixed_solver_a_tol=1.0e-21,
-monitor_convergence=.true.,
-normalise=.true.,
-reference_reset_time=3600.0,
-si_maximum_iterations=7,
-si_method='block_gcr',
-si_preconditioner='pressure',
-si_tolerance=1.0e-21,
-split_w=.true.,
-/
-&mixing
-leonard_term=.false.,
-smagorinsky=.false.,
-viscosity=.false.,
-viscosity_mu=0.0,
-/
-&esm_couple
-l_esm_couple_test=.false.,
-/
-&orography
-orog_init_option='ancil',
-/
-&partitioning
-panel_decomposition='auto',
-panel_xproc=1,
-panel_yproc=1,
-partitioner='cubedsphere',
-/
-&physics
-limit_drag_incs=.false.,
-sample_physics_scalars=.true.,
-sample_physics_winds=.true.,
-/
-&planet
-cp=1005.0,
-gravity=9.80665,
-omega=7.292116E-5,
-p_zero=100000.0,
-rd=287.05,
-scaling_factor=1.0,
-/
-&radiative_gases
-cfc113_rad_opt='off',
-cfc11_rad_opt='off',
-cfc12_rad_opt='off',
-ch4_rad_opt='off',
-co2_rad_opt='off',
-co_rad_opt='off',
-cs_rad_opt='off',
-h2_rad_opt='off',
-h2o_rad_opt='prognostic',
-hcfc22_rad_opt='off',
-hcn_rad_opt='off',
-he_rad_opt='off',
-hfc134a_rad_opt='off',
-k_rad_opt='off',
-l_cts_fcg_rates=.false.,
-li_rad_opt='off',
-n2_rad_opt='off',
-n2o_rad_opt='off',
-na_rad_opt='off',
-nh3_rad_opt='off',
-o2_rad_opt='off',
-o3_rad_opt='off',
-rb_rad_opt='off',
-so2_rad_opt='off',
-tio_rad_opt='off',
-vo_rad_opt='off',
-/
-&solver
-fail_on_non_converged=.false.,
-gcrk=18,
-maximum_iterations=50,
-method='chebyshev',
-monitor_convergence=.false.,
-preconditioner='diagonal',
-tolerance=1.0e-18,
-/
-&time
-calendar='timestep',
-calendar_origin='2018-04-14 21:00:00',
-calendar_start='2018-04-14 21:00:00',
-calendar_type='gregorian',
-timestep_end='13',
-timestep_start='1',
-/
-×tepping
-alpha=0.55,
-dt=3600,
-inner_iterations=2,
-method='semi_implicit',
-outer_iterations=2,
-runge_kutta_method='forward_euler',
-spinup_alpha=.false.,
-tau_r=1.0,
-tau_t=1.0,
-tau_u=0.55,
-/
-&transport
-adjust_theta=.false.,
-adjust_tracer_equation=.false.
-adjust_vhv_wind=.false.
-broken_w2_projection=.false.,
-calculate_detj='upwind',
-cap_density_predictor=0.01,
-cfl_mol_1d_stab=1.0,
-cfl_mol_2d_stab=1.0,
-cfl_mol_3d_stab=1.0,
-cheap_update=.false.,
-consistent_metric=.false.,
-dep_pt_stencil_extent=3,
-dry_field_name='density',
-enforce_min_value=5*.false.,
-equation_form=1,2,2,2,2,
-extended_mesh=.false.,
-ffsl_inner_order=2,
-ffsl_outer_order=2,
-ffsl_splitting=5*1,
-ffsl_unity_3d=.false.
-ffsl_vertical_order=5*2
-field_names='density','potential_temperature','wind','moisture','cloud',
-fv_horizontal_order=2,
-fv_vertical_order=2,
-horizontal_method=5*1,
-horizontal_monotone=5*1,
-log_space=5*.false.,
-max_vert_cfl_calc='uniform',
-min_val_abs_tol=-1.0e-12,
-min_val_max_iterations=10,
-min_val_method='iterative',
-min_value=0.0,0.0,-99999999.0,0.0,0.0,
-oned_reconstruction=.false.,
-operators='fv',
-profile_size=5,
-reversible=5*.false.,
-runge_kutta_method='ssp3',
-scheme=5*1,
-si_outer_transport='none',
-slice_order='parabola',
-splitting=5*1,
-substep_transport='off',
-theta_dispersion_correction=.false.,
-theta_variable='dry',
-use_density_predictor=.false.,
-vertical_method=5*1,
-vertical_monotone=5*1,
-vertical_monotone_order=5*1,
-vertical_sl_order='cubic',
-wind_mono_top=.false.
-wind_mono_top_depth=5
-/
-&validity_test
-number_gamma_values=2,
-update_ls_frequency=1,
-/
diff --git a/applications/jedi_lfric_tests/example_tlm_tests/configuration_dry_relaxed.nml b/applications/jedi_lfric_tests/example_tlm_tests/configuration_dry_relaxed.nml
deleted file mode 100644
index 3b26fe9d..00000000
--- a/applications/jedi_lfric_tests/example_tlm_tests/configuration_dry_relaxed.nml
+++ /dev/null
@@ -1,399 +0,0 @@
-&jedi_lfric_tests
-test_field='theta',
-/
-
-#### Configure JEDI-LFRIC
-
-&jedi_geometry
-io_calender_start='2018-04-14T21:00:00',
-io_path_inc_read='/data/users/lfric/data/jedi-lfric/Ticket354/pert_fields/lfric_diag',
-io_path_state_read='/data/users/lfric/data/jedi-lfric/Ticket354/ls_fields/jedi_trajectory',
-io_path_state_write='write_file',
-io_setup_increment=.false.,
-io_time_step='P0DT1H0M0S',
-/
-&jedi_state
-state_time='2018-04-14 21:00:00',
-use_pseudo_model=.true.,
-variables='theta','rho','u10m','exner','u_in_w3','v_in_w3','w_in_wth',
-'m_v','m_cl','m_r','m_s',
-/
-&jedi_increment
-inc_time='2018-04-14 21:00:00',
-initialise_via_read=.false.,
-variables='theta','rho','exner','u_in_w3','v_in_w3','w_in_wth','m_v',
-'m_cl','m_r','m_s',
-/
-&jedi_linear_model
-nl_time_step='P0DT1H0M0S',
-/
-&jedi_pseudo_model
-initial_time='2018-04-14T21:00:00',
-number_of_steps=9,
-time_step='P0DT1H0M0S',
-/
-&jedi_lfric_settings
-adjoint_test_tolerance=1.0e-4,
-forecast_length='P0DT6H0M0S',
-/
-
-#### Configure LFRic
-
-&base_mesh
-file_prefix='mesh_C12',
-geometry='spherical',
-prepartitioned=.false.,
-prime_mesh_name='C12',
-topology='fully_periodic',
-/
-&boundaries
-limited_area=.false.,
-transport_overwrite_freq='final'
-/
-&checks
-limit_cfl=.false.,
-/
-§ion_choice
-aerosol='none',
-boundary_layer='none',
-chemistry='none',
-cloud='none',
-dynamics='gungho',
-external_forcing=.false.,
-iau=.false.,
-iau_surf=.false.,
-methane_oxidation=.false.,
-orographic_drag='none',
-radiation='none',
-spectral_gwd='none',
-stochastic_physics='none',
-surface='none',
-/
-&damping_layer
-dl_base=40000.0,
-dl_str=0.05,
-dl_type='standard',
-/
-&departure_points
-horizontal_limit='cap',
-horizontal_method='ffsl',
-n_dep_pt_iterations=1,
-vertical_limit='exponential',
-vertical_method='timeaverage',
-vertical_sorting=.false.,
-/
-&energy_correction
-encorr_usage='none',
-integral_method='fd',
-/
-&extrusion
-domain_height=80000.0,
-method='um_L70_50t_20s_80km',
-number_of_layers=70,
-planet_radius=6371229.0,
-stretching_height=17507.0,
-stretching_method='smooth',
-/
-&files
-ancil_directory='/data/users/lfric/data/ancils/basic-gal/yak/C12',
-checkpoint_stem_name='',
-diag_stem_name='',
-orography_mean_ancil_path='orography/gmted_ramp2/qrparm.orog',
-start_dump_directory='',
-start_dump_filename='',
-/
-&finite_element
-cellshape='quadrilateral',
-coord_order=1,
-coord_system='native',
-element_order_h=0,
-element_order_v=0,
-rehabilitate=.true.,
-vorticity_in_w1=.false.,
-/
-&formulation
-dlayer_on=.true.,
-dry_static_adjust=.true.,
-eos_method='sampled',
-exner_from_eos=.false.,
-init_exner_bt=.true.,
-l_multigrid=.false.,
-lagged_orog=.true.,
-moisture_formulation='dry',
-moisture_in_solver=.false.,
-p2theta_vert=.true.,
-rotating=.true.,
-shallow=.true.,
-si_momentum_equation=.false.,
-use_multires_coupling=.false.,
-use_physics=.false.,
-use_wavedynamics=.true.,
-vector_invariant=.false.,
-/
-&helmholtz_solver
-fail_on_non_converged=.false.,
-gcrk=8,
-method='bicgstab',
-monitor_convergence=.true.,
-normalise=.true.,
-preconditioner='tridiagonal',
-si_pressure_a_tol=1.0e-8,
-si_pressure_maximum_iterations=400,
-si_pressure_tolerance=1.0e-4,
-/
-&idealised
-f_lon_deg=0.0,
-perturb_init=.false.
-perturb_magnitude=0
-perturb_seed=0
-test='gravity_wave',
-/
-&ideal_surface
-canopy_height=19.01,16.38,0.79,1.26,1.0,
-leaf_area_index=5.0,4.0,1.5,1.5,1.5,
-n_snow_layers=11*0,
-snow_depth=11*0.0,
-snow_layer_ice_mass=27*0.0,
-snow_layer_temp=27*273.0,
-snow_layer_thickness=27*0.0,
-soil_moisture=15.86,98.861,274.35,862.27,
-soil_temperature=284.508,286.537,289.512,293.066,
-surf_tile_fracs=9*0.0,1.0,0.0,
-surf_tile_temps=9*295.0,300.0,265.0,
-tile_snow_mass=11*0.0,
-/
-&initialization
-ancil_option='none',
-coarse_aerosol_ancil=.false.,
-coarse_orography_ancil=.false.,
-coarse_ozone_ancil=.false.,
-init_option='analytic',
-lbc_option='none',
-ls_option='analytic',
-model_eos_height=100,
-n_orog_smooth=0,
-read_w2h_wind=.true.,
-sea_ice_source='ancillary',
-snow_source='start_dump',
-w0_orography_mapping=.false.,
-zero_w2v_wind=.false.,
-/
-&initial_density
-density_background=0.1,
-density_max=2.0,
-r1=0.0,
-r2=0.0,
-x1=0.0,
-x2=0.0,
-y1=0.0,
-y2=0.0,
-z1=0.0,
-z2=0.0,
-/
-&initial_pressure
-method='balanced',
-surface_pressure=1000.0e2,
-/
-&initial_temperature
-bvf_square=0.0001,
-pert_centre=120.0,
-pert_width_scaling=1.0,
-perturb='none',
-theta_surf=300.0,
-/
-&initial_vapour
-/
-&initial_wind
-nl_constant=0.0,
-profile='none',
-sbr_angle_lat=0.0,
-sbr_angle_lon=0.0,
-smp_init_wind=.false.,
-u0=0.0,
-v0=0.0,
-wind_time_period=0.0,
-/
-&io
-checkpoint_read=.false.,
-checkpoint_write=.false.,
-counter_output_suffix='counter.txt',
-diag_active_files='lfric_diag',
-diag_always_on_sampling=.false.,
-diagnostic_frequency=8,
-file_convention='UGRID',
-nodal_output_on_w3=.false.,
-subroutine_counters=.false.,
-subroutine_timers=.true.,
-timer_output_path='timer.txt',
-use_xios_io=.true.,
-write_conservation_diag=.false.,
-write_diag=.true.,
-write_dump=.false.,
-write_fluxes=.false.,
-write_minmax_tseries=.false.,
-/
-&linear
-ls_read_w2h=.false.,
-pert_option='analytic',
-/
-&logging
-run_log_level='info',
-/
-&mixed_solver
-eliminate_variables='discrete',
-fail_on_non_converged=.false.,
-gcrk=6,
-guess_np1=.false.,
-mixed_solver_a_tol=0.0,
-monitor_convergence=.true.,
-normalise=.true.,
-reference_reset_time=3600.0,
-si_maximum_iterations=10,
-si_method='block_gcr',
-si_preconditioner='pressure',
-si_tolerance=1.0e-5,
-split_w=.true.,
-/
-&mixing
-leonard_term=.false.,
-smagorinsky=.false.,
-viscosity=.false.,
-viscosity_mu=0.0,
-/
-&esm_couple
-l_esm_couple_test=.false.,
-/
-&orography
-orog_init_option='ancil',
-/
-&partitioning
-panel_decomposition='auto',
-panel_xproc=1,
-panel_yproc=1,
-partitioner='cubedsphere',
-/
-&physics
-limit_drag_incs=.false.,
-sample_physics_scalars=.true.,
-sample_physics_winds=.true.,
-/
-&planet
-cp=1005.0,
-gravity=9.80665,
-omega=7.292116E-5,
-p_zero=100000.0,
-rd=287.05,
-scaling_factor=1.0,
-/
-&radiative_gases
-cfc113_rad_opt='off',
-cfc11_rad_opt='off',
-cfc12_rad_opt='off',
-ch4_rad_opt='off',
-co2_rad_opt='off',
-co_rad_opt='off',
-cs_rad_opt='off',
-h2_rad_opt='off',
-h2o_rad_opt='prognostic',
-hcfc22_rad_opt='off',
-hcn_rad_opt='off',
-he_rad_opt='off',
-hfc134a_rad_opt='off',
-k_rad_opt='off',
-l_cts_fcg_rates=.false.,
-li_rad_opt='off',
-n2_rad_opt='off',
-n2o_rad_opt='off',
-na_rad_opt='off',
-nh3_rad_opt='off',
-o2_rad_opt='off',
-o3_rad_opt='off',
-rb_rad_opt='off',
-so2_rad_opt='off',
-tio_rad_opt='off',
-vo_rad_opt='off',
-/
-&solver
-fail_on_non_converged=.false.,
-gcrk=18,
-maximum_iterations=7,
-method='chebyshev',
-monitor_convergence=.false.,
-preconditioner='diagonal',
-tolerance=1.0e-6,
-/
-&time
-calendar='timestep',
-calendar_origin='2018-04-14 21:00:00',
-calendar_start='2018-04-14 21:00:00',
-calendar_type='gregorian',
-timestep_end='13',
-timestep_start='1',
-/
-×tepping
-alpha=0.55,
-dt=3600,
-inner_iterations=2,
-method='semi_implicit',
-outer_iterations=2,
-runge_kutta_method='forward_euler',
-spinup_alpha=.false.,
-tau_r=1.0,
-tau_t=1.0,
-tau_u=0.55,
-/
-&transport
-adjust_theta=.false.,
-adjust_tracer_equation=.false.
-adjust_vhv_wind=.false.
-broken_w2_projection=.false.,
-calculate_detj='upwind',
-cap_density_predictor=0.01,
-cfl_mol_1d_stab=1.0,
-cfl_mol_2d_stab=1.0,
-cfl_mol_3d_stab=1.0,
-cheap_update=.false.,
-consistent_metric=.false.,
-dep_pt_stencil_extent=3,
-dry_field_name='density',
-enforce_min_value=5*.false.,
-equation_form=1,2,2,2,2,
-extended_mesh=.false.,
-ffsl_inner_order=2,
-ffsl_outer_order=2,
-ffsl_splitting=5*1,
-ffsl_unity_3d=.false.
-ffsl_vertical_order=5*2
-field_names='density','potential_temperature','wind','moisture','cloud',
-fv_horizontal_order=2,
-fv_vertical_order=2,
-horizontal_method=5*1,
-horizontal_monotone=5*1,
-log_space=5*.false.,
-max_vert_cfl_calc='uniform',
-min_val_abs_tol=-1.0e-12,
-min_val_max_iterations=10,
-min_val_method='iterative',
-min_value=0.0,0.0,-99999999.0,0.0,0.0,
-oned_reconstruction=.false.,
-operators='fv',
-profile_size=5,
-reversible=5*.false.,
-runge_kutta_method='ssp3',
-scheme=5*1,
-si_outer_transport='none',
-slice_order='parabola',
-splitting=5*1,
-substep_transport='off',
-theta_dispersion_correction=.false.,
-theta_variable='dry',
-use_density_predictor=.false.,
-vertical_method=5*1,
-vertical_monotone=5*1,
-vertical_monotone_order=5*1,
-vertical_sl_order='cubic',
-/
-&validity_test
-number_gamma_values=2,
-update_ls_frequency=1,
-/
diff --git a/applications/jedi_lfric_tests/example_tlm_tests/iodef.xml b/applications/jedi_lfric_tests/example_tlm_tests/iodef.xml
index fade05b8..808f8ef9 100644
--- a/applications/jedi_lfric_tests/example_tlm_tests/iodef.xml
+++ b/applications/jedi_lfric_tests/example_tlm_tests/iodef.xml
@@ -47,7 +47,7 @@
-
+
@@ -61,7 +61,7 @@
-
+
@@ -74,7 +74,7 @@
-
+
@@ -396,7 +396,7 @@
-
+
diff --git a/applications/jedi_lfric_tests/example_tlm_tests/mesh_C12.nc b/applications/jedi_lfric_tests/example_tlm_tests/mesh_C12.nc
deleted file mode 100644
index f7ea6988..00000000
Binary files a/applications/jedi_lfric_tests/example_tlm_tests/mesh_C12.nc and /dev/null differ
diff --git a/rose-stem/app/jedi_id_tlm_tests/opt/rose-app-C12_MG.conf b/rose-stem/app/jedi_id_tlm_tests/opt/rose-app-C12_MG.conf
new file mode 100644
index 00000000..125a4758
--- /dev/null
+++ b/rose-stem/app/jedi_id_tlm_tests/opt/rose-app-C12_MG.conf
@@ -0,0 +1,8 @@
+[file:mesh_C12_MG.nc]
+mode=auto
+source=$MESH_DIR/mesh_C12_MG.nc
+
+[namelist:base_mesh]
+!!f_lat_deg=
+file_prefix='mesh_C12_MG'
+!!fplane=
diff --git a/rose-stem/app/jedi_id_tlm_tests/opt/rose-app-default.conf b/rose-stem/app/jedi_id_tlm_tests/opt/rose-app-default.conf
deleted file mode 100644
index e69de29b..00000000
diff --git a/rose-stem/app/jedi_id_tlm_tests/opt/rose-app-nwp_gal9_c12.conf b/rose-stem/app/jedi_id_tlm_tests/opt/rose-app-nwp_gal9_c12.conf
new file mode 100644
index 00000000..de473661
--- /dev/null
+++ b/rose-stem/app/jedi_id_tlm_tests/opt/rose-app-nwp_gal9_c12.conf
@@ -0,0 +1,28 @@
+[file:iodef_temp.xml]
+mode=auto
+source=$ROSE_SUITE_DIR/app/jedi_id_tlm_tests/file/iodef.xml
+
+[namelist:io]
+diagnostic_frequency=8
+
+[namelist:jedi_geometry]
+io_calender_start='2018-04-14T21:00:00'
+io_path_inc_read='$BIG_DATA_DIR/jedi-lfric/Ticket354/pert_fields/lfric_diag'
+io_path_state_read='$BIG_DATA_DIR/jedi-lfric/Ticket354/ls_fields/jedi_trajectory'
+
+[namelist:jedi_increment]
+inc_time='2018-04-14 21:00:00'
+
+[namelist:jedi_pseudo_model]
+initial_time='2018-04-14T21:00:00'
+
+[namelist:jedi_state]
+state_time='2018-04-14 21:00:00'
+
+[namelist:multigrid]
+chain_mesh_tags='dynamics','multigrid_l1','multigrid_l2'
+multigrid_chain_nitems=3
+
+[namelist:time]
+calendar_origin='2018-04-14 21:00:00'
+calendar_start='2018-04-14 21:00:00'
diff --git a/rose-stem/app/jedi_id_tlm_tests/rose-app.conf b/rose-stem/app/jedi_id_tlm_tests/rose-app.conf
index 7d23de1e..72005b67 100644
--- a/rose-stem/app/jedi_id_tlm_tests/rose-app.conf
+++ b/rose-stem/app/jedi_id_tlm_tests/rose-app.conf
@@ -23,13 +23,19 @@ source=namelist:jedi_lfric_tests
= namelist:jedi_linear_model
= namelist:jedi_pseudo_model
= namelist:jedi_lfric_settings
+ = (namelist:aerosol)
= namelist:base_mesh
+ = (namelist:blayer)
= namelist:boundaries
= namelist:checks
= namelist:section_choice
+ = (namelist:cloud)
+ = (namelist:chemistry)
+ = (namelist:convection)
+ = (namelist:cosp)
= (namelist:damping_layer)
= (namelist:departure_points)
- = namelist:energy_correction
+ = (namelist:energy_correction)
= (namelist:external_forcing)
= namelist:extrusion
= (namelist:files)
@@ -40,6 +46,7 @@ source=namelist:jedi_lfric_tests
= (namelist:iau_addinf_io(:))
= (namelist:iau_ainc_io(:))
= (namelist:iau_bcorr_io(:))
+ = (namelist:iau)
= (namelist:idealised)
= (namelist:ideal_surface)
= namelist:initialization
@@ -63,29 +70,33 @@ source=namelist:jedi_lfric_tests
= (namelist:jules_vegetation)
= namelist:linear
= namelist:logging
+ = (namelist:microphysics)
= namelist:mixed_solver
- = (namelist:mixing)
+ = namelist:mixing
= (namelist:multigrid)
= (namelist:multires_coupling)
= namelist:esm_couple
+ = (namelist:orbit)
= namelist:orography
= (namelist:orography_agnesi_cartesian)
= (namelist:orography_agnesi_spherical)
- = (namelist:orography_bell_cartesian)
- = (namelist:orography_bell_spherical)
= (namelist:orography_dcmip200_spherical)
= (namelist:orography_schar_cartesian)
= (namelist:orography_schar_spherical)
= namelist:partitioning
= (namelist:physics)
= namelist:planet
+ = (namelist:radiation)
= namelist:radiative_gases
+ = (namelist:spectral_gwd)
+ = (namelist:orographic_drag)
= namelist:solver
= (namelist:specified_surface)
+ = (namelist:star)
= (namelist:stochastic_physics)
+ = (namelist:surface)
= (namelist:temp_tend_data)
= (namelist:theta_relax)
- = (namelist:theta_relax)
= namelist:time
= namelist:timestepping
= namelist:transport
@@ -106,24 +117,24 @@ easyaerosol_cdnc=.false.
easyaerosol_lw=.false.
easyaerosol_sw=.false.
!!emissions='GC5'
-glomap_mode='off'
+glomap_mode='dust_and_clim'
!!horiz_d=2.25
-!!l_radaer=.false.
+!!l_radaer=.true.
murk=.false.
!!murk_lbc=.false.
!!murk_prognostic=.false.
!!murk_source_scaling=1.0
!!murk_visibility=.false.
!!n_radaer_step=1
-!!prec_file=''
-sulphuric_strat_climatology=.false.
+!!prec_file='precalc/RADAER_pcalc.ukca'
+sulphuric_strat_climatology=.true.
!!sulphuric_strat_column=1.86604e-6
ukca_mode_seg_size=4
!!us_am=1.45
[namelist:base_mesh]
!!f_lat_deg=45.0
-file_prefix='mesh.nc'
+file_prefix='mesh'
!!fplane=.false.
geometry='spherical'
prepartitioned=.false.
@@ -186,7 +197,7 @@ limited_area=.false.
!!rim_width_ns=1
!!solver_boundary_depth=1
!!transport_boundary_depth=6
-transport_overwrite_freq='split_step'
+transport_overwrite_freq='final'
[namelist:checks]
limit_cfl=.false.
@@ -206,14 +217,14 @@ chem_scheme='none'
!!fjx_spec_file='FJX_spec_Nov11.dat'
!!flexchem_opt='bs1999'
i_chem_timestep_halvings=0
-!!i_ukca_chem_version=0
+!!i_ukca_chem_version=111
!!l_ukca_asad_full=.false.
-!!l_ukca_linox_scaling=.false.
-!!l_ukca_quasinewton=.false.
+!!l_ukca_linox_scaling=
+!!l_ukca_quasinewton=
!!l_ukca_ro2_ntp=.false.
-!!lightnox_scale_fac=0
+!!lightnox_scale_fac=
!!photol_scheme='off'
-!!top_bdy_opt='no_overwrt'
+!!top_bdy_opt=''
[!!namelist:cloud]
!!cff_spread_rate=1.0e-5
@@ -319,7 +330,7 @@ stretching_method='smooth'
!!aerosols_ancil_path=''
!!albedo_nir_ancil_path=''
!!albedo_vis_ancil_path=''
-ancil_directory='$BIG_DATA_DIR/ancils/basic-gal/yak/${ancil_resolution}'
+ancil_directory='$BIG_DATA_DIR/ancils/basic-gal/yak/${RESOLUTION}'
checkpoint_stem_name=''
!!cloud_drop_no_conc_ancil_path=''
!!coarse_ancil_directory=''
@@ -380,7 +391,7 @@ diag_stem_name=''
!!o3_ancil_path=''
!!oh_ancil_path=''
orography_mean_ancil_path='orography/gmted_ramp2/qrparm.orog'
-!!orography_subgrid_ancil_path='orography/gmted_ramp2/qrparm.orog.ugrid'
+!!orography_subgrid_ancil_path=''
!!ozone_ancil_path=''
!!plant_func_ancil_path=''
!!sea_ancil_path=''
@@ -412,7 +423,7 @@ exner_from_eos=.false.
horizontal_physics_predictor=.false.
horizontal_transport_predictor=.false.
init_exner_bt=.true.
-l_multigrid=.false.
+l_multigrid=.true.
lagged_orog=.true.
moisture_formulation='traditional'
moisture_in_solver=.true.
@@ -422,7 +433,7 @@ shallow=.true.
si_momentum_equation=.false.
theta_moist_source=.false.
use_multires_coupling=.false.
-use_physics=.false.
+use_physics=.true.
use_wavedynamics=.true.
vector_invariant=.false.
@@ -436,16 +447,16 @@ profile_data_v=0.0
times=0.0
[namelist:helmholtz_solver]
-fail_on_non_converged=.false.
-gcrk=18
+!!fail_on_non_converged=.false.
+gcrk=8
!!jacobi_relaxation=0.5
-method='bicgstab'
-monitor_convergence=.true.
+method='prec_only'
+monitor_convergence=.false.
normalise=.true.
-preconditioner='tridiagonal'
-si_pressure_a_tol=0
-si_pressure_maximum_iterations=40
-si_pressure_tolerance=1.0e-15
+preconditioner='multigrid'
+si_pressure_a_tol=1.0e-8
+si_pressure_maximum_iterations=400
+si_pressure_tolerance=1.0e-4
[namelist:iau]
!!iau_ainc_multifile=.false.
@@ -455,7 +466,7 @@ si_pressure_tolerance=1.0e-15
!!iau_tendency_ainc=.false.
!!iau_tendency_bcorr=.true.
!!iau_tendency_pertinc=.false.
-!!iau_ts_start=0
+!!iau_ts_start=1
!!iau_use_addinf=.false.
!!iau_use_bcorr=.false.
!!iau_use_level_one_temp=.false.
@@ -502,15 +513,15 @@ f_lon_deg=0.0
perturb_init=.false.
!!perturb_magnitude=0
!!perturb_seed=0
-test='gravity_wave'
+test='none'
[namelist:initial_density]
density_background=0.1
density_max=2.0
-r1=0.0
-r2=0.0
-x1=0.0
-x2=0.0
+r1=0.4
+r2=0.4
+x1=0.4
+x2=-0.4
y1=0.0
y2=0.0
z1=0.0
@@ -522,22 +533,22 @@ surface_pressure=1000.0e2
[namelist:initial_temperature]
bvf_square=0.0001
-pert_centre=120.0
+pert_centre=60.0
pert_width_scaling=1.0
perturb='none'
-!!profile_data=300.0
-!!profile_heights=0.0
-!!profile_size=1
+!!profile_data=300.0,300.0
+!!profile_heights=0.0,10.0e3
+!!profile_size=2
theta_surf=300.0
[namelist:initial_vapour]
-!!profile_data=0.0
-!!profile_heights=0.0
-!!profile_size=1
+!!profile_data=0.0,0.0
+!!profile_heights=0.0,10.0e3
+!!profile_size=2
[namelist:initial_wind]
nl_constant=0.0
-profile='none'
+profile='constant_uv'
!!profile_data_u=0.0
!!profile_data_v=0.0
!!profile_data_w=0.0
@@ -547,8 +558,8 @@ profile='none'
!!profile_size_w=1
sbr_angle_lat=0.0
sbr_angle_lon=0.0
-smp_init_wind=.false.
-u0=0.0
+smp_init_wind=.true.
+u0=2.0
v0=0.0
wind_time_period=0.0
@@ -576,7 +587,7 @@ checkpoint_write=.false.
counter_output_suffix='counter.txt'
diag_active_files='lfric_diag'
diag_always_on_sampling=.false.
-diagnostic_frequency=8
+diagnostic_frequency=12
!!end_of_run_checkpoint=.true.
file_convention='UGRID'
multifile_io=.false.
@@ -592,7 +603,7 @@ write_fluxes=.false.
write_minmax_tseries=.false.
[namelist:jedi_geometry]
-io_calender_start='2018-04-14T21:00:00'
+io_calender_start='2021-06-02T00:00:00'
io_path_inc_read='$BIG_DATA_DIR/jedi-lfric/Ticket354/pert_fields/lfric_diag'
io_path_state_read='$BIG_DATA_DIR/jedi-lfric/Ticket354/ls_fields/jedi_trajectory'
io_path_state_write='write_file'
@@ -600,7 +611,7 @@ io_setup_increment=.false.
io_time_step='P0DT1H0M0S'
[namelist:jedi_increment]
-inc_time='2018-04-14 21:00:00'
+inc_time='2021-06-02 00:00:00'
initialise_via_read=.false.
variables='theta','rho','exner','u_in_w3','v_in_w3','w_in_wth','m_v',
='m_cl','m_r','m_s'
@@ -617,12 +628,12 @@ incremental_wind_interpolation=.true.
nl_time_step='P0DT1H0M0S'
[namelist:jedi_pseudo_model]
-initial_time='2018-04-14T21:00:00'
+initial_time='2021-06-02 00:00:00'
number_of_steps=9
time_step='P0DT1H0M0S'
[namelist:jedi_state]
-state_time='2018-04-14 21:00:00'
+state_time='2021-06-02 00:00:00'
use_pseudo_model=.true.
variables='theta','rho','u10m','exner','u_in_w3','v_in_w3','w_in_wth',
='m_v','m_cl','m_r','m_s'
@@ -659,7 +670,7 @@ kext_io=0.5,0.5,1.0,1.0,0.5
knl_io=5*0.2
omega_io=0.101,0.083,0.132,0.135,0.115
omnir_io=0.788,0.545,0.864,0.787,0.785
-z0hm_pft_io=1.65,1.65,0.1,0.1,0.1
+z0hm_pft_io=1.0,1.0,0.01,0.01,0.01
!!z0v_io=1.1,1.1,0.22,0.22,1.0
[!!namelist:jules_radiation]
@@ -698,8 +709,8 @@ l_use_dtstar_sea=.false.
nice=1
!!u_cdn_hw=55.0
!!u_cdn_max=33.0
-!!z0h_specified=0.01
-!!z0m_specified=0.1
+!!z0h_specified=0.0
+!!z0m_specified=0.0
[!!namelist:jules_snow]
can_clump=8.0,4.0,1.0,1.0,1.0
@@ -776,9 +787,11 @@ l_spec_veg_z0=.true.
[namelist:linear]
fixed_ls=.true.
-l_stabilise_bl=.false.
+l_stabilise_bl=.true.
ls_read_w2h=.false.
-pert_option='analytic'
+max_bl_stabilisation=0.75
+n_bl_levels_to_stabilise=15
+pert_option='file'
[namelist:logging]
log_to_rank_zero_only=.true.
@@ -806,40 +819,40 @@ microphysics_casim=.false.
!!orog_block=.true.
!!orog_rain=.true.
!!orog_rime=.true.
-!!prog_tnuc=.false.
+!!prog_tnuc=.true.
!!qcl_rime=1.0e-4
-!!shape_rime=.false.
+!!shape_rime=.true.
turb_gen_mixph=.true.
!!z_surf=50.0
[namelist:mixed_solver]
eliminate_variables='discrete'
-fail_on_non_converged=.false.
-gcrk=10
+fail_on_non_converged=.true.
+gcrk=4
guess_np1=.false.
!!jacobi_relaxation=0.5
-mixed_solver_a_tol=1.0e-21
+mixed_solver_a_tol=1.0e-3
monitor_convergence=.true.
normalise=.true.
reference_reset_time=3600.0
-si_maximum_iterations=7
+si_maximum_iterations=10
si_method='block_gcr'
si_preconditioner='pressure'
-si_tolerance=1.0e-21
+si_tolerance=1.0e-1
split_w=.true.
[namelist:mixing]
!!leonard_kl=2.0
leonard_term=.false.
-!!method='blending'
+!!method='blend_1dbl_fa'
!!mix_factor=0.2
!!smag_l_calc='UseDx'
smagorinsky=.false.
viscosity=.false.
viscosity_mu=0.0
-[!!namelist:multigrid]
-chain_mesh_tags='','','',''
+[namelist:multigrid]
+chain_mesh_tags='dynamics','multigrid_l1','multigrid_l2','multigrid_l3'
multigrid_chain_nitems=4
n_coarsesmooth=4
n_postsmooth=2
@@ -847,9 +860,17 @@ n_presmooth=2
smooth_relaxation=0.8
[!!namelist:multires_coupling]
-aerosol_mesh_name='dynamics'
+aerosol_mesh_name='aerosol'
coarse_aerosol_transport=.false.
coarse_rad_aerosol=.false.
+dynamics_mesh_name='dynamics'
+!!lowest_order_aero_flag=.false.
+multires_coupling_mesh_tags='dynamics'
+multires_coupling_mode='test'
+negative_correction='none'
+physics_mesh_name='aerosol'
+reconstruction='simple'
+recovery_order='linear'
[!!namelist:orbit]
!!arg_periapsis=1.796767421
@@ -944,7 +965,7 @@ phi_centre_dec=0.0
wavelength=4000.0
[namelist:partitioning]
-generate_inner_halos=.true.
+generate_inner_halos=.false.
panel_decomposition='auto'
!!panel_xproc=1
!!panel_yproc=1
@@ -959,15 +980,15 @@ configure_segments=.false.
!!electric_placement='slow'
!!evap_condense_placement='fast'
!!gw_segment=0
-!!limit_drag_incs=.false.
+limit_drag_incs=.false.
!!lowest_level='gradient'
!!ls_ppn_segment=0
!!microphysics_placement='slow'
!!orographic_drag_placement='slow'
!!radiation_placement='slow'
-!!sample_physics_scalars=.true.
-!!sample_physics_winds=.true.
-!!sample_physics_winds_correction=.false.
+sample_physics_scalars=.true.
+sample_physics_winds=.true.
+sample_physics_winds_correction=.false.
!!smagorinsky_placement='end'
!!spectral_gwd_placement='slow'
!!stochastic_physics_placement='fast'
@@ -1010,12 +1031,12 @@ mcica_data_file='spec/mcica_data'
n_radstep=2
!!planet_albedo=0.06
!!planet_emissivity=0.985
-scatter_method_lw='full'
-!!scatter_method_lwinc='full'
+scatter_method_lw='hybrid'
+!!scatter_method_lwinc='approx'
spectral_file_lw='spec/sp_lw_ga9'
-!!spectral_file_lwinc='spec/sp_lw_cloud7'
+!!spectral_file_lwinc='spec/sp_lw_cloud9'
spectral_file_sw='spec/sp_sw_ga9'
-!!spectral_file_swinc='spec/sp_sw_cloud7'
+!!spectral_file_swinc='spec/sp_sw_cloud9'
topography='slope'
[namelist:radiative_gases]
@@ -1029,26 +1050,26 @@ cfc113_rad_opt='off'
!!cfc11_clim_fcg_nyears=0
!!cfc11_clim_fcg_rates=0
!!cfc11_clim_fcg_years=0
-!!cfc11_mix_ratio=1.110e-09
-cfc11_rad_opt='off'
+cfc11_mix_ratio=1.110e-09
+cfc11_rad_opt='constant'
!!cfc12_clim_fcg_levls=0
!!cfc12_clim_fcg_nyears=0
!!cfc12_clim_fcg_rates=0
!!cfc12_clim_fcg_years=0
-!!cfc12_mix_ratio=2.187e-09
-cfc12_rad_opt='off'
+cfc12_mix_ratio=2.187e-09
+cfc12_rad_opt='constant'
!!ch4_clim_fcg_levls=0
!!ch4_clim_fcg_nyears=0
!!ch4_clim_fcg_rates=0
!!ch4_clim_fcg_years=0
-!!ch4_mix_ratio=1.006e-06
-ch4_rad_opt='off'
+ch4_mix_ratio=1.006e-06
+ch4_rad_opt='constant'
!!co2_clim_fcg_levls=0
!!co2_clim_fcg_nyears=0
!!co2_clim_fcg_rates=0
!!co2_clim_fcg_years=0
-!!co2_mix_ratio=6.002e-04
-co2_rad_opt='off'
+co2_mix_ratio=6.002e-04
+co2_rad_opt='constant'
!!co_clim_fcg_levls=0
!!co_clim_fcg_nyears=0
!!co_clim_fcg_rates=0
@@ -1120,8 +1141,8 @@ n2_rad_opt='off'
!!n2o_clim_fcg_nyears=0
!!n2o_clim_fcg_rates=0
!!n2o_clim_fcg_years=0
-!!n2o_mix_ratio=4.945e-07
-n2o_rad_opt='off'
+n2o_mix_ratio=4.945e-07
+n2o_rad_opt='constant'
!!na_clim_fcg_levls=0
!!na_clim_fcg_nyears=0
!!na_clim_fcg_rates=0
@@ -1138,8 +1159,8 @@ nh3_rad_opt='off'
!!o2_clim_fcg_nyears=0
!!o2_clim_fcg_rates=0
!!o2_clim_fcg_years=0
-!!o2_mix_ratio=0.2314
-o2_rad_opt='off'
+o2_mix_ratio=0.2314
+o2_rad_opt='constant'
!!o3_clim_fcg_levls=0
!!o3_clim_fcg_nyears=0
!!o3_clim_fcg_rates=0
@@ -1148,7 +1169,7 @@ o2_rad_opt='off'
!!o3_profile_data=0
!!o3_profile_heights=0.0
!!o3_profile_size=0
-o3_rad_opt='off'
+o3_rad_opt='ancil'
!!rb_clim_fcg_levls=0
!!rb_clim_fcg_nyears=0
!!rb_clim_fcg_rates=0
@@ -1175,10 +1196,10 @@ tio_rad_opt='off'
vo_rad_opt='off'
[namelist:section_choice]
-!!aerosol='none'
-!!boundary_layer='none'
-!!chemistry='none'
-!!cloud='none'
+aerosol='none'
+boundary_layer='none'
+chemistry='none'
+cloud='none'
!!convection='none'
dynamics='gungho'
!!electric='none'
@@ -1186,23 +1207,23 @@ external_forcing=.false.
iau=.false.
iau_sst=.false.
iau_surf=.false.
-!!methane_oxidation=.false.
+methane_oxidation=.false.
!!microphysics='none'
-!!orographic_drag='none'
-!!radiation='none'
-!!spectral_gwd='none'
-!!stochastic_physics='none'
-!!surface='none'
+orographic_drag='none'
+radiation='none'
+spectral_gwd='none'
+stochastic_physics='none'
+surface='none'
[namelist:solver]
-fail_on_non_converged=.false.
+!!fail_on_non_converged=.false.
gcrk=18
!!jacobi_relaxation=0.5
-maximum_iterations=50
+maximum_iterations=7
method='chebyshev'
-monitor_convergence=.true.
+monitor_convergence=.false.
preconditioner='diagonal'
-tolerance=1.0e-18
+tolerance=1.0e-6
[namelist:specified_surface]
!!function_amplitude_e=200
@@ -1229,10 +1250,10 @@ tolerance=1.0e-18
!!time_units_sst='seconds'
[!!namelist:spectral_gwd]
-add_cgw=.false.
-!!cgw_scale_factor=1.0
+add_cgw=.true.
+!!cgw_scale_factor=0.86
ussp_heating=.true.
-ussp_launch_factor=1.3
+ussp_launch_factor=1.2
wavelstar=4300.0
[!!namelist:star]
@@ -1285,9 +1306,9 @@ ens_memb=${ENSEMBLE_MEMBER}
!!rp_lsfc_orog_drag_param=0.15,0.15,0.15
!!rp_lsfc_z0_soil=1.0e-3,1.0e-3,1.0e-3
!!rp_lsfc_z0_urban_mult=1.0,1.0,1.0
-!!rp_lsfc_z0hm_pft=1.65000,1.65000,1.00000e-2,1.00000e-2,1.00000e-1
-!!rp_lsfc_z0hm_pft_max=1.65000,1.65000,1.00000e-2,1.00000e-2,1.00000e-1
-!!rp_lsfc_z0hm_pft_min=1.65000,1.65000,1.00000e-2,1.00000e-2,1.00000e-1
+!!rp_lsfc_z0hm_pft=1.00,1.00,0.022,0.022,0.025
+!!rp_lsfc_z0hm_pft_max=1.00,1.00,0.022,0.022,0.025
+!!rp_lsfc_z0hm_pft_min=1.00,1.00,0.022,0.022,0.025
!!rp_lsfc_z0hm_soil=2.0e-1,2.0e-1,2.0e-1
!!rp_lsfc_z0v=
!!rp_lsfc_z0v_max=
@@ -1332,7 +1353,7 @@ ens_memb=${ENSEMBLE_MEMBER}
!!spt_use_convection=.true.
!!spt_use_microphysics=.true.
!!spt_use_radiation=.true.
-stph_n_max=22
+stph_n_max=60
stph_n_min=20
use_random_parameters=.false.
use_skeb=.false.
@@ -1363,8 +1384,8 @@ timescale=1.0
[namelist:time]
calendar='timestep'
-calendar_origin='2018-04-14 21:00:00'
-calendar_start='2018-04-14 21:00:00'
+calendar_origin='2021-06-02 00:00:00'
+calendar_start='2021-06-02 00:00:00'
calendar_type='gregorian'
timestep_end='$RESTART_STOP'
timestep_start='$RESTART_START'
@@ -1372,7 +1393,7 @@ timestep_start='$RESTART_START'
[namelist:timestepping]
alpha=0.55
dt=$DT
-inner_iterations=2
+inner_iterations=1
method='semi_implicit'
outer_iterations=2
runge_kutta_method='forward_euler'
@@ -1387,6 +1408,7 @@ adjust_theta=.false.
!!adjust_theta_above=30000.0
adjust_tracer_equation=.false.
adjust_vhv_wind=.false.
+ageofair_reset_level=10
broken_w2_projection=.false.
calculate_detj='upwind'
cap_density_predictor=0.5
@@ -1403,14 +1425,15 @@ ffsl_inner_order=0
ffsl_outer_order=1
ffsl_splitting=5*1
ffsl_unity_3d=.false.
-ffsl_vertical_order=5*2
-field_names='density','potential_temperature','wind','moisture','cloud'
+ffsl_vertical_order=2,2,1,2,2
+field_names='density','potential_temperature','wind','moisture',
+ ='con_tracer'
fv_horizontal_order=2
fv_vertical_order=2
horizontal_method=5*1
horizontal_monotone=5*1
-log_space=5*.false.
-max_vert_cfl_calc='uniform'
+log_space=.true.,.true.,.false.,.false.,.false.
+max_vert_cfl_calc='dep_point'
min_val_abs_tol=-1.0e-12
min_val_max_iterations=10
min_val_method='iterative'
@@ -1420,7 +1443,7 @@ operators='fv'
panel_edge_high_order=.true.
panel_edge_treatment='none'
profile_size=5
-reversible=5*.false.
+reversible=.true.,.true.,.false.,.true.,.true.
runge_kutta_method='ssp3'
scheme=5*1
si_outer_transport='none'
@@ -1430,10 +1453,11 @@ splitting=5*1
substep_transport='off'
theta_dispersion_correction=.false.
theta_variable='dry'
+transport_ageofair=.false.
use_density_predictor=.false.
vertical_method=5*1
vertical_monotone=5*1
-vertical_monotone_order=5*1
+vertical_monotone_order=5*3
vertical_sl_order='cubic'
wind_mono_top=.false.
!!wind_mono_top_depth=5
diff --git a/rose-stem/app/jedi_lfric_tests/file/iodef.xml b/rose-stem/app/jedi_lfric_tests/file/iodef.xml
index be8ae024..d9d6303a 100644
--- a/rose-stem/app/jedi_lfric_tests/file/iodef.xml
+++ b/rose-stem/app/jedi_lfric_tests/file/iodef.xml
@@ -302,7 +302,7 @@
-
+
diff --git a/rose-stem/app/jedi_lfric_tests/opt/rose-app-C12_MG.conf b/rose-stem/app/jedi_lfric_tests/opt/rose-app-C12_MG.conf
new file mode 100644
index 00000000..125a4758
--- /dev/null
+++ b/rose-stem/app/jedi_lfric_tests/opt/rose-app-C12_MG.conf
@@ -0,0 +1,8 @@
+[file:mesh_C12_MG.nc]
+mode=auto
+source=$MESH_DIR/mesh_C12_MG.nc
+
+[namelist:base_mesh]
+!!f_lat_deg=
+file_prefix='mesh_C12_MG'
+!!fplane=
diff --git a/rose-stem/app/jedi_lfric_tests/opt/rose-app-nwp_gal9.conf b/rose-stem/app/jedi_lfric_tests/opt/rose-app-nwp_gal9.conf
deleted file mode 100644
index 90d207a8..00000000
--- a/rose-stem/app/jedi_lfric_tests/opt/rose-app-nwp_gal9.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[file:iodef_temp.xml]
-mode=auto
-source=$ROSE_SUITE_DIR/app/jedi_lfric_tests/file/iodef.xml
diff --git a/rose-stem/app/jedi_lfric_tests/opt/rose-app-nwp_gal9_c12.conf b/rose-stem/app/jedi_lfric_tests/opt/rose-app-nwp_gal9_c12.conf
new file mode 100644
index 00000000..feabdeff
--- /dev/null
+++ b/rose-stem/app/jedi_lfric_tests/opt/rose-app-nwp_gal9_c12.conf
@@ -0,0 +1,20 @@
+[file:iodef_temp.xml]
+mode=auto
+source=$ROSE_SUITE_DIR/app/jedi_lfric_tests/file/iodef.xml
+
+[namelist:files]
+ls_directory='$BIG_DATA_DIR/tangent-linear/Ticket354'
+ls_filename='final_ls'
+start_dump_directory='$BIG_DATA_DIR/tangent-linear/Ticket354'
+start_dump_filename='final_pert'
+
+[namelist:io]
+diagnostic_frequency=8
+
+[namelist:multigrid]
+chain_mesh_tags='dynamics','multigrid_l1','multigrid_l2'
+multigrid_chain_nitems=3
+
+[namelist:time]
+calendar_origin='2016-01-01 15:00:00'
+calendar_start='2016-01-01 15:00:00'
diff --git a/rose-stem/app/jedi_lfric_tests/opt/rose-app-runge-kutta.conf b/rose-stem/app/jedi_lfric_tests/opt/rose-app-runge-kutta.conf
index 6c3a2714..b90cd33b 100644
--- a/rose-stem/app/jedi_lfric_tests/opt/rose-app-runge-kutta.conf
+++ b/rose-stem/app/jedi_lfric_tests/opt/rose-app-runge-kutta.conf
@@ -20,7 +20,6 @@ start_dump_directory=''
start_dump_filename=''
[namelist:finite_element]
-coord_system='xyz'
vorticity_in_w1=.true.
[namelist:formulation]
@@ -28,12 +27,28 @@ dlayer_on=.false.
dry_static_adjust=.false.
eos_method='projected'
exner_from_eos=.true.
+l_multigrid=.false.
moisture_formulation='dry'
!!theta_moist_source=.false.
[namelist:helmholtz_solver]
-gcrk=18
-si_pressure_tolerance=1.0e-6
+preconditioner='tridiagonal'
+
+[namelist:idealised]
+test='gravity_wave'
+
+[namelist:initial_density]
+r1=0.0
+r2=0.0
+x1=0.0
+x2=0.0
+
+[namelist:initial_temperature]
+pert_centre=-60.0
+
+[namelist:initial_wind]
+smp_init_wind=.false.
+u0=0.0
[namelist:initialization]
init_option='analytic'
@@ -45,6 +60,7 @@ diagnostic_frequency=20
[namelist:linear]
fixed_ls=.false.
+l_stabilise_bl=.false.
pert_option='analytic'
[namelist:mixed_solver]
@@ -52,9 +68,15 @@ gcrk=6
mixed_solver_a_tol=1.0e-6
si_tolerance=1.0e-3
+[!!namelist:multigrid]
+chain_mesh_tags='','','',''
+
[namelist:orography]
orog_init_option='none'
+[namelist:partitioning]
+generate_inner_halos=.true.
+
[namelist:planet]
scaling_factor=125.0
@@ -74,9 +96,6 @@ method='rk'
cfl_mol_1d_stab=2.0
cfl_mol_2d_stab=2.0
cfl_mol_3d_stab=2.0
-log_space=5*.false.
max_vert_cfl_calc='uniform'
-reversible=.false.
runge_kutta_method='ssp4'
-slice_order='cubic'
!!wind_mono_top_depth=0
diff --git a/rose-stem/app/jedi_lfric_tests/rose-app.conf b/rose-stem/app/jedi_lfric_tests/rose-app.conf
index 3638e4a5..54b8acfc 100644
--- a/rose-stem/app/jedi_lfric_tests/rose-app.conf
+++ b/rose-stem/app/jedi_lfric_tests/rose-app.conf
@@ -20,17 +20,22 @@ source=namelist:jedi_lfric_tests
= namelist:jedi_geometry
= namelist:jedi_state
= namelist:jedi_increment
- = namelist:jedi_pseudo_model
= namelist:jedi_linear_model
- = namelist:jedi_model
+ = namelist:jedi_pseudo_model
= namelist:jedi_lfric_settings
+ = (namelist:aerosol)
= namelist:base_mesh
+ = (namelist:blayer)
= namelist:boundaries
= namelist:checks
= namelist:section_choice
+ = (namelist:cloud)
+ = (namelist:chemistry)
+ = (namelist:convection)
+ = (namelist:cosp)
= (namelist:damping_layer)
= (namelist:departure_points)
- = namelist:energy_correction
+ = (namelist:energy_correction)
= (namelist:external_forcing)
= namelist:extrusion
= (namelist:files)
@@ -41,6 +46,7 @@ source=namelist:jedi_lfric_tests
= (namelist:iau_addinf_io(:))
= (namelist:iau_ainc_io(:))
= (namelist:iau_bcorr_io(:))
+ = (namelist:iau)
= (namelist:idealised)
= (namelist:ideal_surface)
= namelist:initialization
@@ -64,26 +70,31 @@ source=namelist:jedi_lfric_tests
= (namelist:jules_vegetation)
= namelist:linear
= namelist:logging
+ = (namelist:microphysics)
= namelist:mixed_solver
- = (namelist:mixing)
+ = namelist:mixing
= (namelist:multigrid)
= (namelist:multires_coupling)
= namelist:esm_couple
+ = (namelist:orbit)
= namelist:orography
= (namelist:orography_agnesi_cartesian)
= (namelist:orography_agnesi_spherical)
- = (namelist:orography_bell_cartesian)
- = (namelist:orography_bell_spherical)
= (namelist:orography_dcmip200_spherical)
= (namelist:orography_schar_cartesian)
= (namelist:orography_schar_spherical)
= namelist:partitioning
= (namelist:physics)
= namelist:planet
+ = (namelist:radiation)
= namelist:radiative_gases
+ = (namelist:spectral_gwd)
+ = (namelist:orographic_drag)
= namelist:solver
= (namelist:specified_surface)
+ = (namelist:star)
= (namelist:stochastic_physics)
+ = (namelist:surface)
= (namelist:temp_tend_data)
= (namelist:theta_relax)
= namelist:time
@@ -106,17 +117,17 @@ easyaerosol_cdnc=.false.
easyaerosol_lw=.false.
easyaerosol_sw=.false.
!!emissions='GC5'
-glomap_mode='off'
+glomap_mode='dust_and_clim'
!!horiz_d=2.25
-!!l_radaer=.false.
+!!l_radaer=.true.
murk=.false.
!!murk_lbc=.false.
!!murk_prognostic=.false.
!!murk_source_scaling=1.0
!!murk_visibility=.false.
!!n_radaer_step=1
-!!prec_file=''
-sulphuric_strat_climatology=.false.
+!!prec_file='precalc/RADAER_pcalc.ukca'
+sulphuric_strat_climatology=.true.
!!sulphuric_strat_column=1.86604e-6
ukca_mode_seg_size=4
!!us_am=1.45
@@ -186,7 +197,7 @@ limited_area=.false.
!!rim_width_ns=1
!!solver_boundary_depth=1
!!transport_boundary_depth=6
-transport_overwrite_freq='split_step'
+transport_overwrite_freq='final'
[namelist:checks]
limit_cfl=.false.
@@ -206,14 +217,14 @@ chem_scheme='none'
!!fjx_spec_file='FJX_spec_Nov11.dat'
!!flexchem_opt='bs1999'
i_chem_timestep_halvings=0
-!!i_ukca_chem_version=0
+!!i_ukca_chem_version=111
!!l_ukca_asad_full=.false.
-!!l_ukca_linox_scaling=.false.
-!!l_ukca_quasinewton=.false.
+!!l_ukca_linox_scaling=
+!!l_ukca_quasinewton=
!!l_ukca_ro2_ntp=.false.
-!!lightnox_scale_fac=0
+!!lightnox_scale_fac=
!!photol_scheme='off'
-!!top_bdy_opt='no_overwrt'
+!!top_bdy_opt=''
[!!namelist:cloud]
!!cff_spread_rate=1.0e-5
@@ -274,7 +285,7 @@ l_cosp=.false.
[namelist:damping_layer]
dl_base=40000.0
dl_str=0.05
-dl_type='latitude'
+dl_type='standard'
[namelist:departure_points]
horizontal_limit='cap'
@@ -319,7 +330,7 @@ stretching_method='smooth'
!!aerosols_ancil_path=''
!!albedo_nir_ancil_path=''
!!albedo_vis_ancil_path=''
-ancil_directory='$BIG_DATA_DIR/ancils/basic-gal/Quagga/${ancil_resolution}/n96e_l70'
+ancil_directory='$BIG_DATA_DIR/ancils/basic-gal/yak/${RESOLUTION}'
checkpoint_stem_name='$CYLC_SUITE_SHARE_DIR/data/restartGungho_$ROSE_TASK_NAME'
!!cloud_drop_no_conc_ancil_path=''
!!coarse_ancil_directory=''
@@ -374,13 +385,13 @@ diag_stem_name='diagGungho'
!!land_area_ancil_path=''
!!lbc_directory=''
!!lbc_filename=''
-ls_directory='$BIG_DATA_DIR/tangent-linear/Ticket354'
-ls_filename='final_ls'
+ls_directory='$BIG_DATA_DIR/tangent-linear/Ticket735'
+ls_filename='final_2021060200-2021060207'
!!no3_ancil_path=''
!!o3_ancil_path=''
!!oh_ancil_path=''
-orography_mean_ancil_path='orography/gmted_ramp2/qrparm.orog.ugrid'
-!!orography_subgrid_ancil_path='orography/gmted_ramp2/qrparm.orog.ugrid'
+orography_mean_ancil_path='orography/gmted_ramp2/qrparm.orog'
+!!orography_subgrid_ancil_path=''
!!ozone_ancil_path=''
!!plant_func_ancil_path=''
!!sea_ancil_path=''
@@ -390,8 +401,8 @@ orography_mean_ancil_path='orography/gmted_ramp2/qrparm.orog.ugrid'
!!soil_dust_ancil_path=''
!!soil_rough_ancil_path=''
!!sst_ancil_path=''
-start_dump_directory='$BIG_DATA_DIR/tangent-linear/Ticket354'
-start_dump_filename='final_pert'
+start_dump_directory='$BIG_DATA_DIR/tangent-linear/Ticket735'
+start_dump_filename='final_2021060200-2021060207.pert'
!!surface_frac_ancil_path=''
!!urban_ancil_path=''
@@ -412,7 +423,7 @@ exner_from_eos=.false.
horizontal_physics_predictor=.false.
horizontal_transport_predictor=.false.
init_exner_bt=.true.
-l_multigrid=.false.
+l_multigrid=.true.
lagged_orog=.true.
moisture_formulation='traditional'
moisture_in_solver=.true.
@@ -442,7 +453,7 @@ gcrk=8
method='prec_only'
monitor_convergence=.false.
normalise=.true.
-preconditioner='tridiagonal'
+preconditioner='multigrid'
si_pressure_a_tol=1.0e-8
si_pressure_maximum_iterations=400
si_pressure_tolerance=1.0e-4
@@ -455,7 +466,7 @@ si_pressure_tolerance=1.0e-4
!!iau_tendency_ainc=.false.
!!iau_tendency_bcorr=.true.
!!iau_tendency_pertinc=.false.
-!!iau_ts_start=0
+!!iau_ts_start=1
!!iau_use_addinf=.false.
!!iau_use_bcorr=.false.
!!iau_use_level_one_temp=.false.
@@ -502,15 +513,15 @@ f_lon_deg=0.0
perturb_init=.false.
!!perturb_magnitude=0
!!perturb_seed=0
-test='gravity_wave'
+test='none'
[namelist:initial_density]
density_background=0.1
density_max=2.0
-r1=0.0
-r2=0.0
-x1=0.0
-x2=0.0
+r1=0.4
+r2=0.4
+x1=0.4
+x2=-0.4
y1=0.0
y2=0.0
z1=0.0
@@ -522,22 +533,22 @@ surface_pressure=1000.0e2
[namelist:initial_temperature]
bvf_square=0.0001
-pert_centre=120.0
+pert_centre=60.0
pert_width_scaling=1.0
perturb='none'
-!!profile_data=300.0
-!!profile_heights=0.0
-!!profile_size=1
+!!profile_data=300.0,300.0
+!!profile_heights=0.0,10.0e3
+!!profile_size=2
theta_surf=300.0
[namelist:initial_vapour]
-!!profile_data=0.0
-!!profile_heights=0.0
-!!profile_size=1
+!!profile_data=0.0,0.0
+!!profile_heights=0.0,10.0e3
+!!profile_size=2
[namelist:initial_wind]
nl_constant=0.0
-profile='none'
+profile='constant_uv'
!!profile_data_u=0.0
!!profile_data_v=0.0
!!profile_data_w=0.0
@@ -547,8 +558,8 @@ profile='none'
!!profile_size_w=1
sbr_angle_lat=0.0
sbr_angle_lon=0.0
-smp_init_wind=.false.
-u0=0.0
+smp_init_wind=.true.
+u0=2.0
v0=0.0
wind_time_period=0.0
@@ -576,7 +587,7 @@ checkpoint_write=.false.
counter_output_suffix='counter.txt'
diag_active_files='lfric_diag'
diag_always_on_sampling=.false.
-diagnostic_frequency=8
+diagnostic_frequency=12
!!end_of_run_checkpoint=.true.
file_convention='UGRID'
multifile_io=.false.
@@ -592,15 +603,15 @@ write_fluxes=.false.
write_minmax_tseries=.false.
[namelist:jedi_geometry]
-io_calender_start='2018-04-14T21:00:00'
-io_path_inc_read=''
+io_calender_start='2021-06-02T00:00:00'
+io_path_inc_read='$BIG_DATA_DIR/jedi-lfric/Ticket354/pert_fields/lfric_diag'
io_path_state_read='$BIG_DATA_DIR/jedi-lfric/Ticket354/ls_fields/jedi_trajectory'
io_path_state_write='write_file'
io_setup_increment=.false.
io_time_step='P0DT1H0M0S'
[namelist:jedi_increment]
-inc_time='2018-04-14 21:00:00'
+inc_time='2021-06-02 00:00:00'
initialise_via_read=.false.
variables='theta','rho','exner','u_in_w3','v_in_w3','w_in_wth','m_v',
='m_cl','m_r','m_s'
@@ -613,19 +624,19 @@ forecast_length='P0DT6H0M0S'
test_field='theta'
[namelist:jedi_linear_model]
-incremental_wind_interpolation=.true.
+incremental_wind_interpolation=.false.
nl_time_step='P0DT1H0M0S'
[namelist:jedi_model]
time_step='P0DT1H0M0S'
[namelist:jedi_pseudo_model]
-initial_time='2018-04-14T21:00:00'
+initial_time='2021-06-02 00:00:00'
number_of_steps=9
time_step='P0DT1H0M0S'
[namelist:jedi_state]
-state_time='2018-04-14 21:00:00'
+state_time='2021-06-02 00:00:00'
use_pseudo_model=.true.
variables='theta','rho','u10m','exner','u_in_w3','v_in_w3','w_in_wth',
='m_v','m_cl','m_r','m_s'
@@ -662,7 +673,7 @@ kext_io=0.5,0.5,1.0,1.0,0.5
knl_io=5*0.2
omega_io=0.101,0.083,0.132,0.135,0.115
omnir_io=0.788,0.545,0.864,0.787,0.785
-z0hm_pft_io=1.65,1.65,0.1,0.1,0.1
+z0hm_pft_io=1.0,1.0,0.01,0.01,0.01
!!z0v_io=1.1,1.1,0.22,0.22,1.0
[!!namelist:jules_radiation]
@@ -701,8 +712,8 @@ l_use_dtstar_sea=.false.
nice=1
!!u_cdn_hw=55.0
!!u_cdn_max=33.0
-!!z0h_specified=0.01
-!!z0m_specified=0.1
+!!z0h_specified=0.0
+!!z0m_specified=0.0
[!!namelist:jules_snow]
can_clump=8.0,4.0,1.0,1.0,1.0
@@ -779,8 +790,10 @@ l_spec_veg_z0=.true.
[namelist:linear]
fixed_ls=.true.
-l_stabilise_bl=.false.
+l_stabilise_bl=.true.
ls_read_w2h=.false.
+max_bl_stabilisation=0.75
+n_bl_levels_to_stabilise=15
pert_option='file'
[namelist:logging]
@@ -809,9 +822,9 @@ microphysics_casim=.false.
!!orog_block=.true.
!!orog_rain=.true.
!!orog_rime=.true.
-!!prog_tnuc=.false.
+!!prog_tnuc=.true.
!!qcl_rime=1.0e-4
-!!shape_rime=.false.
+!!shape_rime=.true.
turb_gen_mixph=.true.
!!z_surf=50.0
@@ -824,7 +837,7 @@ guess_np1=.false.
mixed_solver_a_tol=1.0e-3
monitor_convergence=.true.
normalise=.true.
-reference_reset_time=3600.
+reference_reset_time=3600.0
si_maximum_iterations=10
si_method='block_gcr'
si_preconditioner='pressure'
@@ -834,15 +847,15 @@ split_w=.true.
[namelist:mixing]
!!leonard_kl=2.0
leonard_term=.false.
-!!method='blending'
+!!method='blend_1dbl_fa'
!!mix_factor=0.2
!!smag_l_calc='UseDx'
smagorinsky=.false.
viscosity=.false.
viscosity_mu=0.0
-[!!namelist:multigrid]
-chain_mesh_tags='','','',''
+[namelist:multigrid]
+chain_mesh_tags='dynamics','multigrid_l1','multigrid_l2','multigrid_l3'
multigrid_chain_nitems=4
n_coarsesmooth=4
n_postsmooth=2
@@ -850,9 +863,17 @@ n_presmooth=2
smooth_relaxation=0.8
[!!namelist:multires_coupling]
-aerosol_mesh_name='dynamics'
+aerosol_mesh_name='aerosol'
coarse_aerosol_transport=.false.
coarse_rad_aerosol=.false.
+dynamics_mesh_name='dynamics'
+!!lowest_order_aero_flag=.false.
+multires_coupling_mesh_tags='dynamics'
+multires_coupling_mode='test'
+negative_correction='none'
+physics_mesh_name='aerosol'
+reconstruction='simple'
+recovery_order='linear'
[!!namelist:orbit]
!!arg_periapsis=1.796767421
@@ -947,7 +968,7 @@ phi_centre_dec=0.0
wavelength=4000.0
[namelist:partitioning]
-generate_inner_halos=.true.
+generate_inner_halos=.false.
panel_decomposition='auto'
!!panel_xproc=1
!!panel_yproc=1
@@ -1013,12 +1034,12 @@ mcica_data_file='spec/mcica_data'
n_radstep=2
!!planet_albedo=0.06
!!planet_emissivity=0.985
-scatter_method_lw='full'
-!!scatter_method_lwinc='full'
+scatter_method_lw='hybrid'
+!!scatter_method_lwinc='approx'
spectral_file_lw='spec/sp_lw_ga9'
-!!spectral_file_lwinc='spec/sp_lw_cloud7'
+!!spectral_file_lwinc='spec/sp_lw_cloud9'
spectral_file_sw='spec/sp_sw_ga9'
-!!spectral_file_swinc='spec/sp_sw_cloud7'
+!!spectral_file_swinc='spec/sp_sw_cloud9'
topography='slope'
[namelist:radiative_gases]
@@ -1032,26 +1053,26 @@ cfc113_rad_opt='off'
!!cfc11_clim_fcg_nyears=0
!!cfc11_clim_fcg_rates=0
!!cfc11_clim_fcg_years=0
-!!cfc11_mix_ratio=1.110e-09
-cfc11_rad_opt='off'
+cfc11_mix_ratio=1.110e-09
+cfc11_rad_opt='constant'
!!cfc12_clim_fcg_levls=0
!!cfc12_clim_fcg_nyears=0
!!cfc12_clim_fcg_rates=0
!!cfc12_clim_fcg_years=0
-!!cfc12_mix_ratio=2.187e-09
-cfc12_rad_opt='off'
+cfc12_mix_ratio=2.187e-09
+cfc12_rad_opt='constant'
!!ch4_clim_fcg_levls=0
!!ch4_clim_fcg_nyears=0
!!ch4_clim_fcg_rates=0
!!ch4_clim_fcg_years=0
-!!ch4_mix_ratio=1.006e-06
-ch4_rad_opt='off'
+ch4_mix_ratio=1.006e-06
+ch4_rad_opt='constant'
!!co2_clim_fcg_levls=0
!!co2_clim_fcg_nyears=0
!!co2_clim_fcg_rates=0
!!co2_clim_fcg_years=0
-!!co2_mix_ratio=6.002e-04
-co2_rad_opt='off'
+co2_mix_ratio=6.002e-04
+co2_rad_opt='constant'
!!co_clim_fcg_levls=0
!!co_clim_fcg_nyears=0
!!co_clim_fcg_rates=0
@@ -1123,8 +1144,8 @@ n2_rad_opt='off'
!!n2o_clim_fcg_nyears=0
!!n2o_clim_fcg_rates=0
!!n2o_clim_fcg_years=0
-!!n2o_mix_ratio=4.945e-07
-n2o_rad_opt='off'
+n2o_mix_ratio=4.945e-07
+n2o_rad_opt='constant'
!!na_clim_fcg_levls=0
!!na_clim_fcg_nyears=0
!!na_clim_fcg_rates=0
@@ -1141,8 +1162,8 @@ nh3_rad_opt='off'
!!o2_clim_fcg_nyears=0
!!o2_clim_fcg_rates=0
!!o2_clim_fcg_years=0
-!!o2_mix_ratio=0.2314
-o2_rad_opt='off'
+o2_mix_ratio=0.2314
+o2_rad_opt='constant'
!!o3_clim_fcg_levls=0
!!o3_clim_fcg_nyears=0
!!o3_clim_fcg_rates=0
@@ -1151,7 +1172,7 @@ o2_rad_opt='off'
!!o3_profile_data=0
!!o3_profile_heights=0.0
!!o3_profile_size=0
-o3_rad_opt='off'
+o3_rad_opt='ancil'
!!rb_clim_fcg_levls=0
!!rb_clim_fcg_nyears=0
!!rb_clim_fcg_rates=0
@@ -1232,10 +1253,10 @@ tolerance=1.0e-6
!!time_units_sst='seconds'
[!!namelist:spectral_gwd]
-add_cgw=.false.
-!!cgw_scale_factor=1.0
+add_cgw=.true.
+!!cgw_scale_factor=0.86
ussp_heating=.true.
-ussp_launch_factor=1.3
+ussp_launch_factor=1.2
wavelstar=4300.0
[!!namelist:star]
@@ -1288,9 +1309,9 @@ ens_memb=${ENSEMBLE_MEMBER}
!!rp_lsfc_orog_drag_param=0.15,0.15,0.15
!!rp_lsfc_z0_soil=1.0e-3,1.0e-3,1.0e-3
!!rp_lsfc_z0_urban_mult=1.0,1.0,1.0
-!!rp_lsfc_z0hm_pft=1.65000,1.65000,1.00000e-2,1.00000e-2,1.00000e-1
-!!rp_lsfc_z0hm_pft_max=1.65000,1.65000,1.00000e-2,1.00000e-2,1.00000e-1
-!!rp_lsfc_z0hm_pft_min=1.65000,1.65000,1.00000e-2,1.00000e-2,1.00000e-1
+!!rp_lsfc_z0hm_pft=1.00,1.00,0.022,0.022,0.025
+!!rp_lsfc_z0hm_pft_max=1.00,1.00,0.022,0.022,0.025
+!!rp_lsfc_z0hm_pft_min=1.00,1.00,0.022,0.022,0.025
!!rp_lsfc_z0hm_soil=2.0e-1,2.0e-1,2.0e-1
!!rp_lsfc_z0v=
!!rp_lsfc_z0v_max=
@@ -1335,7 +1356,7 @@ ens_memb=${ENSEMBLE_MEMBER}
!!spt_use_convection=.true.
!!spt_use_microphysics=.true.
!!spt_use_radiation=.true.
-stph_n_max=22
+stph_n_max=60
stph_n_min=20
use_random_parameters=.false.
use_skeb=.false.
@@ -1366,8 +1387,8 @@ timescale=1.0
[namelist:time]
calendar='timestep'
-calendar_origin='2016-01-01 15:00:00'
-calendar_start='2016-01-01 15:00:00'
+calendar_origin='2021-06-02 00:00:00'
+calendar_start='2021-06-02 00:00:00'
calendar_type='gregorian'
timestep_end='$RESTART_STOP'
timestep_start='$RESTART_START'
@@ -1375,7 +1396,7 @@ timestep_start='$RESTART_START'
[namelist:timestepping]
alpha=0.55
dt=$DT
-inner_iterations=2
+inner_iterations=1
method='semi_implicit'
outer_iterations=2
runge_kutta_method='forward_euler'
diff --git a/rose-stem/app/jedi_tlm_forecast_tl/opt/rose-app-C12_MG.conf b/rose-stem/app/jedi_tlm_forecast_tl/opt/rose-app-C12_MG.conf
new file mode 100644
index 00000000..125a4758
--- /dev/null
+++ b/rose-stem/app/jedi_tlm_forecast_tl/opt/rose-app-C12_MG.conf
@@ -0,0 +1,8 @@
+[file:mesh_C12_MG.nc]
+mode=auto
+source=$MESH_DIR/mesh_C12_MG.nc
+
+[namelist:base_mesh]
+!!f_lat_deg=
+file_prefix='mesh_C12_MG'
+!!fplane=
diff --git a/rose-stem/app/jedi_tlm_forecast_tl/opt/rose-app-default.conf b/rose-stem/app/jedi_tlm_forecast_tl/opt/rose-app-default.conf
deleted file mode 100644
index e69de29b..00000000
diff --git a/rose-stem/app/jedi_tlm_forecast_tl/opt/rose-app-nwp_gal9_c12.conf b/rose-stem/app/jedi_tlm_forecast_tl/opt/rose-app-nwp_gal9_c12.conf
new file mode 100644
index 00000000..a83200b7
--- /dev/null
+++ b/rose-stem/app/jedi_tlm_forecast_tl/opt/rose-app-nwp_gal9_c12.conf
@@ -0,0 +1,28 @@
+[file:iodef_temp.xml]
+mode=auto
+source=$ROSE_SUITE_DIR/app/jedi_tlm_forecast_tl/file/iodef.xml
+
+[namelist:io]
+diagnostic_frequency=8
+
+[namelist:jedi_geometry]
+io_calender_start='2018-04-14T21:00:00'
+io_path_inc_read='$BIG_DATA_DIR/jedi-lfric/Ticket354/pert_fields/lfric_diag'
+io_path_state_read='$BIG_DATA_DIR/jedi-lfric/Ticket354/ls_fields/jedi_trajectory'
+
+[namelist:jedi_increment]
+inc_time='2018-04-14 21:00:00'
+
+[namelist:jedi_pseudo_model]
+initial_time='2018-04-14T21:00:00'
+
+[namelist:jedi_state]
+state_time='2018-04-14 21:00:00'
+
+[namelist:multigrid]
+chain_mesh_tags='dynamics','multigrid_l1','multigrid_l2'
+multigrid_chain_nitems=3
+
+[namelist:time]
+calendar_origin='2018-04-14 21:00:00'
+calendar_start='2018-04-14 21:00:00'
diff --git a/rose-stem/app/jedi_tlm_forecast_tl/opt/rose-app-rrt_equals_dt.conf b/rose-stem/app/jedi_tlm_forecast_tl/opt/rose-app-rrt_equals_dt.conf
new file mode 100644
index 00000000..3d974564
--- /dev/null
+++ b/rose-stem/app/jedi_tlm_forecast_tl/opt/rose-app-rrt_equals_dt.conf
@@ -0,0 +1,2 @@
+[namelist:mixed_solver]
+reference_reset_time=$DT
diff --git a/rose-stem/app/jedi_tlm_forecast_tl/opt/rose-app-semi_strict_solver.conf b/rose-stem/app/jedi_tlm_forecast_tl/opt/rose-app-semi_strict_solver.conf
new file mode 100644
index 00000000..d9c5499f
--- /dev/null
+++ b/rose-stem/app/jedi_tlm_forecast_tl/opt/rose-app-semi_strict_solver.conf
@@ -0,0 +1,9 @@
+[namelist:jedi_lfric_settings]
+adjoint_test_tolerance=1.0e-3
+
+[namelist:mixed_solver]
+mixed_solver_a_tol=1.0e-21
+si_tolerance=1.0e-3
+
+[namelist:timestepping]
+outer_iterations=1
diff --git a/rose-stem/app/jedi_tlm_forecast_tl/rose-app.conf b/rose-stem/app/jedi_tlm_forecast_tl/rose-app.conf
index b74d09f2..906e9c25 100644
--- a/rose-stem/app/jedi_tlm_forecast_tl/rose-app.conf
+++ b/rose-stem/app/jedi_tlm_forecast_tl/rose-app.conf
@@ -23,13 +23,19 @@ source=namelist:jedi_lfric_tests
= namelist:jedi_linear_model
= namelist:jedi_pseudo_model
= namelist:jedi_lfric_settings
+ = (namelist:aerosol)
= namelist:base_mesh
+ = (namelist:blayer)
= namelist:boundaries
= namelist:checks
= namelist:section_choice
+ = (namelist:cloud)
+ = (namelist:chemistry)
+ = (namelist:convection)
+ = (namelist:cosp)
= (namelist:damping_layer)
= (namelist:departure_points)
- = namelist:energy_correction
+ = (namelist:energy_correction)
= (namelist:external_forcing)
= namelist:extrusion
= (namelist:files)
@@ -40,6 +46,7 @@ source=namelist:jedi_lfric_tests
= (namelist:iau_addinf_io(:))
= (namelist:iau_ainc_io(:))
= (namelist:iau_bcorr_io(:))
+ = (namelist:iau)
= (namelist:idealised)
= (namelist:ideal_surface)
= namelist:initialization
@@ -63,25 +70,31 @@ source=namelist:jedi_lfric_tests
= (namelist:jules_vegetation)
= namelist:linear
= namelist:logging
+ = (namelist:microphysics)
= namelist:mixed_solver
- = (namelist:mixing)
+ = namelist:mixing
= (namelist:multigrid)
= (namelist:multires_coupling)
= namelist:esm_couple
+ = (namelist:orbit)
= namelist:orography
= (namelist:orography_agnesi_cartesian)
= (namelist:orography_agnesi_spherical)
- = (namelist:orography_bell_cartesian)
- = (namelist:orography_bell_spherical)
= (namelist:orography_dcmip200_spherical)
= (namelist:orography_schar_cartesian)
= (namelist:orography_schar_spherical)
= namelist:partitioning
= (namelist:physics)
= namelist:planet
+ = (namelist:radiation)
= namelist:radiative_gases
+ = (namelist:spectral_gwd)
+ = (namelist:orographic_drag)
= namelist:solver
= (namelist:specified_surface)
+ = (namelist:star)
+ = (namelist:stochastic_physics)
+ = (namelist:surface)
= (namelist:temp_tend_data)
= (namelist:theta_relax)
= namelist:time
@@ -104,24 +117,24 @@ easyaerosol_cdnc=.false.
easyaerosol_lw=.false.
easyaerosol_sw=.false.
!!emissions='GC5'
-glomap_mode='off'
+glomap_mode='dust_and_clim'
!!horiz_d=2.25
-!!l_radaer=.false.
+!!l_radaer=.true.
murk=.false.
!!murk_lbc=.false.
!!murk_prognostic=.false.
!!murk_source_scaling=1.0
!!murk_visibility=.false.
!!n_radaer_step=1
-!!prec_file=''
-sulphuric_strat_climatology=.false.
+!!prec_file='precalc/RADAER_pcalc.ukca'
+sulphuric_strat_climatology=.true.
!!sulphuric_strat_column=1.86604e-6
ukca_mode_seg_size=4
!!us_am=1.45
[namelist:base_mesh]
!!f_lat_deg=45.0
-file_prefix='mesh.nc'
+file_prefix='mesh'
!!fplane=.false.
geometry='spherical'
prepartitioned=.false.
@@ -184,7 +197,7 @@ limited_area=.false.
!!rim_width_ns=1
!!solver_boundary_depth=1
!!transport_boundary_depth=6
-transport_overwrite_freq='split_step'
+transport_overwrite_freq='final'
[namelist:checks]
limit_cfl=.false.
@@ -204,14 +217,14 @@ chem_scheme='none'
!!fjx_spec_file='FJX_spec_Nov11.dat'
!!flexchem_opt='bs1999'
i_chem_timestep_halvings=0
-!!i_ukca_chem_version=0
+!!i_ukca_chem_version=111
!!l_ukca_asad_full=.false.
-!!l_ukca_linox_scaling=.false.
-!!l_ukca_quasinewton=.false.
+!!l_ukca_linox_scaling=
+!!l_ukca_quasinewton=
!!l_ukca_ro2_ntp=.false.
-!!lightnox_scale_fac=0
+!!lightnox_scale_fac=
!!photol_scheme='off'
-!!top_bdy_opt='no_overwrt'
+!!top_bdy_opt=''
[!!namelist:cloud]
!!cff_spread_rate=1.0e-5
@@ -317,7 +330,7 @@ stretching_method='smooth'
!!aerosols_ancil_path=''
!!albedo_nir_ancil_path=''
!!albedo_vis_ancil_path=''
-ancil_directory='$BIG_DATA_DIR/ancils/basic-gal/yak/${ancil_resolution}'
+ancil_directory='$BIG_DATA_DIR/ancils/basic-gal/yak/${RESOLUTION}'
checkpoint_stem_name=''
!!cloud_drop_no_conc_ancil_path=''
!!coarse_ancil_directory=''
@@ -378,7 +391,7 @@ diag_stem_name=''
!!o3_ancil_path=''
!!oh_ancil_path=''
orography_mean_ancil_path='orography/gmted_ramp2/qrparm.orog'
-!!orography_subgrid_ancil_path='orography/gmted_ramp2/qrparm.orog.ugrid'
+!!orography_subgrid_ancil_path=''
!!ozone_ancil_path=''
!!plant_func_ancil_path=''
!!sea_ancil_path=''
@@ -410,7 +423,7 @@ exner_from_eos=.false.
horizontal_physics_predictor=.false.
horizontal_transport_predictor=.false.
init_exner_bt=.true.
-l_multigrid=.false.
+l_multigrid=.true.
lagged_orog=.true.
moisture_formulation='traditional'
moisture_in_solver=.true.
@@ -420,7 +433,7 @@ shallow=.true.
si_momentum_equation=.false.
theta_moist_source=.false.
use_multires_coupling=.false.
-use_physics=.false.
+use_physics=.true.
use_wavedynamics=.true.
vector_invariant=.false.
@@ -434,16 +447,16 @@ profile_data_v=0.0
times=0.0
[namelist:helmholtz_solver]
-fail_on_non_converged=.false.
-gcrk=18
+!!fail_on_non_converged=.false.
+gcrk=8
!!jacobi_relaxation=0.5
-method='bicgstab'
-monitor_convergence=.true.
+method='prec_only'
+monitor_convergence=.false.
normalise=.true.
-preconditioner='tridiagonal'
-si_pressure_a_tol=0
-si_pressure_maximum_iterations=40
-si_pressure_tolerance=1.0e-15
+preconditioner='multigrid'
+si_pressure_a_tol=1.0e-8
+si_pressure_maximum_iterations=400
+si_pressure_tolerance=1.0e-4
[namelist:iau]
!!iau_ainc_multifile=.false.
@@ -453,7 +466,7 @@ si_pressure_tolerance=1.0e-15
!!iau_tendency_ainc=.false.
!!iau_tendency_bcorr=.true.
!!iau_tendency_pertinc=.false.
-!!iau_ts_start=0
+!!iau_ts_start=1
!!iau_use_addinf=.false.
!!iau_use_bcorr=.false.
!!iau_use_level_one_temp=.false.
@@ -500,15 +513,15 @@ f_lon_deg=0.0
perturb_init=.false.
!!perturb_magnitude=0
!!perturb_seed=0
-test='gravity_wave'
+test='none'
[namelist:initial_density]
density_background=0.1
density_max=2.0
-r1=0.0
-r2=0.0
-x1=0.0
-x2=0.0
+r1=0.4
+r2=0.4
+x1=0.4
+x2=-0.4
y1=0.0
y2=0.0
z1=0.0
@@ -520,22 +533,22 @@ surface_pressure=1000.0e2
[namelist:initial_temperature]
bvf_square=0.0001
-pert_centre=120.0
+pert_centre=60.0
pert_width_scaling=1.0
perturb='none'
-!!profile_data=300.0
-!!profile_heights=0.0
-!!profile_size=1
+!!profile_data=300.0,300.0
+!!profile_heights=0.0,10.0e3
+!!profile_size=2
theta_surf=300.0
[namelist:initial_vapour]
-!!profile_data=0.0
-!!profile_heights=0.0
-!!profile_size=1
+!!profile_data=0.0,0.0
+!!profile_heights=0.0,10.0e3
+!!profile_size=2
[namelist:initial_wind]
nl_constant=0.0
-profile='none'
+profile='constant_uv'
!!profile_data_u=0.0
!!profile_data_v=0.0
!!profile_data_w=0.0
@@ -545,8 +558,8 @@ profile='none'
!!profile_size_w=1
sbr_angle_lat=0.0
sbr_angle_lon=0.0
-smp_init_wind=.false.
-u0=0.0
+smp_init_wind=.true.
+u0=2.0
v0=0.0
wind_time_period=0.0
@@ -574,7 +587,7 @@ checkpoint_write=.false.
counter_output_suffix='counter.txt'
diag_active_files='lfric_diag'
diag_always_on_sampling=.false.
-diagnostic_frequency=8
+diagnostic_frequency=12
!!end_of_run_checkpoint=.true.
file_convention='UGRID'
multifile_io=.false.
@@ -590,16 +603,16 @@ write_fluxes=.false.
write_minmax_tseries=.false.
[namelist:jedi_geometry]
-io_calender_start='2018-04-14T21:00:00'
+io_calender_start='2021-06-02T00:00:00'
io_path_inc_read='$BIG_DATA_DIR/jedi-lfric/Ticket354/pert_fields/lfric_diag'
io_path_state_read='$BIG_DATA_DIR/jedi-lfric/Ticket354/ls_fields/jedi_trajectory'
io_path_state_write='write_file'
-io_setup_increment=.true.
+io_setup_increment=.false.
io_time_step='P0DT1H0M0S'
[namelist:jedi_increment]
-inc_time='2018-04-14 21:00:00'
-initialise_via_read=.true.
+inc_time='2021-06-02 00:00:00'
+initialise_via_read=.false.
variables='theta','rho','exner','u_in_w3','v_in_w3','w_in_wth','m_v',
='m_cl','m_r','m_s'
@@ -611,15 +624,16 @@ forecast_length='P0DT6H0M0S'
test_field='theta'
[namelist:jedi_linear_model]
+incremental_wind_interpolation=.false.
nl_time_step='P0DT1H0M0S'
[namelist:jedi_pseudo_model]
-initial_time='2018-04-14T21:00:00'
+initial_time='2021-06-02 00:00:00'
number_of_steps=9
time_step='P0DT1H0M0S'
[namelist:jedi_state]
-state_time='2018-04-14 21:00:00'
+state_time='2021-06-02 00:00:00'
use_pseudo_model=.true.
variables='theta','rho','u10m','exner','u_in_w3','v_in_w3','w_in_wth',
='m_v','m_cl','m_r','m_s'
@@ -656,7 +670,7 @@ kext_io=0.5,0.5,1.0,1.0,0.5
knl_io=5*0.2
omega_io=0.101,0.083,0.132,0.135,0.115
omnir_io=0.788,0.545,0.864,0.787,0.785
-z0hm_pft_io=1.65,1.65,0.1,0.1,0.1
+z0hm_pft_io=1.0,1.0,0.01,0.01,0.01
!!z0v_io=1.1,1.1,0.22,0.22,1.0
[!!namelist:jules_radiation]
@@ -695,8 +709,8 @@ l_use_dtstar_sea=.false.
nice=1
!!u_cdn_hw=55.0
!!u_cdn_max=33.0
-!!z0h_specified=0.01
-!!z0m_specified=0.1
+!!z0h_specified=0.0
+!!z0m_specified=0.0
[!!namelist:jules_snow]
can_clump=8.0,4.0,1.0,1.0,1.0
@@ -773,9 +787,11 @@ l_spec_veg_z0=.true.
[namelist:linear]
fixed_ls=.true.
-l_stabilise_bl=.false.
+l_stabilise_bl=.true.
ls_read_w2h=.false.
-pert_option='analytic'
+max_bl_stabilisation=0.75
+n_bl_levels_to_stabilise=15
+pert_option='file'
[namelist:logging]
log_to_rank_zero_only=.true.
@@ -803,40 +819,40 @@ microphysics_casim=.false.
!!orog_block=.true.
!!orog_rain=.true.
!!orog_rime=.true.
-!!prog_tnuc=.false.
+!!prog_tnuc=.true.
!!qcl_rime=1.0e-4
-!!shape_rime=.false.
+!!shape_rime=.true.
turb_gen_mixph=.true.
!!z_surf=50.0
[namelist:mixed_solver]
eliminate_variables='discrete'
-fail_on_non_converged=.false.
-gcrk=10
+fail_on_non_converged=.true.
+gcrk=4
guess_np1=.false.
!!jacobi_relaxation=0.5
-mixed_solver_a_tol=1.0e-21
+mixed_solver_a_tol=1.0e-3
monitor_convergence=.true.
normalise=.true.
reference_reset_time=3600.0
-si_maximum_iterations=7
+si_maximum_iterations=10
si_method='block_gcr'
si_preconditioner='pressure'
-si_tolerance=1.0e-21
+si_tolerance=1.0e-1
split_w=.true.
[namelist:mixing]
!!leonard_kl=2.0
leonard_term=.false.
-!!method='blending'
+!!method='blend_1dbl_fa'
!!mix_factor=0.2
!!smag_l_calc='UseDx'
smagorinsky=.false.
viscosity=.false.
viscosity_mu=0.0
-[!!namelist:multigrid]
-chain_mesh_tags='','','',''
+[namelist:multigrid]
+chain_mesh_tags='dynamics','multigrid_l1','multigrid_l2','multigrid_l3'
multigrid_chain_nitems=4
n_coarsesmooth=4
n_postsmooth=2
@@ -844,9 +860,17 @@ n_presmooth=2
smooth_relaxation=0.8
[!!namelist:multires_coupling]
-aerosol_mesh_name='dynamics'
+aerosol_mesh_name='aerosol'
coarse_aerosol_transport=.false.
coarse_rad_aerosol=.false.
+dynamics_mesh_name='dynamics'
+!!lowest_order_aero_flag=.false.
+multires_coupling_mesh_tags='dynamics'
+multires_coupling_mode='test'
+negative_correction='none'
+physics_mesh_name='aerosol'
+reconstruction='simple'
+recovery_order='linear'
[!!namelist:orbit]
!!arg_periapsis=1.796767421
@@ -941,7 +965,7 @@ phi_centre_dec=0.0
wavelength=4000.0
[namelist:partitioning]
-generate_inner_halos=.true.
+generate_inner_halos=.false.
panel_decomposition='auto'
!!panel_xproc=1
!!panel_yproc=1
@@ -956,15 +980,15 @@ configure_segments=.false.
!!electric_placement='slow'
!!evap_condense_placement='fast'
!!gw_segment=0
-!!limit_drag_incs=.false.
+limit_drag_incs=.false.
!!lowest_level='gradient'
!!ls_ppn_segment=0
!!microphysics_placement='slow'
!!orographic_drag_placement='slow'
!!radiation_placement='slow'
-!!sample_physics_scalars=.true.
-!!sample_physics_winds=.true.
-!!sample_physics_winds_correction=.false.
+sample_physics_scalars=.true.
+sample_physics_winds=.true.
+sample_physics_winds_correction=.false.
!!smagorinsky_placement='end'
!!spectral_gwd_placement='slow'
!!stochastic_physics_placement='fast'
@@ -1007,12 +1031,12 @@ mcica_data_file='spec/mcica_data'
n_radstep=2
!!planet_albedo=0.06
!!planet_emissivity=0.985
-scatter_method_lw='full'
-!!scatter_method_lwinc='full'
+scatter_method_lw='hybrid'
+!!scatter_method_lwinc='approx'
spectral_file_lw='spec/sp_lw_ga9'
-!!spectral_file_lwinc='spec/sp_lw_cloud7'
+!!spectral_file_lwinc='spec/sp_lw_cloud9'
spectral_file_sw='spec/sp_sw_ga9'
-!!spectral_file_swinc='spec/sp_sw_cloud7'
+!!spectral_file_swinc='spec/sp_sw_cloud9'
topography='slope'
[namelist:radiative_gases]
@@ -1026,26 +1050,26 @@ cfc113_rad_opt='off'
!!cfc11_clim_fcg_nyears=0
!!cfc11_clim_fcg_rates=0
!!cfc11_clim_fcg_years=0
-!!cfc11_mix_ratio=1.110e-09
-cfc11_rad_opt='off'
+cfc11_mix_ratio=1.110e-09
+cfc11_rad_opt='constant'
!!cfc12_clim_fcg_levls=0
!!cfc12_clim_fcg_nyears=0
!!cfc12_clim_fcg_rates=0
!!cfc12_clim_fcg_years=0
-!!cfc12_mix_ratio=2.187e-09
-cfc12_rad_opt='off'
+cfc12_mix_ratio=2.187e-09
+cfc12_rad_opt='constant'
!!ch4_clim_fcg_levls=0
!!ch4_clim_fcg_nyears=0
!!ch4_clim_fcg_rates=0
!!ch4_clim_fcg_years=0
-!!ch4_mix_ratio=1.006e-06
-ch4_rad_opt='off'
+ch4_mix_ratio=1.006e-06
+ch4_rad_opt='constant'
!!co2_clim_fcg_levls=0
!!co2_clim_fcg_nyears=0
!!co2_clim_fcg_rates=0
!!co2_clim_fcg_years=0
-!!co2_mix_ratio=6.002e-04
-co2_rad_opt='off'
+co2_mix_ratio=6.002e-04
+co2_rad_opt='constant'
!!co_clim_fcg_levls=0
!!co_clim_fcg_nyears=0
!!co_clim_fcg_rates=0
@@ -1117,8 +1141,8 @@ n2_rad_opt='off'
!!n2o_clim_fcg_nyears=0
!!n2o_clim_fcg_rates=0
!!n2o_clim_fcg_years=0
-!!n2o_mix_ratio=4.945e-07
-n2o_rad_opt='off'
+n2o_mix_ratio=4.945e-07
+n2o_rad_opt='constant'
!!na_clim_fcg_levls=0
!!na_clim_fcg_nyears=0
!!na_clim_fcg_rates=0
@@ -1135,8 +1159,8 @@ nh3_rad_opt='off'
!!o2_clim_fcg_nyears=0
!!o2_clim_fcg_rates=0
!!o2_clim_fcg_years=0
-!!o2_mix_ratio=0.2314
-o2_rad_opt='off'
+o2_mix_ratio=0.2314
+o2_rad_opt='constant'
!!o3_clim_fcg_levls=0
!!o3_clim_fcg_nyears=0
!!o3_clim_fcg_rates=0
@@ -1145,7 +1169,7 @@ o2_rad_opt='off'
!!o3_profile_data=0
!!o3_profile_heights=0.0
!!o3_profile_size=0
-o3_rad_opt='off'
+o3_rad_opt='ancil'
!!rb_clim_fcg_levls=0
!!rb_clim_fcg_nyears=0
!!rb_clim_fcg_rates=0
@@ -1172,10 +1196,10 @@ tio_rad_opt='off'
vo_rad_opt='off'
[namelist:section_choice]
-!!aerosol='none'
-!!boundary_layer='none'
-!!chemistry='none'
-!!cloud='none'
+aerosol='none'
+boundary_layer='none'
+chemistry='none'
+cloud='none'
!!convection='none'
dynamics='gungho'
!!electric='none'
@@ -1183,23 +1207,23 @@ external_forcing=.false.
iau=.false.
iau_sst=.false.
iau_surf=.false.
-!!methane_oxidation=.false.
+methane_oxidation=.false.
!!microphysics='none'
-!!orographic_drag='none'
-!!radiation='none'
-!!spectral_gwd='none'
-!!stochastic_physics='none'
-!!surface='none'
+orographic_drag='none'
+radiation='none'
+spectral_gwd='none'
+stochastic_physics='none'
+surface='none'
[namelist:solver]
-fail_on_non_converged=.false.
+!!fail_on_non_converged=.false.
gcrk=18
!!jacobi_relaxation=0.5
-maximum_iterations=50
+maximum_iterations=7
method='chebyshev'
-monitor_convergence=.true.
+monitor_convergence=.false.
preconditioner='diagonal'
-tolerance=1.0e-18
+tolerance=1.0e-6
[namelist:specified_surface]
!!function_amplitude_e=200
@@ -1226,10 +1250,10 @@ tolerance=1.0e-18
!!time_units_sst='seconds'
[!!namelist:spectral_gwd]
-add_cgw=.false.
-!!cgw_scale_factor=1.0
+add_cgw=.true.
+!!cgw_scale_factor=0.86
ussp_heating=.true.
-ussp_launch_factor=1.3
+ussp_launch_factor=1.2
wavelstar=4300.0
[!!namelist:star]
@@ -1282,9 +1306,9 @@ ens_memb=${ENSEMBLE_MEMBER}
!!rp_lsfc_orog_drag_param=0.15,0.15,0.15
!!rp_lsfc_z0_soil=1.0e-3,1.0e-3,1.0e-3
!!rp_lsfc_z0_urban_mult=1.0,1.0,1.0
-!!rp_lsfc_z0hm_pft=1.65000,1.65000,1.00000e-2,1.00000e-2,1.00000e-1
-!!rp_lsfc_z0hm_pft_max=1.65000,1.65000,1.00000e-2,1.00000e-2,1.00000e-1
-!!rp_lsfc_z0hm_pft_min=1.65000,1.65000,1.00000e-2,1.00000e-2,1.00000e-1
+!!rp_lsfc_z0hm_pft=1.00,1.00,0.022,0.022,0.025
+!!rp_lsfc_z0hm_pft_max=1.00,1.00,0.022,0.022,0.025
+!!rp_lsfc_z0hm_pft_min=1.00,1.00,0.022,0.022,0.025
!!rp_lsfc_z0hm_soil=2.0e-1,2.0e-1,2.0e-1
!!rp_lsfc_z0v=
!!rp_lsfc_z0v_max=
@@ -1329,7 +1353,7 @@ ens_memb=${ENSEMBLE_MEMBER}
!!spt_use_convection=.true.
!!spt_use_microphysics=.true.
!!spt_use_radiation=.true.
-stph_n_max=22
+stph_n_max=60
stph_n_min=20
use_random_parameters=.false.
use_skeb=.false.
@@ -1360,8 +1384,8 @@ timescale=1.0
[namelist:time]
calendar='timestep'
-calendar_origin='2018-04-14 21:00:00'
-calendar_start='2018-04-14 21:00:00'
+calendar_origin='2021-06-02 00:00:00'
+calendar_start='2021-06-02 00:00:00'
calendar_type='gregorian'
timestep_end='$RESTART_STOP'
timestep_start='$RESTART_START'
@@ -1369,7 +1393,7 @@ timestep_start='$RESTART_START'
[namelist:timestepping]
alpha=0.55
dt=$DT
-inner_iterations=2
+inner_iterations=1
method='semi_implicit'
outer_iterations=2
runge_kutta_method='forward_euler'
@@ -1384,6 +1408,7 @@ adjust_theta=.false.
!!adjust_theta_above=30000.0
adjust_tracer_equation=.false.
adjust_vhv_wind=.false.
+ageofair_reset_level=10
broken_w2_projection=.false.
calculate_detj='upwind'
cap_density_predictor=0.5
@@ -1400,14 +1425,15 @@ ffsl_inner_order=0
ffsl_outer_order=1
ffsl_splitting=5*1
ffsl_unity_3d=.false.
-ffsl_vertical_order=5*2
-field_names='density','potential_temperature','wind','moisture','cloud'
+ffsl_vertical_order=2,2,1,2,2
+field_names='density','potential_temperature','wind','moisture',
+ ='con_tracer'
fv_horizontal_order=2
fv_vertical_order=2
horizontal_method=5*1
horizontal_monotone=5*1
-log_space=5*.false.
-max_vert_cfl_calc='uniform'
+log_space=.true.,.true.,.false.,.false.,.false.
+max_vert_cfl_calc='dep_point'
min_val_abs_tol=-1.0e-12
min_val_max_iterations=10
min_val_method='iterative'
@@ -1417,7 +1443,7 @@ operators='fv'
panel_edge_high_order=.true.
panel_edge_treatment='none'
profile_size=5
-reversible=5*.false.
+reversible=.true.,.true.,.false.,.true.,.true.
runge_kutta_method='ssp3'
scheme=5*1
si_outer_transport='none'
@@ -1427,10 +1453,11 @@ splitting=5*1
substep_transport='off'
theta_dispersion_correction=.false.
theta_variable='dry'
+transport_ageofair=.false.
use_density_predictor=.false.
vertical_method=5*1
vertical_monotone=5*1
-vertical_monotone_order=5*1
+vertical_monotone_order=5*3
vertical_sl_order='cubic'
wind_mono_top=.false.
!!wind_mono_top_depth=5
diff --git a/rose-stem/app/jedi_tlm_tests/opt/rose-app-C12_MG.conf b/rose-stem/app/jedi_tlm_tests/opt/rose-app-C12_MG.conf
new file mode 100644
index 00000000..125a4758
--- /dev/null
+++ b/rose-stem/app/jedi_tlm_tests/opt/rose-app-C12_MG.conf
@@ -0,0 +1,8 @@
+[file:mesh_C12_MG.nc]
+mode=auto
+source=$MESH_DIR/mesh_C12_MG.nc
+
+[namelist:base_mesh]
+!!f_lat_deg=
+file_prefix='mesh_C12_MG'
+!!fplane=
diff --git a/rose-stem/app/jedi_tlm_tests/opt/rose-app-default.conf b/rose-stem/app/jedi_tlm_tests/opt/rose-app-default.conf
deleted file mode 100644
index e69de29b..00000000
diff --git a/rose-stem/app/jedi_tlm_tests/opt/rose-app-dry.conf b/rose-stem/app/jedi_tlm_tests/opt/rose-app-dry.conf
index 3f2af7e5..ffd315be 100644
--- a/rose-stem/app/jedi_tlm_tests/opt/rose-app-dry.conf
+++ b/rose-stem/app/jedi_tlm_tests/opt/rose-app-dry.conf
@@ -2,3 +2,8 @@
moisture_formulation='dry'
moisture_in_solver=.false.
!!theta_moist_source=.false.
+
+[namelist:section_choice]
+!!aerosol='none'
+!!cloud='none'
+!!methane_oxidation=.false.
diff --git a/rose-stem/app/jedi_tlm_tests/opt/rose-app-nwp_gal9_c12.conf b/rose-stem/app/jedi_tlm_tests/opt/rose-app-nwp_gal9_c12.conf
new file mode 100644
index 00000000..ccd55de3
--- /dev/null
+++ b/rose-stem/app/jedi_tlm_tests/opt/rose-app-nwp_gal9_c12.conf
@@ -0,0 +1,28 @@
+[file:iodef_temp.xml]
+mode=auto
+source=$ROSE_SUITE_DIR/app/jedi_tlm_tests/file/iodef.xml
+
+[namelist:io]
+diagnostic_frequency=8
+
+[namelist:jedi_geometry]
+io_calender_start='2018-04-14T21:00:00'
+io_path_inc_read='$BIG_DATA_DIR/jedi-lfric/Ticket354/pert_fields/lfric_diag'
+io_path_state_read='$BIG_DATA_DIR/jedi-lfric/Ticket354/ls_fields/jedi_trajectory'
+
+[namelist:jedi_increment]
+inc_time='2018-04-14 21:00:00'
+
+[namelist:jedi_pseudo_model]
+initial_time='2018-04-14T21:00:00'
+
+[namelist:jedi_state]
+state_time='2018-04-14 21:00:00'
+
+[namelist:multigrid]
+chain_mesh_tags='dynamics','multigrid_l1','multigrid_l2'
+multigrid_chain_nitems=3
+
+[namelist:time]
+calendar_origin='2018-04-14 21:00:00'
+calendar_start='2018-04-14 21:00:00'
diff --git a/rose-stem/app/jedi_tlm_tests/opt/rose-app-relaxed_solver.conf b/rose-stem/app/jedi_tlm_tests/opt/rose-app-relaxed_solver.conf
deleted file mode 100644
index b435c2bc..00000000
--- a/rose-stem/app/jedi_tlm_tests/opt/rose-app-relaxed_solver.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-[namelist:helmholtz_solver]
-gcrk=8
-si_pressure_a_tol=1.0e-8
-si_pressure_maximum_iterations=400
-si_pressure_tolerance=1.0e-4
-
-[namelist:mixed_solver]
-gcrk=6
-mixed_solver_a_tol=0.0
-si_maximum_iterations=10
-si_tolerance=1.0e-5
-
-[namelist:solver]
-maximum_iterations=7
-tolerance=1.0e-6
diff --git a/rose-stem/app/jedi_tlm_tests/opt/rose-app-rrt_equals_dt.conf b/rose-stem/app/jedi_tlm_tests/opt/rose-app-rrt_equals_dt.conf
new file mode 100644
index 00000000..3d974564
--- /dev/null
+++ b/rose-stem/app/jedi_tlm_tests/opt/rose-app-rrt_equals_dt.conf
@@ -0,0 +1,2 @@
+[namelist:mixed_solver]
+reference_reset_time=$DT
diff --git a/rose-stem/app/jedi_tlm_tests/opt/rose-app-semi_strict_solver.conf b/rose-stem/app/jedi_tlm_tests/opt/rose-app-semi_strict_solver.conf
new file mode 100644
index 00000000..d9c5499f
--- /dev/null
+++ b/rose-stem/app/jedi_tlm_tests/opt/rose-app-semi_strict_solver.conf
@@ -0,0 +1,9 @@
+[namelist:jedi_lfric_settings]
+adjoint_test_tolerance=1.0e-3
+
+[namelist:mixed_solver]
+mixed_solver_a_tol=1.0e-21
+si_tolerance=1.0e-3
+
+[namelist:timestepping]
+outer_iterations=1
diff --git a/rose-stem/app/jedi_tlm_tests/opt/rose-app-strict_solver.conf b/rose-stem/app/jedi_tlm_tests/opt/rose-app-strict_solver.conf
new file mode 100644
index 00000000..77270e0f
--- /dev/null
+++ b/rose-stem/app/jedi_tlm_tests/opt/rose-app-strict_solver.conf
@@ -0,0 +1,15 @@
+[namelist:helmholtz_solver]
+gcrk=18
+si_pressure_a_tol=0
+si_pressure_tolerance=1.0e-15
+
+[namelist:mixed_solver]
+fail_on_non_converged=.false.
+gcrk=10
+mixed_solver_a_tol=1.0e-21
+si_maximum_iterations=100
+si_tolerance=1.0e-21
+
+[namelist:solver]
+maximum_iterations=50
+tolerance=1.0e-18
diff --git a/rose-stem/app/jedi_tlm_tests/rose-app.conf b/rose-stem/app/jedi_tlm_tests/rose-app.conf
index c9d61c15..d6c76f00 100644
--- a/rose-stem/app/jedi_tlm_tests/rose-app.conf
+++ b/rose-stem/app/jedi_tlm_tests/rose-app.conf
@@ -23,13 +23,19 @@ source=namelist:jedi_lfric_tests
= namelist:jedi_linear_model
= namelist:jedi_pseudo_model
= namelist:jedi_lfric_settings
+ = (namelist:aerosol)
= namelist:base_mesh
+ = (namelist:blayer)
= namelist:boundaries
= namelist:checks
= namelist:section_choice
+ = (namelist:cloud)
+ = (namelist:chemistry)
+ = (namelist:convection)
+ = (namelist:cosp)
= (namelist:damping_layer)
= (namelist:departure_points)
- = namelist:energy_correction
+ = (namelist:energy_correction)
= (namelist:external_forcing)
= namelist:extrusion
= (namelist:files)
@@ -40,6 +46,7 @@ source=namelist:jedi_lfric_tests
= (namelist:iau_addinf_io(:))
= (namelist:iau_ainc_io(:))
= (namelist:iau_bcorr_io(:))
+ = (namelist:iau)
= (namelist:idealised)
= (namelist:ideal_surface)
= namelist:initialization
@@ -63,29 +70,33 @@ source=namelist:jedi_lfric_tests
= (namelist:jules_vegetation)
= namelist:linear
= namelist:logging
+ = (namelist:microphysics)
= namelist:mixed_solver
- = (namelist:mixing)
+ = namelist:mixing
= (namelist:multigrid)
= (namelist:multires_coupling)
= namelist:esm_couple
+ = (namelist:orbit)
= namelist:orography
= (namelist:orography_agnesi_cartesian)
= (namelist:orography_agnesi_spherical)
- = (namelist:orography_bell_cartesian)
- = (namelist:orography_bell_spherical)
= (namelist:orography_dcmip200_spherical)
= (namelist:orography_schar_cartesian)
= (namelist:orography_schar_spherical)
= namelist:partitioning
= (namelist:physics)
= namelist:planet
+ = (namelist:radiation)
= namelist:radiative_gases
+ = (namelist:spectral_gwd)
+ = (namelist:orographic_drag)
= namelist:solver
= (namelist:specified_surface)
+ = (namelist:star)
= (namelist:stochastic_physics)
+ = (namelist:surface)
= (namelist:temp_tend_data)
= (namelist:theta_relax)
- = (namelist:theta_relax)
= namelist:time
= namelist:timestepping
= namelist:transport
@@ -106,24 +117,24 @@ easyaerosol_cdnc=.false.
easyaerosol_lw=.false.
easyaerosol_sw=.false.
!!emissions='GC5'
-glomap_mode='off'
+glomap_mode='dust_and_clim'
!!horiz_d=2.25
-!!l_radaer=.false.
+!!l_radaer=.true.
murk=.false.
!!murk_lbc=.false.
!!murk_prognostic=.false.
!!murk_source_scaling=1.0
!!murk_visibility=.false.
!!n_radaer_step=1
-!!prec_file=''
-sulphuric_strat_climatology=.false.
+!!prec_file='precalc/RADAER_pcalc.ukca'
+sulphuric_strat_climatology=.true.
!!sulphuric_strat_column=1.86604e-6
ukca_mode_seg_size=4
!!us_am=1.45
[namelist:base_mesh]
!!f_lat_deg=45.0
-file_prefix='mesh.nc'
+file_prefix='mesh'
!!fplane=.false.
geometry='spherical'
prepartitioned=.false.
@@ -186,7 +197,7 @@ limited_area=.false.
!!rim_width_ns=1
!!solver_boundary_depth=1
!!transport_boundary_depth=6
-transport_overwrite_freq='split_step'
+transport_overwrite_freq='final'
[namelist:checks]
limit_cfl=.false.
@@ -206,14 +217,14 @@ chem_scheme='none'
!!fjx_spec_file='FJX_spec_Nov11.dat'
!!flexchem_opt='bs1999'
i_chem_timestep_halvings=0
-!!i_ukca_chem_version=0
+!!i_ukca_chem_version=111
!!l_ukca_asad_full=.false.
-!!l_ukca_linox_scaling=.false.
-!!l_ukca_quasinewton=.false.
+!!l_ukca_linox_scaling=
+!!l_ukca_quasinewton=
!!l_ukca_ro2_ntp=.false.
-!!lightnox_scale_fac=0
+!!lightnox_scale_fac=
!!photol_scheme='off'
-!!top_bdy_opt='no_overwrt'
+!!top_bdy_opt=''
[!!namelist:cloud]
!!cff_spread_rate=1.0e-5
@@ -319,7 +330,7 @@ stretching_method='smooth'
!!aerosols_ancil_path=''
!!albedo_nir_ancil_path=''
!!albedo_vis_ancil_path=''
-ancil_directory='$BIG_DATA_DIR/ancils/basic-gal/yak/${ancil_resolution}'
+ancil_directory='$BIG_DATA_DIR/ancils/basic-gal/yak/${RESOLUTION}'
checkpoint_stem_name=''
!!cloud_drop_no_conc_ancil_path=''
!!coarse_ancil_directory=''
@@ -380,7 +391,7 @@ diag_stem_name=''
!!o3_ancil_path=''
!!oh_ancil_path=''
orography_mean_ancil_path='orography/gmted_ramp2/qrparm.orog'
-!!orography_subgrid_ancil_path='orography/gmted_ramp2/qrparm.orog.ugrid'
+!!orography_subgrid_ancil_path=''
!!ozone_ancil_path=''
!!plant_func_ancil_path=''
!!sea_ancil_path=''
@@ -412,7 +423,7 @@ exner_from_eos=.false.
horizontal_physics_predictor=.false.
horizontal_transport_predictor=.false.
init_exner_bt=.true.
-l_multigrid=.false.
+l_multigrid=.true.
lagged_orog=.true.
moisture_formulation='traditional'
moisture_in_solver=.true.
@@ -422,7 +433,7 @@ shallow=.true.
si_momentum_equation=.false.
theta_moist_source=.false.
use_multires_coupling=.false.
-use_physics=.false.
+use_physics=.true.
use_wavedynamics=.true.
vector_invariant=.false.
@@ -436,16 +447,16 @@ profile_data_v=0.0
times=0.0
[namelist:helmholtz_solver]
-fail_on_non_converged=.false.
-gcrk=18
+!!fail_on_non_converged=.false.
+gcrk=8
!!jacobi_relaxation=0.5
-method='bicgstab'
-monitor_convergence=.true.
+method='prec_only'
+monitor_convergence=.false.
normalise=.true.
-preconditioner='tridiagonal'
-si_pressure_a_tol=0
-si_pressure_maximum_iterations=40
-si_pressure_tolerance=1.0e-15
+preconditioner='multigrid'
+si_pressure_a_tol=1.0e-8
+si_pressure_maximum_iterations=400
+si_pressure_tolerance=1.0e-4
[namelist:iau]
!!iau_ainc_multifile=.false.
@@ -455,7 +466,7 @@ si_pressure_tolerance=1.0e-15
!!iau_tendency_ainc=.false.
!!iau_tendency_bcorr=.true.
!!iau_tendency_pertinc=.false.
-!!iau_ts_start=0
+!!iau_ts_start=1
!!iau_use_addinf=.false.
!!iau_use_bcorr=.false.
!!iau_use_level_one_temp=.false.
@@ -502,15 +513,15 @@ f_lon_deg=0.0
perturb_init=.false.
!!perturb_magnitude=0
!!perturb_seed=0
-test='gravity_wave'
+test='none'
[namelist:initial_density]
density_background=0.1
density_max=2.0
-r1=0.0
-r2=0.0
-x1=0.0
-x2=0.0
+r1=0.4
+r2=0.4
+x1=0.4
+x2=-0.4
y1=0.0
y2=0.0
z1=0.0
@@ -522,22 +533,22 @@ surface_pressure=1000.0e2
[namelist:initial_temperature]
bvf_square=0.0001
-pert_centre=120.0
+pert_centre=60.0
pert_width_scaling=1.0
perturb='none'
-!!profile_data=300.0
-!!profile_heights=0.0
-!!profile_size=1
+!!profile_data=300.0,300.0
+!!profile_heights=0.0,10.0e3
+!!profile_size=2
theta_surf=300.0
[namelist:initial_vapour]
-!!profile_data=0.0
-!!profile_heights=0.0
-!!profile_size=1
+!!profile_data=0.0,0.0
+!!profile_heights=0.0,10.0e3
+!!profile_size=2
[namelist:initial_wind]
nl_constant=0.0
-profile='none'
+profile='constant_uv'
!!profile_data_u=0.0
!!profile_data_v=0.0
!!profile_data_w=0.0
@@ -547,8 +558,8 @@ profile='none'
!!profile_size_w=1
sbr_angle_lat=0.0
sbr_angle_lon=0.0
-smp_init_wind=.false.
-u0=0.0
+smp_init_wind=.true.
+u0=2.0
v0=0.0
wind_time_period=0.0
@@ -576,7 +587,7 @@ checkpoint_write=.false.
counter_output_suffix='counter.txt'
diag_active_files='lfric_diag'
diag_always_on_sampling=.false.
-diagnostic_frequency=8
+diagnostic_frequency=12
!!end_of_run_checkpoint=.true.
file_convention='UGRID'
multifile_io=.false.
@@ -592,7 +603,7 @@ write_fluxes=.false.
write_minmax_tseries=.false.
[namelist:jedi_geometry]
-io_calender_start='2018-04-14T21:00:00'
+io_calender_start='2021-06-02T00:00:00'
io_path_inc_read='$BIG_DATA_DIR/jedi-lfric/Ticket354/pert_fields/lfric_diag'
io_path_state_read='$BIG_DATA_DIR/jedi-lfric/Ticket354/ls_fields/jedi_trajectory'
io_path_state_write='write_file'
@@ -600,7 +611,7 @@ io_setup_increment=.false.
io_time_step='P0DT1H0M0S'
[namelist:jedi_increment]
-inc_time='2018-04-14 21:00:00'
+inc_time='2021-06-02 00:00:00'
initialise_via_read=.false.
variables='theta','rho','exner','u_in_w3','v_in_w3','w_in_wth','m_v',
='m_cl','m_r','m_s'
@@ -613,16 +624,16 @@ forecast_length='P0DT6H0M0S'
test_field='theta'
[namelist:jedi_linear_model]
-incremental_wind_interpolation=.true.
+incremental_wind_interpolation=.false.
nl_time_step='P0DT1H0M0S'
[namelist:jedi_pseudo_model]
-initial_time='2018-04-14T21:00:00'
+initial_time='2021-06-02 00:00:00'
number_of_steps=9
time_step='P0DT1H0M0S'
[namelist:jedi_state]
-state_time='2018-04-14 21:00:00'
+state_time='2021-06-02 00:00:00'
use_pseudo_model=.true.
variables='theta','rho','u10m','exner','u_in_w3','v_in_w3','w_in_wth',
='m_v','m_cl','m_r','m_s'
@@ -659,7 +670,7 @@ kext_io=0.5,0.5,1.0,1.0,0.5
knl_io=5*0.2
omega_io=0.101,0.083,0.132,0.135,0.115
omnir_io=0.788,0.545,0.864,0.787,0.785
-z0hm_pft_io=1.65,1.65,0.1,0.1,0.1
+z0hm_pft_io=1.0,1.0,0.01,0.01,0.01
!!z0v_io=1.1,1.1,0.22,0.22,1.0
[!!namelist:jules_radiation]
@@ -698,8 +709,8 @@ l_use_dtstar_sea=.false.
nice=1
!!u_cdn_hw=55.0
!!u_cdn_max=33.0
-!!z0h_specified=0.01
-!!z0m_specified=0.1
+!!z0h_specified=0.0
+!!z0m_specified=0.0
[!!namelist:jules_snow]
can_clump=8.0,4.0,1.0,1.0,1.0
@@ -742,8 +753,12 @@ l_land_ice_imp=.true.
l_mo_buoyancy_calc=.true.
!!l_point_data=.false.
l_urban2t=.false.
+<<<<<<< HEAD
+l_vary_z0m_soil=.true.
+=======
l_vary_z0m_soil=.false.
!!orog_drag_param=0.15
+>>>>>>> main
srf_ex_cnv_gust=.true.
[!!namelist:jules_surface_types]
@@ -776,9 +791,11 @@ l_spec_veg_z0=.true.
[namelist:linear]
fixed_ls=.true.
-l_stabilise_bl=.false.
+l_stabilise_bl=.true.
ls_read_w2h=.false.
-pert_option='analytic'
+max_bl_stabilisation=0.75
+n_bl_levels_to_stabilise=15
+pert_option='file'
[namelist:logging]
log_to_rank_zero_only=.true.
@@ -806,40 +823,40 @@ microphysics_casim=.false.
!!orog_block=.true.
!!orog_rain=.true.
!!orog_rime=.true.
-!!prog_tnuc=.false.
+!!prog_tnuc=.true.
!!qcl_rime=1.0e-4
-!!shape_rime=.false.
+!!shape_rime=.true.
turb_gen_mixph=.true.
!!z_surf=50.0
[namelist:mixed_solver]
eliminate_variables='discrete'
-fail_on_non_converged=.false.
-gcrk=10
+fail_on_non_converged=.true.
+gcrk=4
guess_np1=.false.
!!jacobi_relaxation=0.5
-mixed_solver_a_tol=1.0e-21
+mixed_solver_a_tol=1.0e-3
monitor_convergence=.true.
normalise=.true.
reference_reset_time=3600.0
-si_maximum_iterations=7
+si_maximum_iterations=10
si_method='block_gcr'
si_preconditioner='pressure'
-si_tolerance=1.0e-21
+si_tolerance=1.0e-1
split_w=.true.
[namelist:mixing]
!!leonard_kl=2.0
leonard_term=.false.
-!!method='blending'
+!!method='blend_1dbl_fa'
!!mix_factor=0.2
!!smag_l_calc='UseDx'
smagorinsky=.false.
viscosity=.false.
viscosity_mu=0.0
-[!!namelist:multigrid]
-chain_mesh_tags='','','',''
+[namelist:multigrid]
+chain_mesh_tags='dynamics','multigrid_l1','multigrid_l2','multigrid_l3'
multigrid_chain_nitems=4
n_coarsesmooth=4
n_postsmooth=2
@@ -847,9 +864,17 @@ n_presmooth=2
smooth_relaxation=0.8
[!!namelist:multires_coupling]
-aerosol_mesh_name='dynamics'
+aerosol_mesh_name='aerosol'
coarse_aerosol_transport=.false.
coarse_rad_aerosol=.false.
+dynamics_mesh_name='dynamics'
+!!lowest_order_aero_flag=.false.
+multires_coupling_mesh_tags='dynamics'
+multires_coupling_mode='test'
+negative_correction='none'
+physics_mesh_name='aerosol'
+reconstruction='simple'
+recovery_order='linear'
[!!namelist:orbit]
!!arg_periapsis=1.796767421
@@ -944,7 +969,7 @@ phi_centre_dec=0.0
wavelength=4000.0
[namelist:partitioning]
-generate_inner_halos=.true.
+generate_inner_halos=.false.
panel_decomposition='auto'
!!panel_xproc=1
!!panel_yproc=1
@@ -959,15 +984,15 @@ configure_segments=.false.
!!electric_placement='slow'
!!evap_condense_placement='fast'
!!gw_segment=0
-!!limit_drag_incs=.false.
+limit_drag_incs=.false.
!!lowest_level='gradient'
!!ls_ppn_segment=0
!!microphysics_placement='slow'
!!orographic_drag_placement='slow'
!!radiation_placement='slow'
-!!sample_physics_scalars=.true.
-!!sample_physics_winds=.true.
-!!sample_physics_winds_correction=.false.
+sample_physics_scalars=.true.
+sample_physics_winds=.true.
+sample_physics_winds_correction=.false.
!!smagorinsky_placement='end'
!!spectral_gwd_placement='slow'
!!stochastic_physics_placement='fast'
@@ -1010,12 +1035,12 @@ mcica_data_file='spec/mcica_data'
n_radstep=2
!!planet_albedo=0.06
!!planet_emissivity=0.985
-scatter_method_lw='full'
-!!scatter_method_lwinc='full'
+scatter_method_lw='hybrid'
+!!scatter_method_lwinc='approx'
spectral_file_lw='spec/sp_lw_ga9'
-!!spectral_file_lwinc='spec/sp_lw_cloud7'
+!!spectral_file_lwinc='spec/sp_lw_cloud9'
spectral_file_sw='spec/sp_sw_ga9'
-!!spectral_file_swinc='spec/sp_sw_cloud7'
+!!spectral_file_swinc='spec/sp_sw_cloud9'
topography='slope'
[namelist:radiative_gases]
@@ -1029,26 +1054,26 @@ cfc113_rad_opt='off'
!!cfc11_clim_fcg_nyears=0
!!cfc11_clim_fcg_rates=0
!!cfc11_clim_fcg_years=0
-!!cfc11_mix_ratio=1.110e-09
-cfc11_rad_opt='off'
+cfc11_mix_ratio=1.110e-09
+cfc11_rad_opt='constant'
!!cfc12_clim_fcg_levls=0
!!cfc12_clim_fcg_nyears=0
!!cfc12_clim_fcg_rates=0
!!cfc12_clim_fcg_years=0
-!!cfc12_mix_ratio=2.187e-09
-cfc12_rad_opt='off'
+cfc12_mix_ratio=2.187e-09
+cfc12_rad_opt='constant'
!!ch4_clim_fcg_levls=0
!!ch4_clim_fcg_nyears=0
!!ch4_clim_fcg_rates=0
!!ch4_clim_fcg_years=0
-!!ch4_mix_ratio=1.006e-06
-ch4_rad_opt='off'
+ch4_mix_ratio=1.006e-06
+ch4_rad_opt='constant'
!!co2_clim_fcg_levls=0
!!co2_clim_fcg_nyears=0
!!co2_clim_fcg_rates=0
!!co2_clim_fcg_years=0
-!!co2_mix_ratio=6.002e-04
-co2_rad_opt='off'
+co2_mix_ratio=6.002e-04
+co2_rad_opt='constant'
!!co_clim_fcg_levls=0
!!co_clim_fcg_nyears=0
!!co_clim_fcg_rates=0
@@ -1120,8 +1145,8 @@ n2_rad_opt='off'
!!n2o_clim_fcg_nyears=0
!!n2o_clim_fcg_rates=0
!!n2o_clim_fcg_years=0
-!!n2o_mix_ratio=4.945e-07
-n2o_rad_opt='off'
+n2o_mix_ratio=4.945e-07
+n2o_rad_opt='constant'
!!na_clim_fcg_levls=0
!!na_clim_fcg_nyears=0
!!na_clim_fcg_rates=0
@@ -1138,8 +1163,8 @@ nh3_rad_opt='off'
!!o2_clim_fcg_nyears=0
!!o2_clim_fcg_rates=0
!!o2_clim_fcg_years=0
-!!o2_mix_ratio=0.2314
-o2_rad_opt='off'
+o2_mix_ratio=0.2314
+o2_rad_opt='constant'
!!o3_clim_fcg_levls=0
!!o3_clim_fcg_nyears=0
!!o3_clim_fcg_rates=0
@@ -1148,7 +1173,7 @@ o2_rad_opt='off'
!!o3_profile_data=0
!!o3_profile_heights=0.0
!!o3_profile_size=0
-o3_rad_opt='off'
+o3_rad_opt='ancil'
!!rb_clim_fcg_levls=0
!!rb_clim_fcg_nyears=0
!!rb_clim_fcg_rates=0
@@ -1175,10 +1200,10 @@ tio_rad_opt='off'
vo_rad_opt='off'
[namelist:section_choice]
-!!aerosol='none'
-!!boundary_layer='none'
-!!chemistry='none'
-!!cloud='none'
+aerosol='none'
+boundary_layer='none'
+chemistry='none'
+cloud='none'
!!convection='none'
dynamics='gungho'
!!electric='none'
@@ -1186,23 +1211,23 @@ external_forcing=.false.
iau=.false.
iau_sst=.false.
iau_surf=.false.
-!!methane_oxidation=.false.
+methane_oxidation=.false.
!!microphysics='none'
-!!orographic_drag='none'
-!!radiation='none'
-!!spectral_gwd='none'
-!!stochastic_physics='none'
-!!surface='none'
+orographic_drag='none'
+radiation='none'
+spectral_gwd='none'
+stochastic_physics='none'
+surface='none'
[namelist:solver]
-fail_on_non_converged=.false.
+!!fail_on_non_converged=.false.
gcrk=18
!!jacobi_relaxation=0.5
-maximum_iterations=50
+maximum_iterations=7
method='chebyshev'
-monitor_convergence=.true.
+monitor_convergence=.false.
preconditioner='diagonal'
-tolerance=1.0e-18
+tolerance=1.0e-6
[namelist:specified_surface]
!!function_amplitude_e=200
@@ -1229,10 +1254,10 @@ tolerance=1.0e-18
!!time_units_sst='seconds'
[!!namelist:spectral_gwd]
-add_cgw=.false.
-!!cgw_scale_factor=1.0
+add_cgw=.true.
+!!cgw_scale_factor=0.86
ussp_heating=.true.
-ussp_launch_factor=1.3
+ussp_launch_factor=1.2
wavelstar=4300.0
[!!namelist:star]
@@ -1285,9 +1310,9 @@ ens_memb=${ENSEMBLE_MEMBER}
!!rp_lsfc_orog_drag_param=0.15,0.15,0.15
!!rp_lsfc_z0_soil=1.0e-3,1.0e-3,1.0e-3
!!rp_lsfc_z0_urban_mult=1.0,1.0,1.0
-!!rp_lsfc_z0hm_pft=1.65000,1.65000,1.00000e-2,1.00000e-2,1.00000e-1
-!!rp_lsfc_z0hm_pft_max=1.65000,1.65000,1.00000e-2,1.00000e-2,1.00000e-1
-!!rp_lsfc_z0hm_pft_min=1.65000,1.65000,1.00000e-2,1.00000e-2,1.00000e-1
+!!rp_lsfc_z0hm_pft=1.00,1.00,0.022,0.022,0.025
+!!rp_lsfc_z0hm_pft_max=1.00,1.00,0.022,0.022,0.025
+!!rp_lsfc_z0hm_pft_min=1.00,1.00,0.022,0.022,0.025
!!rp_lsfc_z0hm_soil=2.0e-1,2.0e-1,2.0e-1
!!rp_lsfc_z0v=
!!rp_lsfc_z0v_max=
@@ -1332,7 +1357,7 @@ ens_memb=${ENSEMBLE_MEMBER}
!!spt_use_convection=.true.
!!spt_use_microphysics=.true.
!!spt_use_radiation=.true.
-stph_n_max=22
+stph_n_max=60
stph_n_min=20
use_random_parameters=.false.
use_skeb=.false.
@@ -1363,8 +1388,8 @@ timescale=1.0
[namelist:time]
calendar='timestep'
-calendar_origin='2018-04-14 21:00:00'
-calendar_start='2018-04-14 21:00:00'
+calendar_origin='2021-06-02 00:00:00'
+calendar_start='2021-06-02 00:00:00'
calendar_type='gregorian'
timestep_end='$RESTART_STOP'
timestep_start='$RESTART_START'
@@ -1372,7 +1397,7 @@ timestep_start='$RESTART_START'
[namelist:timestepping]
alpha=0.55
dt=$DT
-inner_iterations=2
+inner_iterations=1
method='semi_implicit'
outer_iterations=2
runge_kutta_method='forward_euler'
@@ -1387,6 +1412,7 @@ adjust_theta=.false.
!!adjust_theta_above=30000.0
adjust_tracer_equation=.false.
adjust_vhv_wind=.false.
+ageofair_reset_level=10
broken_w2_projection=.false.
calculate_detj='upwind'
cap_density_predictor=0.5
@@ -1403,14 +1429,15 @@ ffsl_inner_order=0
ffsl_outer_order=1
ffsl_splitting=5*1
ffsl_unity_3d=.false.
-ffsl_vertical_order=5*2
-field_names='density','potential_temperature','wind','moisture','cloud'
+ffsl_vertical_order=2,2,1,2,2
+field_names='density','potential_temperature','wind','moisture',
+ ='con_tracer'
fv_horizontal_order=2
fv_vertical_order=2
horizontal_method=5*1
horizontal_monotone=5*1
-log_space=5*.false.
-max_vert_cfl_calc='uniform'
+log_space=.true.,.true.,.false.,.false.,.false.
+max_vert_cfl_calc='dep_point'
min_val_abs_tol=-1.0e-12
min_val_max_iterations=10
min_val_method='iterative'
@@ -1420,7 +1447,7 @@ operators='fv'
panel_edge_high_order=.true.
panel_edge_treatment='none'
profile_size=5
-reversible=5*.false.
+reversible=.true.,.true.,.false.,.true.,.true.
runge_kutta_method='ssp3'
scheme=5*1
si_outer_transport='none'
@@ -1430,10 +1457,11 @@ splitting=5*1
substep_transport='off'
theta_dispersion_correction=.false.
theta_variable='dry'
+transport_ageofair=.false.
use_density_predictor=.false.
vertical_method=5*1
vertical_monotone=5*1
-vertical_monotone_order=5*1
+vertical_monotone_order=5*3
vertical_sl_order='cubic'
wind_mono_top=.false.
!!wind_mono_top_depth=5
diff --git a/rose-stem/site/common/jedi_lfric_tests/tasks_jedi_lfric_tests.cylc b/rose-stem/site/common/jedi_lfric_tests/tasks_jedi_lfric_tests.cylc
index 22c3c074..b13cd70f 100644
--- a/rose-stem/site/common/jedi_lfric_tests/tasks_jedi_lfric_tests.cylc
+++ b/rose-stem/site/common/jedi_lfric_tests/tasks_jedi_lfric_tests.cylc
@@ -5,12 +5,11 @@
{# ########################################################################### #}
{% do LOG.debug("Entered site/common/jedi_lfric_tests/tasks_jedi_lfric_tests.cylc") %}
-{% if task_ns.conf_name == "nwp_gal9-C12" %}
+{% if task_ns.conf_name == "nwp_gal9-C12_MG" %}
{% do task_dict.update({
- "opt_confs": ["nwp_gal9"],
- "resolution": "C12",
- "ancil_resolution": "C12",
+ "opt_confs": ["nwp_gal9_c12"],
+ "resolution": "C12_MG",
"DT": 1800,
"tsteps": 12,
"mpi_parts": 6,
@@ -21,7 +20,7 @@
{% do task_dict.update({
"opt_confs": ["runge-kutta"],
"resolution": "C12",
- "ancil_resolution": "C12",
+ "DT": 1,
"tsteps": 20,
}) %}
@@ -61,181 +60,174 @@
"mpi_parts": 6,
}) %}
-{% elif task_ns.conf_name == "tlm_forecast_tl_default-C12" %}
+{% elif task_ns.conf_name == "tlm_forecast_tl_nwp_gal9-C12_MG" %}
{% do task_dict.update({
"app_name": "jedi_tlm_forecast_tl",
- "opt_confs": ["default"],
- "resolution": "C12",
+ "opt_confs": ["nwp_gal9_c12", "rrt_equals_dt", "semi_strict_solver"],
+ "resolution": "C12_MG",
"ancil_resolution": "C12",
"DT": 1800,
"tsteps": 13,
"mpi_parts": 6,
}) %}
-{% elif task_ns.conf_name == "id_tlm_tests_default-C12" %}
+{% elif task_ns.conf_name == "id_tlm_tests_nwp_gal9-C12_MG" %}
{% do task_dict.update({
"app_name": "jedi_id_tlm_tests",
- "opt_confs": ["default"],
- "resolution": "C12",
+ "opt_confs": ["nwp_gal9_c12"],
+ "resolution": "C12_MG",
"ancil_resolution": "C12",
- "DT": 3600,
+ "DT": 1800,
"tsteps": 13,
"mpi_parts": 6,
}) %}
-{% elif task_ns.conf_name == "id_tlm_tests_default-1PE-C12" %}
+{% elif task_ns.conf_name == "id_tlm_tests_nwp_gal9-1PE-C12_MG" %}
{% do task_dict.update({
"app_name": "jedi_id_tlm_tests",
- "opt_confs": ["default"],
- "resolution": "C12",
+ "opt_confs": ["nwp_gal9_c12"],
+ "resolution": "C12_MG",
"ancil_resolution": "C12",
- "DT": 3600,
+ "DT": 1800,
"tsteps": 13,
"mpi_parts": 1,
}) %}
-{% elif task_ns.conf_name == "tlm_tests_default-C12" %}
+{% elif task_ns.conf_name == "tlm_tests_nwp_gal9-C12_MG" %}
{% do task_dict.update({
"app_name": "jedi_tlm_tests",
- "opt_confs": ["default"],
- "resolution": "C12",
+ "opt_confs": ["nwp_gal9_c12", "rrt_equals_dt", "semi_strict_solver"],
+ "resolution": "C12_MG",
"ancil_resolution": "C12",
- "DT": 3600,
+ "DT": 1800,
"tsteps": 13,
"mpi_parts": 6,
}) %}
-{% elif task_ns.conf_name == "tlm_tests_default-1PE-C12" %}
+{% elif task_ns.conf_name == "tlm_tests_nwp_gal9-1PE-C12_MG" %}
{% do task_dict.update({
"app_name": "jedi_tlm_tests",
- "opt_confs": ["default"],
- "resolution": "C12",
+ "opt_confs": ["nwp_gal9_c12", "rrt_equals_dt", "semi_strict_solver"],
+ "resolution": "C12_MG",
"ancil_resolution": "C12",
- "DT": 3600,
+ "DT": 1800,
"tsteps": 13,
"mpi_parts": 1,
}) %}
-{% elif task_ns.conf_name == "tlm_tests_default-4OMP-C12" %}
+{% elif task_ns.conf_name == "tlm_tests_nwp_gal9-4OMP-C12_MG" %}
{% do task_dict.update({
"app_name": "jedi_tlm_tests",
- "opt_confs": ["default"],
- "resolution": "C12",
+ "opt_confs": ["nwp_gal9_c12", "rrt_equals_dt", "semi_strict_solver"],
+ "resolution": "C12_MG",
"ancil_resolution": "C12",
- "DT": 3600,
+ "DT": 1800,
"tsteps": 13,
"mpi_parts": 6,
"threads": 4,
}) %}
-{% elif task_ns.conf_name == "tlm_tests_default-1PE-4OMP-C12" %}
+{% elif task_ns.conf_name == "tlm_tests_nwp_gal9-1PE-4OMP-C12_MG" %}
{% do task_dict.update({
"app_name": "jedi_tlm_tests",
- "opt_confs": ["default"],
- "resolution": "C12",
+ "opt_confs": ["nwp_gal9_c12", "rrt_equals_dt", "semi_strict_solver"],
+ "resolution": "C12_MG",
"ancil_resolution": "C12",
- "DT": 3600,
+ "DT": 1800,
"tsteps": 13,
"mpi_parts": 1,
"threads": 4,
}) %}
-{% elif task_ns.conf_name == "tlm_tests_default-dry-C12" %}
+{% elif task_ns.conf_name == "tlm_tests_nwp_gal9-dry-C12_MG" %}
{% do task_dict.update({
"app_name": "jedi_tlm_tests",
- "opt_confs": ["default", "dry"],
- "resolution": "C12",
+ "opt_confs": ["nwp_gal9_c12", "rrt_equals_dt", "semi_strict_solver", "dry"],
+ "resolution": "C12_MG",
"ancil_resolution": "C12",
- "DT": 3600,
+ "DT": 1800,
"tsteps": 13,
"mpi_parts": 6,
}) %}
-{% elif task_ns.conf_name == "tlm_tests_default-dry-1PE-C12" %}
+{% elif task_ns.conf_name == "tlm_tests_nwp_gal9-dry-1PE-C12_MG" %}
{% do task_dict.update({
"app_name": "jedi_tlm_tests",
- "opt_confs": ["default", "dry"],
- "resolution": "C12",
+ "opt_confs": ["nwp_gal9_c12", "rrt_equals_dt", "semi_strict_solver", "dry"],
+ "resolution": "C12_MG",
"ancil_resolution": "C12",
- "DT": 3600,
+ "DT": 1800,
"tsteps": 13,
"mpi_parts": 1,
}) %}
-{% elif task_ns.conf_name == "tlm_tests_default-dry-4OMP-C12" %}
+{% elif task_ns.conf_name == "tlm_tests_nwp_gal9-dry-4OMP-C12_MG" %}
{% do task_dict.update({
"app_name": "jedi_tlm_tests",
- "opt_confs": ["default", "dry"],
- "resolution": "C12",
+ "opt_confs": ["nwp_gal9_c12", "rrt_equals_dt", "semi_strict_solver", "dry"],
+ "resolution": "C12_MG",
"ancil_resolution": "C12",
- "DT": 3600,
+ "DT": 1800,
"tsteps": 13,
"mpi_parts": 6,
"threads": 4,
}) %}
-{% elif task_ns.conf_name == "tlm_tests_default-dry-1PE-4OMP-C12" %}
+{% elif task_ns.conf_name == "tlm_tests_nwp_gal9-dry-1PE-4OMP-C12_MG" %}
{% do task_dict.update({
"app_name": "jedi_tlm_tests",
- "opt_confs": ["default", "dry"],
- "resolution": "C12",
+ "opt_confs": ["nwp_gal9_c12", "rrt_equals_dt", "semi_strict_solver", "dry"],
+ "resolution": "C12_MG",
"ancil_resolution": "C12",
- "DT": 3600,
+ "DT": 1800,
"tsteps": 13,
"mpi_parts": 1,
"threads": 4,
}) %}
-
-{% elif task_ns.conf_name == "tlm_tests_default-relaxed_solver-C12" %}
+{% elif task_ns.conf_name == "tlm_forecast_tl_nwp_gal9-C12_op" %}
{% do task_dict.update({
- "app_name": "jedi_tlm_tests",
- "opt_confs": ["default", "relaxed_solver"],
- "resolution": "C12",
+ "app_name": "jedi_tlm_forecast_tl",
+ "opt_confs": ["nwp_gal9_c12", "rrt_equals_dt", "semi_strict_solver"],
+ "resolution": "C12_op",
"ancil_resolution": "C12",
- "DT": 3600,
+ "DT": 1800,
"tsteps": 13,
"mpi_parts": 6,
}) %}
-{% elif task_ns.conf_name == "tlm_tests_default-relaxed_solver-1PE-C12" %}
+
+{% elif task_ns.conf_name == "tlm_tests_nwp_gal9-C12_op" %}
{% do task_dict.update({
"app_name": "jedi_tlm_tests",
- "opt_confs": ["default", "relaxed_solver"],
- "resolution": "C12",
- "ancil_resolution": "C12",
- "DT": 3600,
- "tsteps": 13,
- "mpi_parts": 1,
- }) %}
-{% elif task_ns.conf_name == "tlm_forecast_tl_default-C12_op" %}
- {% do task_dict.update({
- "app_name": "jedi_tlm_forecast_tl",
- "opt_confs": ["default"],
+ "opt_confs": ["nwp_gal9_c12", "rrt_equals_dt", "semi_strict_solver"],
"resolution": "C12_op",
"ancil_resolution": "C12",
"DT": 1800,
"tsteps": 13,
"mpi_parts": 6,
}) %}
-{% elif task_ns.conf_name == "tlm_tests_default-C12_op" %}
+
+{% elif task_ns.conf_name == "tlm_tests_nwp_gal9-strict_solver-4OMP-C12_MG" %}
+
{% do task_dict.update({
"app_name": "jedi_tlm_tests",
- "opt_confs": ["default"],
- "resolution": "C12_op",
+ "opt_confs": ["nwp_gal9_c12", "rrt_equals_dt", "strict_solver"],
+ "resolution": "C12_MG",
"ancil_resolution": "C12",
- "DT": 3600,
+ "DT": 1800,
"tsteps": 13,
"mpi_parts": 6,
+ "threads": 4,
}) %}
{% elif task_ns.conf_name == "integration_tests" %}
@@ -262,19 +254,18 @@
{# List of configuration names that have no kgo #}
{% set no_kgo = [
- "id_tlm_tests_default-C12",
- "id_tlm_tests_default-1PE-C12",
- "tlm_tests_default-C12",
- "tlm_tests_default-C12_op",
- "tlm_tests_default-1PE-C12",
- "tlm_tests_default-4OMP-C12",
- "tlm_tests_default-1PE-4OMP-C12",
- "tlm_tests_default-dry-C12",
- "tlm_tests_default-dry-4OMP-C12",
- "tlm_tests_default-dry-1PE-C12",
- "tlm_tests_default-dry-1PE-4OMP-C12",
- "tlm_tests_default-relaxed_solver-C12",
- "tlm_tests_default-relaxed_solver-1PE-C12"
+ "id_tlm_tests_nwp_gal9-C12_MG",
+ "id_tlm_tests_nwp_gal9-1PE-C12_MG",
+ "tlm_tests_nwp_gal9-C12_MG",
+ "tlm_tests_nwp_gal9-C12_op",
+ "tlm_tests_nwp_gal9-1PE-C12_MG",
+ "tlm_tests_nwp_gal9-4OMP-C12_MG",
+ "tlm_tests_nwp_gal9-1PE-4OMP-C12_MG",
+ "tlm_tests_nwp_gal9-dry-C12_MG",
+ "tlm_tests_nwp_gal9-dry-4OMP-C12_MG",
+ "tlm_tests_nwp_gal9-dry-1PE-C12_MG",
+ "tlm_tests_nwp_gal9-dry-1PE-4OMP-C12_MG",
+ "tlm_tests_nwp_gal9-strict_solver-4OMP-C12_MG"
] %}
{% if task_ns.conf_name not in no_kgo %}
diff --git a/rose-stem/site/meto/groups/groups_jedi_lfric_tests.cylc b/rose-stem/site/meto/groups/groups_jedi_lfric_tests.cylc
index c5dbac60..8cb86a8f 100644
--- a/rose-stem/site/meto/groups/groups_jedi_lfric_tests.cylc
+++ b/rose-stem/site/meto/groups/groups_jedi_lfric_tests.cylc
@@ -8,7 +8,7 @@
{# Azspice Groups #}
{% do site_groups.update({
"jedi_lfric_tests_azspice_developer": [
- "jedi_lfric_tests_nwp_gal9-C12_azspice_gnu_fast-debug-64bit",
+ "jedi_lfric_tests_nwp_gal9-C12_MG_azspice_gnu_fast-debug-64bit",
"jedi_lfric_tests_runge-kutta-C12_azspice_gnu_fast-debug-64bit",
"jedi_lfric_tests_runge-kutta-C12_azspice_gnu_full-debug-64bit",
"jedi_lfric_tests_forecast_gh-si-for-linear-C12_azspice_gnu_fast-debug-64bit",
@@ -16,24 +16,23 @@
"jedi_lfric_tests_forecast_pseudo_default-C12_azspice_gnu_fast-debug-64bit",
"jedi_lfric_tests_forecast_pseudo_pseudomodel-C12_azspice_gnu_fast-debug-64bit",
"jedi_lfric_tests_forecast_pseudo_pseudomodel-C12_azspice_gnu_full-debug-64bit",
- "jedi_lfric_tests_tlm_forecast_tl_default-C12_azspice_gnu_fast-debug-64bit",
- "jedi_lfric_tests_id_tlm_tests_default-C12_azspice_gnu_fast-debug-64bit",
- "jedi_lfric_tests_id_tlm_tests_default-1PE-C12_azspice_gnu_fast-debug-64bit",
- "jedi_lfric_tests_tlm_tests_default-C12_azspice_gnu_fast-debug-64bit",
- "jedi_lfric_tests_tlm_tests_default-1PE-C12_azspice_gnu_fast-debug-64bit",
- "jedi_lfric_tests_tlm_tests_default-4OMP-C12_azspice_gnu_fast-debug-64bit",
- "jedi_lfric_tests_tlm_tests_default-1PE-4OMP-C12_azspice_gnu_fast-debug-64bit",
- "jedi_lfric_tests_tlm_tests_default-dry-C12_azspice_gnu_fast-debug-64bit",
- "jedi_lfric_tests_tlm_tests_default-dry-1PE-C12_azspice_gnu_fast-debug-64bit",
- "jedi_lfric_tests_tlm_tests_default-dry-4OMP-C12_azspice_gnu_fast-debug-64bit",
- "jedi_lfric_tests_tlm_tests_default-dry-1PE-4OMP-C12_azspice_gnu_fast-debug-64bit",
- "jedi_lfric_tests_tlm_tests_default-relaxed_solver-C12_azspice_gnu_fast-debug-64bit",
- "jedi_lfric_tests_tlm_tests_default-relaxed_solver-1PE-C12_azspice_gnu_fast-debug-64bit",
+ "jedi_lfric_tests_tlm_forecast_tl_nwp_gal9-C12_MG_azspice_gnu_fast-debug-64bit",
+ "jedi_lfric_tests_id_tlm_tests_nwp_gal9-C12_MG_azspice_gnu_fast-debug-64bit",
+ "jedi_lfric_tests_id_tlm_tests_nwp_gal9-1PE-C12_MG_azspice_gnu_fast-debug-64bit",
+ "jedi_lfric_tests_tlm_tests_nwp_gal9-C12_MG_azspice_gnu_fast-debug-64bit",
+ "jedi_lfric_tests_tlm_tests_nwp_gal9-1PE-C12_MG_azspice_gnu_fast-debug-64bit",
+ "jedi_lfric_tests_tlm_tests_nwp_gal9-4OMP-C12_MG_azspice_gnu_fast-debug-64bit",
+ "jedi_lfric_tests_tlm_tests_nwp_gal9-1PE-4OMP-C12_MG_azspice_gnu_fast-debug-64bit",
+ "jedi_lfric_tests_tlm_tests_nwp_gal9-dry-C12_MG_azspice_gnu_fast-debug-64bit",
+ "jedi_lfric_tests_tlm_tests_nwp_gal9-dry-1PE-C12_MG_azspice_gnu_fast-debug-64bit",
+ "jedi_lfric_tests_tlm_tests_nwp_gal9-dry-4OMP-C12_MG_azspice_gnu_fast-debug-64bit",
+ "jedi_lfric_tests_tlm_tests_nwp_gal9-dry-1PE-4OMP-C12_MG_azspice_gnu_fast-debug-64bit",
+ "jedi_lfric_tests_tlm_tests_nwp_gal9-strict_solver-4OMP-C12_MG_azspice_gnu_fast-debug-64bit-rsolver64",
"jedi_lfric_tests_azspice_integration_tests",
],
"jedi_lfric_tests_op_azspice_developer": [
- "jedi_lfric_tests_tlm_forecast_tl_default-C12_op_azspice_gnu_fast-debug-64bit",
- "jedi_lfric_tests_tlm_tests_default-C12_op_azspice_gnu_fast-debug-64bit",
+ "jedi_lfric_tests_tlm_forecast_tl_nwp_gal9-C12_op_azspice_gnu_fast-debug-64bit",
+ "jedi_lfric_tests_tlm_tests_nwp_gal9-C12_op_azspice_gnu_fast-debug-64bit",
],
"jedi_lfric_tests_azspice": [
"jedi_lfric_tests_azspice_developer",
@@ -44,6 +43,7 @@
],
"jedi_lfric_tests_azspice_build": [
"build_jedi_lfric_tests_azspice_gnu_fast-debug-64bit",
+ "build_jedi_lfric_tests_azspice_gnu_fast-debug-64bit-rsolver64",
"build_jedi_lfric_tests_azspice_gnu_full-debug-64bit",
],
}) %}
@@ -52,29 +52,28 @@
{# EX1A Groups #}
{% do site_groups.update({
"jedi_lfric_tests_ex1a_developer": [
- "jedi_lfric_tests_nwp_gal9-C12_ex1a_cce_fast-debug-64bit",
+ "jedi_lfric_tests_nwp_gal9-C12_MG_ex1a_cce_fast-debug-64bit",
"jedi_lfric_tests_runge-kutta-C12_ex1a_cce_fast-debug-64bit",
"jedi_lfric_tests_forecast_gh-si-for-linear-C12_ex1a_cce_fast-debug-64bit",
"jedi_lfric_tests_forecast_pseudo_default-C12_ex1a_cce_fast-debug-64bit",
"jedi_lfric_tests_forecast_pseudo_pseudomodel-C12_ex1a_cce_fast-debug-64bit",
- "jedi_lfric_tests_tlm_forecast_tl_default-C12_ex1a_cce_fast-debug-64bit",
- "jedi_lfric_tests_id_tlm_tests_default-C12_ex1a_cce_fast-debug-64bit",
- "jedi_lfric_tests_id_tlm_tests_default-1PE-C12_ex1a_cce_fast-debug-64bit",
- "jedi_lfric_tests_tlm_tests_default-C12_ex1a_cce_fast-debug-64bit",
- "jedi_lfric_tests_tlm_tests_default-1PE-C12_ex1a_cce_fast-debug-64bit",
- "jedi_lfric_tests_tlm_tests_default-4OMP-C12_ex1a_cce_fast-debug-64bit",
- "jedi_lfric_tests_tlm_tests_default-1PE-4OMP-C12_ex1a_cce_fast-debug-64bit",
- "jedi_lfric_tests_tlm_tests_default-dry-C12_ex1a_cce_fast-debug-64bit",
- "jedi_lfric_tests_tlm_tests_default-dry-1PE-C12_ex1a_cce_fast-debug-64bit",
- "jedi_lfric_tests_tlm_tests_default-dry-4OMP-C12_ex1a_cce_fast-debug-64bit",
- "jedi_lfric_tests_tlm_tests_default-dry-1PE-4OMP-C12_ex1a_cce_fast-debug-64bit",
- "jedi_lfric_tests_tlm_tests_default-relaxed_solver-C12_ex1a_cce_fast-debug-64bit",
- "jedi_lfric_tests_tlm_tests_default-relaxed_solver-1PE-C12_ex1a_cce_fast-debug-64bit",
+ "jedi_lfric_tests_tlm_forecast_tl_nwp_gal9-C12_MG_ex1a_cce_fast-debug-64bit",
+ "jedi_lfric_tests_id_tlm_tests_nwp_gal9-C12_MG_ex1a_cce_fast-debug-64bit",
+ "jedi_lfric_tests_id_tlm_tests_nwp_gal9-1PE-C12_MG_ex1a_cce_fast-debug-64bit",
+ "jedi_lfric_tests_tlm_tests_nwp_gal9-C12_MG_ex1a_cce_fast-debug-64bit",
+ "jedi_lfric_tests_tlm_tests_nwp_gal9-1PE-C12_MG_ex1a_cce_fast-debug-64bit",
+ "jedi_lfric_tests_tlm_tests_nwp_gal9-4OMP-C12_MG_ex1a_cce_fast-debug-64bit",
+ "jedi_lfric_tests_tlm_tests_nwp_gal9-1PE-4OMP-C12_MG_ex1a_cce_fast-debug-64bit",
+ "jedi_lfric_tests_tlm_tests_nwp_gal9-dry-C12_MG_ex1a_cce_fast-debug-64bit",
+ "jedi_lfric_tests_tlm_tests_nwp_gal9-dry-1PE-C12_MG_ex1a_cce_fast-debug-64bit",
+ "jedi_lfric_tests_tlm_tests_nwp_gal9-dry-4OMP-C12_MG_ex1a_cce_fast-debug-64bit",
+ "jedi_lfric_tests_tlm_tests_nwp_gal9-dry-1PE-4OMP-C12_MG_ex1a_cce_fast-debug-64bit",
+ "jedi_lfric_tests_tlm_tests_nwp_gal9-strict_solver-4OMP-C12_MG_ex1a_cce_fast-debug-64bit-rsolver64",
"jedi_lfric_tests_ex1a_integration_tests",
],
"jedi_lfric_tests_op_ex1a_developer": [
- "jedi_lfric_tests_tlm_forecast_tl_default-C12_op_ex1a_cce_fast-debug-64bit",
- "jedi_lfric_tests_tlm_tests_default-C12_op_ex1a_cce_fast-debug-64bit",
+ "jedi_lfric_tests_tlm_forecast_tl_nwp_gal9-C12_op_ex1a_cce_fast-debug-64bit",
+ "jedi_lfric_tests_tlm_tests_nwp_gal9-C12_op_ex1a_cce_fast-debug-64bit",
],
"jedi_lfric_tests_ex1a": [
"jedi_lfric_tests_ex1a_developer",
@@ -85,6 +84,7 @@
],
"jedi_lfric_tests_ex1a_build": [
"build_jedi_lfric_tests_ex1a_cce_fast-debug-64bit",
+ "build_jedi_lfric_tests_ex1a_cce_fast-debug-64bit-rsolver64",
],
}) %}