read in all possible constituents from file, not just build-time ones #301
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
nusbaume
reviewed
Sep 23, 2024
cacraigucar
approved these changes
Oct 16, 2024
|
This PR is waiting on a |
nusbaume
approved these changes
Dec 2, 2024
jimmielin
added a commit
that referenced
this pull request
Dec 16, 2024
Originator(s): jimmielin Description (include the issue title, and the keyword ['closes', 'fixes', 'resolves'] followed by the issue number): All changes are bit-for-bit, except those noted: Implements `cam_thermo_water_update`: - updates `cp_or_cv_dycore` (`specific_heat_for_air_used_in_dycore`) in `air_composition.F90` for SE and MPAS dynamical cores - read `cp_or_cv_dycore` from CAM snapshot (refer to companion CAM PR) - energy formula (that has to be matching dycore) is recognized and set by null-dycore in `dyn_grid.F90` by looking at global attributes of the initial file; see `find_energy_formula` - added `is_first_timestep` logical state flag Ports `cam_thermo` and related updates in `air_composition` and `dp_coupling` from CAM 6.3.109 (https://github.com/ESCOMP/CAM/pull/761/files) - update to hydrostatic energy calculation - changes `get_cp`, `get_R` in `air_composition.F90` to use moist mixing ratios - **answer-changing:** update to moist-to-dry (for physics) conversion in `dp_coupling::derived_phys_dry` to account for all water tracers instead of just Q - **answer-changing:** update to not-really-"exner" calculation to use composition-dependent `cappav` instead of `cappa` Changes `vcoord` in `dyn_tests_utils` (old CAM) to `energy_formula` now in `cam_thermo_formula` (separated out into a different file to avoid dependency issues) - `vc_moist_pressure` is now `ENERGY_FORMULA_DYCORE_FV`; `vc_dry_pressure` is `_SE`; `vc_height` is `_MPAS` - these are just integer flags (0,1,2) and values are kept consistent with old CAM and their use in dynamics tests Ports global mean utility module (`gmean_mod.F90`), de-chunkized from CAM: - Implements `get_wght` in `physics_grid` for weighted sum calculation Imports `check_energy_chng` and `check_energy_fix` from `atmospheric_physics` Describe any changes made to build system: N/A Describe any changes made to the namelist: contained within ncar-physics List any changes to the defaults for the input datasets (e.g. boundary datasets): - Added `cp_or_cv_dycore` in CAM snapshots List all files eliminated and why: N/A List all files added and what they do: ``` - energy_formula A src/data/cam_thermo_formula.F90 A src/data/cam_thermo_formula.meta - gmean A src/utils/gmean_mod.F90 ``` List all existing files that have been modified, and describe the changes: (Helpful git command: `git diff --name-status development...<your_branch_name>`) ``` - ncar-physics update M .gitmodules M src/physics/ncar_ccpp - `is_first_timestep` M src/control/cam_comp.F90 - cam_thermo_water_update for cp_or_cv_dycore (include in registry; read from ic) M src/data/air_composition.F90 M src/data/cam_thermo.F90 M src/data/registry.xml M tools/stdnames_to_inputnames_dictionary.xml M src/dynamics/se/dp_coupling.F90 M src/dynamics/se/dycore/prim_advance_mod.F90 M src/dynamics/se/dyn_comp.F90 M src/dynamics/utils/dyn_thermo.F90 - energy_formula M src/physics/utils/phys_comp.F90 M src/dynamics/mpas/dyn_comp.F90 M src/dynamics/none/dyn_comp.F90 M src/dynamics/none/dyn_grid.F90 - gmean M src/physics/utils/physics_grid.F90 ``` Note: bit-for-bit in check_energy with CAM is tricky to validate without dycore updates to SE; may need to merge #301 first --------- Co-authored-by: Kuan-Chih Wang <[email protected]>
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 name (required for release branches):
Originator(s): peverwhee
Summary (include the keyword ['closes', 'fixes', 'resolves'] and issue number):
Describe any changes made to build system:
M cime_config/cam_autogen.py
M cime_config/cam_build_cache.py
M cime_config/cam_config.py
Describe any changes made to the namelist: None
List any changes to the defaults for the input datasets (e.g. boundary datasets): None
List all files eliminated and why: None
List all files added and what they do: None
List all existing files that have been modified, and describe the changes:
(Helpful git command:
git diff --name-status development...<your_branch_name>)M src/data/generate_registry_data.py
M src/data/write_init_files.py
M test/unit/test_*.py
If there are new failures (compare to the
test/existing-test-failures.txtfile),have them OK'd by the gatekeeper, note them here, and add them to the file.
If there are baseline differences, include the test and the reason for the
diff. What is the nature of the change? Roundoff?
derecho/intel/aux_sima:
derecho/gnu/aux_sima:
If this changes climate describe any run(s) done to evaluate the new
climate in enough detail that it(they) could be reproduced:
CAM-SIMA date used for the baseline comparison tests if different than latest: