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

update branch #1

Closed
wants to merge 1,567 commits into from
Closed

update branch #1

wants to merge 1,567 commits into from

Conversation

TeaganKing
Copy link
Owner

No description provided.

glemieux and others added 30 commits April 9, 2024 13:51
@glemieux
Merge tag 'ctsm5.1.dev176' into fates-api35-param_update
3bd358d 
Merge b4b-dev
@ekluzek
Put new ctsm5.2 finidat files in initdata_esmf/ctsm5.2 directory
b32df77
@ekluzek
Just update mksurfdata_map to mksurfdata_esmf using VS code
ec9af2d
@ekluzek
remove some no longer needed mksurfdata_map settings
91a4906
@ekluzek
Remove comments about mksurfdata_map
c9f13bd
@ekluzek
Updates to ChangeLog from @slevis-lmwg review, and a few additions fr…
146d44a 
…om going through issues
@ekluzek
Add cam7.0 LND_TUNING options
5b1ee03
@ekluzek
make default gen_mksurfdata generated scripts have a .sh extension
705d0c7
@ekluzek
Remove the .sh exention from gen_mksurfdata_build.sh as one of the pa…
9b5ef22 
…rts of ESCOMP#2446
@ekluzek
Remove mkmapdata and mksurfdata from the template file
6bfb9af
@ekluzek
Merge tag 'ctsm5.1.dev176' into updatetodev176
156fb3a 
Merge b4b-dev

 Conflicts:
	bld/namelist_files/namelist_defaults_ctsm.xml
	bld/namelist_files/namelist_defaults_overall.xml
	bld/namelist_files/namelist_definition_ctsm.xml
	bld/unit_testers/build-namelist_test.pl
	cime_config/config_component.xml
	cime_config/testdefs/testlist_clm.xml
	doc/ChangeLog
	doc/ChangeSum
@ekluzek
Merge branch 'updatetodev176' of github.com:ekluzek/CTSM into updatet…
63bda08 
…odev176

 Conflicts:
	cime_config/config_component.xml
	doc/ChangeSum
@adrifoster
add ny/nx
e36dc8b
@wwieder
inching closer to functional usermods
142343f
@wwieder
starting to add dtlimit for lai streams
61676c0
@ekluzek @slevis-lmwg
Update doc/ChangeLog
7cd7f80 
From @slevis-lmwg suggestion.

Co-authored-by: Samuel Levis <[email protected]>
@wwieder
remove reduntant usermods, addresses ESCOMP#2470
3a6f0f7
@wwieder
explicitly set CALENDAR for transient vs. spinup cases
031c476
@ekluzek
Get namelist working
babd281 
Update namelist with needed cam4.0,
cam5.0, and clm6_0 changes so that the
namelist tester works and compares as expected to the previous version.
@ekluzek
Remove the unneeded PE layout changes
ec7814c 
for ctsm_sci tests with the updated default
PE layouts we have in place.
@wwieder
bring lai_dtlimit to namelist variable
6dd3b54
@wwieder
updating usermods for lai_dtlimit
4762186
@wwieder
more usermods for SP/BGG + spin/hist
6a4dad8
@wwieder
address ESCOMP#2474 by creating run_directory
f30b528
@wwieder
extend dtlimit for transient runs
149b95e
@wwieder
setting CALENDAR correctly for spinup and transient cases
ba9b05f
@wwieder
chagnes requested for LAI streams
362d412
@wwieder
getting lai streams to work for HIST cases
1548c0b
@wwieder
adding a bit to log file
7aafb0c
@slevis-lmwg
Merge branch 'b4b-dev' into b4b-neon
ea4bcc6
jedwards4b and others added 28 commits May 27, 2024 17:40
@jedwards4b
add submodules
0f7d429
@jedwards4b
update submodules
aa54473
@slevis-lmwg
Add comment in lilacsmoke.py as per code review
798d43c
@slevis-lmwg
Updated ChangeLog and ChangeSum
aaeae95
@slevis-lmwg
Update share in Externals.cfg
62d8ad0
@slevis-lmwg
Update ChangeLog with latest info about tests
26c1222
@slevis-lmwg
Merge pull request ESCOMP#2539 from slevis-lmwg/upd_externals_to_beta17
6aebaad 
Update Externals.cfg to cesm2_3_beta17, remove mct, retire /test/tools
@jedwards4b
update ChangeLog
5cdf117
@jedwards4b
update run_sys_tests.py for fleximod
51079bf
@slevis-lmwg
Replace checkout_externals with git-fleximod in documentation
6b550b1
@slevis-lmwg
Restore .gitignore as it was
6129622
@slevis-lmwg
Delete README_EXTERNALS.rst to be like ESCOMP#2559
5a577cd
@slevis-lmwg
Add dummy ./manage_externals/checkout_externals with ERROR message
61c97a1
@slevis-lmwg
Replace cheyenne with derecho in a .rst file
1ed3f19
@slevis-lmwg
Add "bin/" before git-fleximod in README documentation
4f9db00
@slevis-lmwg
Replacing README_EXTERNALS.rst with README_GITFLEXIMOD.rst
8ac86a1
@slevis-lmwg
Updates to README_GITFLEXIMOD.rst as per Jim's review
03762a0
@slevis-lmwg
Jim's suggestions for doc/.../lilac/.../obtaining-and-building-ctsm.rst
6fa0255
@slevis-lmwg
Remove cheyenne from testlis_clm.xml
ae93d22
@slevis-lmwg
Merge remote-tracking branch 'slevis-lmwg/git-fleximod_documentation'…
256877f 
… into ctsm5.2.007/candidate

slevis resolved conflicts:
README
@jedwards4b
fix subtree add
b25a02d
@jedwards4b
Squashed '.lib/git-fleximod/' content from commit a354b05
eb94e4d 
git-subtree-dir: .lib/git-fleximod
git-subtree-split: a354b05
@jedwards4b
Merge commit 'eb94e4d298564d52197d9cf632d73ffad74c5f61' as '.lib/git-…
7fcad57 
…fleximod'
@jedwards4b
Merge remote-tracking branch 'mydev/ctsm5.2.007/candidate' into ctsm5…
a7f62da 
….2.007/candidate
@slevis-lmwg
Draft of ChangeLog/ChageSum
c834c30
@slevis-lmwg
Replace manage_externals with git-fleximod in an error message
9a82a3f
@slevis-lmwg
Replace "externals directories" with "git submodules" in ChangeLogs
c9020ec
@slevis-lmwg
Merge pull request ESCOMP#2559 from jedwards4b/ctsm5.2.007/candidate
a943377 
Remove manage externals and update documentation accordingly
@TeaganKing TeaganKing closed this Jun 25, 2024
TeaganKing pushed a commit that referenced this pull request Aug 16, 2024
@samsrabin
Merge pull request #1 from glemieux/fates-landuse-v2-modechecks
1ffa406 
Update build namelist checks for valid landuse v2 mode combinations
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.