-
Notifications
You must be signed in to change notification settings - Fork 392
Initial LES options for MPAS-Atmosphere #1404
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
Open
mgduda
wants to merge
109
commits into
MPAS-Dev:develop
Choose a base branch
from
mgduda:atmosphere/initial_les
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
109 commits
Select commit
Hold shift + click to select a range
934f6e4
add new deformation coefficients to registries
da78a8c
initialize new deformation coefficients
b7880ce
add pointers for new coefficients
235b61c
add initialization of new arrays to zero
cf17fae
pass new arrays to dyn_tend_work - compiles
bf910d6
add deformation formulation to 2d Smagorinsky kdiff
mgduda 31a507c
bug fixes for computing the deformation coefficients for the 2D Smago…
skamaroc a4c08d4
Fixed error in w_x, w_y deformation coefficients.
skamaroc 4fbeab4
New module file for the dissipation routines.
skamaroc bf5e369
(1) Changes to the Makefile to compile new dissipation module.
mgduda 597f74f
Modifications to use mpas_atm_dimensions in the dissipation module
skamaroc b454527
Adding configuration string for the les models in the Registry.
mgduda 728077e
Moved the dissipation term computations for u, theta and w from
mgduda 93d2ac5
Added initialization for convective boundary layer LES case.
skamaroc c5eb44e
add calcalate_n2 routine (no functional code yet)
b18f3e2
add to arg list of calculate_n2
a633636
add dry N^2
d42a459
fix theta to be in diag pool
f0fc10d
fix to use theta_m and qv instead of non-updated theta
116368b
use local 1d theta array for efficiency
b673e28
add qtot drag term to thetav in dry case
a9d7bfa
add cloudy conditions N2 calculation following WRF and Durran and Kle…
f12589d
remove thetav use
7abd792
add bn2 to output and commented out test call
mgduda a6faf86
added a 3D vertical eddy viscosity to the Registry for use in LES app…
skamaroc 88aa0b2
Added a horizontal eddy_viscosity array to go along with the vertical
skamaroc 05f206c
Bug fixes in the new LES mixing routines.
skamaroc 92fbf81
added test calls to the new 3D LES schemes. This is currently hardwired
mgduda 1eaffdf
Bug fixes for the supercell test case using the 3D Smagorinsky LES mo…
skamaroc eb4b3ef
switched signs of the vertical turbulent fluxes and vertical flux div…
skamaroc dbd83ea
Added new lower boundary conditions for LES simulations:
mgduda 59f1348
Added a scalar variable named tke. This is the turbulent kinetic energy
skamaroc 31f21ff
Added passive test of prognostic tke. Does not yet pass debug step.
skamaroc 7e1581b
1.5 order prognostic tke mods. The prognostic tke does not feed back …
skamaroc 84ad242
Added mixing routines for scalars within the LES models,
skamaroc bf39525
Clean up and changes to run the prognostic tke les model. initial tests
skamaroc 203fdef
bug fixes and the addition of the Prandtl number formulation to the
skamaroc 1f442ae
changed Prandtl number to 1/3 for LES simulations in the MPAS_constan…
skamaroc 57a8829
implemented a perturbation coriolis term option for the LES cases.
skamaroc 7ddd21d
introduced the sheared PBL test case for the LES implementation, incl…
skamaroc 6212e0e
Implemented SAS case sounding in LES initialization.
skamaroc 3591008
Added the SAS LES time-varying lower boundary moisture and heat fluxes.
mgduda f77c123
changed the initialization for the random potential temperature pretu…
skamaroc b6f044a
Added a 3D diagnostic variable: the inverse Prandtl number used in the
skamaroc 2a9afca
Threaded the 3D inverse Prandtl number through to the routines that n…
skamaroc 7bef48f
ustm passed to u_dissipation_3d, diag_physics pool accessed
f2ae5be
ustm add pointer remove blanks in pool statement
1ab69a0
add les_model check to bypass pbl calls
b6f5cba
add time_of_day_seconds calculation (compiles)
d6d42f0
add flux_les_sas call in driver_sfclayer routine
a7a1dc5
add fluxes to sfclay arguments and pass in
e6d26f2
pass heat flux args to sfclay1d
460c8b5
copy specified fluxes to hfx and qfx before sfclay1d
fb5e94f
add MOL and BR calculations to sfclay1d
88df14a
add ustm drag in u_dissipation_3d les_sas_test
5c9feb4
skip hfx and qfx calcs in sfclay for specified_flux
d0d418d
pass hfx and qfx to dissipation and use for les_sas
3121ce5
comment out duplicate flux_les_sas in dissipiation module
af3233d
Set dummy TSK and UST=USTM (no VCONV)
16637ca
sign correction for MOL
210df8e
pass clock atm_do_timestep to physics_driver to driver_sfclayer
eba2aee
put k loop around prandtl_inverse calc in dissipation
9895ad5
bug fixes - fixed an uninitialized value in the w turbulent flux at t…
skamaroc 82a1a8c
hfx = heat_flux*rho*cp (factor added)
a7828af
add print for ust_edge
5e34d46
initialize landmask, lu_index(ivgtyp), xland = 1
4514244
change hardwired value of f - need to generize to use fEdge
cdb3a2e
fix rdzw/rdzu for w dissipation, use fEdge instead of coriolis_value
dcaa620
revert to hardwired f until fEdge can be used
19e94ab
convert moisture_flux w'q' to surface flux qfx
2bea048
moisture_flux in dynamics should be w'q' = qfx/rho
99e8905
add commented fEdge line while still using hardwired f
dudhia 684cc61
initial prep to use les_test option
dudhia 2410a51
fix for compile
dudhia f0ee5eb
fixes to compile init_atmosphere
dudhia af5807a
to compile atmosphere
dudhia a284542
fix small error in tke shear production and add surface heat flux
dudhia c3f694c
remove specialized physics code to leave dynonly les
dudhia d916283
mods to scale les-supercell case and remove surface fluxes from les_test
dudhia 97e73ed
add seed tke = 0.1 at all points
dudhia ac2f96c
fix scaling for x_period and y_period for cases
dudhia 250db00
revert supercell a_scale to 1.0
dudhia e446ec8
add config_les_surface to registry and routines (not used yet)
dudhia 96574f2
clean up and reduce duplication
dudhia a311c6f
remove redundant dissipation routines
dudhia 49372ce
Merge with Bill Skamarock updated LES modules
dudhia 6345dc1
add surface flux namelist options
dudhia eef4473
Add explicit declarations of iCell, k, and p in the calculate_n2 routine
mgduda a6eec0e
Avoid passing null pointers for ustm, hfx, and qfx to atm_compute_dyn…
mgduda 44e0d39
Remove unused variables from new LES code
mgduda 197296f
Clean up trailing whitespace and indentation in mpas_atm_dissipation_…
mgduda 3df6857
Use a macro for debugging print statements in mpas_atm_dissipation_mo…
mgduda e093272
Add 'lbc_tke' to the 'lbc_scalars' var_array in atmosphere core Regis…
mgduda d60a765
Initial pass at porting mpas_atm_dissipation_models to GPUs with OpenACC
mgduda d79df9c
Update copyright statement at the top of mpas_atm_dissipation_models.F
mgduda f600615
Fix LaTeX quotes in possible_values for config_les_model and config_l…
mgduda 4d3b299
Fix indentation of deformation_coef_* variables in atmosphere core Re…
mgduda d866412
Clean up indentation in atm_init_test_coefs routine in mpas_atm_advec…
mgduda 84986ea
Tidy up module use statements in mpas_atm_time_integration.F
mgduda be8887d
Fix indentation of call to atm_compute_dyn_tend in atm_srk3
mgduda 4245502
Fix indentation of calls to calculate_n2 and les_models in atm_comput…
mgduda 01c4a5e
Remove commented-out calls to non-existent dissipation routines
mgduda fb5c14a
Set the Prandtl number back to 1.0 in mpas_constants
mgduda 128b96d
Remove unnecessary variables from the atmosphere core's restart stream
mgduda ce6c254
Move computation of time_of_day_seconds into flux_les_sas routine
mgduda b2a7449
Fix implementation of "CAM-MPAS" 2nd-order horizontal filter
mgduda dc9c0d7
Use integer comparisons for config_les_model and config_les_surface
mgduda 27c8b38
Revert init_atm_case_squall_line routine to v8.3.1
mgduda e9d81de
Revert the init_atm_case_mtn_wave routine to v8.3.1
mgduda File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We will need a corresponding change to src/core_atmosphere/CMakelists.txt
Add
mpas_atm_dissipation_models.FtoATMOSPHERE_CORE_DYNAMICS_SOURCESI was able to build mpas-bundle with that change.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jim-p-w Thanks for testing out the CMake build! I'll update the
CMakeLists.txtinsrc/core_atmosphere.