Update with tag 'cmeps1.0.6' #11
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
cmeps0.14.50
…OMP#115) * add cpl_scalar for tiled grids, other minor fixes * add new cpl_scalar for mediator history files for tiled gridded domains * remove unnecessary trims, fix minor typos and indentation * set ntile=0 when ntile scalar doesn't exist * modify dstmask for lnd->atm in UFS Co-authored-by: uturuncoglu <[email protected]>
…o allows me to do unit-testing easier
…is_mod Conflicts: cesm/nuopc_cap_share/shr_dust_emis_mod.F90
Change check_if_initiatlized to logical function to help with unit testing.
Make the checking of options it's own subroutine to help with unit-testing.
Add ability to obtain multi level input from ocn and map and pass it back to cism
Add shr_dust_emis_mod to handle options for dust emissions between CTSM and CAM
Add trigrid capability - ability to run atm and lnd on separate grids
new fix for add_gusts
bug fix primarily for usf testing
…ay_error gnu reports an error if this unused variable is not allocated
At least for now, we want the default to be to remove negative runoff for lnd-derived runoff, but NOT for glc-derived runoff.
…and_only Separate the control of removing negative runoff for lnd vs glc, and set default to false for glc-derived runoff ### Description of changes This is a follow-up to ESCOMP#471 . At least for now, we want the default to be to remove negative runoff for lnd-derived runoff, but NOT for glc-derived runoff. This PR implements that change. Note that this changes behavior for the correction of glc-derived runoff, but keeps the behavior the same as before for lnd-derived runoff. ### Specific notes Are changes expected to change answers? (specify if bfb, different at roundoff, more substantial): **Yes - changes answers substantially for runoff fields in some B compsets (or other configurations with both active land/river and active ocean) - but only for configurations that have glc-derived runoff; this can currently come from configurations with CISM in EVOLVE mode or DGLC (even in NOEVOLVE mode). Note that this change just undoes part of the answer changes that came from ESCOMP#471 .** Any User Interface Changes (namelist or namelist defaults changes)? Separates the namelist item remove_negative_runoff into two separate options: remove_negative_runoff_lnd and remove_negative_runoff_glc. ### Testing performed Please describe the tests along with the target model and machine(s) If possible, please also added hashes that were used in the testing Using `cesm2_3_beta17` (with CISM at `756cfa6f0514d89977d2732ad06a4d364da5d418`, mosart at mosart1.1.02, and removing the contents of `cime_config/testmods_dirs/allactive/defaultio/user_nl_mosart`: Ran three versions of `SMS_D_Ld3.f19_g17.B1850G.derecho_intel.allactive-cism-test_coupling`: - One with default flags - One with `remove_negative_runoff_glc` set to true - One with `remove_negative_runoff_lnd` set to false I checked the behavior in these in runs with dbug_flag set to 21 so I would see diagnostics of what fields were being adjusted, and confirmed that the correct fields were being operated on in all three cases.
This was mistakenly removed in 4d9073d when cleaning up unused variables. Resolves ESCOMP#482
* add new functionality for transferring dms,bfr,n2o and nh3 from ocn to atm (only valid for BLOM) * added blom configurations * fixed bug in that advertising for So_t_depth and So_s_depth was never happening * addressed issues isn PR review Co-authored-by: Mariana Vertenstein <[email protected]>
Declare cnt variable needed with ESMF_AWARE_THREADING
fix an error in the aoflux wind_gust fields
Update EarthWorksOrg/CMEPS with upstream work from ESCOMP/CESM/cesm3_0_beta01
Update EarthWorksOrg/CMEPS with upstream work from ESCOMP/CESM/cesm3_0_beta02
gdicker1
changed the title
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.
Advance EarthWorksOrg/CMEPS to include changes from the ESCOMP/CMEPS 'cmeps1.0.6' tag. This matches with updates of other externals to what's used in ESCOMP/CESM tag 'cesm3_0_beta02'
This PR is meant to be merged after #10