use tangent hyperbolic stretching

CliMA · Sep 11, 2024 · 00bd37b · 00bd37b
1 parent a22b643
commit 00bd37b
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/config/model_configs/single_column_radiative_equilibrium_allsky_idealized_clouds.yml b/config/model_configs/single_column_radiative_equilibrium_allsky_idealized_clouds.yml
@@ -1,13 +1,13 @@
 dt_save_state_to_disk: "100days"
 initial_condition: "IsothermalProfile"
 hyperdiff: false
-z_elem: 70
+z_elem: 63
 dt: "3hours"
 idealized_h2o: true
 t_end: "654days"
 dz_top: 10000.0
 idealized_clouds: true
-dz_bottom: 100.0
+dz_bottom: 30.0
 config: "column"
 insolation: "timevarying"
 z_max: 70000.0

diff --git a/config/model_configs/single_column_radiative_equilibrium_clearsky.yml b/config/model_configs/single_column_radiative_equilibrium_clearsky.yml
@@ -1,12 +1,12 @@
 dt_save_state_to_disk: "100days"
 initial_condition: "IsothermalProfile"
 hyperdiff: false
-z_elem: 70
+z_elem: 63
 dt: "3hours"
 idealized_h2o: true
 t_end: "654days"
 dz_top: 10000.0
-dz_bottom: 100.0
+dz_bottom: 30.0
 config: "column"
 z_max: 70000.0
 dt_save_to_sol: "30hours"

diff --git a/...ig/model_configs/single_column_radiative_equilibrium_clearsky_prognostic_surface_temp.yml b/...ig/model_configs/single_column_radiative_equilibrium_clearsky_prognostic_surface_temp.yml
@@ -5,8 +5,8 @@ hyperdiff: false
 config: "column"
 initial_condition: "IsothermalProfile"
 z_max: 70000
-z_elem: 70
-dz_bottom: 100
+z_elem: 63
+dz_bottom: 30
 dz_top: 10000
 t_end: "654days"
 dt: "3hours"

diff --git a/config/model_configs/single_column_radiative_equilibrium_gray.yml b/config/model_configs/single_column_radiative_equilibrium_gray.yml
@@ -1,11 +1,13 @@
 dt_save_state_to_disk: "100days"
 initial_condition: "IsothermalProfile"
 hyperdiff: false
-z_elem: 70
+# It seems radiative equilibrium needs a larger dz near the top
+# to be stable, so we use a smaller z_elem
+z_elem: 50
 dt: "3hours"
 t_end: "654days"
 dz_top: 10000.0
-dz_bottom: 100.0
+dz_bottom: 30.0
 config: "column"
 z_max: 70000.0
 dt_save_to_sol: "30hours"

diff --git a/src/solver/type_getters.jl b/src/solver/type_getters.jl
@@ -184,7 +184,7 @@ function get_spaces(parsed_args, params, comms_ctx)
         h_space =
             make_horizontal_space(horizontal_mesh, quad, comms_ctx, bubble)
         z_stretch = if parsed_args["z_stretch"]
-            Meshes.GeneralizedExponentialStretching(dz_bottom, dz_top)
+            Meshes.HyperbolicTangentStretching(dz_bottom)
         else
             Meshes.Uniform()
         end
@@ -219,7 +219,7 @@ function get_spaces(parsed_args, params, comms_ctx)
         h_space =
             make_horizontal_space(horizontal_mesh, quad, comms_ctx, bubble)
         z_stretch = if parsed_args["z_stretch"]
-            Meshes.GeneralizedExponentialStretching(dz_bottom, dz_top)
+            Meshes.HyperbolicTangentStretching(dz_bottom)
         else
             Meshes.Uniform()
         end
@@ -241,7 +241,7 @@ function get_spaces(parsed_args, params, comms_ctx)
         h_space =
             make_horizontal_space(horizontal_mesh, quad, comms_ctx, bubble)
         z_stretch = if parsed_args["z_stretch"]
-            Meshes.GeneralizedExponentialStretching(dz_bottom, dz_top)
+            Meshes.HyperbolicTangentStretching(dz_bottom)
         else
             Meshes.Uniform()
         end
@@ -265,7 +265,7 @@ function get_spaces(parsed_args, params, comms_ctx)
         h_space =
             make_horizontal_space(horizontal_mesh, quad, comms_ctx, bubble)
         z_stretch = if parsed_args["z_stretch"]
-            Meshes.GeneralizedExponentialStretching(dz_bottom, dz_top)
+            Meshes.HyperbolicTangentStretching(dz_bottom)
         else
             Meshes.Uniform()
         end

diff --git a/test/parameterized_tendencies/gravity_wave/orographic_gravity_wave/ogwd_3d.jl b/test/parameterized_tendencies/gravity_wave/orographic_gravity_wave/ogwd_3d.jl
@@ -98,7 +98,7 @@ warp_function = CA.generate_topography_warp(earth_spline)
 # Create meshes and spaces
 h_elem = 16
 nh_poly = 3
-z_max = 45e3
+z_max = 42e3
 z_elem = 33
 dz_bottom = 300.0
 dz_top = 5000.0
@@ -109,7 +109,7 @@ horizontal_mesh = CA.cubed_sphere_mesh(; radius, h_elem)
 h_space = CA.make_horizontal_space(horizontal_mesh, quad, comms_ctx, false)
 
 
-z_stretch = Meshes.GeneralizedExponentialStretching(dz_bottom, dz_top)
+z_stretch = Meshes.HyperbolicTangentStretching(dz_bottom)
 center_space, face_space = CA.make_hybrid_spaces(
     h_space,
     z_max,