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 cap for optional features; use UPP as submodule (was #904) #910

Merged
merged 145 commits into from
Nov 22, 2021

Conversation

DeniseWorthen
Copy link
Collaborator

@DeniseWorthen DeniseWorthen commented Nov 12, 2021

PR Checklist

  • Ths 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 responsiblity to keep the PR up-to-date with the develop branch of ufs-weather-model.

Description

  • Updates CICE cap for optional features
  • Uses UPP as a FV3atm submodule (@DusanJovic-NOAA)
  • remove CA namelist settings from HAFS related input.nml files
  • removes control_ca_restart test (unused). CA restart is now tested in the cpld and control P7 test suites.
  • adds 35d RT test (cpld_bmark_p7_35d) which can be used with rt_35d.conf (@MinsukJi-NOAA)

Issue(s) addressed

Testing

The full RT for both Intel and GNU was run on Hera. All baselines were B4B.

During RT testing, new versions of g2tmpl were used on dell and gaea. Baselines changed for the following tests due to the comparison of the GrbF00 and GrbF24 files

regional_quilt 034 failed in check_result
regional_quilt_2threads 035 failed in check_result
regional_quilt_RRTMGP 038 failed in check_result

Dependencies

DeniseWorthen and others added 30 commits March 27, 2021 12:30
This reverts commit 7b826d4.
@DeniseWorthen DeniseWorthen added Baseline Updates Current baselines will be updated. cheyenne-gnu-BL labels Nov 19, 2021
@dusanjovic
Copy link

I tried to set g2tmpl module load to a version that does not exist (g2tmpl/99.0.0), and module load still works. I think that's because, for example, on Gaea:

$ grep load /lustre/f2/pdata/ncep_shared/hpc-stack/modulefiles/mpi/intel/18.0.6.288/cray-mpich/7.7.11/upp/10.0.10.lua
load("bacio", "g2", "g2tmpl", "ip", "sp", "w3nco", "w3emc", "crtm")

I think modules should just list:

$ grep prereq /lustre/f2/pdata/ncep_shared/hpc-stack/modulefiles/mpi/intel/18.0.6.288/cray-mpich/7.7.11/upp/10.0.10.lua
prereq("bacio", "g2", "g2tmpl", "ip", "sp", "w3nco", "w3emc", "crtm")

and not load other modules, especially not without explicit version.

@DusanJovic-NOAA
Copy link
Collaborator

WCOSS (Cray and Dell) logs are here:
/scratch1/NCEPDEV/stmp2/Dusan.Jovic/pr910/RegressionTests_wcoss_cray.log
/scratch1/NCEPDEV/stmp2/Dusan.Jovic/pr910/RegressionTests_wcoss_dell_p3.log

@DeniseWorthen DeniseWorthen merged commit 9c78af1 into ufs-community:develop Nov 22, 2021
@DusanJovic-NOAA DusanJovic-NOAA mentioned this pull request Nov 22, 2021
16 tasks
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. Waiting for Reviews The PR is waiting for reviews from associated component PR's.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update NUOPC cap for new features Use UPP as a submodule
9 participants