Skip to content

Bugfix th2m #1517

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

Merged
mingchen-NOAA merged 4 commits into from
Oct 28, 2025
Merged

Bugfix th2m #1517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
27a82cc
correct TH2M computation and test in ww3_tp2.3
mickaelaccensi Oct 21, 2025
65e5c44
correct formula in manual
mickaelaccensi Oct 23, 2025
fb1b307
activate th2m and sth2m
mickaelaccensi Oct 27, 2025
180e048
Merge branch 'develop' into bugfix_th2m
mickaelaccensi Oct 28, 2025
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 manual/eqs/output.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ \subsection{~Output parameters} \label{sub:outpars}
\frac{a_1(f)^2+b_1(f)^2}{E(f)^2} \right )^{1/2} \right \} \right ]^{1/2}
\: , \label{eq:sig_th1} \end{equation}
\item \textbf{TH2M} Mean direction from $a_2$ and $b_2$ (degr.)
\begin{equation} \theta_2 (f)= \mbox{atan} \left ( \frac{b_2(f)}{a_2(f)} \right )
\begin{equation} \theta_2 (f)= 0.5 \mbox{atan} \left ( \frac{b_2(f)}{a_2(f)} \right )
\: , \label{eq:theta_2} \end{equation} \begin{equation}
a_2(f) = 2 \pi \int_0^{2\pi} \int_0^\infty \cos(2 \theta) F(\sigma,\theta) \:
\mathrm{d}\theta \: , \end{equation} \begin{equation}
Expand Down
2 changes: 1 addition & 1 deletion model/src/w3iogomd.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1684,7 +1684,7 @@ SUBROUTINE W3OUTG ( A, FLPART, FLOUTG, FLOUTG2 )
IF ( FLOLOC( 3, 3).AND.(IK.GE.E3DF(2,3).AND.IK.LE.E3DF(3,3))) &
STH1M(JSEA,IK)= SQRT(ABS(2.*(1-M1)))*RADE
IF ( FLOLOC( 3, 4).AND.(IK.GE.E3DF(2,4).AND.IK.LE.E3DF(3,4))) &
TH2M(JSEA,IK)= MOD ( 270. - RADE*0.5*ATAN2(ABY2(JSEA),AB2X(JSEA)) , 180. )
TH2M(JSEA,IK)= MOD ( 270. - RADE*0.5*ATAN2(AB2Y(JSEA),AB2X(JSEA)) , 180. )
M2 = SQRT(AB2X(JSEA)**2+AB2Y(JSEA)**2)/MAX(1E-20,AB(JSEA))
IF ( FLOLOC( 3, 5).AND.(IK.GE.E3DF(2,5).AND.IK.LE.E3DF(3,5))) &
STH2M(JSEA,IK)= SQRT(ABS(0.5*(1-M2)))*RADE
Expand Down
2 changes: 1 addition & 1 deletion regtests/ww3_tp2.3/input/namelists_GARDEN.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
&OUTS E3D=1, TH1MF=1, STH1MF=1 /
&OUTS E3D=1, TH1MF=1, STH1MF=1,TH2MF=1, STH2MF=1 /
&PRO2 DTIME=345600. /
&PRO3 WDTHTH=1.50, WDTHCG=1.50 /
END OF NAMELISTS
2 changes: 1 addition & 1 deletion regtests/ww3_tp2.3/input/ww3_grid.inp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ $
$
$ Activated up to one line per namelist !!
$
&OUTS E3D=1, TH1MF=1, STH1MF=1 /
&OUTS E3D=1, TH1MF=1, STH1MF=1, TH2MF=1, STH2MF=1 /
$ &PRO2 DTIME= 0. /
$ &PRO2 DTIME=172800. /
&PRO2 DTIME=345600. /
Expand Down
2 changes: 1 addition & 1 deletion regtests/ww3_tp2.3/input/ww3_ounf.inp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ $ file for a full documentation of field output options. Namelist type
$ selection is used here (for alternative F/T flags, see ww3_shel.inp).
$
N
HS DIR SPR DP EF TH1M STH1M
HS DIR SPR DP EF TH1M STH1M TH2M STH2M
$
$--------------------------------------------------------------------- $
$ netCDF version [3,4]
Expand Down
2 changes: 1 addition & 1 deletion regtests/ww3_tp2.3/input/ww3_ounf.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
FIELD%TIMESTART = '19680606 000000'
FIELD%TIMESTRIDE = '86400.'
FIELD%TIMECOUNT = '999'
FIELD%LIST = 'HS DIR SPR DP EF TH1M STH1M'
FIELD%LIST = 'HS DIR SPR DP EF TH1M STH1M TH2M STH2M'
FIELD%PARTITION = '0 1 2'
FIELD%TYPE = 4
/
Expand Down
2 changes: 1 addition & 1 deletion regtests/ww3_tp2.3/input/ww3_shel.inp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $
19680606 000000 86400 19680611 000000
$ (1) Forcing Fields
N
HS DIR SPR DP EF TH1M STH1M
HS DIR SPR DP EF TH1M STH1M TH2M STH2M
$
19680606 000000 0 19680608 000000
19680606 000000 0 19680608 000000
Expand Down
2 changes: 1 addition & 1 deletion regtests/ww3_tp2.3/input/ww3_shel.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
! Define the output types point parameters via OUTPUT_TYPE_NML namelist
! -------------------------------------------------------------------- !
&OUTPUT_TYPE_NML
TYPE%FIELD%LIST = 'HS DIR SPR DP EF TH1M STH1M'
TYPE%FIELD%LIST = 'HS DIR SPR DP EF TH1M STH1M TH2M STH2M'
/

! -------------------------------------------------------------------- !
Expand Down