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

Bugfix/trnc #1079

Merged
merged 3 commits into from
Sep 22, 2023
Merged

Bugfix/trnc #1079

merged 3 commits into from
Sep 22, 2023

Conversation

mickaelaccensi
Copy link
Collaborator

Pull Request Summary

correct calendar for track netcdf output

Description

read the mod_def.ww3 to define the calendar type
update output dates in regtest ww3_tp2.2 to show the issue

Issue(s) addressed

issue #1077

Commit Message

correct calendar for track netcdf output

Check list

Testing

  • How were these changes tested? ww3_tp2.2
  • Are the changes covered by regression tests? (If not, why? Do new tests need to be added?) ww3_tp2.2
  • 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.)
  • only changes in ww3_tp2.2 in the output dates
  • Please provide the summary output of matrix.comp (matrix.Diff.txt, matrixCompFull.txt and matrixCompSummary.txt):

@MatthewMasarik-NOAA
Copy link
Collaborator

Thanks @mickaelaccensi. There's a few PR's ahead of this one, I've updated the commit queue.

@MatthewMasarik-NOAA
Copy link
Collaborator

Hi @mickaelaccensi I appreciate you documenting that ww3_tp2.2 will change.

Can you please also remember to attach the runs logs required in the PR header? We're trying to keep the review process moving as quickly as possible and filling out the PR header completely helps. In a broader sense we are going to review our PR template and how we're communicating the requirements, so just a general heads up there will be more to come on that shortly.

@MatthewMasarik-NOAA
Copy link
Collaborator

PRs #1073 and #1076 are still being tested, so this PR is up next. Thanks for syncing. I'll start testing, the timeline is beginning of next week. The commit queue is updated now.

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.

matrix.comp

**********************************************************************          
********************* non-identical cases ****************************          
**********************************************************************          
## known non-b4b                                                                
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                     (16 files differ)        
mww3_test_03/./work_PR1_MPI_d2                     (8 files differ)             
mww3_test_03/./work_PR3_UNO_MPI_d2_c                     (10 files differ)      
mww3_test_03/./work_PR3_UQ_MPI_d2_c                     (15 files differ)       
mww3_test_03/./work_PR3_UNO_MPI_d2                     (18 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                     (17 files differ)         
ww3_tp2.10/./work_MPI_OMPH                     (7 files differ)                 
ww3_tp2.16/./work_MPI_OMPH                     (4 files differ)                 
ww3_ufs1.3/./work_a                     (3 files differ)                        
##                                                                              
                                                                                
ww3_tp2.2/./work_PR2_UNO                     (14 files differ)                  
ww3_tp2.2/./work_PR1_MPI                     (14 files differ)                  
ww3_tp2.2/./work_PR3_UNO_MPI                 (14 files differ)              
ww3_tp2.2/./work_PR3_UQ                      (14 files differ)                   
ww3_tp2.2/./work_PR3_UNO                     (14 files differ)                  
ww3_tp2.2/./work_PR1                         (14 files differ)                      
ww3_tp2.2/./work_PR2_UQ                      (14 files differ)                   
ww3_tp2.2/./work_PR2_UQ_MPI                  (14 files differ)               
ww3_tp2.2/./work_PR3_UQ_MPI                  (14 files differ)               
ww3_tp2.2/./work_PR2_UNO_MPI                 (14 files differ)                                                              
**********************************************************************          
************************ identical cases *****************************          
**********************************************************************

ww3_tp2.2 diffs

The 14 files differing for each of the tests above are listed here, plus 4 *.nc files at the bottom not compared due to differing file names from this change. All diffs in the files were seen to be due to shift in date from 1968-06 to 2022-06:

     log.ww3                            
     out_grd.ww3               
     out_pnt.ww3                
     tab51.ww3
     tab52.ww3
     tab53.ww3
     track_o.ww3
     ww3_ounf.out
     ww3_ounp.out
     ww3_outf.out
     ww3_outp_spec.out
     ww3_outp_tab51.out
     ww3_outp_tab52.out
     ww3_outp_tab53.out
 
     ww3.196806.nc        -- not in compare directory        
     ww3.196806_spec.nc   -- not in compare directory           
     ww3.202206.nc        -- in comp directory only          
     ww3.202206_spec.nc   -- in comp directory only

All changes outside the known list of non-b4b tests have been accounted for.

Code review

PASS

Testing

PASS

Approved.

@MatthewMasarik-NOAA
Copy link
Collaborator

@mickaelaccensi thank you for finding this bug and submitting the fix.

@MatthewMasarik-NOAA MatthewMasarik-NOAA merged commit 7bbdaca into NOAA-EMC:develop Sep 22, 2023
20 checks passed
miguelsolanocordoba added a commit to wavespotter/WW3 that referenced this pull request Apr 19, 2024
* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: Mickael Accensi <[email protected]>
Co-authored-by: Benoit Pouliot <[email protected]>
Co-authored-by: Matthew Masarik <[email protected]>
Co-authored-by: Ghazal-Mohammadpour <[email protected]>
Co-authored-by: Jessica Meixner <[email protected]>
Co-authored-by: Biao Zhao <[email protected]>
Co-authored-by: Edward Hartnett <[email protected]>
Co-authored-by: Alex Richert <[email protected]>
Co-authored-by: Fabrice Ardhuin <[email protected]>
Co-authored-by: W. Erick Rogers <[email protected]>
Co-authored-by: Denise Worthen <[email protected]>
Co-authored-by: Camille Teicheira <[email protected]>
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.

2 participants