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.

Sign up for GitHub

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

Jump to bottom

Bugfix/gqm #1127

Merged
merged 2 commits into from
Nov 28, 2023
Merged

Bugfix/gqm #1127

merged 2 commits into from
Nov 28, 2023

Conversation

mickaelaccensi
Copy link
Collaborator

@mickaelaccensi mickaelaccensi commented Nov 21, 2023 •
edited
Loading

Pull Request Summary

correct bugs to run correctly GQM implementation

Description

add missing documentation and correct bugs found both with debug options and ddt software
the results of ww3_ts1 should now be correct

Issue(s) addressed

Commit Message

correct bugs to run correctly GQM implementation

Check list

Testing

  • How were these changes tested? ww3_ts1
  • Are the changes covered by regression tests? (If not, why? Do new tests need to be added?) ww3_ts1
  • Have the matrix regression tests been run (if yes, please note HPC and compiler)? on going
  • Please indicate the expected changes in the regression test output, (Note the list of known non-identical tests.)
    -the only differences are still due to pdlib on my HPC (ww3_tp2.17, ww3_tp2.21, ww3_tp2.6)
    -diff on ww3_ts1 are expected
  • Please provide the summary output of matrix.comp (matrix.Diff.txt, matrixCompFull.txt and matrixCompSummary.txt):

matrixCompSummary.txt
matrixCompFull.txt

@mickaelaccensi
Copy link
Collaborator Author

@MatthewMasarik-NOAA can you test this PR first. It should solve a few issues I had on my st4table branch and also in @ukmo-ccbunney draft PR about the whitecap variable which was not correctly initialized.

Once this branch is merged, I'll provide another branch for st4 to try to track step by step the changes

@MatthewMasarik-NOAA
Copy link
Collaborator

Sure thing @mickaelaccensi. Do you have the regtest results, so I know what I should be looking for?

@mickaelaccensi
Copy link
Collaborator Author

it's running right now, I will provide once it's done. it should change the outputs in ww3_ts1

@MatthewMasarik-NOAA
Copy link
Collaborator

Great, thanks for sending those when their done. I'll get the tests submitted.

@JessicaMeixner-NOAA
Copy link
Collaborator

@mickaelaccensi have the tests finished running? If so, if you can post those we'll start running things on our end.

@mickaelaccensi
Copy link
Collaborator Author

@JessicaMeixner-NOAA done. The only differences are still due to pdlib on my HPC (ww3_tp2.17, ww3_tp2.21, ww3_tp2.6)

diff on ww3_ts1 are expected

@JessicaMeixner-NOAA
Copy link
Collaborator

Thanks for posting the logs!

@MatthewMasarik-NOAA
Copy link
Collaborator

MatthewMasarik-NOAA commented Nov 27, 2023 •
edited
Loading

Quick clarification - I think #1124 was up first.. Are the logs for that PR, or this one?

And my apologies... I probably confused things with my posts here from last week.

@JessicaMeixner-NOAA
Copy link
Collaborator

@MatthewMasarik-NOAA can you test this PR first. It should solve a few issues I had on my st4table branch and also in @ukmo-ccbunney draft PR about the whitecap variable which was not correctly initialized.

Once this branch is merged, I'll provide another branch for st4 to try to track step by step the changes

@MatthewMasarik-NOAA I think this PR was requested to go first.

@MatthewMasarik-NOAA
Copy link
Collaborator

@MatthewMasarik-NOAA can you test this PR first. It should solve a few issues I had on my st4table branch and also in @ukmo-ccbunney draft PR about the whitecap variable which was not correctly initialized.
Once this branch is merged, I'll provide another branch for st4 to try to track step by step the changes

@MatthewMasarik-NOAA I think this PR was requested to go first.

Its all coming back... doh. Sorry for my confusion.

@MatthewMasarik-NOAA
Copy link
Collaborator

Thanks for the logs @mickaelaccensi, I'll work on completing the review.

MatthewMasarik-NOAA
MatthewMasarik-NOAA approved these changes Nov 28, 2023
View reviewed changes
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

matrix.comp
Summary output below shows: 1) known non-b4b's, 2) expected differences in ww3_ts1 tests.

**********************************************************************
********************* non-identical cases ****************************
**********************************************************************
## known non-b4b
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_PR2_UQ_MPI_e                     (1 files differ)
mww3_test_03/./work_PR2_UNO_MPI_d2                     (16 files differ)
mww3_test_03/./work_PR1_MPI_d2                     (8 files differ)
mww3_test_03/./work_PR3_UNO_MPI_d2_c                     (12 files differ)
mww3_test_03/./work_PR3_UQ_MPI_d2_c                     (15 files differ)
mww3_test_03/./work_PR3_UNO_MPI_d2                     (12 files differ)
mww3_test_03/./work_PR2_UQ_MPI_d2                     (15 files differ)
mww3_test_03/./work_PR3_UQ_MPI_e                     (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)
##

ww3_ts1/./work_ST4_T700                     (2 files differ)
ww3_ts1/./work_T707GQM                     (2 files differ)
ww3_ts1/./work_T713GQM                     (2 files differ)


**********************************************************************
************************ identical cases *****************************
**********************************************************************

matrixCompSummary.txt
matrixCompFull.txt
matrixDiff.txt

@MatthewMasarik-NOAA
Copy link
Collaborator

@mickaelaccensi thanks for finding a fix for this issue, and the documentation updates!

@MatthewMasarik-NOAA MatthewMasarik-NOAA merged commit d90078b into NOAA-EMC:develop Nov 28, 2023
20 checks passed
@MatthewMasarik-NOAA MatthewMasarik-NOAA mentioned this pull request Nov 28, 2023
Merged
3 tasks
miguelsolanocordoba added a commit to wavespotter/WW3 that referenced this pull request Apr 19, 2024
@miguelsolanocordoba @ukmo-ccbunney
@mickaelaccensi @benoitp-cmc @MatthewMasarik-NOAA @Ghazal-Mohammadpour @JessicaMeixner-NOAA @Biao-Zhao @edwardhartnett @AlexanderRichert-NOAA @ErickRogers @DeniseWorthen @camilleanne
Re-base with NOAA-EMC and fix gustiness (#15)
6334796 
* Bugfix - initialised VD and VS to zero in w3srcemd. (NOAA-EMC#1037)

* More efficient test for binary files in matrix.comp (NOAA-EMC#1035)

* Tidy up of pre-processor directives and unused variables in w3srcemd.F90 (NOAA-EMC#1010)

* Correct typo in w3srcemd.F90 pre-processor directive. (NOAA-EMC#1039)

* minor bugfix for matrix grepping on keywords (NOAA-EMC#1049)

* Stop masking group 1 output where icec > icen (NOAA-EMC#1019)

* Doxygen documentation added, 8th subset.(NOAA-EMC#1046)

* NC4 ,F90 ,XX0 switches removed from ww3_tp2.19 regtest (NOAA-EMC#1054)

* CI:  Fix for Intel scripts. GNU scripts updated. (NOAA-EMC#1064)

* correct the computation of QP parameter, add QKK output parameter, change UST scale factor (NOAA-EMC#1050)

* correct issue with ww3_multi when requesting restart2 and using nml file instead of inp file (NOAA-EMC#1070)

* correct calendar for track netcdf output (NOAA-EMC#1079)

* Fix missing mod_def.ww3 file in multigrid regression tests for track output (NOAA-EMC#1091)

* STAB3: fix cmake build for ST4 or ST3 (NOAA-EMC#1086)

* new feature to output out_grd.ww3, out_pnt.ww3 and mod_def.ww3 both in binary and ascii format using switch ASCII. (NOAA-EMC#1089)

* Update local unit number arrays (NDS, MDS) to be same size of array defined in w3odatmd (size=15). Also, defined unit numbers for NDS(14) and NDS(15). (NOAA-EMC#1098)

* Removed code referencing PHIOC in output section for PHICE in ww3_ounf (NOAA-EMC#1093)

* implementation of the GQM (Gaussian Quadrature Method) to replace the DIA in NL1 or NL2. (NOAA-EMC#1083)

* update logic to ensure you are not accessing uninitialized dates (NOAA-EMC#1114)

* Initialised S and D arrays in W3SDB1 before potential early return if zero energy. (NOAA-EMC#1115)

* ww3_ounp.F90:  x/y units attribute corrected from 'm' to 'km' (NOAA-EMC#1088)

* Bugfix: Assign unit numbers to ASCII gridded/point output in multi-grid mode. (NOAA-EMC#1118)

* correct bugs to run correctly GQM implementation (NOAA-EMC#1127)

* Adding documentation to w3iopo() in preparation for code for NOAA-EMC#682. (NOAA-EMC#1131)

* NCEP regtest module updates: uses spack-stack/1.5.0, includes scotch/7.0.4 (NOAA-EMC#1137)

* Minor update to ncep regtests (NOAA-EMC#1138)

* Updated intel workflow to install oneapi compilers from new location. (NOAA-EMC#1157)

* Add unit test for points I/O code. (NOAA-EMC#1158)

* Update Intel CI (relocate /usr/local; ensure intel-oneapi-mpi; use ubuntu-latest) (NOAA-EMC#1161)

* remove lookup table for ST4 to speed up computation and clean up the ST4 code (NOAA-EMC#1124)

Co-authored-by: Fabrice Ardhuin <fabrice.ardhuin@ifremer.fr>

* initialize USSP_WN for mod_def (NOAA-EMC#1165)

* Introduce IC4M8 and IC4M9 to WW3 (NOAA-EMC#1176)

* clean up and add ST4 variables (NOAA-EMC#1181)

* w3fld1md.F90: fix divide by zero in CRIT2 parameter (NOAA-EMC#1184)

* ww3_prnc.F90: fix out-of-scope grid index write statement (NOAA-EMC#1185)

* Bugfix: address potential divide-by-zero in APPENDTAIL (NOAA-EMC#1188)

Co-authored-by: Denise Worthen <denise.worthen@noaa.gov>

* Provide initial drying of cells with depth < ZLIM for SMC grid. (NOAA-EMC#1192)

* Output OMP threading info to screen when running ww3_shel/ww3_multi compiled with the OMPG switch. Also fixes truncation of build.log when running run_cmake_build. (NOAA-EMC#1191)

* Added screen output showing number of threads when OMP enabled.

* update build to get more info in logs (NOAA-EMC#46)

---------

Co-authored-by: Jessica Meixner <jessica.meixner@noaa.gov>

* update run_cmake_test to catch build errors and exit (NOAA-EMC#1194)

* fix merge conflicts

* Fix gustiness bug, as suggst by Pieter

* Change USTARsigma to WAM implementation

---------

Co-authored-by: Chris Bunney <48915820+ukmo-ccbunney@users.noreply.github.com>
Co-authored-by: Mickael Accensi <49198861+mickaelaccensi@users.noreply.github.com>
Co-authored-by: Benoit Pouliot <51411504+benoitp-cmc@users.noreply.github.com>
Co-authored-by: Matthew Masarik <86749872+MatthewMasarik-NOAA@users.noreply.github.com>
Co-authored-by: Ghazal-Mohammadpour <124626872+Ghazal-Mohammadpour@users.noreply.github.com>
Co-authored-by: Jessica Meixner <jessica.meixner@noaa.gov>
Co-authored-by: Biao Zhao <zhaobiaodeyouxiang@163.com>
Co-authored-by: Edward Hartnett <38856240+edwardhartnett@users.noreply.github.com>
Co-authored-by: Alex Richert <82525672+AlexanderRichert-NOAA@users.noreply.github.com>
Co-authored-by: Fabrice Ardhuin <fabrice.ardhuin@ifremer.fr>
Co-authored-by: W. Erick Rogers <156342000+ErickRogers@users.noreply.github.com>
Co-authored-by: Denise Worthen <denise.worthen@noaa.gov>
Co-authored-by: Camille Teicheira <cteicheira@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MatthewMasarik-NOAA MatthewMasarik-NOAA MatthewMasarik-NOAA approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@mickaelaccensi @MatthewMasarik-NOAA @JessicaMeixner-NOAA