Align jedi_lfric_tests linear model/adjoint testing to adjoint_tests and linear_model

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,18 +88,18 @@ 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.,
 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,23 +252,33 @@ 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.,
 /
 &orography
 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',
 &timestepping
 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,