Differentiate namelists

Author: cbegeman

compass/ocean/tests/turbulence_closure/forward.py

@@ -50,6 +50,12 @@ def __init__(self, test_case, resolution, name='forward', subdir=None,
                          ntasks=ntasks, min_tasks=min_tasks, openmp_threads=openmp_threads)
         self.add_namelist_file('compass.ocean.tests.turbulence_closure',
                                'namelist.forward')
+        if resolution < 500:
+            self.add_namelist_file('compass.ocean.tests.turbulence_closure',
+                                   'namelist.les.forward')
+        if resolution < 100:
+            self.add_namelist_file('compass.ocean.tests.turbulence_closure',
+                                   'namelist.nonhydro.forward')
 
         # make sure output is double precision
         self.add_streams_file('compass.ocean.streams', 'streams.output')

compass/ocean/tests/turbulence_closure/namelist.forward

@@ -1,40 +1,18 @@
 config_write_output_on_startup = .false.
 config_time_integrator = 'split_implicit'
+config_btr_si_partition_match_mode = .false.
 config_run_duration = '0004_00:00:00'
-config_dt = '00:00:00.1'
 config_use_implicit_bottom_drag = .false.
 config_zonal_ssh_grad = 0.0
 config_meridional_ssh_grad = 0.0
-config_aust_scale_factor = 0.70710678
 config_use_mom_div2 = .true.
 config_mom_div2 = .00002
 config_use_mom_div4 = .false.
 config_mom_div4 = 1.0e12
-config_enable_nonhydrostatic_mode = .true.
-config_triskCV = .false.
-config_nonhydrostatic_preconditioner = 'bjacobi'
-config_nonhydrostatic_solver_type = 'cg'
-config_nonhydrostatic_solve_surface_boundary_condition = 'pressureTopGradientBottom'
-config_use_constant_forced_pgf = .false.
-config_use_two_equation_turbulence_model = .true.
-config_two_equation_model_choice = 'omega'
 config_use_activeTracers_surface_bulk_forcing = .true.
-config_LES_mode = .true.
 config_vertMom_del2 = 2e-6
 config_tracer_del2 = 2e-6
 config_mom_del2 = .true.
 config_mom_del2 = 2e-6
-config_use_cvmix = .false.
 config_cvmix_background_diffusion = 1.0e-2
 config_cvmix_background_viscosity = 1.0e-2
-config_btr_si_partition_match_mode = .false.
-config_two_equation_length_min = 0.1
-config_two_equation_tke_min = 1e-10
-config_two_equation_psi_min = 1e-10
-config_tke_ini = 1.0e-30
-config_thickness_flux_type = 'upwind'
-config_LES_noise_enable = .true.
-config_LES_noise_max_time = 150
-config_LES_noise_min_level = 5
-config_LES_noise_max_level = 45 
-config_LES_noise_perturbation_magnitude = 1e-4

compass/ocean/tests/turbulence_closure/namelist.les.forward

@@ -0,0 +1,13 @@
+config_LES_mode = .true.
+config_use_two_equation_turbulence_model = .true.
+config_two_equation_model_choice = 'omega'
+config_use_cvmix = .false.
+config_two_equation_length_min = 0.1
+config_two_equation_tke_min = 1e-10
+config_two_equation_psi_min = 1e-10
+config_tke_ini = 1.0e-30
+config_LES_noise_enable = .true.
+config_LES_noise_max_time = 150
+config_LES_noise_min_level = 5
+config_LES_noise_max_level = 45 
+config_LES_noise_perturbation_magnitude = 1e-4

compass/ocean/tests/turbulence_closure/namelist.nonhydro.forward

@@ -0,0 +1,8 @@
+config_enable_nonhydrostatic_mode = .true.
+config_triskCV = .false.
+config_nonhydrostatic_preconditioner = 'bjacobi'
+config_nonhydrostatic_solver_type = 'cg'
+config_nonhydrostatic_solve_surface_boundary_condition = 'pressureTopGradientBottom'
+config_use_constant_forced_pgf = .false.
+config_thickness_flux_type = 'upwind'
+config_aust_scale_factor = 0.70710678