Update CICE to CICE-Consortium (2024-05-01)+update mom6 to its main repo. 20240508 commit #2275 #2259

NickSzapiro-NOAA · 2024-04-30T05:36:30Z

Commit Queue Requirements:

Fill out all sections of this template.
All sub component pull requests have been reviewed by their code managers.
Run the full Intel+GNU RT suite (compared to current baselines) on either Hera/Derecho/Hercules
Commit 'test_changes.list' from previous step

Description:

CICE-Consortium/CICE#935 This adds a namelist variable to control whether coords are written to history files
CICE-Consortium/CICE#936 This sets calendar information to be consistent w/ the namelist and vice versa
CICE-Consortium/CICE#938 This fixes a typo w/in a CESMCOUPLED block
CICE-Consortium/CICE#939 and CICE-Consortium/CICE#942 Port to Carpenter
CICE-Consortium/CICE#940 This adds new diagnostics field for snow volume tendencies due to thermo and dynamics
CICE-Consortium/CICE#943 This ensures that individual history streams have unique filenames. If they do not, then streams will overwrite each other. With this change, abort in that case.
CICE-Consortium/CICE#948 Fix Github Actions for macos system update
mom-ocean/MOM6#1623 Address compiler warning

Commit Message:

* UFSWM - Update CICE to CICE-Consortium (2024-05-01) and mom6 to its main repo (2024-05-08)
  * CICE - Update CICE to CICE-Consortium (2024-05-01)
  * MOM6 - Update mom6 to its main repo. 20240508 commit

Priority:

Normal

Git Tracking

UFSWM:

Sub component Pull Requests:

UFSWM Blocking Dependencies:

None

Changes

Regression Test Changes (Please commit test_changes.list):

No Baseline Changes.
hera log and test_changes.list in commit history

Input data Changes:

None.

Library Changes/Upgrades:

No Updates

Testing Log:

jkbk2004 · 2024-05-09T22:12:42Z

@pjpegion @jiandewang I merged in #2271 and #2275 to this pr. Can you check?

jiandewang · 2024-05-09T22:19:06Z

MOM is pointing to the right branch. Thanks

BrianCurtis-NOAA · 2024-05-10T12:51:02Z

As per instructions in the previous pull request (see: #2215 (comment)), @jkbk2004 and team: when you combine multiple pull requests together its extremely important to bring all of the information from the outside PR's into the combined PR.

jkbk2004 · 2024-05-10T12:56:07Z

It's strange to see compile error on gaea with physics. It ran ok on hera/orion/hercules though.

/gpfs/f5/epic/scratch/Jong.Kim/rt-2259/FV3/ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/gcycle.F90(236): error #8\
284: If the actual argument is scalar, the dummy argument shall be scalar unless the actual argument is of type charact\
er or is an element of an array that is not assumed shape, pointer, or polymorphic.   [SIG1T]
      CALL SFCCYCLE (9998, npts, max(lsoil,lsoil_lsm), sig1t, fhcyc, &
-----------^
compilation aborted for /gpfs/f5/epic/scratch/Jong.Kim/rt-2259/FV3/ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/g\
cycle.F90 (code 1)
make[2]: *** [FV3/ccpp/physics/CMakeFiles/ccpp_physics.dir/build.make:296: FV3/ccpp/physics/CMakeFiles/ccpp_physics.dir\
/physics/Interstitials/UFS_SCM_NEPTUNE/gcycle.F90.o] Error 1

jkbk2004 · 2024-05-10T13:39:14Z

As per instructions in the previous pull request (see: #2215 (comment)), @jkbk2004 and team: when you combine multiple pull requests together its extremely important to bring all of the information from the outside PR's into the combined PR.

@BrianCurtis-NOAA @zach1221 @FernandoAndrade-NOAA Thanks for the note! We will make sure to pull out all the PR information when PR is ready.

BrianCurtis-NOAA · 2024-05-10T13:51:01Z

As per instructions in the previous pull request (see: #2215 (comment)), @jkbk2004 and team: when you combine multiple pull requests together its extremely important to bring all of the information from the outside PR's into the combined PR.

@BrianCurtis-NOAA @zach1221 @FernandoAndrade-NOAA Thanks for the note! We will make sure to pull out all the PR information when PR is ready.

This should be completed before the PR starts testing. Testing is the final stage of the PR process before merge.

jkbk2004 · 2024-05-10T13:51:45Z

It's strange to see compile error on gaea with physics. It ran ok on hera/orion/hercules though.

/gpfs/f5/epic/scratch/Jong.Kim/rt-2259/FV3/ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/gcycle.F90(236): error #8\
284: If the actual argument is scalar, the dummy argument shall be scalar unless the actual argument is of type charact\
er or is an element of an array that is not assumed shape, pointer, or polymorphic.   [SIG1T]
      CALL SFCCYCLE (9998, npts, max(lsoil,lsoil_lsm), sig1t, fhcyc, &
-----------^
compilation aborted for /gpfs/f5/epic/scratch/Jong.Kim/rt-2259/FV3/ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/g\
cycle.F90 (code 1)
make[2]: *** [FV3/ccpp/physics/CMakeFiles/ccpp_physics.dir/build.make:296: FV3/ccpp/physics/CMakeFiles/ccpp_physics.dir\
/physics/Interstitials/UFS_SCM_NEPTUNE/gcycle.F90.o] Error 1

@pjpegion The gaea build failures came from #2271. I am detaching #2271.

BrianCurtis-NOAA · 2024-05-10T14:02:38Z

It's strange to see compile error on gaea with physics. It ran ok on hera/orion/hercules though.

/gpfs/f5/epic/scratch/Jong.Kim/rt-2259/FV3/ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/gcycle.F90(236): error #8\
284: If the actual argument is scalar, the dummy argument shall be scalar unless the actual argument is of type charact\
er or is an element of an array that is not assumed shape, pointer, or polymorphic.   [SIG1T]
      CALL SFCCYCLE (9998, npts, max(lsoil,lsoil_lsm), sig1t, fhcyc, &
-----------^
compilation aborted for /gpfs/f5/epic/scratch/Jong.Kim/rt-2259/FV3/ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/g\
cycle.F90 (code 1)
make[2]: *** [FV3/ccpp/physics/CMakeFiles/ccpp_physics.dir/build.make:296: FV3/ccpp/physics/CMakeFiles/ccpp_physics.dir\
/physics/Interstitials/UFS_SCM_NEPTUNE/gcycle.F90.o] Error 1

@pjpegion The gaea build failures came from #2271. I am detaching #2271.

@jkbk2004 can you please elaborate on how this comes from #2271? You said it ran fine on three other platforms. This leans to being a gaea issue, not a PR issue.

on-behalf-of @ufs-community <[email protected]>

jiandewang · 2024-05-13T14:00:11Z

@zach1221 I am heading for a dental appt. now, so if it comes to the point that needs MOM6 merging, please bear me a bit delay.

jiandewang · 2024-05-13T15:43:36Z

@zach1221 my dental appt. finished earlier than expected. Back to business now. Let me know when its time I shall do MOM6 merging

BrianCurtis-NOAA · 2024-05-13T15:44:47Z

At this point if we're waiting on Acorn only, then skip it. Lots of testing SA work going on Acorn, and it's currently not running there.

FernandoAndrade-NOAA · 2024-05-13T16:00:24Z

Ok, I'll leave a note in the sub PRs to continue with the merge process.

DeniseWorthen

CICE hash is correct.

jiandewang · 2024-05-13T16:35:31Z

just merged MOM6 woth hash 3bcfbbea

NickSzapiro-NOAA · 2024-05-13T16:54:25Z

@DeniseWorthen @jiandewang Updated CICE and MOM6 hashes

BrianCurtis-NOAA

Hashes look good on MOM6 and CICE.

NickSzapiro-NOAA and others added 3 commits April 29, 2024 16:00

CICE branch in .gitmodules

d4897d7

Update CICE

7162f03

Merge branch 'ufs-community:develop' into cice_sync

1489332

NickSzapiro-NOAA added No Baseline Change No Baseline Change Waiting for Reviews The PR is waiting for reviews from associated component PR's. labels May 1, 2024

NickSzapiro-NOAA added 2 commits May 2, 2024 11:18

Merge branch 'ufs-community:develop' into cice_sync

180d9ce

Add lat,lon entries in icefields_nml in ice_in.IN

ad05dd1

NickSzapiro-NOAA changed the title ~~Update CICE to CICE-Consortium (2024-04-30)~~ Update CICE to CICE-Consortium (2024-05-01) May 2, 2024

NickSzapiro-NOAA added 2 commits May 2, 2024 16:02

Update CICE hash

45dcdf9

No baseline changes on hera

7602f8d

NickSzapiro-NOAA requested review from DeniseWorthen and BrianCurtis-NOAA May 7, 2024 15:24

Merge branch 'develop' into cice_sync

ee46fd3

jkbk2004 mentioned this pull request May 9, 2024

update cubed sphere gitmodules for perturbation/increments for cold starts #2271

Closed

14 tasks

NickSzapiro-NOAA and others added 2 commits May 9, 2024 14:20

Merge branch 'develop' into cice_sync

0437fb9

cobined in PR 2275 and 2271

0b42e89

jkbk2004 changed the title ~~Update CICE to CICE-Consortium (2024-05-01)~~ Update CICE to CICE-Consortium (2024-05-01)+update cubed sphere gitmodules for perturbation/increments for cold starts #2271+update mom6 to its main repo. 20240508 commit #2275 May 9, 2024

jkbk2004 added 2 commits May 10, 2024 12:38

add hera RT log: passed

dcee03e

add orion/hercules RT logs: passed

5511721

jkbk2004 removed the Waiting for Reviews The PR is waiting for reviews from associated component PR's. label May 10, 2024

detaching PR 2271

6a75664

zach1221 removed hercules-RT Run Hera regression testing orion-RT derecho-RT Run regression tests on Derecho labels May 12, 2024

epic-cicd-jenkins and others added 5 commits May 12, 2024 08:32

[AutoRT] Hercules Job Completed.

c351d19

on-behalf-of @ufs-community <[email protected]>

[AutoRT] Derecho Job Completed.

575b7c2

on-behalf-of @ufs-community <[email protected]>

add orion RT logs: passed

0d40ef7

Update Jenkinsfile.combined load git orion

ef470dc

add derecho RT logs: all passed

bd6721b

DeniseWorthen mentioned this pull request May 13, 2024

WCOSS2: pio install does not seem to support pnetcdf #2232

Closed

zach1221 and others added 4 commits May 13, 2024 13:35

add control_p8_gnu ORT logs: passed

fa74e3c

add regional_control_gnu ORT logs: passed

8651db1

add cpld_control_gnu ORT logs: passed

0fe95b2

Update opnReqTest ww3 input-data

45a969e

WCOSS2 RT Log: Passed

83d822f

This was referenced May 13, 2024

Update to CICE-Consortium/main (2024-05-01) NOAA-EMC/CICE#79

Merged

update to main 20240508 commit NOAA-EMC/MOM6#134

Merged

Revert .gitmodules and update CICE hash

bcdb838

DeniseWorthen previously approved these changes May 13, 2024

View reviewed changes

Update MOM6 hash

0dcc261

NickSzapiro-NOAA dismissed DeniseWorthen’s stale review via 0dcc261 May 13, 2024 16:52

BrianCurtis-NOAA approved these changes May 13, 2024

View reviewed changes

jkbk2004 approved these changes May 13, 2024

View reviewed changes

FernandoAndrade-NOAA merged commit b2668e8 into ufs-community:develop May 13, 2024
3 checks passed

NickSzapiro-NOAA deleted the cice_sync branch May 16, 2024 06:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update CICE to CICE-Consortium (2024-05-01)+update mom6 to its main repo. 20240508 commit #2275 #2259

Update CICE to CICE-Consortium (2024-05-01)+update mom6 to its main repo. 20240508 commit #2275 #2259

NickSzapiro-NOAA commented Apr 30, 2024 •

edited

Loading

jkbk2004 commented May 9, 2024

jiandewang commented May 9, 2024

BrianCurtis-NOAA commented May 10, 2024

jkbk2004 commented May 10, 2024

jkbk2004 commented May 10, 2024

BrianCurtis-NOAA commented May 10, 2024

jkbk2004 commented May 10, 2024

BrianCurtis-NOAA commented May 10, 2024

jiandewang commented May 13, 2024

jiandewang commented May 13, 2024

BrianCurtis-NOAA commented May 13, 2024

FernandoAndrade-NOAA commented May 13, 2024

DeniseWorthen left a comment

jiandewang commented May 13, 2024

NickSzapiro-NOAA commented May 13, 2024

BrianCurtis-NOAA left a comment

Update CICE to CICE-Consortium (2024-05-01)+update mom6 to its main repo. 20240508 commit #2275 #2259

Update CICE to CICE-Consortium (2024-05-01)+update mom6 to its main repo. 20240508 commit #2275 #2259

Conversation

NickSzapiro-NOAA commented Apr 30, 2024 • edited Loading

Commit Queue Requirements:

Description:

Commit Message:

Priority:

Git Tracking

UFSWM:

Sub component Pull Requests:

UFSWM Blocking Dependencies:

Changes

Regression Test Changes (Please commit test_changes.list):

Input data Changes:

Library Changes/Upgrades:

Testing Log:

jkbk2004 commented May 9, 2024

jiandewang commented May 9, 2024

BrianCurtis-NOAA commented May 10, 2024

jkbk2004 commented May 10, 2024

jkbk2004 commented May 10, 2024

BrianCurtis-NOAA commented May 10, 2024

jkbk2004 commented May 10, 2024

BrianCurtis-NOAA commented May 10, 2024

jiandewang commented May 13, 2024

jiandewang commented May 13, 2024

BrianCurtis-NOAA commented May 13, 2024

FernandoAndrade-NOAA commented May 13, 2024

DeniseWorthen left a comment

Choose a reason for hiding this comment

jiandewang commented May 13, 2024

NickSzapiro-NOAA commented May 13, 2024

BrianCurtis-NOAA left a comment

Choose a reason for hiding this comment

NickSzapiro-NOAA commented Apr 30, 2024 •

edited

Loading