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

Merge tag 'ctsm5.1.dev175' into b4bdev #2432

Merged
merged 46 commits into from
Mar 22, 2024
Merged

Merge tag 'ctsm5.1.dev175' into b4bdev #2432

merged 46 commits into from
Mar 22, 2024

Conversation

slevis-lmwg
Copy link
Contributor

Merge dev175 to b4bdev

rgknox and others added 30 commits September 22, 2023 11:14
@rgknox
Update external pointer for fates, better name of experimental branch
8a6bd78
@rgknox
Merge branch 'clmfates-gru-init-fix' into unsupported_fates_sp_calibr…
30ac836 
…ation
@rgknox
added some comments
adfb459
@rgknox
updates to crossreffing namelist history vars and allocated history vars
5aafde9
@rgknox
Merge branch 'master' into fates-hist-density
e07b445
@rgknox
changed nl argument to text
0e0c6c1
@rgknox
api changes to support history density controls with fates
4ca7aea
@rgknox
changed hist dense namelist to integer
4bbe6fa
@rgknox
fates history density, api tweak
902fe4d
@rgknox
fates history density work
4ea5c21
@rgknox
Changed default namelist density to level 2, which preserves b4b
a826ce9
@rgknox
Merge branch 'master' into fates-hist-density
8b7b4f7
@rgknox
bcasting fates history density level
cd289a1
@rgknox
Setting fates hist density default to 2 until we roll out new tests
63d2512
@olyson
New history fields for coupler history verification (default inactive)
204d6d0
@olyson
New parameter file and namelist values for clm5_1
ebb9f3e
@olyson
Remove flg_snoage_scl in SNICAR such that xdrdt can have an effect
923d05d
@olyson
Remove snicar_snobc_intmix from EXPERIMENTAL endrun (allow it to be
0dd297a 
true)
@olyson
Remove snicar_snobc_intmix from CLMBuildNamelist.pm warning
0178f40
@olyson
Rework logic for snicar_snobc_intmix and snicar_snodst_intmix
55f496d
@olyson
Move snow5d_thresh_for_onset to parameter files
cfdb29d
@rgknox
update allvars
f3ff644
@rgknox
Updated namelist naming convention: from density to dimension for fat…
a22a01b 
…es_history_dimlevel
@rgknox
updating external
b8cdb90
@rgknox
Merge tag 'ctsm5.1.dev171' into fates-hist-density
35436c2 
Set initial t_soisno=272K for soils and 274K for urban road
@slevis-lmwg
Update param file paths
0214933
@slevis-lmwg
Merge tag 'ctsm5.1.dev171' into deadveg
3f9dc9f 
Set initial t_soisno=272K for soils and 274K for urban road

slevis resolved conflicts:
bld/namelist_files/namelist_defaults_ctsm.xml
cime_config/testdefs/testmods_dirs/clm/ciso_cwd_hr/user_nl_clm
src/main/atm2lndType.F90
@rgknox
subtle updates to namelist reading and testing
5ce3241
@slevis-lmwg
Draft ChangeLog/ChangeSum files
280385c
@slevis-lmwg
Corrections/updates to ChangeLog
89b037b
rgknox and others added 16 commits March 11, 2024 11:18
@rgknox
merge resolution with ctsm5.1.dev171-sci.1.72.0_api.33.0.0
d46dc29
@rgknox
Merge branch 'merge-b4bdev-20240307' into fates-hist-density-m172
6c42073
@rgknox
Updated change logs and externals for history dim level
1f2de04
@ekluzek
Merge tag 'ctsm5.1.dev172' into fates-hist-density
cdc90f2 
Merge b4b-dev

Update of externals to what's expected in cesm2_3_beta17. Some documentation updates including a rebuild
of the documentation and updating how images are handled with git lfs. Improvements to the documentation for
residue removal and tillage for prognostic crops.

 Conflicts:
	doc/ChangeLog
	doc/ChangeSum
@ekluzek
Update Changelog date, add some notes about python and build-namelist…
de19312 
… testing
@ekluzek
Merge pull request ESCOMP#2339 from rgknox/fates-hist-density
55f2cf3 
FATES history dimension control
@slevis-lmwg
Merge remote-tracking branch 'escomp/master' into deadveg
6126bf2 
slevis resolved conflicts:
doc/ChangeLog
doc/ChangeSum
@slevis-lmwg
Update to ChangeLog concerning test-suite results
c628466
@slevis-lmwg
Update ChangeSum date of tag
4036dff
@slevis-lmwg
Correction to last commit
0886f3e
@slevis-lmwg
Merge pull request ESCOMP#2348 from olyson/deadveg
f448885 
Changes to improve vegetation health at high latitudes
@slevis-lmwg
Merge commit 'f4488859b5256dd716b833feb07150bc5a12fa2b' into merge-b4…
b6e93a2 
…bdev-20240321

slevis note: Latest master commit is same as ctsm5.1.dev174
@slevis-lmwg
Draft ChangeLog/ChangeSum
f64ba14
@slevis-lmwg
Updated ChangeLog
109c444
@slevis-lmwg
Merge pull request ESCOMP#2431 from slevis-lmwg/merge-b4bdev-20240321
1bab27e 
Merge b4bdev 20240321
@slevis-lmwg
Merge tag 'ctsm5.1.dev175' into merge-b4bdev-20240321
c76af67 
Merge b4bdev 20240321
@slevis-lmwg slevis-lmwg self-assigned this Mar 22, 2024
@slevis-lmwg slevis-lmwg added the bfb bit-for-bit label Mar 22, 2024
@slevis-lmwg
Copy link
Contributor Author

slevis-lmwg commented Mar 22, 2024 •
edited
Loading

@samsrabin @ekluzek
I have reached step 15g in the bfb-dev instructions:

  • I need approval to complete the merge.
  • I need Erik to add dev175 to the CESM test database.

I need to rebase the PR so that the merge goes to the bfb-dev branch rather than to master. From what I can tell right now, i can accomplish this with one of the options in the merge button.

@slevis-lmwg slevis-lmwg marked this pull request as draft March 22, 2024 01:27
@slevis-lmwg slevis-lmwg marked this pull request as ready for review March 22, 2024 01:28
@slevis-lmwg
Copy link
Contributor Author

@samsrabin or @ekluzek
I thought I'd be able to "rebase" this PR at the top where it says "...wants to merge 1 commit into..." but now I do not see such an option. I got myself in this bind by returning to my original merge-b4bdev-20240321 branch instead of creating a new one from b4b-dev. Do either of you have suggestions for moving forward from here OR should I go back to step 15a?

@ekluzek ekluzek changed the base branch from master to b4b-dev March 22, 2024 02:16
@ekluzek
Copy link
Collaborator

ekluzek commented Mar 22, 2024

Hey @slevis-lmwg. I went ahead and changed it. But I also have had troubling finding it in the past. I've done it enough now that I know what to do. Just an example of it's easier to show someone. So next time we have a meeting I'll show you...

@samsrabin
Copy link
Collaborator

@slevis-lmwg The reason we specify merging the master branch back into b4b-dev is to guarantee that b4b-dev is up-to-date with the latest master. But if you've double-checked to make sure that this branch at the latest commit is identical to the latest master, it's all good.

@slevis-lmwg slevis-lmwg merged commit 4ffba74 into ESCOMP:b4b-dev Mar 22, 2024
4 checks passed
@slevis-lmwg slevis-lmwg deleted the merge-b4bdev-20240321 branch March 22, 2024 16:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ekluzek ekluzek ekluzek approved these changes

Assignees

@slevis-lmwg slevis-lmwg

Labels
bfb bit-for-bit
Projects
None yet
Milestone
No milestone
Development

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