merge hongyili/mosart/mosart-heat-v3 into heat-TEPP#6
Draft
thurber wants to merge 1523 commits intofeature/heat-TEPPfrom
Draft
merge hongyili/mosart/mosart-heat-v3 into heat-TEPP#6thurber wants to merge 1523 commits intofeature/heat-TEPPfrom
thurber wants to merge 1523 commits intofeature/heat-TEPPfrom
Conversation
Fix F2010SC5-CMIP6.northamericax4v1_r0125_northamericax4v1 This PR adds ATM2ROF maps between the northamericax4v1 atm grid and the r0125 land grid, which are now required after the merge of mosart-heat. [NML] only for F2010SC5-CMIP6.northamericax4v1_r0125_northamericax4v1 [BFB] for all tested configurations
modified: components/cam/bld/config_files/definition.xml modified: components/cam/bld/configure modified: components/cam/bld/namelist_files/namelist_defaults_cam.xml new file: components/cam/bld/namelist_files/use_cases/RCEMIP_EAMv1.xml modified: components/cam/cime_config/config_component.xml modified: components/cam/cime_config/config_compsets.xml
modified: components/cam/bld/namelist_files/namelist_definition.xml modified: components/cam/src/control/physconst.F90
modified: cime/src/drivers/mct/cime_config/config_component_e3sm.xml
NH IMEX improvements: 1. Switch newton iteration to iterate on w instead of PHI. This formulation removes all scans (for improved GPU performance), improves precision (allowing residuals down to 1e-11) and makes for better normalization of the Newton increment and residual norms. 2. Add "tstep_type=9", an IMEX method based on the KGU53 explicit table used by the hydrostatic code, and adding a 2nd order implicit table. 3. adjust reference profiles to those found best for HS+topo simulations (but resulting in a degradation in the DCMIP Shar mountain test case) 4. remove obsolete IMEX timestepping algorithms. [BFB] except for theta-l H and NH tests testing and documentation of KGU53-IMEX method: https://acme-climate.atlassian.net/wiki/spaces/NGDNA/pages/1041401881/IMEX+methods
modified: components/cam/src/physics/rrtmgp/radiation.F90
modified: components/cam/bld/config_files/definition.xml modified: components/cam/bld/configure modified: components/cam/bld/namelist_files/use_cases/RCEMIP_EAMv1.xml modified: components/cam/cime_config/config_component.xml new file: components/cam/cime_config/usermods_dirs/rcemip/user_nl_cpl
CESM will still use this, but for E3SM I will implement an alternative approach that I feel is more flexible modified: components/cam/src/control/physconst.F90 modified: components/cam/src/utils/orbit.F90
One variable allows total solar irradiance to be prescribed and the other provides a switch to disable aerosol radiative calculations modified: components/cam/bld/build-namelist modified: components/cam/bld/namelist_files/namelist_defaults_cam.xml modified: components/cam/bld/namelist_files/namelist_definition.xml
This new variable allows the behavior of shr_orb_cosz() in shr_orb_mod to be overridden globally. By setting constant_zenith_deg with a value >=0 shr_orb_cosz() will always return the cosine of that value. The motivation behind this is to allow special idealized cases, like RCE with a coupled ocean. modified: cime/src/drivers/mct/cime_config/namelist_definition_drv.xml modified: cime/src/drivers/mct/shr/seq_infodata_mod.F90 modified: cime/src/share/util/shr_orb_mod.F90
modified: cime/src/drivers/mct/shr/seq_infodata_mod.F90
modified: cime/config/e3sm/tests.py
modified: components/cam/bld/namelist_files/use_cases/RCEMIP_EAMv1.xml modified: components/cam/cime_config/config_component.xml
modified: cime/config/e3sm/allactive/config_pesall.xml
also remove obsolete namelist variables
The two-way irrigation scheme between land and river models is updated to fit the tri-grid configuration. The temporary water conservation solution developed for different land and river grid is removed. Two additional flags are added to the land model to make the irrigation scheme more flexible: extra_gw_irr (for extra groundwater pumping) and firrig_data (for using prepossessed parameter). Also some modifications were made to couple MOSART-WM and MOSART-inundation. [BFB]
Upgrading PnetCDF library for the default intel compiler from 1.7.0 to 1.11.0
Sarich/add gen domain test Add tool testing framework (at this point only gen_domain test) to CIME scripts_regression_tests.py [BFB] * sarich/add-gen-domain-test: add class setup and teardown for CIME tools test class allow gen_domain_test.sh to give default mpi option to configure Add test for gen_domain in CIME scripts_regression_tests
Update mpas-source, COMPASS only This PR updates the mpas-source submodule and only changes files that pertain to testing and setup. It does not alter any E3SM routines. [BFB]
Fix summit pnetcdf linking * Updating summit env modules * Reorder linking for summit * Fix Makefile macro generator to support negation [BFB] * jgfouca/cime/fix_summit_pnetcdf: Updating more modules restore original pnetcdf More fixes Fix summit/ibm pnetcdf linking
Upgrading PnetCDF library for the default intel compiler from 1.7.0 to 1.11.0 [BFB] Fixes #3383
Fix bugs that break the coupling of the dynamic land use model and the crop model. [BFB]
For ELM, when use_pheno_flux_limiter=.true., the components of maintance respiration are updated to avoid negative carbon state variables. However, the total maintenance respiration is not updated accordingly, causing an overesimation of total maintenance respiration mr. Now this bug is fixed by ensuring maintenance respiration is always recalculated by summing up its components. [non-BFB] due to very tiny value changes. Fixes #3256
Fixes the incorrect merge of #3257 in 2649126 Fixes #3499 [BFB]
Replace WHERE with DO loops in landice for PGI v19.10 This PR brings in a new mpas-source submodule that has changes only in the landice core that replaces WHEREs with DO loops for PGI v19.10. Fixes #2862 [BFB]
Update mpas-source: init mode, COMPASS, minor ice shelf diagnostics This PR brings in a new mpas-source submodule with changes only to mpas-ocean source code. These changes are all related to the creation of initial conditions for ice shelves. It does not alter forward simulations without ice shelves. [BFB]
Refactor RRTMGP cloud optics to remove dependence on state/pbuf Refactor RRTMGP interface and cloud optics routines to remove deep-rooted dependencies on state and pbuf. This work benefits the MMF GPU port of the RRTMGP interface (by allowing us to call cloud optics routines with CRM arrays) and also the SCREAM effort to rewrite the atmosphere driver infrastructure. Additionally, it improves transparency in the radiation interface, by making it more obvious what fields from pbuf are being used to derived cloud optical properties. Despite extensive refactoring, this is bit-for-bit with the previous version. Also adds a new testmods directory for running RRTMGP with the "old" cloud optics schemes (Ebert and Curry plus Slingo), which are used with the MMF single-moment microphysics configuration. [BFB] * brhillman/atm/refactor-cloud-optics: (24 commits) Clarify changeseed and make sw/lw consistent Add documentation on compress_optics_sw Move ec and slingo use statements calculate_heating_rate should take array args Use arrays size ncol instead of pcols Move gas handling up to radiation_tend Move optics up to radiation_tend Move handling coszrs up to radiation_tend Move icall loop to radiation_tend level Move setting albedo up a level Move setting rad state up to driver level Shorten albedo names Move day compression out of set_rad_state Simplify/breakup set_gas_concentrations Shorten cloud_optics variable names Cloud optics to use assumed-shape arrays Simplify set_aerosol_optics Move state/pbuf out of cloud optics routines Remove cam_optics_type and just pass arrays Move state and pbuf out of get_cloud_optics_* ...
I grepped our repo and updated the ones I could find. [BFB]
…3510) Submodule operations must now be recursive I grepped our repo and updated the ones I could find. [BFB] * jgfouca/sub_ops_need_to_be_recursive: Submodule operations must now be recursive
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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's a lot of non-mosart changes, so might be easiest to ctrl-f to search for file paths of interest like "components/mosart/src/"