Skip to content

Merge master (ctsm5.3.041) into b4b-dev 2025-04-24#3092

Merged
samsrabin merged 3 commits intoESCOMP:b4b-devfrom
samsrabin:merge-master-20250424
Apr 25, 2025
Merged

Merge master (ctsm5.3.041) into b4b-dev 2025-04-24#3092
samsrabin merged 3 commits intoESCOMP:b4b-devfrom
samsrabin:merge-master-20250424

Conversation

@samsrabin
Copy link
Copy Markdown
Member

No description provided.

@samsrabin samsrabin added the b4b bit-for-bit label Apr 25, 2025
@samsrabin samsrabin self-assigned this Apr 25, 2025
@adrifoster adrifoster self-requested a review April 25, 2025 20:59
@samsrabin samsrabin merged commit 882e9e9 into ESCOMP:b4b-dev Apr 25, 2025
3 checks passed
slevis-lmwg added a commit to slevis-lmwg/ctsm that referenced this pull request May 9, 2025
Merge b4bdev 20250509

Updates to the b4b-dev branch since its last merge to master (PRs ESCOMP#3091 ESCOMP#3092), as shown by git log:

- Merge pull request Update docs infrastructure ESCOMP#2809 from samsrabin/update-docs-builder-2
  Update docs infrastructure
- Merge pull request Update externals to cesm3_0_alpha06c ESCOMP#3106 from ekluzek/update_to_alpha06c
  Update externals to cesm3_0_alpha06c
- Merge pull request User control over snow thermal conductivity scheme over glaciers ESCOMP#3072 from wwieder/JordanGlacier
  User control over snow thermal conductivity scheme over glaciers
ekluzek added a commit to ekluzek/CTSM that referenced this pull request May 9, 2025
Merge b4bdev 20250509

Updates to the b4b-dev branch since its last merge to master (PRs ESCOMP#3091 ESCOMP#3092), as shown by git log:

- Merge pull request Update docs infrastructure ESCOMP#2809 from samsrabin/update-docs-builder-2
  Update docs infrastructure
- Merge pull request Update externals to cesm3_0_alpha06c ESCOMP#3106 from ekluzek/update_to_alpha06c
  Update externals to cesm3_0_alpha06c
- Merge pull request User control over snow thermal conductivity scheme over glaciers ESCOMP#3072 from wwieder/JordanGlacier
  User control over snow thermal conductivity scheme over glaciers

 Conflicts:
	src/biogeochem/CNFireNoFireMod.F90
slevis-lmwg added a commit to slevis-lmwg/ctsm that referenced this pull request May 10, 2025
Merge b4bdev 20250509

Updates to the b4b-dev branch since its last merge to master (PRs ESCOMP#3091 ESCOMP#3092), as shown by git log:

- Merge pull request Update docs infrastructure ESCOMP#2809 from samsrabin/update-docs-builder-2
  Update docs infrastructure
- Merge pull request Update externals to cesm3_0_alpha06c ESCOMP#3106 from ekluzek/update_to_alpha06c
  Update externals to cesm3_0_alpha06c
- Merge pull request User control over snow thermal conductivity scheme over glaciers ESCOMP#3072 from wwieder/JordanGlacier
  User control over snow thermal conductivity scheme over glaciers
samsrabin added a commit to samsrabin/CTSM that referenced this pull request May 12, 2025
Merge b4bdev 20250509

Updates to the b4b-dev branch since its last merge to master (PRs ESCOMP#3091 ESCOMP#3092), as shown by git log:

- Merge pull request Update docs infrastructure ESCOMP#2809 from samsrabin/update-docs-builder-2
  Update docs infrastructure
- Merge pull request Update externals to cesm3_0_alpha06c ESCOMP#3106 from ekluzek/update_to_alpha06c
  Update externals to cesm3_0_alpha06c
- Merge pull request User control over snow thermal conductivity scheme over glaciers ESCOMP#3072 from wwieder/JordanGlacier
  User control over snow thermal conductivity scheme over glaciers
glemieux added a commit to glemieux/ctsm that referenced this pull request May 12, 2025
Merge b4bdev 20250509

Updates to the b4b-dev branch since its last merge to master (PRs ESCOMP#3091 ESCOMP#3092), as shown by git log:

- Merge pull request Update docs infrastructure ESCOMP#2809 from samsrabin/update-docs-builder-2
  Update docs infrastructure
- Merge pull request Update externals to cesm3_0_alpha06c ESCOMP#3106 from ekluzek/update_to_alpha06c
  Update externals to cesm3_0_alpha06c
- Merge pull request User control over snow thermal conductivity scheme over glaciers ESCOMP#3072 from wwieder/JordanGlacier
  User control over snow thermal conductivity scheme over glaciers
samsrabin added a commit to samsrabin/CTSM that referenced this pull request May 14, 2025
Merge b4bdev 20250509

Updates to the b4b-dev branch since its last merge to master (PRs ESCOMP#3091 ESCOMP#3092), as shown by git log:

- Merge pull request Update docs infrastructure ESCOMP#2809 from samsrabin/update-docs-builder-2
  Update docs infrastructure
- Merge pull request Update externals to cesm3_0_alpha06c ESCOMP#3106 from ekluzek/update_to_alpha06c
  Update externals to cesm3_0_alpha06c
- Merge pull request User control over snow thermal conductivity scheme over glaciers ESCOMP#3072 from wwieder/JordanGlacier
  User control over snow thermal conductivity scheme over glaciers
slevis-lmwg added a commit to slevis-lmwg/ctsm that referenced this pull request May 14, 2025
Merge b4bdev 20250509

Updates to the b4b-dev branch since its last merge to master (PRs ESCOMP#3091 ESCOMP#3092), as shown by git log:

- Merge pull request Update docs infrastructure ESCOMP#2809 from samsrabin/update-docs-builder-2
  Update docs infrastructure
- Merge pull request Update externals to cesm3_0_alpha06c ESCOMP#3106 from ekluzek/update_to_alpha06c
  Update externals to cesm3_0_alpha06c
- Merge pull request User control over snow thermal conductivity scheme over glaciers ESCOMP#3072 from wwieder/JordanGlacier
  User control over snow thermal conductivity scheme over glaciers
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

b4b bit-for-bit

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants