Adjust resolutions and add tests with no sponge and no topography

CliMA · Aug 19, 2024 · c5d8264 · c5d8264
1 parent a83af93
commit c5d8264
Show file tree

Hide file tree

Showing 31 changed files with 431 additions and 157 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -146,8 +146,8 @@ steps:
   #         --job_id single_column_hydrostatic_balance_ft64
   #       artifact_paths: "single_column_hydrostatic_balance_ft64/output_active/*"
 
-  # - group: "Box Examples"
-  #   steps:
+  - group: "Box Examples"
+    steps:
 
   #     - label: ":computer: Box hydrostatic balance (ρe_tot)"
   #       command: >
@@ -170,6 +170,13 @@ steps:
   #         --job_id rcemipii_box_diagnostic_edmfx
   #       artifact_paths: "rcemipii_box_diagnostic_edmfx/output_active/*"
 
+      - label: ":computer: Analytic No Topography Test (3D, Oswald's configuration)"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/box_analytic_no_topography_oswald_config_test.yml
+          --job_id box_analytic_no_topography_oswald_config_test
+        artifact_paths: "box_analytic_no_topography_oswald_config_test/output_active/*"
+
   - group: "Plane Examples"
     steps:
       # - label: ":computer: Agnesi linear hydrostatic mountain experiment (uniform)"
@@ -207,19 +214,19 @@ steps:
           --job_id plane_analytic_no_topography_float32_test
         artifact_paths: "plane_analytic_no_topography_float32_test/output_active/*"
 
-      # - label: ":computer: Analytic Cosine Hills Test (2D)"
-      #   command: >
-      #     julia --color=yes --project=examples examples/hybrid/driver.jl
-      #     --config_file $CONFIG_PATH/plane_analytic_cosine_hills_test.yml
-      #     --job_id plane_analytic_cosine_hills_test
-      #   artifact_paths: "plane_analytic_cosine_hills_test/output_active/*"
+      - label: ":computer: Analytic Cosine Hills Test (2D)"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/plane_analytic_cosine_hills_test.yml
+          --job_id plane_analytic_cosine_hills_test
+        artifact_paths: "plane_analytic_cosine_hills_test/output_active/*"
 
-      # - label: ":computer: Analytic Cosine Hills Test (2D, Float32)"
-      #   command: >
-      #     julia --color=yes --project=examples examples/hybrid/driver.jl
-      #     --config_file $CONFIG_PATH/plane_analytic_cosine_hills_float32_test.yml
-      #     --job_id plane_analytic_cosine_hills_float32_test
-      #   artifact_paths: "plane_analytic_cosine_hills_float32_test/output_active/*"
+      - label: ":computer: Analytic Cosine Hills Test (2D, Float32)"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/plane_analytic_cosine_hills_float32_test.yml
+          --job_id plane_analytic_cosine_hills_float32_test
+        artifact_paths: "plane_analytic_cosine_hills_float32_test/output_active/*"
 
   # - group: "Conservation check"
   #   steps:
@@ -960,6 +967,72 @@ steps:
         agents:
           slurm_gpus: 1
 
+      - label: "GPU: Analytic No Topography Test (2D, Long Duration, No Sponge, No Gravity)"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/plane_analytic_no_topography_no_sponge_no_grav_long_test.yml
+          --job_id gpu_plane_analytic_no_topography_no_sponge_no_grav_long_test
+        artifact_paths: "gpu_plane_analytic_no_topography_no_sponge_no_grav_long_test/output_active/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
+        agents:
+          slurm_gpus: 1
+
+      - label: "GPU: Analytic No Topography Test (2D, Long Duration, No Sponge, No Gravity, Float32)"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/plane_analytic_no_topography_no_sponge_no_grav_long_float32_test.yml
+          --job_id gpu_plane_analytic_no_topography_no_sponge_no_grav_long_float32_test
+        artifact_paths: "gpu_plane_analytic_no_topography_no_sponge_no_grav_long_float32_test/output_active/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
+        agents:
+          slurm_gpus: 1
+
+      - label: "GPU: Analytic No Topography Test (2D, Long Duration, No Sponge, No Gravity, No Hyperdiff)"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/plane_analytic_no_topography_no_sponge_no_grav_no_hyperdiff_long_test.yml
+          --job_id gpu_plane_analytic_no_topography_no_sponge_no_grav_no_hyperdiff_long_test
+        artifact_paths: "gpu_plane_analytic_no_topography_no_sponge_no_grav_no_hyperdiff_long_test/output_active/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
+        agents:
+          slurm_gpus: 1
+
+      - label: "GPU: Analytic No Topography Test (2D, Long Duration, No Sponge, No Gravity, No Hyperdiff, Float32)"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/plane_analytic_no_topography_no_sponge_no_grav_no_hyperdiff_long_float32_test.yml
+          --job_id gpu_plane_analytic_no_topography_no_sponge_no_grav_no_hyperdiff_long_float32_test
+        artifact_paths: "gpu_plane_analytic_no_topography_no_sponge_no_grav_no_hyperdiff_long_float32_test/output_active/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
+        agents:
+          slurm_gpus: 1
+
+      - label: "GPU: Analytic No Topography Test (2D, Long Duration, No Sponge, No Gravity, Explicit)"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/plane_analytic_no_topography_no_sponge_no_grav_long_explicit_test.yml
+          --job_id gpu_plane_analytic_no_topography_no_sponge_no_grav_long_explicit_test
+        artifact_paths: "gpu_plane_analytic_no_topography_no_sponge_no_grav_long_explicit_test/output_active/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
+        agents:
+          slurm_gpus: 1
+
+      - label: "GPU: Analytic No Topography Test (2D, Long Duration, No Sponge, No Gravity, Explicit, Float32)"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/plane_analytic_no_topography_no_sponge_no_grav_long_explicit_float32_test.yml
+          --job_id gpu_plane_analytic_no_topography_no_sponge_no_grav_long_explicit_float32_test
+        artifact_paths: "gpu_plane_analytic_no_topography_no_sponge_no_grav_long_explicit_float32_test/output_active/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
+        agents:
+          slurm_gpus: 1
+
       - label: "GPU: Analytic No Topography Test (Extruded 2D)"
         command: >
           julia --color=yes --project=examples examples/hybrid/driver.jl
@@ -993,27 +1066,27 @@ steps:
         agents:
           slurm_gpus: 1
 
-  #     - label: "GPU: Analytic Cosine Hills Test (2D, Long Duration)"
-  #       command: >
-  #         julia --color=yes --project=examples examples/hybrid/driver.jl
-  #         --config_file $CONFIG_PATH/plane_analytic_cosine_hills_long_test.yml
-  #         --job_id gpu_plane_analytic_cosine_hills_long_test
-  #       artifact_paths: "gpu_plane_analytic_cosine_hills_long_test/output_active/*"
-  #       env:
-  #         CLIMACOMMS_DEVICE: "CUDA"
-  #       agents:
-  #         slurm_gpus: 1
+      - label: "GPU: Analytic Cosine Hills Test (2D, Long Duration)"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/plane_analytic_cosine_hills_long_test.yml
+          --job_id gpu_plane_analytic_cosine_hills_long_test
+        artifact_paths: "gpu_plane_analytic_cosine_hills_long_test/output_active/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
+        agents:
+          slurm_gpus: 1
 
-  #     - label: "GPU: Analytic Cosine Hills Test (2D, Long Duration, Float32)"
-  #       command: >
-  #         julia --color=yes --project=examples examples/hybrid/driver.jl
-  #         --config_file $CONFIG_PATH/plane_analytic_cosine_hills_long_float32_test.yml
-  #         --job_id gpu_plane_analytic_cosine_hills_long_float32_test
-  #       artifact_paths: "gpu_plane_analytic_cosine_hills_long_float32_test/output_active/*"
-  #       env:
-  #         CLIMACOMMS_DEVICE: "CUDA"
-  #       agents:
-  #         slurm_gpus: 1
+      - label: "GPU: Analytic Cosine Hills Test (2D, Long Duration, Float32)"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/plane_analytic_cosine_hills_long_float32_test.yml
+          --job_id gpu_plane_analytic_cosine_hills_long_float32_test
+        artifact_paths: "gpu_plane_analytic_cosine_hills_long_float32_test/output_active/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
+        agents:
+          slurm_gpus: 1
 
   #     - label: "GPU: Analytic Cosine Hills Test (2D, Long Duration, Stronger Sponge)"
   #       command: >
@@ -1092,16 +1165,16 @@ steps:
   #       agents:
   #         slurm_gpus: 1
 
-  #     - label: "GPU: Analytic Agnesi Mountain Test (2D)"
-  #       command: >
-  #         julia --color=yes --project=examples examples/hybrid/driver.jl
-  #         --config_file $CONFIG_PATH/plane_analytic_agnesi_mountain_test.yml
-  #         --job_id gpu_plane_analytic_agnesi_mountain_test
-  #       artifact_paths: "gpu_plane_analytic_agnesi_mountain_test/output_active/*"
-  #       env:
-  #         CLIMACOMMS_DEVICE: "CUDA"
-  #       agents:
-  #         slurm_gpus: 1
+      - label: "GPU: Analytic Agnesi Mountain Test (2D)"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/plane_analytic_agnesi_mountain_test.yml
+          --job_id gpu_plane_analytic_agnesi_mountain_test
+        artifact_paths: "gpu_plane_analytic_agnesi_mountain_test/output_active/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
+        agents:
+          slurm_gpus: 1
 
   #     - label: "GPU: Analytic Huge Schar Mountain Test (2D)"
   #       command: >
@@ -1125,16 +1198,16 @@ steps:
   #       agents:
   #         slurm_gpus: 1
 
-  #     - label: "GPU: Analytic Schar Mountain Test (2D)"
-  #       command: >
-  #         julia --color=yes --project=examples examples/hybrid/driver.jl
-  #         --config_file $CONFIG_PATH/plane_analytic_schar_mountain_test.yml
-  #         --job_id gpu_plane_analytic_schar_mountain_test
-  #       artifact_paths: "gpu_plane_analytic_schar_mountain_test/output_active/*"
-  #       env:
-  #         CLIMACOMMS_DEVICE: "CUDA"
-  #       agents:
-  #         slurm_gpus: 1
+      - label: "GPU: Analytic Schar Mountain Test (2D)"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/plane_analytic_schar_mountain_test.yml
+          --job_id gpu_plane_analytic_schar_mountain_test
+        artifact_paths: "gpu_plane_analytic_schar_mountain_test/output_active/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
+        agents:
+          slurm_gpus: 1
 
   #     - label: "GPU: Analytic Small Schar Mountain Test (2D)"
   #       command: >
@@ -1169,16 +1242,16 @@ steps:
   #       agents:
   #         slurm_gpus: 1
 
-  #     - label: "GPU: Analytic Schar Mountain Test (2D, Float32)"
-  #       command: >
-  #         julia --color=yes --project=examples examples/hybrid/driver.jl
-  #         --config_file $CONFIG_PATH/plane_analytic_schar_mountain_float32_test.yml
-  #         --job_id gpu_plane_analytic_schar_mountain_float32_test
-  #       artifact_paths: "gpu_plane_analytic_schar_mountain_float32_test/output_active/*"
-  #       env:
-  #         CLIMACOMMS_DEVICE: "CUDA"
-  #       agents:
-  #         slurm_gpus: 1
+      - label: "GPU: Analytic Schar Mountain Test (2D, Float32)"
+        command: >
+          julia --color=yes --project=examples examples/hybrid/driver.jl
+          --config_file $CONFIG_PATH/plane_analytic_schar_mountain_float32_test.yml
+          --job_id gpu_plane_analytic_schar_mountain_float32_test
+        artifact_paths: "gpu_plane_analytic_schar_mountain_float32_test/output_active/*"
+        env:
+          CLIMACOMMS_DEVICE: "CUDA"
+        agents:
+          slurm_gpus: 1
 
   #     - label: "GPU: Analytic Tiny Schar Mountain Test (2D, Float32)"
   #       command: >

diff --git a/config/model_configs/box_analytic_no_topography_float32_test.yml b/config/model_configs/box_analytic_no_topography_float32_test.yml
@@ -5,13 +5,13 @@ topography: "Cosine3D"
 x_max: 300e3
 y_max: 300e3
 z_max: 21e3
-x_elem: 15
-y_elem: 15
+x_elem: 3
+y_elem: 3
 z_elem: 50
 z_stretch: false
 max_topography_height: 0
-dt: "12secs"
-t_end: "4days"
+dt: "5secs"
+t_end: "5days"
 rayleigh_sponge: true
 toml: [toml/analytic_topography_test.toml]
 analytic_check: true

diff --git a/...ic_no_topography_oswald_settings_test.yml → ...ytic_no_topography_oswald_config_test.yml b/...ic_no_topography_oswald_settings_test.yml → ...ytic_no_topography_oswald_config_test.yml
@@ -1,5 +1,5 @@
 config: "box"
-FLOAT_TYPE: "Float32"
+FLOAT_TYPE: "Float64"
 initial_condition: "ConstantBuoyancyFrequencyProfile"
 topography: "Cosine2D"
 x_max: 300e3

diff --git a/config/model_configs/box_analytic_no_topography_test.yml b/config/model_configs/box_analytic_no_topography_test.yml
@@ -5,13 +5,13 @@ topography: "Cosine3D"
 x_max: 300e3
 y_max: 300e3
 z_max: 21e3
-x_elem: 15
-y_elem: 15
+x_elem: 3
+y_elem: 3
 z_elem: 50
 z_stretch: false
 max_topography_height: 0
-dt: "12secs"
-t_end: "4days"
+dt: "5secs"
+t_end: "5days"
 rayleigh_sponge: true
 toml: [toml/analytic_topography_test.toml]
 analytic_check: true

diff --git a/config/model_configs/extruded_plane_analytic_no_topography_test.yml b/config/model_configs/extruded_plane_analytic_no_topography_test.yml
@@ -5,12 +5,12 @@ topography: "Cosine2D"
 x_max: 300e3
 y_max: 40e3
 z_max: 21e3
-x_elem: 15
+x_elem: 3
 y_elem: 2
 z_elem: 50
 z_stretch: false
 max_topography_height: 0
-dt: "12secs"
+dt: "5secs"
 t_end: "5days"
 rayleigh_sponge: true
 toml: [toml/analytic_topography_test.toml]

diff --git a/config/model_configs/plane_analytic_agnesi_mountain_test.yml b/config/model_configs/plane_analytic_agnesi_mountain_test.yml
@@ -7,8 +7,8 @@ z_max: 21e3
 x_elem: 100
 z_elem: 100
 z_stretch: false
-dt: "0.5secs"
-t_end: "4days"
+dt: "0.1secs"
+t_end: "18hours"
 rayleigh_sponge: true
 toml: [toml/analytic_topography_test.toml]
 analytic_check: true

diff --git a/config/model_configs/plane_analytic_cosine_hills_float32_test.yml b/config/model_configs/plane_analytic_cosine_hills_float32_test.yml
@@ -7,6 +7,7 @@ z_max: 21e3
 x_elem: 15
 z_elem: 50
 z_stretch: false
+nh_poly: 2
 dt: "12secs"
 t_end: "10days"
 rayleigh_sponge: true

diff --git a/config/model_configs/plane_analytic_cosine_hills_long_float32_test.yml b/config/model_configs/plane_analytic_cosine_hills_long_float32_test.yml
@@ -7,8 +7,9 @@ z_max: 21e3
 x_elem: 15
 z_elem: 50
 z_stretch: false
-dt: "12secs"
-t_end: "100days"
+nh_poly: 2
+dt: "1secs"
+t_end: "9days"
 rayleigh_sponge: true
 toml: [toml/analytic_topography_test.toml]
 analytic_check: true

diff --git a/config/model_configs/plane_analytic_cosine_hills_long_test.yml b/config/model_configs/plane_analytic_cosine_hills_long_test.yml
@@ -7,8 +7,9 @@ z_max: 21e3
 x_elem: 15
 z_elem: 50
 z_stretch: false
-dt: "12secs"
-t_end: "100days"
+nh_poly: 2
+dt: "1secs"
+t_end: "9days"
 rayleigh_sponge: true
 toml: [toml/analytic_topography_test.toml]
 analytic_check: true

diff --git a/config/model_configs/plane_analytic_cosine_hills_test.yml b/config/model_configs/plane_analytic_cosine_hills_test.yml
@@ -7,8 +7,9 @@ z_max: 21e3
 x_elem: 15
 z_elem: 50
 z_stretch: false
-dt: "12secs"
-t_end: "10days"
+nh_poly: 2
+dt: "1secs"
+t_end: "1days"
 rayleigh_sponge: true
 toml: [toml/analytic_topography_test.toml]
 analytic_check: true

diff --git a/config/model_configs/plane_analytic_no_topography_discrete_balance_long_float32_test.yml b/config/model_configs/plane_analytic_no_topography_discrete_balance_long_float32_test.yml
@@ -5,12 +5,13 @@ topography: "Cosine2D"
 discrete_hydrostatic_balance: true
 x_max: 300e3
 z_max: 21e3
-x_elem: 15
+x_elem: 3
 z_elem: 50
 z_stretch: false
+nh_poly: 2
 max_topography_height: 0
-dt: "12secs"
-t_end: "100days"
+dt: "5secs"
+t_end: "40days"
 rayleigh_sponge: true
 toml: [toml/analytic_topography_test.toml]
 analytic_check: true