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

Fix incorrect depth scaling in SMC regtests #1264

Merged
merged 1 commit into from
Jul 19, 2024

Conversation

ukmo-ccbunney
Copy link
Collaborator

@ukmo-ccbunney ukmo-ccbunney commented Jul 3, 2024

Pull Request Summary

A recent change to the SMC code (#1192) requires a change to the ww3_tp2.10 and ww3_tp2.16 regressions tests to correctly scale the input depth field.

Description

The following entry is added to the ww3_grid.nml files for the SMC regtests to explicitly set the depth scaling value:

&DEPTH_NML
  DEPTH%SF = -1.0
/

This is required as the changes made in #1192 change the default depth scaling value (variable VSC in the code) from -1.0 to 1.0. This does not affect the regtests if using the ww3_grid.inp files as this value is mandatory in the INP files.

Issue(s) addressed

Commit Message

Add depth scaling value to SMC regression tests.

Check list

Testing

  • How were these changes tested?
    • Regression tests.
  • Are the changes covered by regression tests? (If not, why? Do new tests need to be added?)
    • Yes
  • Have the matrix regression tests been run (if yes, please note HPC and compiler)?
    • Yes - Linux, GNU fortran,
  • Please indicate the expected changes in the regression test output, (Note the list of known non-identical tests.)
    • The *.nc files created when using NML input in ww3_tp2.10 and ww3_tp2.16 will now be correct.
  • Please provide the summary output of matrix.comp (matrix.Diff.txt, matrixCompFull.txt and matrixCompSummary.txt):
    TBC

@ukmo-ccbunney ukmo-ccbunney self-assigned this Jul 3, 2024
@MatthewMasarik-NOAA
Copy link
Collaborator

Sorry for the delay, testing is in progress.

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.

Code review
Pass

Testing
Pass

Only the known non-b4b's differ.

**********************************************************************
********************* non-identical cases ****************************
**********************************************************************
mww3_test_03/./work_PR1_MPI_e                     (1 files differ)
mww3_test_03/./work_PR3_UQ_MPI_e_c                     (1 files differ)
mww3_test_03/./work_PR3_UNO_MPI_e                     (1 files differ)
mww3_test_03/./work_PR2_UQ_MPI_e                     (1 files differ)
mww3_test_03/./work_PR2_UNO_MPI_d2                     (8 files differ)
mww3_test_03/./work_PR1_MPI_d2                     (6 files differ)
mww3_test_03/./work_PR3_UNO_MPI_d2_c                     (16 files differ)
mww3_test_03/./work_PR3_UQ_MPI_d2_c                     (15 files differ)
mww3_test_03/./work_PR3_UNO_MPI_d2                     (13 files differ)
mww3_test_03/./work_PR2_UQ_MPI_d2                     (16 files differ)
mww3_test_03/./work_PR3_UQ_MPI_e                     (1 files differ)
mww3_test_03/./work_PR3_UNO_MPI_e_c                     (1 files differ)
mww3_test_03/./work_PR3_UQ_MPI_d2                     (16 files differ)
mww3_test_09/./work_MPI_ASCII                     (0 files differ)
ww3_tp2.10/./work_MPI_OMPH                     (7 files differ)
ww3_tp2.16/./work_MPI_OMPH                     (4 files differ)
ww3_tp2.6/./work_ST4_ASCII                     (0 files differ)
ww3_ufs1.3/./work_a                     (3 files differ)
 
**********************************************************************
************************ identical cases *****************************
**********************************************************************

@MatthewMasarik-NOAA MatthewMasarik-NOAA merged commit a2c086e into NOAA-EMC:develop Jul 19, 2024
22 checks passed
@MatthewMasarik-NOAA
Copy link
Collaborator

Thanks @ukmo-ccbunney!

ukmo-ccbunney added a commit to ukmo-waves/WW3 that referenced this pull request Sep 4, 2024
* origin/develop:
  Enable doxygen documentation in the cmake build system (NOAA-EMC#1281)
  Simplify MPI ifdefs in subroutine W3MPIO (NOAA-EMC#1266)
  Add depth scaling value to SMC regression tests. (NOAA-EMC#1264)
  Updates to NCEP regtests for Orion Rocky9 OS(NOAA-EMC#1263)
  Fix code stability issue in ww3_outp (NOAA-EMC#1258)
  Fix GNU regtest CI failure (NOAA-EMC#1253)
ukmo-ccbunney added a commit to ukmo-waves/WW3 that referenced this pull request Sep 4, 2024
* origin/develop:
  Enable doxygen documentation in the cmake build system (NOAA-EMC#1281)
  Simplify MPI ifdefs in subroutine W3MPIO (NOAA-EMC#1266)
  Add depth scaling value to SMC regression tests. (NOAA-EMC#1264)
  Updates to NCEP regtests for Orion Rocky9 OS(NOAA-EMC#1263)
  Fix code stability issue in ww3_outp (NOAA-EMC#1258)
  Fix GNU regtest CI failure (NOAA-EMC#1253)
ukmo-ccbunney added a commit to ukmo-waves/WW3 that referenced this pull request Sep 4, 2024
* feature/gpu/w3srce_refactor:
  Enable doxygen documentation in the cmake build system (NOAA-EMC#1281)
  Simplify MPI ifdefs in subroutine W3MPIO (NOAA-EMC#1266)
  Add depth scaling value to SMC regression tests. (NOAA-EMC#1264)
  Updates to NCEP regtests for Orion Rocky9 OS(NOAA-EMC#1263)
  Fix code stability issue in ww3_outp (NOAA-EMC#1258)
  Fix GNU regtest CI failure (NOAA-EMC#1253)
  Add option to use NetCDF output instead of binary for point output (NOAA-EMC#1230)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

VSC value needs updating for SMC regtests
2 participants