Skip to content

Update CICE with latest Consortium/main#1672

Merged
zach1221 merged 30 commits into
ufs-community:developfrom
DeniseWorthen:feature/updcice
Mar 29, 2023
Merged

Update CICE with latest Consortium/main#1672
zach1221 merged 30 commits into
ufs-community:developfrom
DeniseWorthen:feature/updcice

Conversation

@DeniseWorthen
Copy link
Copy Markdown
Collaborator

@DeniseWorthen DeniseWorthen commented Mar 22, 2023 •
edited by zach1221
Loading

Description

Updates CICE for latest merges at Consortium/main

Top of commit queue on: TBD

Input data additions/changes

  • No changes are expected to input data.
  • There will be new input data.
  • Input data will be updated.

Anticipated changes to regression tests:

  • No changes are expected to any regression test.
  • Changes are expected to the following tests:

Subcomponents involved:

  • AQM
  • CDEPS
  • CICE
  • CMEPS
  • CMakeModules
  • FV3
  • GOCART
  • HYCOM
  • MOM6
  • NOAHMP
  • WW3
  • stochastic_physics
  • none

Combined with PR's (If Applicable):

Commit Queue Checklist:

  • Link PR's from all sub-components involved
  • Confirm reviews completed in sub-component PR's
  • Add all appropriate labels to this PR.
  • Run full RT suite on either Hera/Cheyenne with both Intel/GNU compilers
  • Add list of any failed regression tests to "Anticipated changes to regression tests" section.

Linked PR's and Issues:

Testing Day Checklist:

  • This PR is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR.
  • Move new/updated input data on RDHPCS Hera and propagate input data changes to all supported systems.

Testing Log (for CM's):

  • RDHPCS
    • Intel
      • Hera
      • Orion
      • Jet
      • Gaea
      • Cheyenne
    • GNU
      • Hera
      • Cheyenne
  • WCOSS2
    • Dogwood/Cactus
    • Acorn
  • CI
    • Completed
  • opnReqTest
    • N/A
    • Log attached to comment

RegressionTests_hera.gnu.log
RegressionTests_hera.intel.log

DeniseWorthen and others added 20 commits January 7, 2023 00:12
@DeniseWorthen
hera.intel testing shows
8c0b608 
* reverting the bug fix for ktherm=2 allows all cpld tests to pass
and the single datm test using ktherm=2 (datm_cdeps_gfs) to also pass
all other datm tests which use ktherm=1 fail
@DeniseWorthen
confirm cice testb16d7fd is b4b for all datm/cpld tests
3619de3
@DeniseWorthen
Merge branch 'ufs-community:develop' into feature/updcice
11016e4
@DeniseWorthen
update CICE
a8cacb3
@DeniseWorthen
fix alignments in rt.conf, rt_gnu.conf
4eaf074
@DeniseWorthen
Merge branch 'ufs-community:develop' into feature/updcice
32d5ff2
@DeniseWorthen
update CICE (no code changes)
adc486b
@DeniseWorthen
Merge branch 'ufs-community:develop' into feature/updcice
d3b2469
@DeniseWorthen
Merge branch 'ufs-community:develop' into feature/updcice
45c851b
@jkbk2004
add new BL_DATE
742f77c
@BrianCurtis-NOAA
[AutoRT] hera.gnu Job Completed.
c867e50 
on-behalf-of @ufs-community <brian.curtis@noaa.gov>
@BrianCurtis-NOAA
[AutoRT] hera.intel Job Completed.
45130a8 
on-behalf-of @ufs-community <brian.curtis@noaa.gov>
@BrianCurtis-NOAA
[AutoRT] orion.intel Job Completed.
0e5d6a0 
on-behalf-of @ufs-community <brian.curtis@noaa.gov>
@BrianCurtis-NOAA
[AutoRT] jet.intel Job Completed.
5e3fefb 
on-behalf-of @ufs-community <brian.curtis@noaa.gov>
@BrianCurtis-NOAA
Acorn Intel RT Log
9fbf65a
@jkbk2004
add cheyenne intel.gnu RT logs: passed
eba063d
@jkbk2004
add gaea.intel RT log: passed
e8227ed
@DeniseWorthen
update CICE and revert gitmodules
e5c62f7
@DeniseWorthen
Merge branch 'develop' into feature/updcice
d850095
@DeniseWorthen
update CICE gitmodule
c0a04c4
@DeniseWorthen DeniseWorthen marked this pull request as ready for review March 22, 2023 14:51
@DeniseWorthen DeniseWorthen added the No Baseline Change No Baseline Change label Mar 22, 2023
@DeniseWorthen DeniseWorthen changed the title Update CICE Update CICE with latest Consortium/main Mar 22, 2023
@jkbk2004 jkbk2004 mentioned this pull request Mar 28, 2023
Merged
37 tasks
@zach1221
Copy link
Copy Markdown
Collaborator

zach1221 commented Mar 28, 2023

@DeniseWorthen I think we'll start working through this PR next. I'll begin adding labels and testing.

@zach1221 zach1221 added Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked. jenkins-ci Jenkins CI: ORT build/test on docker container labels Mar 28, 2023
@zach1221
Copy link
Copy Markdown
Collaborator

zach1221 commented Mar 28, 2023

There is still issue with jenkins-ci. I'm running same ORTs manually against this PR now on Hera.

@zach1221
Copy link
Copy Markdown
Collaborator

zach1221 commented Mar 29, 2023

All tests are done, I think we can start the merging process. @DeniseWorthen I'll leave a comment in CICE #59 requesting that pr to be merged.

@zach1221
Copy link
Copy Markdown
Collaborator

zach1221 commented Mar 29, 2023

Actually wcoss/acorn still need to be run, apologies. @BrianCurtis-NOAA are you able to run the RTs for these platforms?

@DeniseWorthen
Copy link
Copy Markdown
Collaborator Author

DeniseWorthen commented Mar 29, 2023

@zach1221 Thanks. Before I do that, I want to be sure everyone is OK w/ the issue of the hash and the .gitmodule that I posted in the slack channel.

@jkbk2004 jkbk2004 mentioned this pull request Mar 29, 2023
Closed
37 tasks
@zach1221
Copy link
Copy Markdown
Collaborator

zach1221 commented Mar 29, 2023

@BrianCurtis-NOAA do you think wcoss will run or are we good to skip it and proceed with merging?

@BrianCurtis-NOAA
Copy link
Copy Markdown
Collaborator

BrianCurtis-NOAA commented Mar 29, 2023 •
edited
Loading

@BrianCurtis-NOAA do you think wcoss will run or are we good to skip it and proceed with merging?

It's still slow and hitting wall clocks. I may need to increase wallclock on wcoss if this keeps happening after switches. Skip WCOSS2.

@zach1221
Copy link
Copy Markdown
Collaborator

zach1221 commented Mar 29, 2023

Alright, thank you, Brian. Skipping wcoss this time.

@zach1221 zach1221 mentioned this pull request Mar 29, 2023
Merged
@DeniseWorthen
Copy link
Copy Markdown
Collaborator Author

DeniseWorthen commented Mar 29, 2023

@zach1221 I've double and triple checked---the new hash for CICE is 5840cd1, which is the current hash in the PR. @BrianCurtis-NOAA will you also double check?

Even though it seems to work, I don't think I'll make the mistake of not changing the .gitmodules again, because this feels very weird.

@BrianCurtis-NOAA
Copy link
Copy Markdown
Collaborator

BrianCurtis-NOAA commented Mar 29, 2023

@zach1221 I've double and triple checked---the new hash for CICE is 5840cd1, which is the current hash in the PR. @BrianCurtis-NOAA will you also double check?

Even though it seems to work, I don't think I'll make the mistake of not changing the .gitmodules again, because this feels very weird.

Looks good to me

@DeniseWorthen
Copy link
Copy Markdown
Collaborator Author

DeniseWorthen commented Mar 29, 2023

I checked out my feature/updcice branch. It is using NOAA-EMC/CICE. Hash is

 5840cd1931e2e32b9dfded0c19049d0f1ec3d04c CICE-interface/CICE (CICE6.0.0-440-g5840cd1)
 a4779cc71125b40a7db3a4da8512247cbf2b0955 CICE-interface/CICE/icepack (Icepack1.1.0-147-ga4779cc)

@zach1221
Copy link
Copy Markdown
Collaborator

zach1221 commented Mar 29, 2023

Thank you for confirming, Denise.

@zach1221 zach1221 merged commit 7267be0 into ufs-community:develop Mar 29, 2023
@BrianCurtis-NOAA
Copy link
Copy Markdown
Collaborator

BrianCurtis-NOAA commented Mar 30, 2023

Acorn/Cactus testing part of #1679

@grantfirl grantfirl mentioned this pull request Apr 17, 2023
Merged
@DeniseWorthen DeniseWorthen self-assigned this Feb 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jkbk2004 jkbk2004 jkbk2004 approved these changes

@BrianCurtis-NOAA BrianCurtis-NOAA BrianCurtis-NOAA approved these changes

@sadeghitabas sadeghitabas Awaiting requested review from sadeghitabas

Assignees

@DeniseWorthen DeniseWorthen

Labels

jenkins-ci Jenkins CI: ORT build/test on docker container No Baseline Change No Baseline Change Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

updates from Consortium/main

7 participants

@DeniseWorthen @zach1221 @BrianCurtis-NOAA @jkbk2004 @support-epic @FernandoAndrade-NOAA @epic-cicd-jenkins