Skip to content

fix ust,ustdir,asf and add ussp to output_exchanges#943

Merged
MatthewMasarik-NOAA merged 1 commit into
NOAA-EMC:developfrom
DeniseWorthen:feature/pdlib_outputmods
Mar 14, 2023
Merged

fix ust,ustdir,asf and add ussp to output_exchanges#943
MatthewMasarik-NOAA merged 1 commit into
NOAA-EMC:developfrom
DeniseWorthen:feature/pdlib_outputmods

Conversation

@DeniseWorthen
Copy link
Copy Markdown
Contributor

@DeniseWorthen DeniseWorthen commented Mar 11, 2023

Pull Request Summary

This work is part of UFS 1556

Fixes output of ust,ustdir and asf when using domain decomposition.
Adds the ability to output USSP when running with domain decomposition.

Description

Issue(s) addressed

Commit Message

Fixes output of ust,ustdir and asf and adds USSP when running with domain decomposition.

Check list

Testing

  • How were these changes tested?
  • Are the changes covered by regression tests? (If not, why? Do new tests need to be added?)
  • Have the matrix regression tests been run (if yes, please note HPC and compiler)?
  • Please indicate the expected changes in the regression test output, (Note the list of known non-identical tests.)
  • Please provide the summary output of matrix.comp (matrix.Diff.txt, matrixCompFull.txt and matrixCompSummary.txt):

@JessicaMeixner-NOAA
Copy link
Copy Markdown
Collaborator

The regression tests had no only expected differences:

 **********************************************************************
********************* non-identical cases ****************************
**********************************************************************
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_UNO_MPI_e                     (1 files differ)
mww3_test_03/./work_PR2_UNO_MPI_d2                     (8 files differ)
mww3_test_03/./work_PR1_MPI_d2                     (8 files differ)
mww3_test_03/./work_PR3_UNO_MPI_d2_c                     (16 files differ)
mww3_test_03/./work_PR3_UQ_MPI_d2_c                     (16 files differ)
mww3_test_03/./work_PR3_UNO_MPI_d2                     (14 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                     (15 files differ)
ww3_ta1/./work_UPD0F_U                     (0 files differ)
ww3_tp2.10/./work_MPI_OMPH                     (7 files differ)
ww3_tp2.16/./work_MPI_OMPH                     (4 files differ)
ww3_tp2.17/./work_ma                     (1 files differ)
ww3_tp2.17/./work_a                     (1 files differ)
ww3_tp2.17/./work_mc1                     (1 files differ)
ww3_tp2.17/./work_mb                     (1 files differ)
ww3_tp2.17/./work_mc                     (1 files differ)
ww3_tp2.17/./work_ma1                     (1 files differ)
ww3_tp2.17/./work_c                     (1 files differ)
ww3_tp2.17/./work_b                     (1 files differ)
ww3_tp2.6/./work_ST0                     (1 files differ)
ww3_tp2.6/./work_ST4                     (1 files differ)
ww3_tp2.6/./work_pdlib                     (4 files differ)
ww3_ts4/./work_ug_MPI                     (1 files differ)
ww3_ufs1.3/./work_a                     (3 files differ)

How were these changes tested? Tested by @DeniseWorthen and results in issues. matrix of regtests run on hera
Are the changes covered by regression tests? (If not, why? Do new tests need to be added?) No - I will take care of adding a regression test for this after this and pr 888 have been merged, we will make sure to add these variables to a regression test output.
Have the matrix regression tests been run (if yes, please note HPC and compiler)? Yes - Hera Intel
Please indicate the expected changes in the regression test output, (Note the list of known non-identical tests.)
No expected changes. See above
Please provide the summary output of matrix.comp (matrix.Diff.txt, matrixCompFull.txt and matrixCompSummary.txt):

matrixCompFull.txt
matrixCompSummary.txt
matrixDiff.txt

Copy link
Copy Markdown
Collaborator

@JessicaMeixner-NOAA JessicaMeixner-NOAA left a comment

Choose a reason for hiding this comment

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

Thank you @DeniseWorthen for this fix!

I ran all the WW3 standalone tests and will add a regression test to add this to the output in a seperate PR.

I would like to give @aronroland an opportunity to review this as well as he knows this code portion the best. But we can get this merged ASAP after that. I think he's already looked at it, so hopefully it will be a quick review process.

Copy link
Copy Markdown
Contributor

@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.

Thank you for catching this @DeniseWorthen!!

@DeniseWorthen
Copy link
Copy Markdown
Contributor Author

DeniseWorthen commented Mar 13, 2023

I anticipate two more bug fixes for unstructured. One to resolve the restart-frequency corruption (documented in UFS issue 1556) and one to fix the hard-wiring in w3initmd

WW3/model/src/w3initmd.F90

Lines 2192 to 2193 in ea0de58

IF ((FLOUT(1) .OR. FLOUT(7)).and.(.not. LPDLIB .or. &
(GTYPE .ne. UNGTYPE).or. .TRUE.)) THEN
Those may or may not be ready this week.

@JessicaMeixner-NOAA
Copy link
Copy Markdown
Collaborator

@aronroland if you do not object I'd like to merge this today. If you need more time for a review please let us know, otherwise I'll plan to merge this around 5pm ET time.

Copy link
Copy Markdown
Collaborator

@aronroland aronroland left a comment

Choose a reason for hiding this comment

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

@DeniseWorthen , @JessicaMeixner-NOAA i have checked everything and from my point of view this can go in.

@MatthewMasarik-NOAA
Copy link
Copy Markdown
Contributor

@aronroland thanks for your approval. @JessicaMeixner-NOAA and myself have already approved this as well.

@MatthewMasarik-NOAA MatthewMasarik-NOAA merged commit 2bf204e into NOAA-EMC:develop Mar 14, 2023
@MatthewMasarik-NOAA
Copy link
Copy Markdown
Contributor

Thanks again @DeniseWorthen for catching this issue and supplying the fix!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

4 participants