Sync develop branch 20241220 to dev/ufs-weather-model #1337

JessicaMeixner-NOAA · 2024-12-20T22:02:12Z

Pull Request Summary

This PR brings in the develop branch to dev/ufs-weather-model.

Description

More details to follow.

Issue(s) addressed

Commit Message

Check list

Branch is up to date with the authoritative repository (NOAA-EMC) develop branch.
Checked the checklist for a developer submitting to develop.
If a version number update is required, checked the updating version number checklist.
If a new feature was added, a regression test for testing the new feature is added.

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):

…ange UST scale factor (NOAA-EMC#1050)

…ile instead of inp file (NOAA-EMC#1070)

…output (NOAA-EMC#1091)

…n binary and ascii format using switch ASCII. (NOAA-EMC#1089)

…efined in w3odatmd (size=15). Also, defined unit numbers for NDS(14) and NDS(15). (NOAA-EMC#1098)

NOAA-EMC#1093)

… DIA in NL1 or NL2. (NOAA-EMC#1083)

…A-EMC#1114)

… zero energy. (NOAA-EMC#1115)

…C#1088)

…id mode. (NOAA-EMC#1118)

…#682. (NOAA-EMC#1131)

…7.0.4 (NOAA-EMC#1137)

…NOAA-EMC#1157)

…untu-latest) (NOAA-EMC#1161)

…ST4 code (NOAA-EMC#1124) Co-authored-by: Fabrice Ardhuin <fabrice.ardhuin@ifremer.fr>

)

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

…-EMC#1192)

…ompiled 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>

…es (NOAA-EMC#1145)

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

Co-authored-by: Nicholas Szapiro <149816583+NickSzapiro-NOAA@users.noreply.github.com>

@ukmo-nievesvaliente

Authored by: @ukmo-nievesvaliente

…OAA-EMC#1230) --------- Co-authored-by: Edward Hartnett <edward.hartnett@noaa.gov> Co-authored-by: Matthew Masarik <Matthew.Masarik@noaa.gov>

Co-authored-by: saeideh banihashemi <saeideh.banihashemi@clogin02.cactus.wcoss2.ncep.noaa.gov>

Co-authored-by: Ty Hesser <thesser1@gmail.com> Co-authored-by: Tyler James Hesser <thesser1@carpenter09.hsn.ex4000.erdc.hpc.mil>

Based on Meylan Horvat Bitz and Bennetts, Ocean Modelling, 2021. Co-Authors include: Erin Thomas, Cecilia Bitz, David Bailey, Nick Szapiro. Co-authored-by: Erin Thomas <ac.ethomas@chrlogin1.lcrc.anl.gov>

…OAA-EMC#1325)

… speed up initialization (NOAA-EMC#1333)

Conflicts: .github/workflows/intel.yml model/inp/ww3_ounf.inp model/src/w3gridmd.F90 model/src/w3initmd.F90 model/src/w3iogomd.F90 model/src/w3ounfmetamd.F90 model/src/w3sic4md.F90

DeniseWorthen · 2024-12-23T23:20:11Z

model/src/w3initmd.F90

@@ -459,7 +462,7 @@ SUBROUTINE W3INIT ( IMOD, IsMulti, FEXT, MDS, MTRACE, ODAT, FLGRD,  FLGR2, FLGD,
    !/ ------------------------------------------------------------------- /
    !/ Parameter list
    !/
-    INTEGER, INTENT(IN)           :: IMOD, MDS(13), MTRACE(2),      &
+    INTEGER, INTENT(IN)           :: IMOD, MDS(15), MTRACE(2),      &


There are a couple of changes needed in the mesh cap code to align w/ the increased array size of MDS. See

WW3/model/src/wav_comp_nuopc.F90

Line 485 in 29063ec

integer :: mds(13) ! Note that nds is set to this in w3initmod

WW3/model/src/wav_shel_inp.F90

Line 53 in 29063ec

integer , intent(out) :: mds(13), ntrace(2)

DeniseWorthen · 2024-12-23T23:33:38Z

model/src/w3wavemd.F90

@@ -1493,6 +1499,8 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT &

            CALL INIT_GET_ISEA(ISEA, JSEA)

+            IF ((IOBP_LOC(JSEA).eq.1..or.IOBP_LOC(JSEA).eq. 3).and.IOBDP_LOC(JSEA).eq.1.and.IOBPA_LOC(JSEA).eq.0) THEN


This if block is not properly indented.

mickaelaccensi and others added 30 commits July 31, 2023 11:38

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

1cacc43

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

dcafc8c

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

2715a9e

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

b810a89

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

991daf8

correct the computation of QP parameter, add QKK output parameter, ch…

6b9edfa

…ange UST scale factor (NOAA-EMC#1050)

correct issue with ww3_multi when requesting restart2 and using nml f…

8589d12

…ile instead of inp file (NOAA-EMC#1070)

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

7bbdaca

Fix missing mod_def.ww3 file in multigrid regression tests for track …

b1356dd

…output (NOAA-EMC#1091)

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

d22b7bb

new feature to output out_grd.ww3, out_pnt.ww3 and mod_def.ww3 both i…

eff6686

…n binary and ascii format using switch ASCII. (NOAA-EMC#1089)

Update local unit number arrays (NDS, MDS) to be same size of array d…

d148d09

…efined 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 (

66262f6

NOAA-EMC#1093)

implementation of the GQM (Gaussian Quadrature Method) to replace the…

8eb3596

… DIA in NL1 or NL2. (NOAA-EMC#1083)

update logic to ensure you are not accessing uninitialized dates (NOA…

4cd995d

…A-EMC#1114)

Initialised S and D arrays in W3SDB1 before potential early return if…

c3451a9

… zero energy. (NOAA-EMC#1115)

ww3_ounp.F90: x/y units attribute corrected from 'm' to 'km' (NOAA-EM…

f702a8f

…C#1088)

Bugfix: Assign unit numbers to ASCII gridded/point output in multi-gr…

1f928aa

…id mode. (NOAA-EMC#1118)

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

d90078b

Adding documentation to w3iopo() in preparation for code for NOAA-EMC…

3f35df7

…#682. (NOAA-EMC#1131)

NCEP regtest module updates: uses spack-stack/1.5.0, includes scotch/…

ff1b9e9

…7.0.4 (NOAA-EMC#1137)

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

d3ea810

Updated intel workflow to install oneapi compilers from new location. (…

88c89be

…NOAA-EMC#1157)

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

7bec560

Update Intel CI (relocate /usr/local; ensure intel-oneapi-mpi; use ub…

63f8270

…untu-latest) (NOAA-EMC#1161)

remove lookup table for ST4 to speed up computation and clean up the …

3952826

…ST4 code (NOAA-EMC#1124) Co-authored-by: Fabrice Ardhuin <fabrice.ardhuin@ifremer.fr>

initialize USSP_WN for mod_def (NOAA-EMC#1165)

026fcdd

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

9a718fc

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

ff0358a

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

ba5cd68

MatthewMasarik-NOAA and others added 27 commits February 5, 2024 18:45

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

fd6d559

)

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

6d42025

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

Provide initial drying of cells with depth < ZLIM for SMC grid. (NOAA…

e085bcf

…-EMC#1192)

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

9d3799f

Adds 360_day calendar support to ww3_prnc (NOAA-EMC#1193)

e064dbf

Fix compiler build 'remark's (NOAA-EMC#1201)

f66b6d4

For NCEP regtests, add option for gnu compiler and new machine Hercul…

399df78

…es (NOAA-EMC#1145)

Fix compiler remarks for ST6 and GMD (NOAA-EMC#1206)

d8b82c9

add output parameters for skewness (NOAA-EMC#1209)

8b5e91f

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

Add ice time variables to restart file (NOAA-EMC#1224)

c13d0b1

Co-authored-by: Nicholas Szapiro <149816583+NickSzapiro-NOAA@users.noreply.github.com>

Functional form of Charnock calculation in ST4. (NOAA-EMC#1225)

14e6bed

Authored by: @ukmo-nievesvaliente

Add option to use NetCDF output instead of binary for point output (N…

629d27a

…OAA-EMC#1230) --------- Co-authored-by: Edward Hartnett <edward.hartnett@noaa.gov> Co-authored-by: Matthew Masarik <Matthew.Masarik@noaa.gov>

Fix GNU regtest CI failure (NOAA-EMC#1253)

f22c38a

Fix code stability issue in ww3_outp (NOAA-EMC#1258)

af38c43

Co-authored-by: saeideh banihashemi <saeideh.banihashemi@clogin02.cactus.wcoss2.ncep.noaa.gov>

Updates to NCEP regtests for Orion Rocky9 OS(NOAA-EMC#1263)

ca58c13

Add depth scaling value to SMC regression tests. (NOAA-EMC#1264)

a2c086e

Simplify MPI ifdefs in subroutine W3MPIO (NOAA-EMC#1266)

b4e119e

Enable doxygen documentation in the cmake build system (NOAA-EMC#1281)

abc77b9

README.md: update with link to doxygen documentation (NOAA-EMC#1316)

7705171

ww3_ufs1.x: fix typo in switch_MPI_OMPH (NOAA-EMC#1323)

bd7b90d

Fixing uninitialized issues within the implicit scheme (NOAA-EMC#1142)

b7afba7

Co-authored-by: Ty Hesser <thesser1@gmail.com> Co-authored-by: Tyler James Hesser <thesser1@carpenter09.hsn.ex4000.erdc.hpc.mil>

IC4M10: New wave damping scheme in sea ice (NOAA-EMC#1293)

d1fdda9

Based on Meylan Horvat Bitz and Bennetts, Ocean Modelling, 2021. Co-Authors include: Erin Thomas, Cecilia Bitz, David Bailey, Nick Szapiro. Co-authored-by: Erin Thomas <ac.ethomas@chrlogin1.lcrc.anl.gov>

Addition of Regression Test (ww3_tic1.1/IC4_M10) (NOAA-EMC#1331)

d82913b

Update IS_IN_UNGRID to handle if grid lon defintions are mismatched (N…

488e3c8

…OAA-EMC#1325)

Optional point weight file (pnt_wght.ww3.nc) for unstructured grid to…

e82df78

… speed up initialization (NOAA-EMC#1333)

Merge branch 'develop' into syncdev2ufs20241220

4aa0e31

Conflicts: .github/workflows/intel.yml model/inp/ww3_ounf.inp model/src/w3gridmd.F90 model/src/w3initmd.F90 model/src/w3iogomd.F90 model/src/w3ounfmetamd.F90 model/src/w3sic4md.F90

JessicaMeixner-NOAA mentioned this pull request Dec 20, 2024

Update with WW3 develop branch 20241220 ufs-community/ufs-weather-model#2546

Draft

14 tasks

DeniseWorthen reviewed Dec 23, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sync develop branch 20241220 to dev/ufs-weather-model #1337

Sync develop branch 20241220 to dev/ufs-weather-model #1337

JessicaMeixner-NOAA commented Dec 20, 2024

DeniseWorthen Dec 23, 2024

DeniseWorthen Dec 23, 2024

		@@ -1493,6 +1499,8 @@ SUBROUTINE W3WAVE ( IMOD, ODAT, TEND, STAMP, NO_OUT &

		CALL INIT_GET_ISEA(ISEA, JSEA)

		IF ((IOBP_LOC(JSEA).eq.1..or.IOBP_LOC(JSEA).eq. 3).and.IOBDP_LOC(JSEA).eq.1.and.IOBPA_LOC(JSEA).eq.0) THEN

Sync develop branch 20241220 to dev/ufs-weather-model #1337

Are you sure you want to change the base?

Sync develop branch 20241220 to dev/ufs-weather-model #1337

Conversation

JessicaMeixner-NOAA commented Dec 20, 2024

Pull Request Summary

Description

Issue(s) addressed

Commit Message

Check list

Testing

DeniseWorthen Dec 23, 2024

Choose a reason for hiding this comment

DeniseWorthen Dec 23, 2024

Choose a reason for hiding this comment