Skip to content

cam6_4_128: Correct allocation and assignment error for 'hgt_matrix_half' field in cospsimulator_intr.F90 #1355

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

Merged
merged 27 commits into from
Oct 30, 2025
Merged

cam6_4_128: Correct allocation and assignment error for 'hgt_matrix_half' field in cospsimulator_intr.F90 #1355

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
f85f6b0
correct allocation and assignment error for 'hgt_matrix_half' field
jshaw35 Aug 5, 2025
52352c5
update COSP tag to most current version 20250827
jshaw35 Aug 27, 2025
0c70f30
Update the CAM COSP driver for COSP2.1.8
jshaw35 Sep 3, 2025
f8d87da
Correct syntax and variable naming errors. COSP2 warm rain diagnostic…
jshaw35 Sep 4, 2025
8ded365
Add COSP's MODIS LWP-REFF joint histograms to CESM
jshaw35 Sep 4, 2025
5daff8d
Add MODIS tau-pressure histograms for liquid and ice clouds.
jshaw35 Sep 5, 2025
5bdbeb5
Correct units of cosp_prs, cosp_reffliq, and cosp_reffice coordinates.
jshaw35 Sep 5, 2025
e9ecf01
Update from reviews
jshaw35 Sep 17, 2025
4d4459a
Correct array constructor error.
jshaw35 Sep 22, 2025
4a13d7f
Merge tag 'cam6_4_117' into hgt_matrix_half_error
cacraigucar Sep 23, 2025
c7ed940
Merge remote-tracking branch 'eaton/fix-cosp-check' into hgt_matrix_h…
cacraigucar Sep 23, 2025
5d9b69e
Merge tag 'cam6_4_120' into hgt_matrix_half_error
cacraigucar Sep 29, 2025
f290fcf
Update cosp submodule
cacraigucar Sep 29, 2025
e7fcdf3
Merge tag 'cam6_4_121' into hgt_matrix_half_error
cacraigucar Sep 30, 2025
dc1fde3
fix NAG compiler error
cacraigucar Oct 1, 2025
d09761a
Update COSP external
cacraigucar Oct 13, 2025
6041faf
put fields in correct COSP simulator
cacraigucar Oct 16, 2025
50a18f6
Merge tag 'cam6_4_126' into hgt_matrix_half_error
cacraigucar Oct 16, 2025
431cd39
Add explicit assignment of CFODD DBZE and ICOD bin centers as targets…
jshaw35 Oct 17, 2025
c1cdb38
Update gitmodules to COSP2.1.9 and handling of COSP sparse checkout.
jshaw35 Oct 20, 2025
a25c0d7
Revert changes to git-fleximod submodule.py for later merge with upda…
jshaw35 Oct 23, 2025
d6e191b
use waccm ne30pg3 default IC file
fvitt Oct 27, 2025
e71c7dc
Merge remote-tracking branch 'upstream/cam_development' into hgt_matr…
nusbaume Oct 28, 2025
6de7568
Update COSP submodule to v2.1.9
nusbaume Oct 28, 2025
25c23f5
Merge remote-tracking branch 'francis/waccm_se_ic' into hgt_matrix_ha…
nusbaume Oct 28, 2025
fdeaae3
Add 'CS_WR_CFODD_REFF_LARGE' to fexcl list in ERC test.
nusbaume Oct 30, 2025
32762fd
Update ChangeLog.
nusbaume Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@

[submodule "cosp2"]
path = src/physics/cosp2/src
url = https://github.com/CFMIP/COSPv2.0
url = https://github.com/CFMIP/COSPv2.0/releases/tag/v2.1.9
fxrequired = AlwaysRequired
fxsparse = ../.cosp_sparse_checkout
fxtag = v2.1.4cesm
fxtag = v2.1.8
Copy link
Collaborator

@cacraigucar cacraigucar Oct 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When doing a fresh clone using this .gitmodules file, git-fleximod indicates an error occurred with the cosp checkout. Two items to note:
1: Typically we have the url just point to the github repo and the tag is set in fxtag. (Note I tried setting the url back to https://github.com/CFMIP/COSPv2.0 and using either tag v2.1.9 or releases/tag/v2.1.9 and neither worked)
2: The old tag was a cesm specific tag. Do we need a new cesm specific tag?

Copy link
Author

@jshaw35 jshaw35 Oct 20, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. I have made changes to git-fleximod that allow me to run ./bin/git-fleximod update successfully when I clone the PR into Derecho (CAM only). The changes to git-fleximod are AI-produced and should be reviewed.
  2. No, this PR resolves the inconsistencies between the hgt_matrix_half fields that led to a CESM specific COSP2 tag.

fxDONOTUSEurl = https://github.com/CFMIP/COSPv2.0

[submodule "clubb"]
Expand Down
Loading