Skip to content
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.

Sign up for GitHub

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

Jump to bottom

PR for merging several PRs at once #2250

Merged
merged 77 commits into from
Nov 15, 2023
Merged

PR for merging several PRs at once #2250

merged 77 commits into from
Nov 15, 2023

Conversation

slevis-lmwg
Copy link
Contributor

Description of changes

Please see the individual PRs
#2156 #2148 #2233 #2235 #2237 #2044
Summarized in the ChangeLog.

Specific notes

Please see the individual PRs. Summarized in the ChangeLog.

Contributors other than yourself, if any:
Multiple, as listed in the individual PRs and the ChangeLog.

CTSM Issues Fixed (include github issue #):
Closes #2156
Closes #2148
Closes #2233
Closes #2235
Closes #2237
Closes #2044
and fixes the issues listed therein.

Are answers expected to change (and if so in what way)?
Please see the individual PRs. Summarized in the ChangeLog.

Any User Interface Changes (namelist or namelist defaults changes)?
Please see the individual PRs. Summarized in the ChangeLog.

Testing performed:
In progress. I will document in the ChangeLog.

ekluzek and others added 30 commits June 28, 2023 10:20
@ekluzek
More confined regular expressing fixing ESCOMP#2039
76569cd
@ekluzek
Merge tag 'ctsm5.1.dev133' into compset_fix
257ee54 
FATES API update to facilitate fates refactor

This updates a number of FATES type names and module use statements
which correspond with a refactoring effort that moves FATES
patches and cohorts into their own respective modules.

With the FATES update is a minor science update, so there are
changes to answers for FATES.

This also incorporates a minor update to a more recent version
of the ccs config external.
@ekluzek
Put NEON site fsurdat files in the namelist_defaults file, and get it…
8aa0a68 
… connected, fixing ESCOMP#2028
@ekluzek
Fix for ESCOMP#2103 making sure --res sent to build-namelist is CLM_U…
df4c392 
…SRDAT rather than \$CLM_USRDAT_NAME as it is now
@ekluzek
Complete build-namelist work needed for ESCOMP#2103 and ESCOMP#2028 h…
7f2475c 
…aving res be CLM_USRDAT when clm_usr_name option is set and setting fsurdat and flanduse in namelist defaults for NEON sites
@AdrienDams
Replace thermal conductivity of snow of Jordan with Sturm
ab94ab4
@slevis-lmwg
Moving run_neon.py to /python and creating wrapper script for it
8b75c9b
@slevis-lmwg
Moving modify_singlept_site_neon.py to /python and creating wrapper s…
8260253 
…cript for it
@TeaganKing
Moving neon_surf_wrapper.py to /python and creating wrapper script fo…
83d36ed 
…r it
@TeaganKing
reformatting with black
4ee49e3
@slevis-lmwg
Updating .git-blame-ignore-revs
9dd60f3
@samsrabin
Fixed "anomoly" typo.
b3327d0
@samsrabin
Removed unnecessary hist_case.
b578626
@samsrabin
num_ens now automatically set.
b5ce120
@samsrabin
Removed unused hist_suffix and ssp_suffix.
8d06313
@samsrabin
Added output_format variable.
2f55d1e
@samsrabin
Can now specify --output-dir.
0ca6d62 
Also fixes bug of write_climo file paths missing a /.
@ekluzek
Move iso functions to utils
c58e0ee
@ekluzek
Some lint and black updates for the new iso utility code
47e7288
@ekluzek
Add unit tester for get_isosplit function
e56552d
@ekluzek
Add unit tester for get_isosplit function
017b021
@ekluzek
Add a test of parse_isoduration and run it in black
3830a6d
@slevis-lmwg
Merge remote-tracking branch 'ekluzek/move_iso_util' into single_point
13e6a82
@TeaganKing
add unit tests
4b6874e
@TeaganKing
remove hard-coded neon site list & use dir structure instead, similar…
528d4f0 
…ly to in run_neon
@TeaganKing
black reformatting
0bc3f00
@TeaganKing
Updating .git-blame-ignore-revs
30ab529
@TeaganKing
addressed some pylint suggestions
807ca5c
@TeaganKing
black reformatting
0207bc9
@TeaganKing
Updating .git-blame-ignore-revs
a6c3c64
TeaganKing and others added 24 commits November 3, 2023 11:27
@TeaganKing
ignore black revision
1f5e042
@samsrabin
Make output_dir if needed.
389bca9
@samsrabin
Refactor output file setup.
2473059
@samsrabin
Refactor creation and filling of forcing variables.
dda9163
bug fix
ca39486
@samsrabin
Refactor creation and filling of time.
8b55281
@samsrabin
Allow alternate flags with hyphens instead of underscores.
8c994b3
@samsrabin
Create and fill lat/lon in separate calls of function.
904266a
@slevis-lmwg
Small corrections for tests to run
b626e88
@samsrabin
Refactor add_to_dataset() out of create_fill_forcing().
2b45ef4
@samsrabin
Move comments and add whitespace.
61d746f
@samsrabin
Save repr_grainc_to_seed_perharv_patch for restart.
32f2907
@samsrabin
Save sowing window dates for restart.
cc43a1a
remove extraneous ws
82ac5d6
@TeaganKing
Update ChangeSum
2a6b4ac
@TeaganKing
Update ChangeLog
eaf488d
@slevis-lmwg
Merge remote-tracking branch 'escomp/master' into single_point
32d334c 
Resolved conflicts:
.git-blame-ignore-revs
doc/ChangeLog
doc/ChangeSum
@slevis-lmwg
Merge remote-tracking branch 'AdrienDams/Sturm' into mergetag-20231114
3f022d3
@slevis-lmwg
Merge remote-tracking branch 'samsrabin/fix-smallville-restart-fills'…
8fdd252 
… into mergetag-20231114
@slevis-lmwg
Merge remote-tracking branch 'adrifoster/cropcalstreammod_compiler_bu…
51ee378 
…g_fix' into mergetag-20231114
@slevis-lmwg
Merge remote-tracking branch 'samsrabin/ssp_anomaly_forcing-refactor'…
6713de7 
… into mergetag-20231114
@slevis-lmwg
Merge remote-tracking branch 'ekluzek/compset_fix' into mergetag-2023…
ed728bf 
…1114
@slevis-lmwg
Update ChangeLog/ChangeSum
df110db
@slevis-lmwg
Minor update to ChangeLog
ed57371
@slevis-lmwg slevis-lmwg self-assigned this Nov 14, 2023
@slevis-lmwg
Copy link
Contributor Author

Test-suites

All tests have this expected NLCOMP difference:
found extra variable: 'snow_thermal_cond_method'

cheyenne OK
izumi OK, the following PASS/FAILs are expected, though I want to check with @wwieder and/or @ekluzek before I go ahead with the merge:

1114-134952iz_gnu: 12 tests
    PASS ERS_Lm20_Mmpi-serial.1x1_smallvilleIA.I2000Clm50BgcCropQianRs.izumi_gnu.clm-cropMonthlyNoinitial COMPARE_base_rest (UNEXPECTED: expected FAIL)
    FAIL ERS_Lm20_Mmpi-serial.1x1_smallvilleIA.I2000Clm50BgcCropQianRs.izumi_gnu.clm-cropMonthlyNoinitial BASELINE ctsm5.1.dev151: DIFF
 
1114-134952iz_nag: 32 tests
    FAIL SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm51Bgc.izumi_nag.clm-default--clm-NEON-NIWO BASELINE ctsm5.1.dev151: DIFF
    FAIL SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm51Bgc.izumi_nag.clm-NEON-MOAB--clm-PRISM BASELINE ctsm5.1.dev151: DIFF

@slevis-lmwg
Copy link
Contributor Author

slevis-lmwg commented Nov 15, 2023 •
edited
Loading

@wwieder showed me the one-line change in #2044 in /cime_config/usermods_dirs/NEON/defaults/shell_commands
that caused the diffs from baseline in the two NEON tests listed above. I reran the two tests without the one-line change and got bfb with baseline, so now this PR is confirmed ready for the merge.

To be clear, we're keeping the one-line change in the merge.

@slevis-lmwg slevis-lmwg merged commit cc1c4d8 into ESCOMP:master Nov 15, 2023
2 checks passed
@slevis-lmwg slevis-lmwg deleted the mergetag-20231114 branch November 15, 2023 00:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@slevis-lmwg slevis-lmwg

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@slevis-lmwg @ekluzek @AdrienDams @TeaganKing @samsrabin