Skip to content

Commit

Permalink
Merge branch 'development' into micro_add_bc_arg
Browse files Browse the repository at this point in the history
  • Loading branch information
gardner48 authored Dec 17, 2024
2 parents 2e60c52 + a8e44bf commit a032425
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions Exec/ABL/inputs_GABLS1_deardorff
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ erf.Ce = 0.7 # Note: Ce_lcoeff = C_e - 1.9*C_k
erf.Ce_wall = 3.9 # To account for "wall effects"
erf.sigma_k = 0.5 # TKE diffusion coeff = 2*Km = Km * inv_sigma_k, Moeng1984, Eqn. 15

erf.rayleigh_damp_U = true
erf.rayleigh_damp_V = true
erf.rayleigh_damp_U = false
erf.rayleigh_damp_V = false
erf.rayleigh_damp_W = true
erf.rayleigh_damp_T = true
erf.rayleigh_damp_T = false
erf.rayleigh_dampcoef = 0.2 # [1/s] following FastEddy
erf.rayleigh_zdamp = 100. # from Beare et al. 2006, "most models applied gravity wave damping above 300 m"

Expand Down
8 changes: 4 additions & 4 deletions Exec/MoistRegTests/Bomex/input_Kessler
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ amrex.fpe_trap_invalid = 1
fabarray.mfiter_tile_size = 1024 1024 1024

# PROBLEM SIZE & GEOMETRY
geometry.prob_extent = 3200 3200 4000
amr.n_cell = 32 32 100
geometry.prob_extent = 6400 6400 4000
amr.n_cell = 64 64 100

geometry.is_periodic = 1 1 0

Expand Down Expand Up @@ -64,8 +64,8 @@ erf.dycore_horiz_adv_type = Upwind_3rd
erf.dycore_vert_adv_type = Upwind_3rd
erf.dryscal_horiz_adv_type = Upwind_3rd
erf.dryscal_vert_adv_type = Upwind_3rd
erf.moistscal_horiz_adv_type = WENO5
erf.moistscal_vert_adv_type = WENO5
erf.moistscal_horiz_adv_type = Upwind_3rd
erf.moistscal_vert_adv_type = Upwind_3rd

erf.moisture_model = "Kessler_NoRain"
erf.buoyancy_type = 1
Expand Down
8 changes: 4 additions & 4 deletions Exec/MoistRegTests/Bomex/input_SAM
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ amrex.fpe_trap_invalid = 1
fabarray.mfiter_tile_size = 1024 1024 1024

# PROBLEM SIZE & GEOMETRY
geometry.prob_extent = 3200 3200 4000
amr.n_cell = 32 32 100
geometry.prob_extent = 6400 6400 4000
amr.n_cell = 64 64 100

geometry.is_periodic = 1 1 0

Expand Down Expand Up @@ -64,8 +64,8 @@ erf.dycore_horiz_adv_type = Upwind_3rd
erf.dycore_vert_adv_type = Upwind_3rd
erf.dryscal_horiz_adv_type = Upwind_3rd
erf.dryscal_vert_adv_type = Upwind_3rd
erf.moistscal_horiz_adv_type = WENO5
erf.moistscal_vert_adv_type = WENO5
erf.moistscal_horiz_adv_type = Upwind_3rd
erf.moistscal_vert_adv_type = Upwind_3rd

erf.moisture_model = "SAM"
erf.buoyancy_type = 1
Expand Down

0 comments on commit a032425

Please sign in to comment.