Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
3c7e8b8
add new namelist module file
EJRainville-NOAA Jun 9, 2026
ddcef0e
Merge branch 'outp_inp2nml' of github.com:EJRainville-NOAA/WW3 into o…
EJRainville-NOAA Jun 18, 2026
01a15bb
Adds two files that will be the start of adding the outp namelist fea…
EJRainville-NOAA Jun 24, 2026
bc21dcd
complete drafts of outp namelist and read and report module developed…
EJRainville-NOAA Jul 15, 2026
62c6ecf
Merge branch 'NOAA-EMC:develop' into outp_inp2nml
EJRainville-NOAA Jul 15, 2026
17fd98d
Merge branch 'outp_inp2nml' of github.com:EJRainville-NOAA/WW3 into o…
EJRainville-NOAA Jul 15, 2026
00707ea
fixes strange spacing in the outp nml file
EJRainville-NOAA Jul 15, 2026
ff19b42
removes unecessary spaces used to define variables
EJRainville-NOAA Jul 15, 2026
2cfa253
adds the outp namelist file to tp2.11 test directory and it is adjust…
EJRainville-NOAA Jul 16, 2026
d69102c
Removed all TEMP comments from w3nmloutpmd.F90
EJRainville-NOAA Jul 17, 2026
76315ee
started to add in reading the nml file for outp.
EJRainville-NOAA Jul 17, 2026
0ecd828
Adds variable type definitions for input to the W3NMLOUTP
EJRainville-NOAA Jul 20, 2026
93fb7bf
Adds test variables to make sure that the module file is read in corr…
EJRainville-NOAA Jul 20, 2026
2d987fb
adds the w3nmloutpmd to the compilation list - follows the boundary c…
EJRainville-NOAA Jul 21, 2026
191a470
added the outp nml moduel to the src_list for cmake
EJRainville-NOAA Jul 21, 2026
f53f24f
fixed missing variable ndsn which caused crash in w3nmloutpmd.F90 com…
EJRainville-NOAA Jul 23, 2026
be1dc46
Fixes compilation error for outp - starting to continue development
EJRainville-NOAA Jul 23, 2026
4fc8fa6
Split the out inp file section and the nml file section into two if s…
EJRainville-NOAA Jul 23, 2026
1467e28
Added missing variables in the read_spectra_nml subroutine
EJRainville-NOAA Jul 23, 2026
d73ca7c
Fixes issues with typing for varaibles in ww3_outp
EJRainville-NOAA Jul 24, 2026
da5eb1b
adjusts the name TYPE to ITYPE for the namelist so there aren't overl…
EJRainville-NOAA Jul 24, 2026
a91b1c0
Merge branch 'outp_inp2nml' of github.com:EJRainville-NOAA/WW3 into o…
EJRainville-NOAA Jul 24, 2026
f6ebcdf
Corrected use of T and F to .True. and .False. for logicals
EJRainville-NOAA Jul 24, 2026
3fff138
added remaining lines to read in from the namelist file - all variabl…
EJRainville-NOAA Jul 24, 2026
9ecd43e
fixed errors for missing variable definitions in ww3_outp.F90 causing…
EJRainville-NOAA Jul 24, 2026
a551245
added the subroutine STRSPLIT to the use call from W3SERVMD
EJRainville-NOAA Jul 24, 2026
6b12132
fixed allocation repeat for FLREQ variable
EJRainville-NOAA Jul 28, 2026
f28de7e
added print statements to track down malloc error in the outp file
EJRainville-NOAA Jul 28, 2026
77ff511
fixed merge conflict with adding print statements for allocation issue
EJRainville-NOAA Jul 28, 2026
f03e0f4
Fixes malloc error in reading in the points list - Namelist is read f…
EJRainville-NOAA Jul 28, 2026
3042a98
Moved all CALL NEXTLN and READ statements for the.inp file to be with…
EJRainville-NOAA Jul 28, 2026
dfe39a3
Removed temporary print statements
EJRainville-NOAA Jul 28, 2026
c4a2274
Added debug print statements to figure out what is happening with the…
EJRainville-NOAA Jul 28, 2026
3fff4c9
Added a print statement to continue debugging the STRSPLIT issue
EJRainville-NOAA Jul 29, 2026
6ce43a8
added a print statement for NOPTS
EJRainville-NOAA Jul 29, 2026
c7be01a
Used a Gemini refactoring to move the CALL W3IOPO subroutine to withi…
EJRainville-NOAA Jul 30, 2026
9ed796c
Removed debug print statements in w3nmloutpmd.F90
EJRainville-NOAA Jul 30, 2026
6b8d8ad
Added print statements to confirm that the input data is being read f…
EJRainville-NOAA Jul 30, 2026
69f2e8e
Added a print statement for ITYPE to test that it is correctly adjust…
EJRainville-NOAA Jul 30, 2026
2f8858d
Added ITYPE=4 for partition and bulletin support in the outp nml file
EJRainville-NOAA Jul 30, 2026
5ac38ee
Added ITYPE=4 read and report subroutines for w3nmloutpmd.F90
EJRainville-NOAA Jul 30, 2026
64cae4c
Added type declaration for NML_PART to address compilation error on m…
EJRainville-NOAA Jul 31, 2026
60c313f
Fixed ww3_outp.F90 to accept the ITYPE=4 Partitition variables.
EJRainville-NOAA Jul 31, 2026
9851bf9
Fixed read in of characters for ITYPE=4 for the variables TIMEV
EJRainville-NOAA Jul 31, 2026
49e041e
Fixed typo bug for switch NML_POINT to NML_PART
EJRainville-NOAA Jul 31, 2026
c5bf8e5
Modified and added new outp namelist files for the ww3_ufs1.1 test case
EJRainville-NOAA Aug 3, 2026
e9e6cdc
Added additional print statements to ww3_outp.F90 to see where the br…
EJRainville-NOAA Aug 5, 2026
95270ea
Converted the name ww3_outp_spec.nml to ww3_outp.nml so that the read…
EJRainville-NOAA Aug 5, 2026
5dfae32
Fixed issue with formatting for the variabel ref_date in the ITYPE=4 …
EJRainville-NOAA Aug 5, 2026
dede4eb
Fixed another formatting bug in the partition namelist section
EJRainville-NOAA Aug 5, 2026
75bbebe
changed the name of the outp nml file back to ww3_outp_spec.nml to fo…
EJRainville-NOAA Aug 5, 2026
d5a6008
Removed all debugging print statements.
EJRainville-NOAA Aug 5, 2026
87b4de4
Added a test statement to test ww3_ufs1.1 with the -N flag to test th…
EJRainville-NOAA Aug 5, 2026
4ccd8b3
changed the point list to be 'all' instead of the point numbers for t…
EJRainville-NOAA Aug 5, 2026
ccdd879
Merge branch 'outp_inp2nml' of github.com:EJRainville-NOAA/WW3 into o…
EJRainville-NOAA Aug 5, 2026
6c93e20
Removed ww3_ounf.nml from the unstructered input files since it is le…
EJRainville-NOAA Aug 6, 2026
6c39e09
Merge branch 'outp_inp2nml' of github.com:EJRainville-NOAA/WW3 into o…
EJRainville-NOAA Aug 6, 2026
f8d9d0c
Adds gemini generated code to help fix the error of needing the raw b…
EJRainville-NOAA Aug 6, 2026
0958c2c
Added debug statements to figure out the netcdf read issue!
EJRainville-NOAA Aug 7, 2026
2111c4b
Added edits to the netcdf read to fix the outp errors
EJRainville-NOAA Aug 7, 2026
ba06eb0
Removed the test write out statement to the outp log
EJRainville-NOAA Aug 7, 2026
dc85d63
Added a debug print statement o find the hand up error in the output.
EJRainville-NOAA Aug 10, 2026
a1a0d04
Added another debug statement to find the hang up
EJRainville-NOAA Aug 10, 2026
47502ea
Added a debug statement to the output to find if the output points lo…
EJRainville-NOAA Aug 10, 2026
229f267
Added batch test script
EJRainville-NOAA Aug 14, 2026
ea0dd6f
Changed input values for the ww3_shel.nml file to match the same outp…
EJRainville-NOAA Aug 18, 2026
d79503b
Merge branch 'NOAA-EMC:develop' into bugfix-1615
EJRainville-NOAA Aug 18, 2026
ddd7b36
Added a new ww3_ounf.nml file to make the grid output the same as the…
EJRainville-NOAA Aug 18, 2026
40f667b
Merge branch 'bugfix-1615' of github.com:EJRainville-NOAA/WW3 into bu…
EJRainville-NOAA Aug 18, 2026
93b59e3
Added the namelist test for ww3_ufs1.1 to the matrix.base file for th…
EJRainville-NOAA Aug 18, 2026
19eb1b6
Removes the testing slurm script - not needed in the ww3 repo
EJRainville-NOAA Aug 18, 2026
e48992a
Merge remote-tracking branch 'origin/bugfix-1615' into outp_inp2nml
EJRainville-NOAA Aug 21, 2026
2b8b2f7
Merge branch 'NOAA-EMC:develop' into outp_inp2nml
EJRainville-NOAA Aug 21, 2026
87ffe4d
Merge branch 'outp_inp2nml' of https://github.com/EJRainville-NOAA/WW…
EJRainville-NOAA Aug 21, 2026
f11630c
Merge branch 'NOAA-EMC:develop' into outp_inp2nml
EJRainville-NOAA Sep 2, 2026
254d7cc
Removes debug orint statements from the outp files to run the matrix …
EJRainville-NOAA Sep 2, 2026
d16bb3f
Merge branch 'NOAA-EMC:develop' into outp_inp2nml
EJRainville-NOAA Sep 8, 2026
6ca7c40
Fixed outp log comment order to make sure they match the original tes…
EJRainville-NOAA Sep 8, 2026
d45f857
Merge branch 'outp_inp2nml' of github.com:EJRainville-NOAA/WW3 into o…
EJRainville-NOAA Sep 8, 2026
b090f0f
Delete matrix.comp
EJRainville-NOAA Sep 8, 2026
9c608ed
Revert "Delete matrix.comp"
EJRainville-NOAA Sep 8, 2026
3f582cc
Delete matcmp
EJRainville-NOAA Sep 8, 2026
756835c
Removed additional unnecessary comments before opening PR.
EJRainville-NOAA Sep 9, 2026
6bca485
Removed unecessary comments before opening PR.
EJRainville-NOAA Sep 9, 2026
495ac7c
Merge branch 'NOAA-EMC:develop' into outp_inp2nml
EJRainville-NOAA Sep 10, 2026
63eb8cb
Fixed indent errors on #ifdef statements for the GNU compiler
EJRainville-NOAA Sep 11, 2026
7db6b81
Fixes write statement type issue - switch from integer to logical
EJRainville-NOAA Sep 14, 2026
2801d48
Merge branch 'NOAA-EMC:develop' into outp_inp2nml
EJRainville-NOAA Sep 14, 2026
ed32541
Reverted changes made in w3iopomd.F90 which were not necessary and le…
EJRainville-NOAA Sep 29, 2026
abf6eba
Removed the unused variable INDREQ that is not used
EJRainville-NOAA Sep 29, 2026
5f4000e
Remove unnecessary namelist test from matrix.base
EJRainville-NOAA Oct 1, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion model/bin/build_utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -925,7 +925,7 @@ create_file_list()
prop=
sourcet="$pdlibcode $pdlibyow $setupcode $flx $ln $st $nl $bt $ic $is $db $tr $bs $igcode $uostmd"
IO='w3bullmd w3iogrmd w3iopomd w3partmd'
aux="constants w3servmd w3timemd w3arrymd w3dispmd w3gsrumd" ;;
aux="constants w3servmd w3timemd w3arrymd w3dispmd w3gsrumd w3nmloutpmd" ;;
ww3_ounp)
core=
data="wmmdatmd w3parall w3triamd $memcode w3gdatmd w3wdatmd w3adatmd w3idatmd w3odatmd"
Expand Down
1 change: 1 addition & 0 deletions model/bin/make_makefile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -414,6 +414,7 @@
'W3NMLPRNCMD' ) modtest=w3nmlprncmd.o ;;
'W3NMLOUNFMD' ) modtest=w3nmlounfmd.o ;;
'W3NMLOUNPMD' ) modtest=w3nmlounpmd.o ;;
'W3NMLOUTPMD' ) modtest=w3nmloutpmd.o ;;
'W3NMLTRNCMD' ) modtest=w3nmltrncmd.o ;;
'W3NMLBOUNCMD' ) modtest=w3nmlbouncmd.o ;;
'W3NMLBOUNDMD' ) modtest=w3nmlboundmd.o ;;
Expand Down
220 changes: 220 additions & 0 deletions model/nml/ww3_outp.nml
Original file line number Diff line number Diff line change
@@ -0,0 +1,220 @@
! -------------------------------------------------------------------- !
! WAVEWATCH III - ww3_outp.nml - Point output post -processor !
! -------------------------------------------------------------------- !

!----------------------------------------------------------------------!
! Define the output to post process from via OUTP_NML namelist
!
! POINT
! * namelist must be terminated with /
! * definitions & defaults:
! POINT%TIMESTART = '19000101 000000' ! Start time for the output(yyyymmdd hhmmss)
! POINT%TIMESTRIDE = '0' ! Time stride, increment of output (s)
! POINT%TIMECOUNT = '1000000' ! Number of output times
! POINT%TIMESPLIT = 0 ! Split output into multiple files for each time
! step or one file (0=one file, 1=separate files)
! POINT%PREFIX = 'wave' ! Prefix for output files
! POINT%LIST = 'all' ! List of points index ['all'|'1 2 3']
! POINT%ITYPE = 0 ! [0=inventory | 1=spectra | 2=mean param | 3=source terms]

&POINT_NML
POINT%TIMESTART = '19000101 000000'
POINT%TIMESTRIDE = '0'
POINT%TIMECOUNT = '1000000'
POINT%TIMESPLIT = 0
POINT%PREFIX = 'wave'
POINT%LIST = 'all'
POINT%ITYPE = 0 ! No additional inputs for type 0, inventory output. For other types, see below.
/

! Additional Variables Depending on ITYPE

! ITYPE=1: Spectra Output
! -------------------------------------------------------------------- !
! * definitions & defaults:
! SPECTRA%OUTPUT = 3 ! 1: Print plots
! ! 2: Table of 1-D spectra
! ! 3: Transfer file
! SPECTRA%SCALE_FAC = 1 ! Scale factor (-1=disabled)
! SPECTRA%OUTPUT_FAC = 0 ! Output factor (0=normalized)
! SPECTRA%ITYPE = 0
! SPECTRA%UNIT_NUM_TRANS = 33 ! Unit number for transfer file, also used in table file name
! SPECTRA%FLAG_UNFORMAT_TRANS = .FALSE. ! Flag for unformatted transfer file (.TRUE. or .FALSE.).

! The transfer file contains records with the following contents.
! - File ID in quotes, number of frequencies, directions and points.
! grid name in quotes (for unformatted file C*21,3I,C*30).
! - Bin frequencies in Hz for all bins.
! - Bin directions in radians for all bins (Oceanographic conv.).
! -+
! - Time in yyyymmdd hhmmss format | loop
! -+ |
! - Point name (C*40), lat, lon, d, U10 and | loop | over
! direction, current speed and direction | over |
! - E(f,theta) | points | times
! -+ -+
!
! The formatted file is readable using free format throughout.
! This data set can be used as input for the bulletin generator
! w3split.
&SPECTRA_NML
SPECTRA%OUTPUT = 3
SPECTRA%SCALE_FAC = 1 ! Scale factor (-1=disabled)
SPECTRA%OUTPUT_FAC = 0 ! Output factor (0=normalized)
SPECTRA%UNIT_NUM_TRANS = 33
SPECTRA%FLAG_UNFORMAT_TRANS = .FALSE.
/

! ITYPE=2: Mean Parameters Output
! -------------------------------------------------------------------- !
! PARAM%OUTPUT = 4 ! 1: Forcing parameters
! ! 2: Mean wave parameters
! ! 3: Nondimensional pars. (U*)
! ! 4: Nondimensional pars. (U10)
! ! 5: Validation table
! ! 6: WMO standard output
!
! PARAM%UNIT_NUM_TABLE = 66 ! Unit number for table file

! Forcing parameters content :
! - dpt, wnd, wnddir, cur, curdir
!
! Mean wave parameters content :
! - hs, lm, tr, th1p, sth1p, fp, th1m, sth1m
!
! Nondimensional parameters (U*) content :
! - ust, efst, fpst, cd, alpha
!
! Nondimensional parameters (U10) content :
! - wnd, efst, fpst, cd, alpha
!
! Validation table content :
! - wnd, wnddir, hs, hsst, cpu, cmu, ast
!
! WMO stantdard output content :
! - wnd, wnddir, hs, tp
!
! If output for one point is requested, a time series table is made,
! otherwise the file contains a separate tables for each output time.
&PARAM_NML
PARAM%OUTPUT = 4
PARAM%UNIT_NUM_TABLE = 66
/

! ITYPE=3: Source Terms Output
! -------------------------------------------------------------------- !
! * definitions & defaults:
! SOURCE%OUTPUT = 4 ! 1: Print plots
! ! 2: Table of 1-D S(f)
! ! 3: Table of 1-D inverse time scales (1/T = S/F)
! ! 4: Transfer file
! SOURCE%SCALE_FAC = 0 ! Scale factor (-1=disabled)
! SOURCE%OUTPUT_FAC = 0 ! Output factor (0=normalized)
! SOURCE%TABLE_FAC = 0 ! Table factor
! 0 : Dimensional.
! 1 : Nondimensional in terms of U10
! 2 : Nondimensional in terms of U*
! 3-5: like 0-2 with f normalized with fp.
! SOURCE%SPECTRUM = T ! [T|F]
! SOURCE%INPUT = T ! [T|F]
! SOURCE%INTERACTIONS = T ! [T|F]
! SOURCE%DISSIPATION = T ! [T|F]
! SOURCE%BOTTOM = T ! [T|F]
! SOURCE%ICE = T ! [T|F]
! SOURCE%TOTAL = T ! [T|F]
!
! Table of 1-D S(f) content :
! - time, station id, station name, longitude, latitude
! - frequency : unit Hz, center band frequency
! - ef(frequency) : 1D spectral density
! - Sin(frequency) : input source term
! - Snl(frequency) : non linear interactions source term
! - Sds(frequency) : dissipation source term
! - Sbt(frequency) : bottom source term
! - Sice(frequency) : ice source term
! - Stot(frequency) : total source term
! - dpt, ust, wnd : mean parameters
!
! Table of 1-D inverse time scales (1/T = S/F) content :
! - time, station id, station name, longitude, latitude
! - frequency : unit Hz, center band frequency
! - ef(frequency) : 1D spectral density
! - tini(frequency) : input inverse time scales source term
! - tnli(frequency) : non linear interactions inverse time scales source term
! - tdsi(frequency) : dissipation inverse time scales source term
! - tbti(frequency) : bottom inverse time scales source term
! - ticei(frequency) : ice inverse time scales source term
! - ttoti(frequency) : total inverse time scales source term
! - dpt, ust, wnd : mean parameters
!
! Transfer file content :
! - time, station id, station name, longitude, latitude
! - frequency : unit Hz, center band frequency - linear log scale (XFR factor)
! - frequency1 : unit Hz, lower band frequency
! - frequency2 : unit Hz, upper band frequency
! - direction : unit degree, convention to, origin East, trigonometric order
! - efth(frequency,direction) : 2D spectral density
! - Sin(frequency,direction) : input source term
! - Snl(frequency,direction) : non linear interactions source term
! - Sds(frequency,direction) : dissipation source term
! - Sbt(frequency,direction) : bottom source term
! - Sice(frequency,direction) : ice source term
! - Stot(frequency,direction) : total source term
! - dpt, wnd, wnddir, cur, curdir, ust : mean parameters
! -------------------------------------------------------------------- !
&SOURCE_NML
SOURCE%OUTPUT = 4 ! 1: Print plots
! 2: Table of 1-D S(f)
! 3: Table of 1-D inverse time scales (1/T = S/F)
! 4: Transfer file
SOURCE%SCALE_FAC = 0 ! Scale factor (-1=disabled)
SOURCE%OUTPUT_FAC = 0 ! Output factor (0=normalized)
SOURCE%TABLE_FAC = 0 ! Table factor
!0 : Dimensional.
!1 : Nondimensional in terms of U10
!2 : Nondimensional in terms of U*
!3-5: like 0-2 with f normalized with fp.
SOURCE%SPECTRUM = T ! [T|F]
SOURCE%INPUT = T ! [T|F]
SOURCE%INTERACTIONS = T ! [T|F]
SOURCE%DISSIPATION = T ! [T|F]
SOURCE%BOTTOM = T ! [T|F]
SOURCE%ICE = T ! [T|F]
SOURCE%TOTAL = T ! [T|F]
/

! ITYPE=4: Spectral partitions and bulletins
! -------------------------------------------------------------------- !
! * definitions & defaults:
! - Sub-type OTYPE : 1 : Spectral partitions
! 2 : Bulletins ASCII format
! 3 : Bulletins CSV format
! 4 : Bulletins ASCII and CSV formats
! - Unit number for transfer file, also used in table file name.
! - Reference date/time in YYYYMMDD HHMMSS format, used for
! including in bulletin legend, and computing forecast time
! in CSV type output (if the first field is negative, the
! reference time becomes the first simulation time slice)
! - Three-character code indicating time zone (UTC, EST etc)
! The transfer file contains records with the following contents.
!
! - File ID in quotes, number of frequencies, directions and points.
! grid name in quotes (for unformatted file C*21,3I,C*30).
! - Bin frequencies in Hz for all bins.
! - Bin directions in radians for all bins (Oceanographic conv.).
! -+
! - Time in yyyymmdd hhmmss format | loop
! -+ |
! - Point name (C*40), lat, lon, d, U10 and | loop | over
! direction, current speed and direction | over |
! - E(f,theta) | points | times
! -+ -+
&PART_NML
PART%OTYPE = 1
PART%UNIT_NUM_TRANS = 2
PART%REF_DATE = '19680606 060000'
PART%TIME_ZONE = 'UTC'
/
! -------------------------------------------------------------------- !
! WAVEWATCH III - end of namelist !
! -------------------------------------------------------------------- !
1 change: 1 addition & 0 deletions model/src/cmake/src_list.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ set(ftn_src
w3nmlmultimd.F90
w3nmlounfmd.F90
w3nmlounpmd.F90
w3nmloutpmd.F90
w3nmlprncmd.F90
w3nmlshelmd.F90
w3nmltrncmd.F90
Expand Down
Loading
Loading