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.

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

Jump to bottom

Enable prescribed ice for UFS #80

Merged
merged 12 commits into from
Jun 11, 2024
Merged

Enable prescribed ice for UFS #80

merged 12 commits into from
Jun 11, 2024

Conversation

NickSzapiro-NOAA
Copy link
Collaborator

@NickSzapiro-NOAA NickSzapiro-NOAA commented May 2, 2024 •
edited
Loading

For detailed information about submitting Pull Requests (PRs) to the CICE-Consortium,
please refer to: https://github.com/CICE-Consortium/About-Us/wiki/Resource-Index#information-for-developers

PR checklist

  • Short (1 sentence) summary of your PR:
    Enable prescribed ice CICE for UFS via CMEPS driver
  • Developer(s):
    Nicholas Szapiro & Denise Worthen
  • Suggest PR reviewers from list in the column to the right.
  • Please copy the PR test results link or provide a summary of testing completed below.
    New ufs-weather-model regression test atm_ds2s_docn_pcice (Add active atmosphere applications with data ocn and data ice components (ATM_DS2S and ATM_DS2S-PCICE) and regression tests (atm_ds2s_docn_dice and atm_ds2s_docn_pcice) ufs-community/ufs-weather-model#2186)
  • How much do the PR code changes differ from the unmodified code?
    • bit for bit (when not in prescribed ice)
    • different at roundoff level
    • more substantial (when in prescribed ice)
  • Does this PR create or have dependencies on Icepack or any other models?
    • Yes
    • No
  • Does this PR update the Icepack submodule? If so, the Icepack submodule must point to a hash on Icepack's main branch.
    • Yes
    • No
  • Does this PR add any new test cases?
    • Yes
    • No
  • Is the documentation being updated? ("Documentation" includes information on the wiki or in the .rst files from doc/source/, which are used to create the online technical docs at https://readthedocs.org/projects/cice-consortium-cice/. A test build of the technical docs will be performed as part of the PR testing.)
    • Yes
    • No, does the documentation need to be updated at a later time?
      • Yes
      • No
  • Please document the changes in detail, including why the changes are made. This will become part of the PR commit log.
    Prescribed ice CICE was enclosed by #ifdef CESMCOUPLED in CMEPS driver. This (with UWM PR) enables the capability to use prescribed ice CICE in ufs-weather-model with CDEPS calls to input from file.

@NickSzapiro-NOAA NickSzapiro-NOAA mentioned this pull request May 2, 2024
Merged
14 tasks
@zach1221
Copy link

@BrianCurtis-NOAA @DeniseWorthen could you please review this CICE PR?

DeniseWorthen
DeniseWorthen reviewed May 29, 2024
View reviewed changes
Copy link
Collaborator

@DeniseWorthen DeniseWorthen left a comment

Choose a reason for hiding this comment

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

I think the title is very confusing. Can you title it more clearly? You're simply enabling prescribed ice for UFS.

Also, have you reviewed these changes w/ Dave Bailey to ensure that they are compatible w/ CESM's use cases?

cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90 Show resolved Hide resolved
cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90 Show resolved Hide resolved
@NickSzapiro-NOAA NickSzapiro-NOAA changed the title Enable prescribed ice CICE ifndef CESMCOUPLED in CMEPS driver Enable prescribed ice for UFS May 29, 2024
@NickSzapiro-NOAA
Copy link
Collaborator Author

Also, have you reviewed these changes w/ Dave Bailey to ensure that they are compatible w/ CESM's use cases?

@DeniseWorthen If this is ready for PR to CICE-Consortium, do you want me to do that (now)?

@jkbk2004
Copy link

@DeniseWorthen @NickSzapiro-NOAA ufs-community/ufs-weather-model#2186 is ready to test. Please, go ahead for final review and approval.

@FernandoAndrade-NOAA
Copy link

Testing on #2186 has completed successfully, please continue with merging this PR.

@NickSzapiro-NOAA NickSzapiro-NOAA merged commit d406c7e into NOAA-EMC:emc/develop Jun 11, 2024
1 check passed
NickSzapiro-NOAA added a commit to NickSzapiro-NOAA/CICE that referenced this pull request Aug 2, 2024
@NickSzapiro-NOAA
Enable prescribed ice for UFS (NOAA-EMC#80)
2245352 
* Remove #ifdef CESMCOUPLED from cicecore/drivers/nuopc/cmeps/CICE_RunMod.F90

* Remove #ifdef CESMCOUPLED from cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90

* Testing changing stream_taxmode from cycle to extend

* Change include mpif.h to use mpi in ice_prescribed_mod.F90

* Call dshr_pio_init from ice_prescribed_init

* Call ice_prescribed_run after ice_prescribed_init

* Incorporate ice_prescribed_nml in ice_prescribed_mod.F90

* write stream_taxmode to log. typo in ice_prescribed_mod.F90.

* Remove CESMCOUPLED so models initialize ice_prescribed at end of ice_prescribed_init

* Change indent for #ifndef for gnu debug

* Only call ice_prescribed_run in ice_prescribed_init #ifndef CESMCOUPLED
@NickSzapiro-NOAA NickSzapiro-NOAA mentioned this pull request Aug 8, 2024
Closed
NickSzapiro-NOAA added a commit that referenced this pull request Sep 9, 2024
@NickSzapiro-NOAA
Enable prescribed ice for UFS (CICE-Consortium#964)
635d9a1 
Prescribed ice CICE was enclosed by #ifdef CESMCOUPLED in CMEPS driver. This allows use of prescribed ice CICE in ufs-weather-model with CDEPS calls to input (sea ice concentration) from file. Starting as cherry-picked as in UFS but dependency on CDEPS likely needs to be optional at compile time. This is needed for History conflicts between CICE-Consortium and emc/develop #84

* Enable prescribed ice for UFS (#80)

* Remove #ifdef CESMCOUPLED from cicecore/drivers/nuopc/cmeps/CICE_RunMod.F90

* Remove #ifdef CESMCOUPLED from cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90

* Testing changing stream_taxmode from cycle to extend

* Change include mpif.h to use mpi in ice_prescribed_mod.F90

* Call dshr_pio_init from ice_prescribed_init

* Call ice_prescribed_run after ice_prescribed_init

* Incorporate ice_prescribed_nml in ice_prescribed_mod.F90

* write stream_taxmode to log. typo in ice_prescribed_mod.F90.

* Remove CESMCOUPLED so models initialize ice_prescribed at end of ice_prescribed_init

* Change indent for #ifndef for gnu debug

* Only call ice_prescribed_run in ice_prescribed_init #ifndef CESMCOUPLED

* Note CDEPS dependency in cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90

* Remove stub prescribed ice code
@NickSzapiro-NOAA NickSzapiro-NOAA deleted the icePrescribed branch September 24, 2024 17:03
NickSzapiro-NOAA added a commit that referenced this pull request Sep 25, 2024
@NickSzapiro-NOAA
Enable prescribed ice for UFS (CICE-Consortium#964)
cba8703 
Prescribed ice CICE was enclosed by #ifdef CESMCOUPLED in CMEPS driver. This allows use of prescribed ice CICE in ufs-weather-model with CDEPS calls to input (sea ice concentration) from file. Starting as cherry-picked as in UFS but dependency on CDEPS likely needs to be optional at compile time. This is needed for History conflicts between CICE-Consortium and emc/develop #84

* Enable prescribed ice for UFS (#80)

* Remove #ifdef CESMCOUPLED from cicecore/drivers/nuopc/cmeps/CICE_RunMod.F90

* Remove #ifdef CESMCOUPLED from cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90

* Testing changing stream_taxmode from cycle to extend

* Change include mpif.h to use mpi in ice_prescribed_mod.F90

* Call dshr_pio_init from ice_prescribed_init

* Call ice_prescribed_run after ice_prescribed_init

* Incorporate ice_prescribed_nml in ice_prescribed_mod.F90

* write stream_taxmode to log. typo in ice_prescribed_mod.F90.

* Remove CESMCOUPLED so models initialize ice_prescribed at end of ice_prescribed_init

* Change indent for #ifndef for gnu debug

* Only call ice_prescribed_run in ice_prescribed_init #ifndef CESMCOUPLED

* Note CDEPS dependency in cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90

* Remove stub prescribed ice code
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DeniseWorthen DeniseWorthen DeniseWorthen approved these changes

@junwang-noaa junwang-noaa junwang-noaa approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@NickSzapiro-NOAA @zach1221 @jkbk2004 @FernandoAndrade-NOAA @junwang-noaa @DeniseWorthen