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

Fb coupling fields #285

Merged
merged 45 commits into from
May 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
f103922
Fb oasis t+0 (#13)
ukmo-juan-castillo Oct 5, 2020
35e6831
Fb uprstr inp (#15)
ukmo-ansaulter Oct 7, 2020
c35acf6
First set of changes, still testing
ukmo-juan-castillo Oct 16, 2020
69259ef
Some fixes
ukmo-juan-castillo Oct 26, 2020
4c272cc
Further changes mainly fixing vector boundaries
ukmo-juan-castillo Oct 28, 2020
01177e4
Main changes
ukmo-juan-castillo Oct 28, 2020
0166c0d
Most changes already present, only need to write in output and restart
ukmo-juan-castillo Oct 29, 2020
f5be40a
Further changes - activate coupling
ukmo-juan-castillo Nov 2, 2020
dd1913f
Bug fixes to make the code compile
ukmo-juan-castillo Nov 3, 2020
3677987
Further changes to run regtests
ukmo-juan-castillo Nov 6, 2020
5c9974d
Minor fixes for output, manual, and switches
ukmo-juan-castillo Nov 23, 2020
f9cfcbb
Merge branch 'develop' into fb_coupling_fields
ukmo-juan-castillo Nov 23, 2020
b72a330
Small fix to comments in model input
ukmo-juan-castillo Dec 7, 2020
00d9fbf
Merge branch 'develop' into fb_coupling_fields
ukmo-juan-castillo Dec 7, 2020
1358ea3
Remove some lines that had to be removed but were overlooked
ukmo-juan-castillo Jan 6, 2021
656eb5e
Substitute ATTX and ATXX switches by WNTX and WNXX; add comments
ukmo-juan-castillo Jan 6, 2021
4a21c10
Change in file missed in latest commit
ukmo-juan-castillo Jan 6, 2021
a157dc9
Merge branch 'develop' into fb_coupling_fields
ukmo-juan-castillo Jan 7, 2021
73ea7e1
Minor changes fixing version change
ukmo-juan-castillo Jan 7, 2021
3dad097
Small fixes after reviewer's comments and to fix regtest
ukmo-juan-castillo Jan 12, 2021
6203ac8
Changes to pass regtests
ukmo-juan-castillo Jan 14, 2021
ad9dd8e
Addition of a new regtest and small fixes to ww3_prnc
ukmo-juan-castillo Jan 15, 2021
11de1d8
Time-interpolate air density when read from file
ukmo-juan-castillo Jan 15, 2021
6a491a7
Ensure that units are consistent
ukmo-juan-castillo Jan 15, 2021
0535ec6
Restore long name in metadata for new fieds, and update code version for
ukmo-juan-castillo Jan 29, 2021
38424b3
Merge branch 'develop' into fb_coupling_fields
ukmo-juan-castillo Feb 8, 2021
895bdf3
Merge branch 'develop' into fb_coupling_fields
ukmo-juan-castillo Feb 8, 2021
95747d3
Merge branch 'fb_coupling_fields' of https://github.com/ukmo-waves/WW…
ukmo-juan-castillo Feb 9, 2021
c39abc1
Update last modification date; corrections for new output field: WNMEAN
ukmo-juan-castillo Feb 9, 2021
b4b7ba4
Fixes from Jessica Meixner; update date of last change in restart file
ukmo-juan-castillo Feb 17, 2021
9193a0e
Small fix to the format of the example input file ww3_multi.inp
ukmo-juan-castillo Feb 18, 2021
81fd832
Merge branch 'develop' into fb_coupling_fields
ukmo-juan-castillo Mar 22, 2021
4c28b60
Some fixes after merging with latest version of develop
ukmo-juan-castillo Mar 22, 2021
ee6599b
Merge branch 'fb_coupling_fields' of https://github.com/ukmo-waves/WW…
ukmo-juan-castillo Mar 22, 2021
23f2ec6
Correct one version number
ukmo-juan-castillo Mar 22, 2021
a2a33f0
Fix the header of the table printed in log.ww3, should not cause changes
ukmo-juan-castillo Mar 25, 2021
9a32f12
Minor fix in the ww3_shel.inp file of one of the regtests
ukmo-juan-castillo Mar 25, 2021
64cc046
Merge remote-tracking branch 'origin/develop' into fb_coupling_fields
ukmo-ccbunney Apr 8, 2021
207fe11
Update ww3_shel.inp
aliabdolali Apr 22, 2021
4b31b7c
Merge remote-tracking branch 'upstream/develop' into fb_coupling_fields
Apr 23, 2021
dd29dd8
Merge branch 'develop' into fb_coupling_fields
ukmo-ccbunney Apr 27, 2021
a6e5cd0
Some fixes and improvements that were proposed during the review process
ukmo-juan-castillo May 12, 2021
6b53f1a
Merge branch 'NOAA-EMC:develop' into fb_coupling_fields
ukmo-ccbunney May 14, 2021
1e28c49
Added comment to the new regtests implemented in ww3_tp2.15
ukmo-juan-castillo May 17, 2021
0af9e03
Merge branch 'fb_coupling_fields' of https://github.com/ukmo-waves/WW…
ukmo-juan-castillo May 17, 2021
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
4 changes: 2 additions & 2 deletions manual/impl/switch.tex
Original file line number Diff line number Diff line change
Expand Up @@ -186,15 +186,15 @@ \subsubsection{~Mandatory switches} \label{sub:man_switch}
\end{slist}

\noindent
Selection of method of wind interpolation (time):
Selection of method of wind/momentum interpolation (time):
\begin{slist}
\sit{wnt0}{No interpolation.}
\sit{wnt1}{Linear interpolation.}
\sit{wnt2}{Approximately quadratic interpolation.}
\end{slist}

\noindent
Selection of method of wind interpolation (space):
Selection of method of wind/momentum interpolation (space):
\begin{slist}
\sit{wnx0}{Vector interpolation.}
\sit{wnx1}{Approximately linear speed interpolation.}
Expand Down
3 changes: 2 additions & 1 deletion model/bin/ww3_from_ftp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ tar -xvzf ww3_from_ftp.${ww3ver}.tar.gz
#Move regtest info from data_regtests to regtests:
echo -e "Moving data from data_regtests to regtests"
cp -r data_regtests/ww3_tp2.18/input/*.nc regtests/ww3_tp2.18/input/
cp -r data_regtests/ww3_tp2.15/input/*.nc regtests/ww3_tp2.15/input/
cp -r data_regtests/ww3_tp2.15/input/wind.nc regtests/ww3_tp2.15/input/
cp -r data_regtests/ww3_tp2.15/input/*.nc regtests/ww3_tp2.15/input_rho/
cp -r data_regtests/ww3_tp2.13/*.png regtests/ww3_tp2.13/
cp -r data_regtests/ww3_tic1.4/input/*.nc regtests/ww3_tic1.4/input/
cp -r data_regtests/ww3_tp2.8/input/*.nc regtests/ww3_tp2.8/input/
Expand Down
30 changes: 24 additions & 6 deletions model/ftn/gx_outf.ftn
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
!/ | A. Chawla |
!/ | J.H.G.M. Alves |
!/ | FORTRAN 90 |
!/ | Last update : 27-Aug-2015 |
!/ | Last update : 22-Mar-2021 |
!/ +-----------------------------------+
!/
!/ 30-Jun-1999 : Final FORTRAN 77 ( version 1.18 )
Expand Down Expand Up @@ -37,6 +37,7 @@
!/ 25-Feb-2013 : Adding double-index output fields ( version 4.11 )
!/ 27-Aug-2015 : ICEH and ICEF added as output ( version 5.10 )
!/ 25-Aug-2018 : Add WBT parameter ( version 6.06 )
!/ 22-Mar-2021 : RHOA and TAUA added as output ( version 7.xx )
!/
!/
!/ Copyright 2009 National Weather Service (NWS),
Expand Down Expand Up @@ -124,12 +125,13 @@
USE W3TIMEMD, ONLY: STME21, TICK21, DSEC21
!/
USE W3GDATMD
USE W3WDATMD, ONLY: TIME, WLV, ICE, ICEH, ICEF, BERG, UST, USTDIR
USE W3WDATMD, ONLY: TIME, WLV, ICE, ICEH, ICEF, BERG, &
UST, USTDIR, RHOAIR
USE W3ADATMD, ONLY: CFLXYMAX, CFLTHMAX, AS, CX, CY, UA, UD, WN, &
DW, HS, WLM, T01, T0M1, T02, THM, THS, FP0, &
THP0, FP1, THP1, ABA, ABD, UBA, UBD, FCUT, &
SXX, SYY, SXY, PHS, PTP, PLP, PDIR, PSI, PWS,&
PTM1, PT1, PT2, PEP, &
PTM1, PT1, PT2, PEP, TAUA, TAUADIR, &
PTHP0, PQP, PSW, PPE, PGW, QP, &
PWST, PNR, USERO, TAUOX, TAUOY, TAUWIX, &
TAUWIY, PHIAW, PHIOC, TUSX, TUSY, PRMS, TPMS,&
Expand Down Expand Up @@ -734,7 +736,7 @@
!/ | WAVEWATCH III NOAA/NCEP |
!/ | H. L. Tolman |
!/ | FORTRAN 90 |
!/ | Last update : 28-Mar-2007 |
!/ | Last update : 22-Mar-2021 |
!/ +-----------------------------------+
!/
!/ 30-Jun-1999 : Final FORTRAN 77 ( version 1.18 )
Expand All @@ -748,6 +750,7 @@
!/ 18-Jan-2007 : Update MSOUT/MBOUT treatment. ( version 3.10 )
!/ 28-Mar-2007 : Adding partitioned output. ( version 3.11 )
!/ Adding user slots for outputs.
!/ 22-Mar-2021 : Add output fields RHOA and TAUA ( version 7.xx )
!/
! 1. Purpose :
!
Expand Down Expand Up @@ -971,15 +974,30 @@
FLONE = .TRUE.
CALL W3S2XY ( NSEA, NSEA, NX, NY, ICE , MAPSF, X1 )
!
! Atmospheric momentum
!
ELSE IF ( J.EQ.1 .AND. K.EQ.8 ) THEN
FLTWO = .TRUE.
CALL W3S2XY ( NSEA, NSEA, NX, NY, TAUA(1:NSEA) &
, MAPSF, XX )
CALL W3S2XY ( NSEA, NSEA, NX, NY, TAUADIR(1:NSEA) &
, MAPSF, XY )
!
! Air density
!
ELSE IF ( J.EQ.1 .AND. K.EQ.9 ) THEN
FLONE = .TRUE.
CALL W3S2XY ( NSEA, NSEA, NX, NY, RHOAIR, MAPSF, X1 )
!
! Ice thickness
!
!/IS2 ELSE IF ( J.EQ.1 .AND. K.EQ.9 ) THEN
!/IS2 ELSE IF ( J.EQ.1 .AND. K.EQ.11 ) THEN
!/IS2 FLONE = .TRUE.
!/IS2 CALL W3S2XY (NSEA, NSEA, NX, NY, ICEH , MAPSF, X1 )
!
! Average sea ice floe diameter
!
!/IS2 ELSE IF ( J.EQ.1 .AND. K.EQ.10) THEN
!/IS2 ELSE IF ( J.EQ.1 .AND. K.EQ.12) THEN
!/IS2 FLONE = .TRUE.
!/IS2 CALL W3S2XY (NSEA, NSEA, NX, NY, ICEF , MAPSF, X1 )
!
Expand Down
35 changes: 32 additions & 3 deletions model/ftn/pdlib_field_vec.ftn
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ MODULE PDLIB_FIELD_VEC
!/ | Mathieu Dutour-Sikiric (IRB) |
!/ | |
!/ | FORTRAN 90 |
!/ | Last update : 01-Jan-2010 |
!/ | Last update : 22-Mar-2021 |
!/ +-----------------------------------+
!/
!/ 01-Jan-2010 : Origination. ( version 6.04 )
!/ 22-Mar-2021 : Add WNMEAN, TAUOC output ( version 7.xx )
!/
!/ Copyright 2010 National Weather Service (NWS),
!/ National Oceanic and Atmospheric Administration. All rights
Expand Down Expand Up @@ -163,6 +164,9 @@ MODULE PDLIB_FIELD_VEC
IF ( FLGRDALL( 2, 17) ) THEN
IH = IH + 1
END IF
IF ( FLGRDALL( 2, 19) ) THEN
IH = IH + 1
END IF
IF ( FLGRDALL( 3, 1) ) THEN
DO IK=E3DF(2,1),E3DF(3,1)
IH = IH + 1
Expand Down Expand Up @@ -317,6 +321,10 @@ MODULE PDLIB_FIELD_VEC
IF ( FLGRDALL( 6, 11) ) THEN
IH = IH + 1
END IF
IF ( FLGRDALL( 6, 13) ) THEN
IH = IH + 1
IH = IH + 1
END IF
IF ( FLGRDALL( 7, 1) ) THEN
IH = IH + 1
IH = IH + 1
Expand Down Expand Up @@ -837,10 +845,11 @@ MODULE PDLIB_FIELD_VEC
!/ | Mathieu Dutour-Sikiric (IRB) |
!/ | |
!/ | FORTRAN 90 |
!/ | Last update : 01-Mai-2018 |
!/ | Last update : 22-Mar-2021 |
!/ +-----------------------------------+
!/
!/ 01-Mai-2018 : Origination. ( version 6.04 )
!/ 22-Mar-2021 : Add WNMEAN, TAUOC output ( version 7.xx )
!/
! 1. Purpose : Do communication for PDLIB output
! 2. Method :
Expand All @@ -863,7 +872,7 @@ MODULE PDLIB_FIELD_VEC
DTDYN, FCUT, SPPNT, ABA, ABD, UBA, UBD,&
SXX, SYY, SXY, USERO, PHS, PTP, PLP, &
PDIR, PSI, PWS, PWST, PNR, PHIAW, &
PHIOC, &
PHIOC, TAUOCX, TAUOCY, WNMEAN, &
TUSX, TUSY, TAUWIX, TAUWIY, TAUOX, &
TAUOY, USSX, USSY, MSSX, MSSY, &
MSCX, MSCY, PRMS, TPMS, CHARN, &
Expand Down Expand Up @@ -1013,6 +1022,10 @@ MODULE PDLIB_FIELD_VEC
IH = IH + 1
Arrexch(IH,JSEA)=WBT(JSEA)
END IF
IF ( FLGRDALL( 2, 19) ) THEN
IH = IH + 1
Arrexch(IH,JSEA)=WNMEAN(JSEA)
END IF
IF ( FLGRDALL( 3, 1) ) THEN
DO IK=E3DF(2,1),E3DF(3,1)
IH = IH + 1
Expand Down Expand Up @@ -1251,6 +1264,12 @@ MODULE PDLIB_FIELD_VEC
IH = IH + 1
Arrexch(IH,JSEA)=PHICE(JSEA)
END IF
IF ( FLGRDALL( 6, 13) ) THEN
IH = IH + 1
Arrexch(IH,JSEA)=TAUOCX(JSEA)
IH = IH + 1
Arrexch(IH,JSEA)=TAUOCY(JSEA)
END IF
IF ( FLGRDALL( 7, 1) ) THEN
IH = IH + 1
Arrexch(IH,JSEA)=ABA(JSEA)
Expand Down Expand Up @@ -1474,6 +1493,10 @@ MODULE PDLIB_FIELD_VEC
IH = IH + 1
WBT(1:NSEA) = ARRtotal(IH,:)
END IF
IF ( FLGRDALL( 2, 19) ) THEN
IH = IH + 1
WNMEAN(1:NSEA) = ARRtotal(IH,:)
END IF
IF ( FLGRDALL( 3, 1) ) THEN
DO IK=E3DF(2,1),E3DF(3,1)
IH = IH + 1
Expand Down Expand Up @@ -1712,6 +1735,12 @@ MODULE PDLIB_FIELD_VEC
IH = IH + 1
PHICE(1:NSEA) = ARRtotal(IH,:)
END IF
IF ( FLGRDALL( 6, 13) ) THEN
IH = IH + 1
TAUOCX(1:NSEA) = ARRtotal(IH,:)
IH = IH + 1
TAUOCY(1:NSEA) = ARRtotal(IH,:)
END IF
IF ( FLGRDALL( 7, 1) ) THEN
IH = IH + 1
ABA(1:NSEA) = ARRtotal(IH,:)
Expand Down
Loading