diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 756bf2f155..7e3603df2f 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -133,10 +133,6 @@ steps: command: > julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/single_column_nonorographic_gravity_wave.yml - - julia --color=yes --project=examples regression_tests/test_mse.jl - --job_id single_column_nonorographic_gravity_wave - --out_dir single_column_nonorographic_gravity_wave artifact_paths: "single_column_nonorographic_gravity_wave/*" - group: "Box Examples" @@ -225,9 +221,6 @@ steps: julia --color=yes --project=examples post_processing/plot/plot_pipeline.jl --nc_dir sphere_baroclinic_wave_rhoe --fig_dir sphere_baroclinic_wave_rhoe --case_name dry_baroclinic_wave - - julia --color=yes --project=examples regression_tests/test_mse.jl - --job_id sphere_baroclinic_wave_rhoe --out_dir sphere_baroclinic_wave_rhoe artifact_paths: "sphere_baroclinic_wave_rhoe/*" - label: ":computer: no lim ARS baroclinic wave (ρe) equilmoist" @@ -262,25 +255,25 @@ steps: --fig_dir sphere_baroclinic_wave_rhoe_equilmoist_expvdiff --case_name aquaplanet artifact_paths: "sphere_baroclinic_wave_rhoe_equilmoist_expvdiff/*" - - label: ":computer: SSP zalesak tracer & energy upwind baroclinic wave (ρe_tot) equilmoist" - command: > - julia --color=yes --project=examples examples/hybrid/driver.jl - --config_file $CONFIG_PATH/$$JOB_NAME.yml + # Add this back when we figure out what to do with SSP and zalesak + # - label: ":computer: SSP zalesak tracer & energy upwind baroclinic wave (ρe_tot) equilmoist" + # command: > + # julia --color=yes --project=examples examples/hybrid/driver.jl + # --config_file $CONFIG_PATH/$$JOB_NAME.yml - julia --color=yes --project=examples post_processing/remap/remap_pipeline.jl - --data_dir $$JOB_NAME - --out_dir $$JOB_NAME + # julia --color=yes --project=examples post_processing/remap/remap_pipeline.jl + # --data_dir $$JOB_NAME + # --out_dir $$JOB_NAME - julia --color=yes --project=examples post_processing/plot/plot_pipeline.jl - --nc_dir $$JOB_NAME - --fig_dir $$JOB_NAME --case_name moist_baroclinic_wave + # julia --color=yes --project=examples post_processing/plot/plot_pipeline.jl + # --nc_dir $$JOB_NAME + # --fig_dir $$JOB_NAME --case_name moist_baroclinic_wave - julia --color=yes --project=examples regression_tests/test_mse.jl --job_id $$JOB_NAME --out_dir $$JOB_NAME - artifact_paths: "$$JOB_NAME/*" - agents: - slurm_mem: 64GB - env: - JOB_NAME: "sphere_zalesak_upwind_tracer_energy_ssp_baroclinic_wave_rhoe_equilmoist" + # artifact_paths: "$$JOB_NAME/*" + # agents: + # slurm_mem: 64GB + # env: + # JOB_NAME: "sphere_zalesak_upwind_tracer_energy_ssp_baroclinic_wave_rhoe_equilmoist" - label: ":computer: no lim ARS baroclinic wave (ρe) equilmoist check conservation float64" command: "julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/sphere_baroclinic_wave_rhoe_equilmoist_conservation_ft64.yml" @@ -297,9 +290,6 @@ steps: julia --color=yes --project=examples post_processing/plot/plot_pipeline.jl --nc_dir sphere_held_suarez_rhotheta --fig_dir sphere_held_suarez_rhotheta --case_name dry_held_suarez - - julia --color=yes --project=examples regression_tests/test_mse.jl - --job_id sphere_held_suarez_rhotheta --out_dir sphere_held_suarez_rhotheta artifact_paths: "sphere_held_suarez_rhotheta/*" - label: ":computer: held suarez (ρe) hightop" @@ -314,9 +304,6 @@ steps: julia --color=yes --project=examples post_processing/plot/plot_pipeline.jl --nc_dir sphere_held_suarez_rhoe_hightop --fig_dir sphere_held_suarez_rhoe_hightop --case_name dry_held_suarez - - julia --color=yes --project=examples regression_tests/test_mse.jl - --job_id sphere_held_suarez_rhoe_hightop --out_dir sphere_held_suarez_rhoe_hightop artifact_paths: "sphere_held_suarez_rhoe_hightop/*" - label: ":computer: no lim ARS held suarez (ρe) equilmoist hightop sponge" @@ -352,10 +339,6 @@ steps: julia --color=yes --project=examples post_processing/plot/plot_pipeline.jl --nc_dir sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res --fig_dir sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res --case_name aquaplanet - - julia --color=yes --project=examples regression_tests/test_mse.jl - --job_id sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res - --out_dir sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res artifact_paths: "sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res/*" agents: slurm_mem: 20GB diff --git a/config/model_configs/single_column_nonorographic_gravity_wave.yml b/config/model_configs/single_column_nonorographic_gravity_wave.yml index 5847e080c9..4dd84a3dfd 100644 --- a/config/model_configs/single_column_nonorographic_gravity_wave.yml +++ b/config/model_configs/single_column_nonorographic_gravity_wave.yml @@ -1,5 +1,4 @@ dt_save_to_disk: "500secs" -regression_test: true initial_condition: "IsothermalProfile" t_end: "1500secs" config: "column" diff --git a/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.yml b/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.yml index 5e546d0070..66d727c5ea 100644 --- a/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.yml +++ b/config/model_configs/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.yml @@ -12,7 +12,6 @@ vert_diff: "true" idealized_insolation: false z_max: 45000.0 precip_model: "0M" -regression_test: true job_id: "sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res" moist: "equil" toml: [toml/sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res.toml] diff --git a/config/model_configs/sphere_baroclinic_wave_rhoe.yml b/config/model_configs/sphere_baroclinic_wave_rhoe.yml index 8febe78d17..aa20a5b53b 100644 --- a/config/model_configs/sphere_baroclinic_wave_rhoe.yml +++ b/config/model_configs/sphere_baroclinic_wave_rhoe.yml @@ -1,5 +1,4 @@ dt_save_to_disk: "2days" -regression_test: true initial_condition: "DryBaroclinicWave" dt: "400secs" t_end: "10days" diff --git a/config/model_configs/sphere_held_suarez_rhoe_hightop.yml b/config/model_configs/sphere_held_suarez_rhoe_hightop.yml index 89e86b61cd..5924785c11 100644 --- a/config/model_configs/sphere_held_suarez_rhoe_hightop.yml +++ b/config/model_configs/sphere_held_suarez_rhoe_hightop.yml @@ -1,6 +1,5 @@ dz_bottom: 300.0 dt_save_to_disk: "4days" -regression_test: true t_end: "8days" forcing: "held_suarez" dt: "400secs" diff --git a/config/model_configs/sphere_held_suarez_rhotheta.yml b/config/model_configs/sphere_held_suarez_rhotheta.yml index 2223e1ee8c..fab665b1fd 100644 --- a/config/model_configs/sphere_held_suarez_rhotheta.yml +++ b/config/model_configs/sphere_held_suarez_rhotheta.yml @@ -1,6 +1,5 @@ energy_name: "rhotheta" dt_save_to_disk: "10days" -regression_test: true t_end: "20days" forcing: "held_suarez" dt: "400secs" diff --git a/config/model_configs/sphere_zalesak_upwind_tracer_energy_ssp_baroclinic_wave_rhoe_equilmoist.yml b/config/model_configs/sphere_zalesak_upwind_tracer_energy_ssp_baroclinic_wave_rhoe_equilmoist.yml index aa077d1748..79468ee586 100644 --- a/config/model_configs/sphere_zalesak_upwind_tracer_energy_ssp_baroclinic_wave_rhoe_equilmoist.yml +++ b/config/model_configs/sphere_zalesak_upwind_tracer_energy_ssp_baroclinic_wave_rhoe_equilmoist.yml @@ -7,7 +7,6 @@ t_end: "5days" ode_algo: "SSP333" energy_upwinding: zalesak precip_model: "0M" -regression_test: true job_id: "sphere_zalesak_upwind_tracer_energy_ssp_baroclinic_wave_rhoe_equilmoist" moist: "equil" apply_limiter: true diff --git a/regression_tests/mse_tables.jl b/regression_tests/mse_tables.jl index 4ac024447f..db56f255be 100644 --- a/regression_tests/mse_tables.jl +++ b/regression_tests/mse_tables.jl @@ -5,13 +5,6 @@ # all_best_mse = OrderedCollections.OrderedDict() # -all_best_mse["sphere_baroclinic_wave_rhoe"] = OrderedCollections.OrderedDict() -all_best_mse["sphere_baroclinic_wave_rhoe"][(:c, :ρ)] = 0 -all_best_mse["sphere_baroclinic_wave_rhoe"][(:c, :ρe_tot)] = 0 -all_best_mse["sphere_baroclinic_wave_rhoe"][(:c, :uₕ, :components, :data, 1)] = 0 -all_best_mse["sphere_baroclinic_wave_rhoe"][(:c, :uₕ, :components, :data, 2)] = 0 -all_best_mse["sphere_baroclinic_wave_rhoe"][(:f, :u₃, :components, :data, 1)] = 0 -# all_best_mse["sphere_baroclinic_wave_rhoe_equilmoist"] = OrderedCollections.OrderedDict() all_best_mse["sphere_baroclinic_wave_rhoe_equilmoist"][(:c, :ρ)] = 0 all_best_mse["sphere_baroclinic_wave_rhoe_equilmoist"][(:c, :ρe_tot)] = 0 @@ -20,28 +13,6 @@ all_best_mse["sphere_baroclinic_wave_rhoe_equilmoist"][(:c, :uₕ, :components, all_best_mse["sphere_baroclinic_wave_rhoe_equilmoist"][(:c, :ρq_tot)] = 0 all_best_mse["sphere_baroclinic_wave_rhoe_equilmoist"][(:f, :u₃, :components, :data, 1)] = 0 # -all_best_mse["sphere_zalesak_upwind_tracer_energy_ssp_baroclinic_wave_rhoe_equilmoist"] = OrderedCollections.OrderedDict() -all_best_mse["sphere_zalesak_upwind_tracer_energy_ssp_baroclinic_wave_rhoe_equilmoist"][(:c, :ρ)] = 0 -all_best_mse["sphere_zalesak_upwind_tracer_energy_ssp_baroclinic_wave_rhoe_equilmoist"][(:c, :uₕ, :components, :data, 1)] = 0 -all_best_mse["sphere_zalesak_upwind_tracer_energy_ssp_baroclinic_wave_rhoe_equilmoist"][(:c, :uₕ, :components, :data, 2)] = 0 -all_best_mse["sphere_zalesak_upwind_tracer_energy_ssp_baroclinic_wave_rhoe_equilmoist"][(:c, :ρe_tot)] = 0 -all_best_mse["sphere_zalesak_upwind_tracer_energy_ssp_baroclinic_wave_rhoe_equilmoist"][(:c, :ρq_tot)] = 0 -all_best_mse["sphere_zalesak_upwind_tracer_energy_ssp_baroclinic_wave_rhoe_equilmoist"][(:f, :u₃, :components, :data, 1)] = 0 -# -all_best_mse["sphere_held_suarez_rhotheta"] = OrderedCollections.OrderedDict() -all_best_mse["sphere_held_suarez_rhotheta"][(:c, :ρ)] = 0 -all_best_mse["sphere_held_suarez_rhotheta"][(:c, :ρθ)] = 0 -all_best_mse["sphere_held_suarez_rhotheta"][(:c, :uₕ, :components, :data, 1)] = 0 -all_best_mse["sphere_held_suarez_rhotheta"][(:c, :uₕ, :components, :data, 2)] = 0 -all_best_mse["sphere_held_suarez_rhotheta"][(:f, :u₃, :components, :data, 1)] = 0 -# -all_best_mse["sphere_held_suarez_rhoe_hightop"] = OrderedCollections.OrderedDict() -all_best_mse["sphere_held_suarez_rhoe_hightop"][(:c, :ρ)] = 0 -all_best_mse["sphere_held_suarez_rhoe_hightop"][(:c, :ρe_tot)] = 0 -all_best_mse["sphere_held_suarez_rhoe_hightop"][(:c, :uₕ, :components, :data, 1)] = 0 -all_best_mse["sphere_held_suarez_rhoe_hightop"][(:c, :uₕ, :components, :data, 2)] = 0 -all_best_mse["sphere_held_suarez_rhoe_hightop"][(:f, :u₃, :components, :data, 1)] = 0 -# all_best_mse["sphere_held_suarez_rhoe_equilmoist_hightop_sponge"] = OrderedCollections.OrderedDict() all_best_mse["sphere_held_suarez_rhoe_equilmoist_hightop_sponge"][(:c, :ρ)] = 0 all_best_mse["sphere_held_suarez_rhoe_equilmoist_hightop_sponge"][(:c, :ρe_tot)] = 0 @@ -50,14 +21,6 @@ all_best_mse["sphere_held_suarez_rhoe_equilmoist_hightop_sponge"][(:c, :uₕ, :c all_best_mse["sphere_held_suarez_rhoe_equilmoist_hightop_sponge"][(:c, :ρq_tot)] = 0 all_best_mse["sphere_held_suarez_rhoe_equilmoist_hightop_sponge"][(:f, :u₃, :components, :data, 1)] = 0 # -all_best_mse["sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res"] = OrderedCollections.OrderedDict() -all_best_mse["sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res"][(:c, :ρ)] = 0 -all_best_mse["sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res"][(:c, :uₕ, :components, :data, 1)] = 0 -all_best_mse["sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res"][(:c, :uₕ, :components, :data, 2)] = 0 -all_best_mse["sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res"][(:c, :ρe_tot)] = 0 -all_best_mse["sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res"][(:c, :ρq_tot)] = 0 -all_best_mse["sphere_aquaplanet_rhoe_equilmoist_allsky_gw_res"][(:f, :u₃, :components, :data, 1)] = 0 -# all_best_mse["sphere_aquaplanet_rhoe_equilmoist_allsky_gw_raw_zonallyasymmetric"] = OrderedCollections.OrderedDict() all_best_mse["sphere_aquaplanet_rhoe_equilmoist_allsky_gw_raw_zonallyasymmetric"][(:c, :ρ)] = 0 all_best_mse["sphere_aquaplanet_rhoe_equilmoist_allsky_gw_raw_zonallyasymmetric"][(:c, :uₕ, :components, :data, 1)] = 0 @@ -66,13 +29,6 @@ all_best_mse["sphere_aquaplanet_rhoe_equilmoist_allsky_gw_raw_zonallyasymmetric" all_best_mse["sphere_aquaplanet_rhoe_equilmoist_allsky_gw_raw_zonallyasymmetric"][(:c, :ρq_tot)] = 0 all_best_mse["sphere_aquaplanet_rhoe_equilmoist_allsky_gw_raw_zonallyasymmetric"][(:f, :u₃, :components, :data, 1)] = 0 # -all_best_mse["single_column_nonorographic_gravity_wave"] = OrderedCollections.OrderedDict() -all_best_mse["single_column_nonorographic_gravity_wave"][(:c, :ρ)] = 0 -all_best_mse["single_column_nonorographic_gravity_wave"][(:c, :ρe_tot)] = 0 -all_best_mse["single_column_nonorographic_gravity_wave"][(:c, :uₕ, :components, :data, 1)] = 0 -all_best_mse["single_column_nonorographic_gravity_wave"][(:c, :uₕ, :components, :data, 2)] = 0 -all_best_mse["single_column_nonorographic_gravity_wave"][(:f, :u₃, :components, :data, 1)] = 0 -# #! format: on ################################# ################################# diff --git a/test/config.jl b/test/config.jl index 458424185b..56366bb8e7 100644 --- a/test/config.jl +++ b/test/config.jl @@ -18,7 +18,7 @@ include(joinpath("..", "perf", "common.jl")) # Target job config overridden by `default_perf` @test config.parsed_args["dt"] == "400secs" # Target job config not overridden by `default_perf` - @test config.parsed_args["regression_test"] == true + @test config.parsed_args["initial_condition"] == "DryBaroclinicWave" # Test that config_dict overrides `default_perf` config_dict = Dict("dt" => "50secs", "initial_condition" => "Bomex")