Repository navigation
Changes to CPLHIST mode for robustness and getting the right default settings for CLM and an updated 1850 ndep file #403
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
Merged
Merged
Changes from all commits
Commits
Show all changes
88 commits
Select commit
Hold shift + click to select a range
d9f75e9
Set defaults for DATM_CPLHIST_* settings for 1850 with DATM coupled t…
ekluzek 67a8f18
Make the default setting for DATM_CPLHIST_DIR under the users archive…
ekluzek fcb28ad
Correct the filenames for cplhist mode for PRES_NDEP
ekluzek a72518b
Add clim_1850_cesm3_for_cmip7
ekluzek b6ebc5c
Add clim_1850_cesm3_for_cmip7
ekluzek ab6e2d7
CPLHIST settings for CLM should be just CLM60, to preserve older answers
ekluzek 82e13db
Merge tag 'cdeps1.0.94' into 1850_aero_ndep_ozone
ekluzek acebf06
Merge branch 'main' into 1850_aero_ndep_ozone
ekluzek c22f68b
Merge tag 'cdeps1.0.105' into 1850_aero_ndep_ozone
ekluzek 07b976f
Needed to get the right variables for ndep in cplhist mode
ekluzek 2e0473f
Spin off some functions to modularize the code, to make way for addin…
ekluzek 6fb38a9
Add headers to new functions, and do suggestions from co-pilots revie…
ekluzek 2523ab1
Do error checking for CPLHIST mode, this resolves #399
ekluzek 3f51f39
Let 1850 cases with CLM60 use cmip7_20tr for CO2 timeseries
ekluzek 7842d5a
Missing for PTS_LAT/LON was actually -999.99 so set it to a variable …
ekluzek 00dbb60
Add some output expects for _handle_model_grid especially for the NEO…
ekluzek 03abec7
Set the default case for CPLHIST with 1850 and CLM60 to a recent case…
ekluzek 3dd89db
No longer need to set DATM_PRESNDEP for CPLHIST case
ekluzek b1aaf13
Have to add logic depending on the LND model since some variables are…
ekluzek b6d4096
Merge commit 'b1aaf13' into 1850_aero_ndep_ozone
ekluzek 1a200c9
Remove debug print statement that shouldn't be there
ekluzek 9b3b5a6
Make align, start, end for the CPLHIST default consistently 101
ekluzek 7faa9cd
Update CO2 dataset fixing #410
ekluzek 0aef11e
Set the ndep default file for 1850 to the preliminary one
ekluzek 9e73166
Backout setting CO2 to cmip7_20tr until we have clim_cmip7_1850 options
ekluzek b03bd5b
Only thing needed now is to the start the run start year, the others …
ekluzek ca485b5
Restrict setting of cplhist for DATM_CO2_TSERIES to only if DATM%CPLH…
ekluzek ec8c0a1
Remove cplhist testmod as realized in code review
ekluzek 8106de7
Set YR_ALIGN for CPLHIST to 1, as the normal thing is to start with y…
ekluzek 816b01f
Fix XML syntax error
ekluzek 967ef1f
Simple changes from code review adding more to docstrings, and combin…
ekluzek 339bf37
Update datm/cime_config/config_component.xml
ekluzek 458df47
Update datm/cime_config/config_component.xml
ekluzek 56a9e5e
Update datm/cime_config/config_component.xml
ekluzek 4d0489a
Update datm/cime_config/config_component.xml
ekluzek 1083247
Update datm/cime_config/config_component.xml
ekluzek 7d61189
A couple things caught in the code review, fix a typo, and remove a c…
ekluzek 2951f37
Merge branch '1850_aero_ndep_ozone' of github.com:ekluzek/CDEPS into …
ekluzek 18c23f1
More things from review, remove checking if DATM_CPLHIST_DOMAIN_FILE …
ekluzek 07846d8
Fix expect so that PLUMBER2 sites work
ekluzek baddde6
Add a note on how ndep for cplhist is in units that don't need to be …
ekluzek 93d3b15
Add a comment about the clim_1850_cesm3_for_cmip7 option to DATM_PRES…
ekluzek 1b961f0
Remove accidental character that screwed up the XML syntax, and adjus…
ekluzek 4a6f49c
Add coupling_mode as an attribute for the cesm settings that could co…
ekluzek 16c24bd
Update to cdeps1.0.106
ekluzek 22b6a65
Merge tag 'cdeps1.0.106' into 1850_aero_ndep_ozone
ekluzek 1ffb371
Remove the coupled_mode attribute, because we aren't doing the cime u…
ekluzek 0841d06
Shorten clim_1850_cesm3_for_cmip7 to clim_1850_cesm3 as suggested in …
ekluzek 5d65471
Add some comments clarify on what the different NDEP source types are
ekluzek b83980a
Fix grammar in a comment
ekluzek d78c9de
From code review, don't do these changes for just CLM, as we want MOM…
ekluzek 027cd71
Distinguish between CESM3 and NorESM settings by adding an option arg…
ekluzek 2a02e03
Move this back to the setting for CO2 default to be cplhist with DATM…
ekluzek 2cc9430
Change CPLHIST tests to use %CESM3 and add some extra tests for %CESM…
ekluzek da74bac
Change subdirectory from atm to 'cpl/hist' as requested in review to …
ekluzek d58728e
Add some notes about the 1850 NDEP options and set to cmip6 for CLM50
ekluzek 5efd094
Remove a bunch of expects as requested in the code review
ekluzek 2a335a2
Work on notes about dataset specifier, and add some notes around it f…
ekluzek ac8519e
Some clarifications
ekluzek adb70c0
Add CMIP6 and CMIP7 to option list, and clarify some of the comments …
ekluzek e289f66
Add the units conversion
ekluzek 29255af
Move CPLHIST for CESM from CPLHIST%CESM3 form to CPLHIST-CESM3, so it…
ekluzek c25b7df
Add some more clarity to the current proposal for chemical constituen…
ekluzek 1f23565
Apply suggestion from @billsacks on the reg-EX matching for NDEP
ekluzek 27dfbbf
Add some tests for transient CMIP7 NDEP data, change CPLHIST%CESM3 to…
ekluzek f28c113
Back out the changes about the dataset specifier for chemical constit…
ekluzek 84c436e
Remove trailing whitespace
ekluzek 882010f
Remove more left over changes documenting the change now backed out, …
ekluzek 9fe3ae1
Add testmods to test the variety of datasets and add tests for them all
ekluzek e1482bc
Add testmods to test the variety of datasets and add tests for them all
ekluzek 4ff8acd
Missing component name in testmods
ekluzek b2b6514
Make the case for CO2 on the cmip7 file in upper case
ekluzek ab2654e
Document that year start and end for CPLHIST-CESM3 is expected to be …
ekluzek ec82648
Update comment from code review
ekluzek e3e93c9
Remove the test that was intended to be cplhist_create with CESM3 NDE…
ekluzek c318f83
Remove the second hist_cmip7_ndep_and_co2 and just do the CRUJRA2024 …
ekluzek eac6c05
Remove the GSWP3 1850_cesm3_ndep test and just leave the one for CRUJ…
ekluzek 9b7f966
Correction from code review
ekluzek e13695a
The matching on DATM wasn't needed in DATM_PRESNDEP so removing as re…
ekluzek ead9b82
Add comment about the generic matching to DATM%CPLHIST from code review
ekluzek ec95697
Fix logic and quote UNSET as caught in the code review
ekluzek 79f0e13
Don't trigger on if the compset has CLM or not, trigger based on if c…
ekluzek 0302402
Correct that available_neon_data is normally None rather than an empt…
ekluzek 8836d64
Correction about PLUMBER2SITE from code review
ekluzek ec5e769
Fix the bit caught in code review that CLM_USRDAT_NAME can NOT be set…
ekluzek 765d8b7
Run through black
ekluzek 4f4bf83
Initialize single_column to false, and allow CLM_USRDAT_NAME to be th…
ekluzek 3277096
Merge branch 'main' into 1850_aero_ndep_ozone
ekluzek 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
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
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.
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.
Uh oh!
There was an error while loading. Please reload this page.