Skip to content

Commit

Permalink
remove some regression tests
Browse files Browse the repository at this point in the history
  • Loading branch information
szy21 committed Nov 10, 2023
1 parent f5e1385 commit 763c811
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 84 deletions.
49 changes: 16 additions & 33 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
dt_save_to_disk: "500secs"
regression_test: true
initial_condition: "IsothermalProfile"
t_end: "1500secs"
config: "column"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]
1 change: 0 additions & 1 deletion config/model_configs/sphere_baroclinic_wave_rhoe.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
dt_save_to_disk: "2days"
regression_test: true
initial_condition: "DryBaroclinicWave"
dt: "400secs"
t_end: "10days"
Expand Down
1 change: 0 additions & 1 deletion config/model_configs/sphere_held_suarez_rhoe_hightop.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
dz_bottom: 300.0
dt_save_to_disk: "4days"
regression_test: true
t_end: "8days"
forcing: "held_suarez"
dt: "400secs"
Expand Down
1 change: 0 additions & 1 deletion config/model_configs/sphere_held_suarez_rhotheta.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
energy_name: "rhotheta"
dt_save_to_disk: "10days"
regression_test: true
t_end: "20days"
forcing: "held_suarez"
dt: "400secs"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
44 changes: 0 additions & 44 deletions regression_tests/mse_tables.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
#################################
#################################
Expand Down
2 changes: 1 addition & 1 deletion test/config.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit 763c811

Please sign in to comment.