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.

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

Update CICE, update ice_in for consistency w/ G-W (was #2069) #2027

Merged
merged 40 commits into from
Jan 10, 2024

Conversation

DeniseWorthen
Copy link
Collaborator

@DeniseWorthen DeniseWorthen commented Dec 6, 2023

PR Author Checklist:

  • I have linked PR's from all sub-components involved in section below.
  • I am confirming reviews are completed in ALL sub-component PR's.
  • I have run the full RT suite on either Hera/Cheyenne AND have attached the log to this PR below this line:
  • I have added the list of all failed regression tests to "Anticipated changes" section.
  • I have filled out all sections of the template.

Description

Update CICE to include latest changes in Consortium/main. Updates ice_in for consistency w/ G-W.

Commit Message

Update CICE to include latest changes in Consortium/main
- implement improvements to the areafact calculation for remapping (CICE-Consortium/CICE#849)
- use -puny when limiting fluxes in icepack (CICE-Consortium/Icepack#474)
- add cpl_frazil namelist (CICE-Consortium/CICE#889) 
- update ice_in for consistency w/ G-W

Linked Issues and Pull Requests

Associated UFSWM Issues to close

Subcomponent Pull Requests

Blocking Dependencies

Subcomponents involved:

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

Anticipated Changes

Input data

  • No changes are expected to input data.
  • Changes are expected to input data:
    • New input data.
    • Updated input data.

Regression Tests:

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

41 Tests fail to run and 41 tests fail to compare

grep check_result RegressionTests_hera.log| wc -l
      41
grep run_test RegressionTests_hera.log| wc -l
      41

The failed tests are any test using CICE

7378:001 cpld_control_p8_mixedmode_intel failed in check_result
7380:002 cpld_control_gfsv17_intel failed in check_result
7382:005 cpld_mpi_gfsv17_intel failed in check_result
7384:006 cpld_debug_gfsv17_intel failed in check_result
7386:007 cpld_control_p8_intel failed in check_result
7388:009 cpld_control_qr_p8_intel failed in check_result
7390:011 cpld_2threads_p8_intel failed in check_result
7392:012 cpld_decomp_p8_intel failed in check_result
7394:013 cpld_mpi_p8_intel failed in check_result
7396:014 cpld_control_ciceC_p8_intel failed in check_result
7398:015 cpld_control_c192_p8_intel failed in check_result
7400:017 cpld_bmark_p8_intel failed in check_result
7402:019 cpld_control_noaero_p8_intel failed in check_result
7404:020 cpld_control_nowave_noaero_p8_intel failed in check_result
7406:021 cpld_debug_p8_intel failed in check_result
7408:022 cpld_debug_noaero_p8_intel failed in check_result
7410:023 cpld_control_noaero_p8_agrid_intel failed in check_result
7412:024 cpld_control_c48_intel failed in check_result
7414:025 cpld_control_p8_faster_intel failed in check_result
7416:026 cpld_control_pdlib_p8_intel failed in check_result
7418:029 cpld_debug_pdlib_p8_intel failed in check_result
7420:150 datm_cdeps_control_cfsr_intel failed in check_result
7422:152 datm_cdeps_control_gefs_intel failed in check_result
7424:153 datm_cdeps_iau_gefs_intel failed in check_result
7426:154 datm_cdeps_stochy_gefs_intel failed in check_result
7428:155 datm_cdeps_ciceC_cfsr_intel failed in check_result
7430:156 datm_cdeps_bulk_cfsr_intel failed in check_result
7432:157 datm_cdeps_bulk_gefs_intel failed in check_result
7434:158 datm_cdeps_mx025_cfsr_intel failed in check_result
7436:159 datm_cdeps_mx025_gefs_intel failed in check_result
7438:160 datm_cdeps_multiple_files_cfsr_intel failed in check_result
7440:161 datm_cdeps_3072x1536_cfsr_intel failed in check_result
7442:162 datm_cdeps_gfs_intel failed in check_result
7444:163 datm_cdeps_debug_cfsr_intel failed in check_result
7446:164 datm_cdeps_control_cfsr_faster_intel failed in check_result
7448:231 cpld_control_p8_gnu failed in check_result
7450:232 cpld_control_nowave_noaero_p8_gnu failed in check_result
7452:233 cpld_debug_p8_gnu failed in check_result
7454:234 cpld_control_pdlib_p8_gnu failed in check_result
7456:235 cpld_debug_pdlib_p8_gnu failed in check_result
7458:236 datm_cdeps_control_cfsr_gnu failed in check_result
Tests effected by changes in this PR:

Libraries

  • Not Needed
  • Needed
    • Create separate issue in JCSDA/spack-stack asking for update to library. Include library name, library version.
    • Add issue link from JCSDA/spack-stack following this item
Code Managers Log
  • 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.
    • N/A

Testing Log:

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

@DeniseWorthen DeniseWorthen marked this pull request as ready for review December 7, 2023 13:19
@DeniseWorthen DeniseWorthen changed the title Update CICE Update CICE, update ice_in for consistency w/ G-W (was #2069) Jan 4, 2024
@DeniseWorthen
Copy link
Collaborator Author

@BrianCurtis-NOAA @junwang-noaa Could one of you please review the CICE PR? Thanks.

@DeniseWorthen
Copy link
Collaborator Author

@FernandoAndrade-NOAA Sorry for the confusion.

@epic-cicd-jenkins
Copy link
Collaborator

Jenkins-ci ORTs failed

@DeniseWorthen
Copy link
Collaborator Author

I still don't have CICE PR approvals @junwang-noaa @BrianCurtis-NOAA

@jkbk2004
Copy link
Collaborator

jkbk2004 commented Jan 9, 2024

All tests are successfully done. We can start merging process. @DeniseWorthen Can you merge in the CICE pr?

@jkbk2004 jkbk2004 merged commit 5662552 into ufs-community:develop Jan 10, 2024
@DeniseWorthen
Copy link
Collaborator Author

@jkbk2004 Why is the commit message not what I posted?

@jkbk2004
Copy link
Collaborator

@jkbk2004 Why is the commit message not what I posted?

@DeniseWorthen Do you mean to keep/save same commit message you posted in description to squash-merge commit log?

@DeniseWorthen
Copy link
Collaborator Author

That is the whole point of asking the developer to provide the commit message, isn't it? Why else would we ask for it to be provided?

@BrianCurtis-NOAA
Copy link
Collaborator

BrianCurtis-NOAA commented Jan 10, 2024

@jkbk2004 Why is the commit message not what I posted?

@DeniseWorthen Do you mean to keep/save same commit message you posted in description to squash-merge commit log?

@jkbk2004 We've discussed this already. Please squash and merge using the commit message provided and reviewed by other code managers in the PR template. Please also communicate this to EPIC's CM's so they are aware of this part of the process.

@jkbk2004
Copy link
Collaborator

@jkbk2004 Why is the commit message not what I posted?

@DeniseWorthen Do you mean to keep/save same commit message you posted in description to squash-merge commit log?

@jkbk2004 We've discussed this already. Please squash and merge using the commit message provided and reviewed by other code managers in the PR template. Please also communicate this to EPIC's CM's so they are aware of this part of the process.

Sure!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Baseline Updates Current baselines will be updated. jenkins-ci Jenkins CI: ORT build/test on docker container Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Allow use of ice_in.IN in global applications Update CICE6 to 6.5.0 release
8 participants