Merge pull request #3193 from CliMA/zs/conservation

clean up conservation test
CliMA · Jul 15, 2024 · 82fab4a · 82fab4a
2 parents ce77d74 + e9cac2e
commit 82fab4a
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 14 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -209,6 +209,27 @@ steps:
         artifact_paths: "plane_density_current_test/output_active/*"
 
 
+  - group: "Conservation check"
+    steps:
+
+      - label: ":computer: baroclinic wave check conservation"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/sphere_baroclinic_wave_conservation.yml
+          --job_id sphere_baroclinic_wave_conservation
+        artifact_paths: "sphere_baroclinic_wave_conservation/output_active/*"
+
+      - label: ":computer: baroclinic wave check conservation float64"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/sphere_baroclinic_wave_conservation_ft64.yml
+          --job_id sphere_baroclinic_wave_conservation_ft64
+        artifact_paths: "sphere_baroclinic_wave_conservation_ft64/output_active/*"
+
+      - label: ":computer: baroclinic wave check conservation with sources"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl --config_file $CONFIG_PATH/sphere_baroclinic_wave_conservation_source.yml
+          --job_id sphere_baroclinic_wave_conservation_source
+        artifact_paths: "sphere_baroclinic_wave_conservation_source/output_active/*"
+
   - group: "Sphere Examples (Dycore)"
     steps:
 
@@ -267,12 +288,6 @@ steps:
       #   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
-          --job_id sphere_baroclinic_wave_rhoe_equilmoist_conservation_ft64
-        artifact_paths: "sphere_baroclinic_wave_rhoe_equilmoist_conservation_ft64/output_active/*"
-
       - label: ":computer: held suarez (ρe) hightop"
         key: sphere_held_suarez_rhoe_hightop
         command: >

diff --git a/config/model_configs/sphere_baroclinic_wave_conservation.yml b/config/model_configs/sphere_baroclinic_wave_conservation.yml
@@ -0,0 +1,6 @@
+initial_condition: "MoistBaroclinicWave"
+dt: "400secs"
+t_end: "5days"
+moist: "equil"
+dt_save_state_to_disk: "5days"
+check_conservation: true
diff --git a/...ave_rhoe_equilmoist_conservation_ft64.yml → ...ere_baroclinic_wave_conservation_ft64.yml b/...ave_rhoe_equilmoist_conservation_ft64.yml → ...ere_baroclinic_wave_conservation_ft64.yml
@@ -1,11 +1,7 @@
+FLOAT_TYPE: "Float64"
+initial_condition: "MoistBaroclinicWave"
+dt: "400secs"
+t_end: "5days"
 moist: "equil"
 dt_save_state_to_disk: "5days"
 check_conservation: true
-initial_condition: "MoistBaroclinicWave"
-t_end: "5days"
-dt: "450secs"
-FLOAT_TYPE: "Float64"
-rad: "clearsky"
-diagnostics:
-  - short_name: [pfull, wa, va, rv, hus]
-    period: 1days
diff --git a/config/model_configs/sphere_baroclinic_wave_conservation_source.yml b/config/model_configs/sphere_baroclinic_wave_conservation_source.yml
@@ -0,0 +1,11 @@
+initial_condition: "MoistBaroclinicWave"
+dt: "400secs"
+t_end: "10days"
+moist: "equil"
+surface_setup: DefaultMoninObukhov
+prognostic_surface: "PrognosticSurfaceTemperature"
+rad: "clearsky"
+precip_model: "0M"
+vert_diff: "true"
+dt_save_state_to_disk: "5days"
+check_conservation: true