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 component defaults, rename templates to .in, rename ufs.configure for application, cleanup tests #2010

Merged

Conversation

DeniseWorthen
Copy link
Collaborator

@DeniseWorthen DeniseWorthen commented Nov 27, 2023

PR Author Checklist:

  • I have linked PR's from all sub-components involved in section below. N/A
  • I am confirming reviews are completed in ALL sub-component PR's. N/A
  • 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

  • Renames various template files for the coupled model to be .IN files

  • Provides component defaults for cice, mom6, cmeps and ww3 that can be re-used among applications instead of repeating the same defaults for each application

  • Renames ufs.configure files using the application (ie, s2s, s2swa) which uses them

  • Adds CICE_, MOM6_ and WW3_ prefixes to many, but not all, configurable variables

  • Adds additional configuration settings for CICE,MOM6,CMEPS restart and output directories

  • Moves use_coldstart and use_mommesh from the ALLComp to the OCN attributes, since these are used only by MOM6

  • Moves eps_imesh from the ALLComp to the ICE attributes since this is used only by ICE. Note MOM6 has a similar setting (eps_omesh) which is configured w/ a default value via MOM_input.

  • gives MOM6 and CICE their own mesh file setting instead of meshiceocn since in upcoming configurations (regional MOM6, FVCOM etc) the ocean will not run with the ice model present

  • Uses INPUT as input directory for all tests using CDEPS instead of various combinations of INPUT_DATM, DATM_INPUT, INPUT_DOCN etc

  • removes unnecessary quotes in tests

  • turns off control_wrtGauss_netcdf_parallel_intel test on hercules. See Issue multiple netcdf_parallel tests fail on hercules #2015

Linked Issues and Pull Requests

Associated UFSWM Issue 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:

Three tests fail but run to completion:

7831:FAILED TESTS:
7832:147 hafs_regional_docn_intel failed in check_result
7833:hafs_regional_docn_intel 147 failed in run_test
7834:148 hafs_regional_docn_oisst_intel failed in check_result
7835:hafs_regional_docn_oisst_intel 148 failed in run_test
7836:149 hafs_regional_datm_cdeps_intel failed in check_result
7837:hafs_regional_datm_cdeps_intel 149 failed in run_test

These tests fail only because the filename stored in a file has a changed directory name, ie INPUT/sst.day.mean.2019.nc vs INPUT_DOCN/sst.day.mean.2019.nc. All other files for each of the failed tests is B4B:

grep NOT RegressionTests_hera.log
5125: Comparing ufs.hafs.docn.r.2019-08-29-21600.nc ............ALT CHECK......NOT OK
5140: Comparing ufs.hafs.docn.r.2019-08-29-21600.nc ............ALT CHECK......NOT OK
5153: Comparing ufs.hafs.datm.r.2019-08-30-00000.nc ............ALT CHECK......NOT OK

Hera RTs were re-run at 86415ba with identical results.

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
    • Cheyenne
  • WCOSS2
    • Dogwood/Cactus
    • Acorn
  • CI
    • Completed
  • opnReqTest
    • N/A
    • Log attached to comment

aerorahul and others added 10 commits November 14, 2023 17:13
* clean up unnecessary quotes in tests
* shared namelist requires mom6 variables to be set
* remove orbital variables from atm-land case since these are
used only for the ocean albedo calculation
* move use_coldstart and use_mommesh to OCN attributes in config.in
files since these are only used by mom6, removed from hafs cases
*remove mediator_read_restart since this is not used by ufs
*add some variables to tests where needed
DeniseWorthen and others added 7 commits November 27, 2023 14:00
* data component tests use mix of input directory names, switch
them all to just INPUT
* orb parameters are required for atm_lnd tests, quotes
are required for gnu cdeps tests
* move some configs to components, not allcomp
* use CICE_,MOM6_,WW3_ prefixes for configurable items
* multigrid is never used for cmeps coupled applications but
required for run_test.sh
@DeniseWorthen DeniseWorthen marked this pull request as ready for review November 29, 2023 22:41
@DeniseWorthen DeniseWorthen added the Baseline Updates Current baselines will be updated. label Nov 29, 2023
@DeniseWorthen DeniseWorthen changed the title add component defaults, rename templates to .in, cleanup tests add component defaults, rename templates to .in, rename ufs.configure for application, cleanup tests Nov 30, 2023
aerorahul
aerorahul previously approved these changes Dec 2, 2023
Copy link
Contributor

@aerorahul aerorahul left a comment

Choose a reason for hiding this comment

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

Thanks for the additional templating of the configuration files.
The changes look good.

Copy link
Collaborator

@MatthewMasarik-NOAA MatthewMasarik-NOAA left a comment

Choose a reason for hiding this comment

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

WW3 updates look good to me.

tests/tests/cpld_bmark_p8 Show resolved Hide resolved
tests/tests/cpld_bmark_p8 Show resolved Hide resolved
@DeniseWorthen
Copy link
Collaborator Author

OK, I think we're good. The only files that I had to modify from the previous PR were to add the new MOM6 variables to the mom6 default export section and add them to the (renamed) MOM .IN files.

export MOM6_DIAG_COORD_DEF_Z_FILE=interpolate_zgrid_40L.nc
export MOM6_DIAG_MISVAL='-1e34'

@zach1221
Copy link
Collaborator

zach1221 commented Dec 7, 2023

OK, I think we're good. The only files that I had to modify from the previous PR were to add the new MOM6 variables to the mom6 default export section and add them to the (renamed) MOM .IN files.

export MOM6_DIAG_COORD_DEF_Z_FILE=interpolate_zgrid_40L.nc
export MOM6_DIAG_MISVAL='-1e34'

Sounds good. I'll get everything started then.

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

Jenkins-ci ORTs passed

@DeniseWorthen
Copy link
Collaborator Author

DeniseWorthen commented Dec 8, 2023

Just noting that the hercules log shows a clean test because I turned off the troublesome control_wrtGauss_netcdf_parallel_intel test in this PR.

@zach1221
Copy link
Collaborator

Testing is complete, sending out final reviews.

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
8 participants