Merge development into main for ZM #194
Merged
Conversation
This file contains 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
Originator(s): peverwhee Summary (include the keyword ['closes', 'fixes', 'resolves'] and issue number): Uses new constituent tendency updater scheme (apply_constituent_tendencies) instead of the temporary dry adiabatic adjustment updater (that no longer exists!) closes #179 Describe any changes made to the namelist: N/A List all files eliminated and why: N/A List all files added and what they do: List all existing files that have been modified, and describe the changes: (Helpful git command: git diff --name-status development...<your_branch_name>) M suites/suite_cam7.xml - use apply_constituent_tendencies scheme List any test failures: n/a Is this a science-changing update? New physics package, algorithm change, tuning changes, etc? No
#182) Originator(s): @dwfncar Summary (include the keyword ['closes', 'fixes', 'resolves'] and issue number): - Closes #99 Describe any changes made to the namelist: N/A List all files eliminated and why: N/A List all files added and what they do: ``` A schemes/musica/tuvx/musica_ccpp_tuvx_aerosol_optics.F90 A test/musica/tuvx/test_tuvx_aerosol_optics.F90 ``` List all existing files that have been modified, and describe the changes: ``` M schemes/musica/tuvx/musica_ccpp_tuvx.F90 M schemes/musica/tuvx/musica_ccpp_tuvx_surface_albedo.F90 M test/docker/Dockerfile.musica M test/docker/Dockerfile.musica.no_install M test/musica/tuvx/CMakeLists.txt ``` List any test failures: N/A Is this a science-changing update? New physics package, algorithm change, tuning changes, etc? No --------- Co-authored-by: davidfillmore <[email protected]> Co-authored-by: David Fillmore <[email protected]> Co-authored-by: Jiwon Gim <[email protected]>
…s and MICM (#184) Originator(s): @boulderdaze Summary (include the keyword ['closes', 'fixes', 'resolves'] and issue number): - Closes #98 - Closes #165 Describe any changes made to the namelist: N/A List all files eliminated and why: N/A List all files added and what they do: ``` A schemes/musica/musica_ccpp_species.F90 A schemes/musica/tuvx/musica_ccpp_tuvx_gas_species.F90 A schemes/musica/tuvx/musica_ccpp_tuvx_load_species.F90 A test/musica/test_musica_species.F90 A test/musica/tuvx/test_tuvx_gas_species.F90 A test/musica/tuvx/test_tuvx_load_species.F90 ``` List all existing files that have been modified, and describe the changes: ``` M schemes/musica/micm/musica_ccpp_micm.F90 M schemes/musica/musica_ccpp.F90 M schemes/musica/musica_ccpp.meta M schemes/musica/tuvx/musica_ccpp_tuvx.F90 M schemes/musica/tuvx/musica_ccpp_tuvx_height_grid.F90 M test/docker/Dockerfile.musica M test/docker/Dockerfile.musica.no_install M test/musica/CMakeLists.txt M test/musica/test_musica_api.F90 M test/musica/tuvx/CMakeLists.txt M test/musica/tuvx/test_tuvx_height_grid.F90 M to_be_ccppized/ccpp_tuvx_utils.F90 ``` List any test failures: N/A Is this a science-changing update? New physics package, algorithm change, tuning changes, etc? No
Originator(s): Cheryl Craig Tag: atmos_phys0_08_000 Summary (include the keyword ['closes', 'fixes', 'resolves'] and issue number): Add ccpp'ized ZM - closes #66 Describe any changes made to the namelist: A schemes/zhang_mcfarlane/zm_convr_namelist.xml - namelist template for ZM List all files eliminated and why: N/A List all files added and what they do: A schemes/cloud_fraction/cloud_fraction_fice.F90 A schemes/cloud_fraction/cloud_fraction_fice.meta - Bring in the cloud_fraction_fice portion of the cloud_fraction CAM code and CCPP'ize it A schemes/sima_diagnostics/zm_diagnostics.F90 A schemes/sima_diagnostics/zm_diagnostics.meta - Add the main ZM diagnostics A schemes/sima_diagnostics/zm_convr_tendency_diagnostics.F90 A schemes/sima_diagnostics/zm_convr_tendency_diagnostics.meta A schemes/sima_diagnostics/zm_evap_tendency_diagnostics.F90 A schemes/sima_diagnostics/zm_evap_tendency_diagnostics.meta A schemes/sima_diagnostics/zm_momtran_tendency_diagnostics.F90 A schemes/sima_diagnostics/zm_momtran_tendency_diagnostics.meta A schemes/sima_diagnostics/zm_tendency_diagnostics.F90 A schemes/sima_diagnostics/zm_tendency_diagnostics.meta - Add ZM tendency diagnostics for each ZM component A schemes/utilities/to_be_ccppized_temporary.F90 A schemes/utilities/to_be_ccppized_temporary.meta - Add a temporary routine to house init methods which aren't being run with to_be_ccppized code. - Add a call to wv_sat_init A schemes/zhang_mcfarlane/set_deep_conv_fluxes_to_general.F90 A schemes/zhang_mcfarlane/set_deep_conv_fluxes_to_general.meta A schemes/zhang_mcfarlane/set_general_conv_fluxes_to_deep.F90 A schemes/zhang_mcfarlane/set_general_conv_fluxes_to_deep.meta - Add interstitials to move variables back and forth from the ZM deep variables to general variables for the ZM routine which is used in shallow convection as well A test/test_suites/suite_zhang_mcfarlane.xml - Suite to test ZM A to_be_ccppized/error_messages.F90 A to_be_ccppized/namelist_utils.F90 A to_be_ccppized/wv_sat_methods.F90 A to_be_ccppized/wv_saturation.F90 - Add methods which ZM requires, but are not being CCPP-ized at this point in time List all existing files that have been modified, and describe the changes: (Helpful git command: git diff --name-status development...<your_branch_name>) M doc/ChangeLog M doc/NamesNotInDictionary.txt - updated with ZM names M schemes/zhang_mcfarlane/zm_conv_convtran.F90 M schemes/zhang_mcfarlane/zm_conv_convtran.meta M schemes/zhang_mcfarlane/zm_conv_evap.F90 M schemes/zhang_mcfarlane/zm_conv_evap.meta M schemes/zhang_mcfarlane/zm_conv_momtran.F90 M schemes/zhang_mcfarlane/zm_conv_momtran.meta M schemes/zhang_mcfarlane/zm_convr.F90 M schemes/zhang_mcfarlane/zm_convr.meta - Further refinements needed to CCPP'ize ZM M suites/suite_cam7.xml - Add ZM routines to CAM7 List any test failures: Is this a science-changing update? New physics package, algorithm change, tuning changes, etc? - CCPP'ized ZM which was a package which already existed in CAM --------- Co-authored-by: Jesse Nusbaumer <[email protected]> Co-authored-by: Haipeng Lin <[email protected]> Co-authored-by: mwaxmonsky <[email protected]>
nusbaume
approved these changes
Jan 25, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Tag: atmos_phys0_08_000
Use new constituent tendency updater in cam7 SDF #188
MUSICA TUVX scheme: create aerosol radiator, set_aerosol_optics_values #182
Set gas-species profiles in TUV-x and map indices between constituents and MICM #184
Complete Zhang McFarlane conversion to CCPP #186