Skip to content

Commit e9e7306

Browse files
dennisYatunindennisYatunin
committed
Try running Schar mountain test with different values of h_max
1 parent 53db6c6 commit e9e7306

File tree

94 files changed

+2468
-1032
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+2468
-1032
lines changed

‎.buildkite/ci_driver.jl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,11 @@ if config.parsed_args["check_steady_state"]
165165
@info " Relative RMSE of u₃ on $n_levels levels closest to the surface:"
166166
@info " $level_u₃_rel_errs"
167167

168-
if t_end > 24 * 60 * 60
169-
# TODO: Float32 simulations currently show significant divergence of uₕ.
170-
@test ᶜuₕ_rel_err < (FT == Float32 ? 0.05 : 0.005)
171-
@test ᶠu₃_rel_err < 0.0005
172-
end
168+
# if t_end > 24 * 60 * 60
169+
# # TODO: Float32 simulations currently show significant divergence of uₕ.
170+
# @test ᶜuₕ_rel_err < (FT == Float32 ? 0.05 : 0.005)
171+
# @test ᶠu₃_rel_err < 0.0005
172+
# end
173173
end
174174

175175
# Conservation checks

‎.buildkite/pipeline.yml‎

Lines changed: 550 additions & 1011 deletions
Large diffs are not rendered by default.

‎config/default_configs/default_config.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ scalar_hyperdiffusion_coefficient:
3737
topography:
3838
help: "Define the surface elevation profile [`NoWarp` (default), `Earth`, `DCMIP200`, `Hughes2023`, `Agnesi`, `Schar`, `Cosine2D`, `Cosine3D`]"
3939
value: "NoWarp"
40+
schar_mountain_height:
41+
help: "Maximum height of mountain when using Schar topography (default is 25 m)"
42+
value: 25.0
4043
mesh_warp_type:
4144
help: "Sets the interior mesh warp method [`Linear`, `SLEVE`]"
4245
value: "SLEVE"

‎config/model_configs/plane_0.000000001m_schar_mountain_float32_test.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
config: "plane"
2+
FLOAT_TYPE: "Float32"
3+
initial_condition: "ConstantBuoyancyFrequencyProfile"
4+
topography: "Schar"
5+
mesh_warp_type: "Linear"
6+
x_max: 100e3
7+
z_max: 21e3
8+
x_elem: 100
9+
z_elem: 100
10+
dz_bottom: 10
11+
schar_mountain_height: 0.000000001
12+
dt: "0.7secs"
13+
t_end: "2days"
14+
rayleigh_sponge: true
15+
disable_surface_flux_tendency: true
16+
toml: [toml/steady_state_test.toml]
17+
check_steady_state: true
18+
output_default_diagnostics: false
19+
diagnostics:
20+
- short_name: [orog, ua, wa, uapredicted, wapredicted, uaerror, waerror]
21+
period: 1hours

‎config/model_configs/plane_0.000000001m_schar_mountain_float64_test.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
config: "plane"
2+
FLOAT_TYPE: "Float64"
3+
initial_condition: "ConstantBuoyancyFrequencyProfile"
4+
topography: "Schar"
5+
mesh_warp_type: "Linear"
6+
x_max: 100e3
7+
z_max: 21e3
8+
x_elem: 100
9+
z_elem: 100
10+
dz_bottom: 10
11+
schar_mountain_height: 0.000000001
12+
dt: "0.7secs"
13+
t_end: "2days"
14+
rayleigh_sponge: true
15+
disable_surface_flux_tendency: true
16+
toml: [toml/steady_state_test.toml]
17+
check_steady_state: true
18+
output_default_diagnostics: false
19+
diagnostics:
20+
- short_name: [orog, ua, wa, uapredicted, wapredicted, uaerror, waerror]
21+
period: 1hours

‎config/model_configs/plane_0.000000002m_schar_mountain_float32_test.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
config: "plane"
2+
FLOAT_TYPE: "Float32"
3+
initial_condition: "ConstantBuoyancyFrequencyProfile"
4+
topography: "Schar"
5+
mesh_warp_type: "Linear"
6+
x_max: 100e3
7+
z_max: 21e3
8+
x_elem: 100
9+
z_elem: 100
10+
dz_bottom: 10
11+
schar_mountain_height: 0.000000002
12+
dt: "0.7secs"
13+
t_end: "2days"
14+
rayleigh_sponge: true
15+
disable_surface_flux_tendency: true
16+
toml: [toml/steady_state_test.toml]
17+
check_steady_state: true
18+
output_default_diagnostics: false
19+
diagnostics:
20+
- short_name: [orog, ua, wa, uapredicted, wapredicted, uaerror, waerror]
21+
period: 1hours

‎config/model_configs/plane_0.000000002m_schar_mountain_float64_test.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
config: "plane"
2+
FLOAT_TYPE: "Float64"
3+
initial_condition: "ConstantBuoyancyFrequencyProfile"
4+
topography: "Schar"
5+
mesh_warp_type: "Linear"
6+
x_max: 100e3
7+
z_max: 21e3
8+
x_elem: 100
9+
z_elem: 100
10+
dz_bottom: 10
11+
schar_mountain_height: 0.000000002
12+
dt: "0.7secs"
13+
t_end: "2days"
14+
rayleigh_sponge: true
15+
disable_surface_flux_tendency: true
16+
toml: [toml/steady_state_test.toml]
17+
check_steady_state: true
18+
output_default_diagnostics: false
19+
diagnostics:
20+
- short_name: [orog, ua, wa, uapredicted, wapredicted, uaerror, waerror]
21+
period: 1hours

‎config/model_configs/plane_0.000000004m_schar_mountain_float32_test.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
config: "plane"
2+
FLOAT_TYPE: "Float32"
3+
initial_condition: "ConstantBuoyancyFrequencyProfile"
4+
topography: "Schar"
5+
mesh_warp_type: "Linear"
6+
x_max: 100e3
7+
z_max: 21e3
8+
x_elem: 100
9+
z_elem: 100
10+
dz_bottom: 10
11+
schar_mountain_height: 0.000000004
12+
dt: "0.7secs"
13+
t_end: "2days"
14+
rayleigh_sponge: true
15+
disable_surface_flux_tendency: true
16+
toml: [toml/steady_state_test.toml]
17+
check_steady_state: true
18+
output_default_diagnostics: false
19+
diagnostics:
20+
- short_name: [orog, ua, wa, uapredicted, wapredicted, uaerror, waerror]
21+
period: 1hours

‎config/model_configs/plane_0.000000004m_schar_mountain_float64_test.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
config: "plane"
2+
FLOAT_TYPE: "Float64"
3+
initial_condition: "ConstantBuoyancyFrequencyProfile"
4+
topography: "Schar"
5+
mesh_warp_type: "Linear"
6+
x_max: 100e3
7+
z_max: 21e3
8+
x_elem: 100
9+
z_elem: 100
10+
dz_bottom: 10
11+
schar_mountain_height: 0.000000004
12+
dt: "0.7secs"
13+
t_end: "2days"
14+
rayleigh_sponge: true
15+
disable_surface_flux_tendency: true
16+
toml: [toml/steady_state_test.toml]
17+
check_steady_state: true
18+
output_default_diagnostics: false
19+
diagnostics:
20+
- short_name: [orog, ua, wa, uapredicted, wapredicted, uaerror, waerror]
21+
period: 1hours

‎config/model_configs/plane_0.000000008m_schar_mountain_float32_test.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
config: "plane"
2+
FLOAT_TYPE: "Float32"
3+
initial_condition: "ConstantBuoyancyFrequencyProfile"
4+
topography: "Schar"
5+
mesh_warp_type: "Linear"
6+
x_max: 100e3
7+
z_max: 21e3
8+
x_elem: 100
9+
z_elem: 100
10+
dz_bottom: 10
11+
schar_mountain_height: 0.000000008
12+
dt: "0.7secs"
13+
t_end: "2days"
14+
rayleigh_sponge: true
15+
disable_surface_flux_tendency: true
16+
toml: [toml/steady_state_test.toml]
17+
check_steady_state: true
18+
output_default_diagnostics: false
19+
diagnostics:
20+
- short_name: [orog, ua, wa, uapredicted, wapredicted, uaerror, waerror]
21+
period: 1hours

0 commit comments

Comments
 (0)