Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace erf.use_terrain by erf.terrain_type in inputs files #2001

Merged
merged 1 commit into from
Dec 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Exec/DevTests/LandSurfaceModel/inputs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ erf.Cs = 0.1
#erf.pbl_type = "MYNN2.5"
#erf.KE_0 = 0.5

erf.use_terrain = true
erf.terrain_type = Static
erf.terrain_smoothing = 2

erf.moisture_model = "None"
Expand Down
2 changes: 1 addition & 1 deletion Exec/DevTests/MetGrid/inputs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ erf.most.zref = 40.0
# TIME STEP CONTROL
erf.fixed_dt = 0.5 # fixed time step depending on grid resolution

erf.use_terrain = true
erf.terrain_type = Static
erf.terrain_smoothing = 2

# DIAGNOSTICS & VERBOSITY
Expand Down
2 changes: 1 addition & 1 deletion Exec/DevTests/MetGrid/inputs_flowmas_metgrid
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ erf.Cs = 0.1

erf.moisture_model = "Kessler"

erf.use_terrain = true
erf.terrain_type = Static
erf.terrain_smoothing = 0
erf.buoyancy_type = 1
erf.terrain_z_levels = 0 53.25373067 116.3299934 190.8583428 278.6665766 381.7196783 502.1312033 642.3454199 \
Expand Down
2 changes: 1 addition & 1 deletion Exec/DevTests/MetGrid/inputs_flowmas_metgrid_NoZlev
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ erf.Cs = 0.1

erf.moisture_model = "Kessler"

erf.use_terrain = true
erf.terrain_type = Static
erf.terrain_smoothing = 2
erf.buoyancy_type = 1

Expand Down
8 changes: 4 additions & 4 deletions Exec/DevTests/MetGrid/inputs_flowmas_wrfinput
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ erf.alpha_T = 1.0
erf.alpha_C = 1.0
erf.use_gravity = true

erf.molec_diff_type = "None"
erf.les_type = "Smagorinsky"
erf.molec_diff_type = None
erf.les_type = Smagorinsky
erf.Cs = 0.1

erf.moisture_model = "Kessler"
erf.moisture_model = Kessler

erf.use_terrain = true
erf.terrain_type = Static
erf.terrain_smoothing = 0
erf.buoyancy_type = 1

Expand Down
1 change: 0 additions & 1 deletion Exec/DevTests/MovingTerrain/inputs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ zlo.type = "SlipWall"
zhi.type = "SlipWall"

# TERRRAIN GRID TYPE
erf.use_terrain = true # enable terrain stencils
erf.terrain_type = Moving # moving terrain
erf.terrain_smoothing = 2 # Sullivan 2004 approach

Expand Down
4 changes: 2 additions & 2 deletions Exec/DryRegTests/DensityCurrent/inputs_crse_halfdomain
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ erf.plot_vars_1 = density x_velocity y_velocity z_velocity pressure theta pr
# SOLVER CHOICE
erf.use_gravity = true
erf.use_coriolis = false
erf.use_terrain = false
erf.terrain_type = Static

erf.les_type = "None"
erf.les_type = None
#
# Diffusion coefficient from Straka, K = 75 m^2/s
#
Expand Down
2 changes: 1 addition & 1 deletion Exec/DryRegTests/WitchOfAgnesi/inputs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ erf.init_type = "input_sounding"
erf.init_sounding_ideal = true

# TERRRAIN GRID TYPE
erf.use_terrain = 1
erf.terrain_type = Static
#erf.terrain_smoothing = 1 # Smoothed Terrain Following coords (Klemp 2011)
#erf.terrain_gamma_m = 0.5
erf.terrain_smoothing = 2 # Sullivan TF
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ geometry.prob_extent = 1000.0 1000.0 500.0
amr.n_cell = 100 100 50

# WINDFARM PARAMETRIZATION PARAMETERS
erf.use_terrain = 1
erf.terrain_type = Static
erf.terrain_z_levels = 0.000000 5.000000 11.040962 17.202744 23.487761 29.898478 36.437410 43.107120 49.910224 56.849391 63.927341 71.146850 78.510749 86.021926 93.683327 101.497956 109.468877 117.599217 125.892163 134.350968 142.978950 151.779491 160.756043 169.912126 179.251331 188.777319 198.493828 208.404667 218.513722 228.824959 239.342420 250.070231 261.012597 272.173811 283.558250 295.170377 307.014747 319.096004 331.418886 343.988226 356.808952 369.886094 383.224778 396.830235 410.707802 424.862920 439.301141 454.028126 469.049651 484.371606 500.000000

Expand Down
Loading