Skip to content

Commit 519eb98

Browse files
szy21szy21
committed
clean up ci
1 parent eaa2206 commit 519eb98

13 files changed

+50
-188
lines changed

‎.buildkite/pipeline.yml‎

Lines changed: 46 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -159,15 +159,6 @@ steps:
159159
--job_id box_density_current_test
160160
artifact_paths: "box_density_current_test/output_active/*"
161161

162-
- label: ":computer: Box rcemipii with diagnostic edmf"
163-
command: >
164-
julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
165-
--config_file $CONFIG_PATH/rcemipii_box_diagnostic_edmfx.yml
166-
--job_id rcemipii_box_diagnostic_edmfx
167-
artifact_paths: "rcemipii_box_diagnostic_edmfx/output_active/*"
168-
agents:
169-
slurm_mem: 20GB
170-
171162
- label: ":computer: CRM rcemipii in a box with 1M"
172163
command: >
173164
julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
@@ -346,7 +337,7 @@ steps:
346337
--job_id baroclinic_wave
347338
artifact_paths: "baroclinic_wave/output_active/*"
348339

349-
- label: ":computer: no lim baroclinic wave equilmoist"
340+
- label: ":computer: baroclinic wave equilmoist"
350341
command: >
351342
julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
352343
--config_file $COMMON_CONFIG_PATH/numerics_sphere_he6ze10.yml
@@ -360,7 +351,7 @@ steps:
360351
agents:
361352
slurm_constraint: icelake|cascadelake|skylake|epyc
362353

363-
- label: ":computer: no lim baroclinic wave equilmoist (AMD)"
354+
- label: ":computer: baroclinic wave equilmoist (AMD)"
364355
command: >
365356
julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
366357
--config_file $COMMON_CONFIG_PATH/numerics_sphere_he6ze10.yml
@@ -381,7 +372,7 @@ steps:
381372
--job_id held_suarez
382373
artifact_paths: "held_suarez/output_active/*"
383374

384-
- label: ":computer: no lim held suarez equilmoist"
375+
- label: ":computer: held suarez equilmoist"
385376
command: >
386377
julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
387378
--config_file $COMMON_CONFIG_PATH/numerics_sphere_he6ze31.yml
@@ -395,24 +386,9 @@ steps:
395386
agents:
396387
slurm_constraint: icelake|cascadelake|skylake|epyc
397388

398-
- group: "Sphere Examples (Aquaplanet)"
389+
- group: "Sphere Examples (Aquaplanet with various parameterizations)"
399390
steps:
400-
- label: ":umbrella: aquaplanet nonequil allsky monin_obukhov varying insol gravity wave (gfdl_restart) high top 1-moment"
401-
command: >
402-
julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
403-
--config_file $COMMON_CONFIG_PATH/numerics_sphere_he6ze31.yml
404-
--config_file $CONFIG_PATH/aquaplanet_nonequil_allsky_gw_res.yml
405-
--job_id aquaplanet_nonequil_allsky_gw_res
406-
407-
julia --color=yes --project=.buildkite reproducibility_tests/test_mse.jl
408-
--job_id aquaplanet_nonequil_allsky_gw_res
409-
--out_dir aquaplanet_nonequil_allsky_gw_res/output_active
410-
artifact_paths: "aquaplanet_nonequil_allsky_gw_res/output_active/*"
411-
agents:
412-
slurm_mem: 20GB
413-
slurm_constraint: icelake|cascadelake|skylake|epyc
414-
415-
- label: ":umbrella: aquaplanet nonequil allsky monin_obukhov varying insol gravity wave (gfdl_restart) high top 2-moment"
391+
- label: ":umbrella: aquaplanet allsky varying insol gravity wave (gfdl_restart) 2-moment"
416392
command: >
417393
julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
418394
--config_file $COMMON_CONFIG_PATH/numerics_sphere_he6ze31.yml
@@ -427,30 +403,45 @@ steps:
427403
slurm_mem: 20GB
428404
slurm_constraint: icelake|cascadelake|skylake|epyc
429405

430-
- label: ":computer: aquaplanet equil allsky monin_obukhov varying insol gravity wave (raw_topo) high top zonally asymmetric"
406+
- label: ":computer: aquaplanet equil allsky varying insol gravity wave (raw_topo)"
431407
command: >
432408
julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
433409
--config_file $COMMON_CONFIG_PATH/numerics_sphere_he6ze31.yml
434-
--config_file $CONFIG_PATH/aquaplanet_equil_allsky_gw_raw_zonalasym.yml
435-
--job_id aquaplanet_equil_allsky_gw_raw_zonalasym
410+
--config_file $CONFIG_PATH/aquaplanet_equil_allsky_gw_raw.yml
411+
--job_id aquaplanet_equil_allsky_gw_raw
436412
437413
julia --color=yes --project=.buildkite reproducibility_tests/test_mse.jl
438-
--job_id aquaplanet_equil_allsky_gw_raw_zonalasym
439-
--out_dir aquaplanet_equil_allsky_gw_raw_zonalasym/output_active
440-
artifact_paths: "aquaplanet_equil_allsky_gw_raw_zonalasym/output_active/*"
414+
--job_id aquaplanet_equil_allsky_gw_raw
415+
--out_dir aquaplanet_equil_allsky_gw_raw/output_active
416+
artifact_paths: "aquaplanet_equil_allsky_gw_raw/output_active/*"
441417
agents:
442418
slurm_mem: 20GB
443419
slurm_constraint: icelake|cascadelake|skylake|epyc
444420

445-
- label: ":computer: aquaplanet for coupler"
421+
- label: ":man_in_business_suit_levitating: EDOnly EDMFX aquaplanet"
446422
command: >
447423
julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
448424
--config_file $COMMON_CONFIG_PATH/numerics_sphere_he6ze31.yml
449-
--config_file $CONFIG_PATH/aquaplanet_for_coupler.yml
450-
--job_id aquaplanet_for_coupler
451-
artifact_paths: "aquaplanet_for_coupler/output_active/*"
425+
--config_file $CONFIG_PATH/edonly_edmfx_aquaplanet.yml
426+
--job_id edonly_edmfx_aquaplanet
427+
artifact_paths: "edonly_edmfx_aquaplanet/output_active/*"
452428
agents:
453429
slurm_mem: 20GB
430+
431+
- label: ":genie: Diagnostic EDMFX aquaplanet"
432+
command: >
433+
julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
434+
--config_file $COMMON_CONFIG_PATH/numerics_sphere_he6ze31.yml
435+
--config_file $CONFIG_PATH/diagnostic_edmfx_aquaplanet.yml
436+
--job_id diagnostic_edmfx_aquaplanet
437+
438+
julia --color=yes --project=.buildkite reproducibility_tests/test_mse.jl
439+
--job_id diagnostic_edmfx_aquaplanet
440+
--out_dir diagnostic_edmfx_aquaplanet/output_active
441+
artifact_paths: "diagnostic_edmfx_aquaplanet/output_active/*"
442+
agents:
443+
slurm_mem: 20GB
444+
slurm_constraint: icelake|cascadelake|skylake|epyc
454445

455446
- label: ":computer: aquaplanet rcemipii with diagnostic edmf"
456447
command: >
@@ -461,6 +452,21 @@ steps:
461452
artifact_paths: "rcemipii_sphere_diagnostic_edmfx/output_active/*"
462453
agents:
463454
slurm_mem: 20GB
455+
456+
- label: ":genie: Prognostic EDMFX aquaplanet"
457+
command: >
458+
julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
459+
--config_file $COMMON_CONFIG_PATH/numerics_sphere_he6ze31.yml
460+
--config_file $CONFIG_PATH/prognostic_edmfx_aquaplanet.yml
461+
--job_id prognostic_edmfx_aquaplanet
462+
463+
julia --color=yes --project=.buildkite reproducibility_tests/test_mse.jl
464+
--job_id prognostic_edmfx_aquaplanet
465+
--out_dir prognostic_edmfx_aquaplanet/output_active
466+
artifact_paths: "prognostic_edmfx_aquaplanet/output_active/*"
467+
agents:
468+
slurm_mem: 20GB
469+
slurm_constraint: icelake|cascadelake|skylake|epyc
464470

465471
- group: "Sphere Examples (Topography)"
466472
steps:
@@ -619,29 +625,7 @@ steps:
619625
620626
julia --color=yes --project=.buildkite post_processing/remap/remap_pipeline.jl
621627
--data_dir prep_remap/output_active --out_dir remap_pipeline_output
622-
artifact_paths: "remap_pipeline_output/*"
623-
624-
- group: "EDOnlyEDMFX"
625-
steps:
626-
- label: ":man_in_business_suit_levitating: EDOnly EDMFX aquaplanet"
627-
command: >
628-
julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
629-
--config_file $COMMON_CONFIG_PATH/numerics_sphere_he6ze31.yml
630-
--config_file $CONFIG_PATH/edonly_edmfx_aquaplanet.yml
631-
--job_id edonly_edmfx_aquaplanet
632-
artifact_paths: "edonly_edmfx_aquaplanet/output_active/*"
633-
agents:
634-
slurm_mem: 20GB
635-
636-
- label: ":man_in_business_suit_levitating: AMIP Target EDOnly nonequil"
637-
command: >
638-
julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
639-
--config_file $COMMON_CONFIG_PATH/numerics_sphere_he16ze63.yml
640-
--config_file $CONFIG_PATH/amip_target_edonly_nonequil.yml
641-
--job_id amip_target_edonly_nonequil
642-
artifact_paths: "amip_target_edonly_nonequil/output_active/*"
643-
agents:
644-
slurm_mem: 20GB
628+
artifact_paths: "remap_pipeline_output/*"
645629

646630
- group: "Diagnostic EDMFX"
647631
steps:
@@ -726,21 +710,6 @@ steps:
726710
agents:
727711
slurm_mem: 20GB
728712

729-
- label: ":genie: Diagnostic EDMFX aquaplanet"
730-
command: >
731-
julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
732-
--config_file $COMMON_CONFIG_PATH/numerics_sphere_he6ze31.yml
733-
--config_file $CONFIG_PATH/diagnostic_edmfx_aquaplanet.yml
734-
--job_id diagnostic_edmfx_aquaplanet
735-
736-
julia --color=yes --project=.buildkite reproducibility_tests/test_mse.jl
737-
--job_id diagnostic_edmfx_aquaplanet
738-
--out_dir diagnostic_edmfx_aquaplanet/output_active
739-
artifact_paths: "diagnostic_edmfx_aquaplanet/output_active/*"
740-
agents:
741-
slurm_mem: 20GB
742-
slurm_constraint: icelake|cascadelake|skylake|epyc
743-
744713
- group: "Prognostic EDMFX"
745714
steps:
746715
- label: ":genie: Prognostic EDMFX advection test in a column"
@@ -926,21 +895,6 @@ steps:
926895
slurm_mem: 12GB
927896
soft_fail: true
928897

929-
- label: ":genie: Prognostic EDMFX aquaplanet"
930-
command: >
931-
julia --color=yes --project=.buildkite .buildkite/ci_driver.jl
932-
--config_file $COMMON_CONFIG_PATH/numerics_sphere_he6ze31.yml
933-
--config_file $CONFIG_PATH/prognostic_edmfx_aquaplanet.yml
934-
--job_id prognostic_edmfx_aquaplanet
935-
936-
julia --color=yes --project=.buildkite reproducibility_tests/test_mse.jl
937-
--job_id prognostic_edmfx_aquaplanet
938-
--out_dir prognostic_edmfx_aquaplanet/output_active
939-
artifact_paths: "prognostic_edmfx_aquaplanet/output_active/*"
940-
agents:
941-
slurm_mem: 20GB
942-
slurm_constraint: icelake|cascadelake|skylake|epyc
943-
944898
- group: "Autodiff"
945899
steps:
946900
- label: "baroclinic wave moist check conservation float64 sparse autodiff"

‎config/default_configs/default_config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ surface_setup:
209209
help: "Surface flux scheme [`DefaultExchangeCoefficients` (default), `DefaultMoninObukhov`, `GCM`, `Reanalysis`, `ReanalysisTimeVarying`]"
210210
value: "DefaultExchangeCoefficients"
211211
surface_temperature:
212-
help: "Prescribed surface temperature functional form ['ZonallySymmetric' (default), 'ZonallyAsymmetric', 'RCEMIPII', `Reanalysis`, `ReanalysisTimeVarying`]"
212+
help: "Prescribed surface temperature functional form ['ZonallySymmetric' (default), 'RCEMIPII', `Reanalysis`, `ReanalysisTimeVarying`]"
213213
value: "ZonallySymmetric"
214214
initial_condition:
215215
help: "Initial condition [`DryBaroclinicWave`, `MoistBaroclinicWave`, `ConstantBuoyancyFrequencyProfile`, `DecayingProfile` (default), `IsothermalProfile`, `Bomex`, `DryDensityCurrentProfile`, `RisingThermalBubbleProfile`, `ISDAC`, `GCM`, `Reanalysis`, `ReanalysisTimeVarying`], or a file path for a NetCDF file (read documentation about requirements)."

‎config/model_configs/amip_target_edonly_nonequil.yml‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

config/model_configs/aquaplanet_equil_allsky_gw_raw_zonalasym.yml renamed to config/model_configs/aquaplanet_equil_allsky_gw_raw.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ vert_diff: true
1313
insolation: "timevarying"
1414
precip_model: "0M"
1515
cloud_model: "grid_scale"
16-
surface_temperature: "ZonallyAsymmetric"
1716
moist: "equil"
1817
albedo_model: "RegressionFunctionAlbedo"
1918
reproducibility_test: true

‎config/model_configs/aquaplanet_for_coupler.yml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎config/model_configs/diagnostic_edmfx_trmm_box.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ edmfx_sgs_diffusive_flux: true
1414
moist: nonequil
1515
cloud_model: "quadrature_sgs"
1616
call_cloud_diagnostics_per_stage: true
17-
apply_limiter: false
1817
precip_model: "1M"
1918
config: box
2019
x_max: 1e8

‎config/model_configs/les_isdac_box.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ precip_model: "1M"
1313
implicit_diffusion: false
1414
approximate_linear_solve_iters: 2
1515
hyperdiff: "false"
16-
apply_limiter: false
1716
smagorinsky_lilly: "UVW"
1817
# time- and spatial discretization
1918
x_elem: 10

‎config/model_configs/prognostic_edmfx_trmm_column_sparse_autodiff.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ edmfx_filter: true
2424
prognostic_tke: true
2525
moist: nonequil
2626
cloud_model: "quadrature_sgs"
27-
apply_limiter: false
2827
precip_model: "1M"
2928
call_cloud_diagnostics_per_stage: true
3029
config: column

‎config/model_configs/rcemipii_box_diagnostic_edmfx.yml‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎src/solver/model_getters.jl‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,11 @@ end
1313
function get_sfc_temperature_form(parsed_args)
1414
surface_temperature = parsed_args["surface_temperature"]
1515
@assert surface_temperature in (
16-
"ZonallyAsymmetric",
1716
"ZonallySymmetric",
1817
"RCEMIPII",
1918
"ReanalysisTimeVarying",
2019
)
21-
return if surface_temperature == "ZonallyAsymmetric"
22-
ZonallyAsymmetricSST()
23-
elseif surface_temperature == "ZonallySymmetric"
20+
return if surface_temperature == "ZonallySymmetric"
2421
ZonallySymmetricSST()
2522
elseif surface_temperature == "RCEMIPII"
2623
RCEMIPIISST()

0 commit comments

Comments
 (0)