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

Add C-grid capability for CICE6 #1269

Merged
merged 232 commits into from
Jul 20, 2022

Conversation

DeniseWorthen
Copy link
Collaborator

@DeniseWorthen DeniseWorthen commented Jun 13, 2022

PR 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. Please consult the ufs-weather-model wiki if you are unsure how to do this.

  • This PR has been tested using a branch which is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR

  • An Issue describing the work contained in this PR has been created either in the subcomponent(s) or in the ufs-weather-model. The Issue should be created in the repository that is most relevant to the changes in contained in the PR. The Issue and the dependent sub-component PR
    are specified below.

  • Results for one or more of the regression tests change and the reasons for the changes are understood and explained below.

  • New or updated input data is required by this PR. If checked, please work with the code managers to update input data sets on all platforms.

Instructions: All subsequent sections of text should be filled in as appropriate.

The information provided below allows the code managers to understand the changes relevant to this PR, whether those changes are in the ufs-weather-model repository or in a subcomponent repository. Ufs-weather-model code managers will use the information provided to add any applicable labels, assign reviewers and place it in the Commit Queue. Once the PR is in the Commit Queue, it is the PR owner's responsibility to keep the PR up-to-date with the develop branch of ufs-weather-model.

Description

Updates CICE6 to include option to run dynamics on the C-grid. Additional variables are added to default_vars and ice_in_template to specify the grid staggering used. The following will specify the current configuration by default:

export GRIDATM=A
export GRIDOCN=A
export GRIDICE=B

To specify C-grid dynamics for CICE6, export GRIDICE=C should be used. A new test cpld_control_ciceC_p8 is added.

Issue(s) addressed

Testing

All baselines using CICE will change. This change is due solely to a change to how the 4 state variables (surface ocean u,v and surface tilts) are averaged. They will now be averaged as state variables instead of fluxes. See PR NOAA-EMC/CICE#50 description for more details.

  • hera.intel
  • hera.gnu
  • orion.intel
  • cheyenne.intel
  • cheyenne.gnu
  • gaea.intel
  • jet.intel (not available)
  • wcoss2.intel
  • [NA] wcoss_cray
  • [NA] wcoss_dell_p3
  • opnReqTest for newly added/changed feature: oRT log for new ciceC test was added at 1c3d42f
  • CI

Dependencies

If testing this branch requires non-default branches in other repositories, list them. Those branches should have matching names (ideally).

DeniseWorthen and others added 30 commits March 27, 2021 12:30
This reverts commit 7b826d4.
@BrianCurtis-NOAA
Copy link
Collaborator

Automated RT Failure Notification
Machine: orion
Compiler: intel
Job: BL
[BL] Repo location: /work/noaa/nems/emc.nemspara/autort/pr/966000899/20220719193012/ufs-weather-model
[BL] Baseline creation and move successful
[RT] Repo location: /work/noaa/nems/emc.nemspara/autort/pr/966000899/20220719205339/ufs-weather-model
[RT] Error: Test cpld_control_ciceC_p8 006 failed in check_result failed
[RT] Error: Test cpld_control_ciceC_p8 006 failed in run_test failed
Please make changes and add the following label back: orion-intel-BL

@BrianCurtis-NOAA
Copy link
Collaborator

Automated RT Failure Notification
Machine: cheyenne
Compiler: intel
Job: BL
[BL] Repo location: /glade/scratch/epicufsrt/autort/tests/auto/pr/966000899/20220719184514/ufs-weather-model
[BL] Baseline creation and move successful
[RT] Repo location: /glade/scratch/epicufsrt/autort/tests/auto/pr/966000899/20220719201349/ufs-weather-model
[RT] Error: Test cpld_control_ciceC_p8 006 failed in run_test failed
Please make changes and add the following label back: cheyenne-intel-BL

@BrianCurtis-NOAA
Copy link
Collaborator

Automated RT Failure Notification
Machine: hera
Compiler: intel
Job: BL
[BL] Repo location: /scratch1/NCEPDEV/nems/emc.nemspara/autort/pr/966000899/20220720004510/ufs-weather-model
[BL] Baseline creation and move successful
[RT] Repo location: /scratch1/NCEPDEV/nems/emc.nemspara/autort/pr/966000899/20220720021445/ufs-weather-model
[RT] Error: Test cpld_control_ciceC_p8 006 failed in check_result failed
[RT] Error: Test cpld_control_ciceC_p8 006 failed in run_test failed
Please make changes and add the following label back: hera-intel-BL

* gnu requires grid parameters in grid_nml to be character strings
* rt.conf missing the 'fv3' in final column for ciceC test; jobs
ran but baselines were not copied
@BrianCurtis-NOAA
Copy link
Collaborator

Automated RT Failure Notification
Machine: gaea
Compiler: intel
Job: BL
[BL] Repo location: /lustre/f2/pdata/ncep/emc.nemspara/autort/pr/966000899/20220720003009/ufs-weather-model
[BL] Baseline creation and move successful
[RT] Repo location: /lustre/f2/pdata/ncep/emc.nemspara/autort/pr/966000899/20220720044107/ufs-weather-model
[RT] Error: Test cpld_control_ciceC_p8 006 failed in check_result failed
[RT] Error: Test cpld_control_ciceC_p8 006 failed in run_test failed
Please make changes and add the following label back: gaea-intel-BL

@jkbk2004
Copy link
Collaborator

@DeniseWorthen sounds like people running jobs on jet. I will run manually on jet now.

@jkbk2004
Copy link
Collaborator

@DeniseWorthen sounds like people running jobs on jet. I will run manually on jet now.

@DeniseWorthen network on jet is not going thru. sounds only existing jobs are running.

@DeniseWorthen
Copy link
Collaborator Author

@jkbk2004 Do you want to wait until Jet is available? I think it is OK to skip a platform for a known reason like this. The next PR is MOM6 and it will also change baselines; only if someone tried to run this specific commit on jet would they have an issue.

@jkbk2004
Copy link
Collaborator

@DeniseWorthen @BrianCurtis-NOAA I agree to skip jet. I like to move on to merge in the pr.

@jkbk2004
Copy link
Collaborator

I am in the workshop at college park. Going out to have lunch. I will be back in an hour.

@jkbk2004
Copy link
Collaborator

can we start merging?

@DeniseWorthen
Copy link
Collaborator Author

CICE has been updated and the gitmodule reverted. This is ready for commit.

@jkbk2004 jkbk2004 merged commit d75bed7 into ufs-community:develop Jul 20, 2022
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Alllow CICE6 dynamics on the C-grid
5 participants