Skip to content

Commit ec22200

Browse files
committed
initial condition with outer layer data
1 parent db4e6df commit ec22200

File tree

4 files changed

+18
-10
lines changed

4 files changed

+18
-10
lines changed

examples/moist_euler/rainy_bubble/elixir_rainy_euler_rainy_bubble.jl

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,12 @@ coordinates_max = (2400.0, 2400.0)
1414

1515
# create layers for initial condition
1616
equations = CompressibleRainyEulerEquations2D()
17-
layers = AtmosphereLayersRainyBubble(equations; total_height = coordinates_max[2] + 1)
17+
atmosphere_data = AtmosphereLayersRainyBubble(equations; total_height = coordinates_max[2] + 1)
18+
19+
# Create the initial condition with the initial data set
20+
function initial_condition_rainy(x, t, equations::CompressibleRainyEulerEquations2D)
21+
return initial_condition_bubble_rainy(x, t, equations; atmosphere_data)
22+
end
1823

1924
###############################################################################
2025
# semidiscretization of the compressible rainy Euler equations
@@ -35,7 +40,7 @@ cells_per_dimension = (64, 64)
3540
mesh = StructuredMesh(cells_per_dimension, coordinates_min, coordinates_max,
3641
periodicity = (true, false))
3742

38-
semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition_bubble_rainy, solver,
43+
semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition_rainy, solver,
3944
source_terms = source_terms_rainy,
4045
boundary_conditions = boundary_conditions)
4146

examples/moist_euler/rainy_bubble/elixir_rainy_euler_rainy_bubble_diffusion.jl

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,12 @@ coordinates_max = (2400.0, 2400.0)
1717

1818
# create layers for initial condition
1919
equations = CompressibleRainyEulerEquations2D()
20-
layers = AtmosphereLayersRainyBubble(equations; total_height = coordinates_max[2] + 1)
20+
atmosphere_data = AtmosphereLayersRainyBubble(equations; total_height = coordinates_max[2] + 1)
21+
22+
# Create the initial condition with the initial data set
23+
function initial_condition_rainy(x, t, equations::CompressibleRainyEulerEquations2D)
24+
return initial_condition_bubble_rainy(x, t, equations; atmosphere_data)
25+
end
2126

2227
###############################################################################
2328
# semidiscretization of the compressible rainy Euler equations
@@ -42,16 +47,14 @@ volume_integral = VolumeIntegralFluxDifferencing(flux_ec_rain)
4247

4348
solver = DGSEM(polydeg, surface_flux, volume_integral)
4449

45-
initial_condition = initial_condition_bubble_rainy
46-
source_terms = source_terms_rainy
47-
4850
initial_refinement_level = 6
4951
mesh = TreeMesh(coordinates_min, coordinates_max,
5052
initial_refinement_level = initial_refinement_level,
5153
periodicity = (true, false), n_cells_max = 1_000_000)
5254

5355
semi = SemidiscretizationHyperbolicParabolic(mesh, (equations, equations_parabolic),
54-
initial_condition, solver; source_terms,
56+
initial_condition_rainy, solver;
57+
source_terms_rainy,
5558
boundary_conditions = (boundary_conditions,
5659
boundary_conditions_parabolic))
5760

src/equations/compressible_rainy_euler_2d.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1130,7 +1130,7 @@ end
11301130

11311131
function initial_condition_bubble_rainy(x, t,
11321132
equations::CompressibleRainyEulerEquations2D;
1133-
atmosphere_layers = layers)
1133+
atmosphere_layers)
11341134
# equations constants
11351135
c_vd = equations.c_dry_air_const_volume
11361136
c_vv = equations.c_vapour_const_volume

src/equations/reference_data.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
#! format: noindent
33

44
# Physical constants in SI units (reference values from the Williamson et al. test suite)
5-
const EARTH_RADIUS = 6.37122e6 # m
5+
const EARTH_RADIUS = 6.371229 # 6.37122e6 # m
66
const EARTH_GRAVITATIONAL_ACCELERATION = 9.81 # 9.80616 # m/s²
7-
const EARTH_ROTATION_RATE = 7.292e-5 # rad/s
7+
const EARTH_ROTATION_RATE = 7.29212 # 7.292e-5 # rad/s
88
const SECONDS_PER_DAY = 8.64e4
99

1010
@doc raw"""

0 commit comments

Comments
 (0)