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.

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

Jump to bottom

W3SRCE refactor [draft] #1123

Draft
wants to merge 108 commits into
base: develop
Choose a base branch
from
Draft

W3SRCE refactor [draft] #1123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
416f3ce
Added chunk loop and start of full array variable processing
ukmo-ccbunney May 16, 2023
124d93a
Cleaned up pre-processor directives in w3srcemd.
ukmo-ccbunney May 16, 2023
cc7e3e2
Small update
ukmo-ccbunney May 17, 2023
b597ca7
Removed a lot of unused variables.
ukmo-ccbunney May 17, 2023
4fbec92
Reinstated accidentally deleted line.
ukmo-ccbunney May 17, 2023
137e461
Merge branch 'develop' into feature/w3srce_tidy
ukmo-ccbunney May 23, 2023
182a943
Merge branch 'develop' into feature/gpu/w3srce_refactor
ukmo-ccbunney Jun 13, 2023
8c8c647
Merge branch 'feature/w3srce_tidy' into feature/gpu/w3srce_refactor
ukmo-ccbunney Jun 13, 2023
43249d2
A few manual changes to get all merges from featuree/w3srce_tidy
ukmo-ccbunney Jun 13, 2023
2a57e68
Removed diff output accidentally left in code
ukmo-ccbunney Jun 13, 2023
21526c1
Remove some rogue CPP directives that were causing havok.
ukmo-ccbunney Jun 14, 2023
120703b
First set of refactors.
ukmo-ccbunney Jun 16, 2023
60539c3
Refactored variables related to W3SINx routines (NOT YET COMPLETE)
ukmo-ccbunney Jun 20, 2023
a823b0f
Added loops to W3SLNx, W3SPRx and W3SDSx calls
ukmo-ccbunney Jun 22, 2023
640af4d
More variables ported. Not yet complete
ukmo-ccbunney Jul 7, 2023
3f64246
Removed unused variables DELX, DELY and DELA from w3srce call
ukmo-ccbunney Jul 7, 2023
90c3bf3
Initialised VS/VD correctly, removed some debug.
ukmo-ccbunney Jul 11, 2023
c65c996
Updated ICE and RHOA/RHOAIR parameters in w3srce call
ukmo-ccbunney Jul 11, 2023
26b0db1
Fixed stress outputs:
ukmo-ccbunney Jul 12, 2023
2957922
Correct zeroing of some variables.
ukmo-ccbunney Jul 13, 2023
a2e4980
Merge remote-tracking branch 'origin/develop' into feature/gpu/w3srce…
ukmo-ccbunney Jul 13, 2023
846ac5a
Removed OMP directives (not relevant for refactored code)
ukmo-ccbunney Jul 13, 2023
4704338
Update V[SD]IO, TAUICE and BEDFORM variables
ukmo-ccbunney Jul 13, 2023
d743e15
Fixed LOADS of incorrectly index `*_CHUNK` variables (became evident …
ukmo-ccbunney Jul 13, 2023
4016ce1
COEF variable updated
ukmo-ccbunney Jul 13, 2023
183ce57
Updated ICEH, ICEF and ICEDMAX
ukmo-ccbunney Jul 13, 2023
259d4c3
Fixed some typos
ukmo-ccbunney Jul 14, 2023
909627c
Removed TODO comment for DTDYN calclation; is actually working ok.
ukmo-ccbunney Jul 14, 2023
b9ea92b
Fixed a typo and aggregated some ifdefs for W3_ICx
ukmo-ccbunney Jul 14, 2023
66189b7
Updated relection (W3_REF1) code:
ukmo-ccbunney Jul 14, 2023
92fec6f
Updated D50 and PSIC variables:
ukmo-ccbunney Jul 14, 2023
cb48fb9
Made VSIO, VDIO and SHAVEIO optional in w3srce subroutine call.
ukmo-ccbunney Jul 14, 2023
b4028d7
Removed unused arguments in w3str1 call. Also added check for zero
ukmo-ccbunney Jul 18, 2023
a8110f3
Fixed bug in DTDYN calculation (was using NSTEPS outside integration …
ukmo-ccbunney Jul 18, 2023
6adadff
SHAVEIO now array
ukmo-ccbunney Jul 18, 2023
569409b
Fixed some indices on VS/VD arrays
ukmo-ccbunney Jul 18, 2023
e43c8cf
Updated the two implicit solver (PDLIB) W3SRCE calls (untested)
ukmo-ccbunney Jul 18, 2023
42e5ab3
Fixed incorrect CLATSL dimension
ukmo-ccbunney Jul 18, 2023
2511ba3
Fixed typo: PDBLIB -> W3_PDLIB
ukmo-ccbunney Jul 18, 2023
b9ee6c7
Sorted out spacing, bad indentation and incorrect call signature to W…
ukmo-ccbunney Jul 18, 2023
25a2bc3
Missing continuation character
ukmo-ccbunney Jul 18, 2023
d2406b1
Bugfix: passed wrong global timestep to first call of implicit W3SRCE
ukmo-ccbunney Jul 19, 2023
fb6c41a
Bugfix:
ukmo-ccbunney Jul 19, 2023
7804ce4
Removed the optional VSIO, VDIO and SHAVEIO arguments to W3SRCE for the
ukmo-ccbunney Jul 19, 2023
df5b22a
Bugfix - wrong dims on WHITECAP dummy varible in W3SRCE; NSEA instead…
ukmo-ccbunney Jul 19, 2023
5e03953
Fixed plenty of incorrect array indices (JSEA/CSEA) that became apparent
ukmo-ccbunney Jul 20, 2023
fee16b1
Fixed bug where FH2 was not being recalculated in CSEA loop
ukmo-ccbunney Jul 21, 2023
d62b43f
Made FMEANS a CHUNK variable for ST3
ukmo-ccbunney Jul 21, 2023
8808cae
Fixed FPI array indices; this is now using a local calculaion for ISEA.
ukmo-ccbunney Jul 21, 2023
3de633e
Fixed some incorrect indices into SPEC
ukmo-ccbunney Jul 25, 2023
cff917e
More bad indices
ukmo-ccbunney Jul 25, 2023
d763900
Update ICEF when exiting W3SRCE
ukmo-ccbunney Jul 26, 2023
9514323
Fix erroneous setting of VA to zero for points excluded from W3SRCE
ukmo-ccbunney Jul 26, 2023
bc400f9
Merge branch 'develop' into feature/gpu/w3srce_refactor
ukmo-ccbunney Jul 28, 2023
6577aa5
A few syntax error/typo bug fixes.
ukmo-ccbunney Jul 31, 2023
7579392
Bug fix on USTAR (was not using chunked variable)
ukmo-ccbunney Jul 31, 2023
e487df5
Avoid zeroing whole TAUICE and PHICE arrays.
ukmo-ccbunney Jul 31, 2023
f5d9bc5
Merge branch 'NOAA-EMC:develop' into feature/gpu/w3srce_refactor
ukmo-ccbunney Aug 1, 2023
d13e3b8
Fixed missing index BRLAMBDA
ukmo-ccbunney Aug 2, 2023
98614cd
Fixed issue where only first seapoint was being processed for implici…
ukmo-ccbunney Aug 2, 2023
f66604f
Bugfix for implcit solver in source terms - was exiting too early
ukmo-ccbunney Aug 3, 2023
c97fd61
Change exit points for implicit source terms - need to ensure all
ukmo-ccbunney Sep 13, 2023
0cc41e7
Merge branch 'develop' into feature/gpu/w3srce_refactor
ukmo-ccbunney Sep 13, 2023
9c26094
W3SRCE: Fixed INTENT of BEDFORMS variable, disabled some debugging.
ukmo-ccbunney Sep 13, 2023
b8b820d
Fixed typo `#ifdef BT4` => `#ifdef W3_BT4`
ukmo-ccbunney Sep 13, 2023
a40da20
Comment
ukmo-ccbunney Sep 15, 2023
52b69c0
Change intent of PHIOC and PHIAW to "INOUT" from "OUT" to maintain B4B
ukmo-ccbunney Sep 20, 2023
34761c5
Forgot to populate TAUA_CHUNK and TAUADIR_CHUNK...
ukmo-ccbunney Sep 26, 2023
3410149
Moved zeroing of TAUICE and PHICE to output seapoint loop to retain B4B
ukmo-ccbunney Sep 26, 2023
bcb6e2c
Moved initialisation of CHARN for B4B reproducibility
ukmo-ccbunney Oct 3, 2023
f69f191
Merge remote-tracking branch 'origin/develop' into feature/gpu/w3srce…
ukmo-ccbunney Oct 4, 2023
5d7937a
Merge branch 'NOAA-EMC:develop' into feature/gpu/w3srce_refactor
ukmo-ccbunney Oct 10, 2023
07896d5
Cleanup: remove old debug code, tidy up comments, etc.
ukmo-ccbunney Oct 12, 2023
f0d54a0
WW3_SHEL and WW3_MULTI now read WW3_SRC_TILE_SIZE environment variable
ukmo-ccbunney Oct 13, 2023
8711b4f
Merge remote-tracking branch 'origin/develop' into feature/gpu/w3srce…
ukmo-ccbunney Oct 13, 2023
efde9a9
More tidy up
ukmo-ccbunney Oct 13, 2023
44f504a
Extend bounds of CG and WN to avoid temporary arrays being created in
ukmo-ccbunney Oct 17, 2023
e1afdb2
Merge remote-tracking branch 'origin/develop' into feature/gpu/w3srce…
ukmo-ccbunney Oct 17, 2023
d3fb4e1
Refactored 2D WHITECAP array into 4 separate arrays to avoid temporaries
ukmo-ccbunney Nov 1, 2023
6bddf5a
Merge remote-tracking branch 'origin/develop' into feature/gpu/w3srce…
ukmo-ccbunney Nov 3, 2023
b8400d6
TAUICE and TAUBBL spit into TAUICE[XY] and TAUBBL[XY] respectively.
ukmo-ccbunney Nov 3, 2023
075f5db
Merge remote-tracking branch 'origin/develop' into feature/gpu/w3srce…
ukmo-ccbunney Nov 7, 2023
02b1954
Fixed typo
ukmo-ccbunney Nov 7, 2023
71ed812
Another stupid typo...
ukmo-ccbunney Nov 7, 2023
262842f
Updated change log for WHITECAP, TAUBBL and TAUICE refactoring.
ukmo-ccbunney Nov 7, 2023
2d96f90
Update change log
ukmo-ccbunney Nov 7, 2023
848edb1
Removed erronous array syntax on TAUBBL[X/Y]
ukmo-ccbunney Nov 7, 2023
e65f96f
Missing trailing comma
ukmo-ccbunney Nov 8, 2023
ff0653c
Missed expansion of TAUBBL in W3SBT4 call
ukmo-ccbunney Nov 8, 2023
d304af0
Tidy up and update comments
ukmo-ccbunney Nov 8, 2023
3fd2293
Refactored BEDFORMS into BEDROUGH, BEDRIPX and BEDRIPY 1D arrays
ukmo-ccbunney Nov 8, 2023
5a2e281
W3SBT4 - refactored BEDFORM to 3 separate 1D arrays
ukmo-ccbunney Nov 8, 2023
a4eb6ee
Fixed incorrect BEDFORM argument list in W3SBT4 calls
ukmo-ccbunney Nov 8, 2023
8c022e2
Typo again
ukmo-ccbunney Nov 8, 2023
873f1b0
Typo
ukmo-ccbunney Nov 9, 2023
f87934f
Clean up some comments, blank lines, etc
ukmo-ccbunney Nov 10, 2023
dd7ad88
Merge remote-tracking branch 'origin/develop' into feature/gpu/w3srce…
ukmo-ccbunney Nov 29, 2023
0fa7e36
Merge branch 'NOAA-EMC:develop' into feature/gpu/w3srce_refactor
ukmo-ccbunney Dec 12, 2023
9afcff2
Merge remote-tracking branch 'origin/develop' into feature/gpu/w3srce…
ukmo-ccbunney Jan 4, 2024
be5de16
Merge branch 'feature/gpu/w3srce_refactor' of https://github.com/ukmo…
ukmo-ccbunney Jan 4, 2024
2d9b019
Merge remote-tracking branch 'origin/develop' into feature/gpu/w3srce…
ukmo-ccbunney Jan 5, 2024
345d9b0
Merge branch 'develop' into feature/gpu/w3srce_refactor
ukmo-ccbunney Jan 19, 2024
136e5de
Merge branch 'NOAA-EMC:develop' into feature/gpu/w3srce_refactor
ukmo-ccbunney Feb 27, 2024
41671b9
Bugfix to NL5 time handling
ukmo-ccbunney Mar 15, 2024
d4bc3f7
Merge branch 'develop' into feature/gpu/w3srce_refactor
ukmo-ccbunney Apr 12, 2024
2df466a
Merge branch 'develop' into feature/gpu/w3srce_refactor
ukmo-ccbunney May 13, 2024
6ad8078
Merge branch 'NOAA-EMC:develop' into feature/gpu/w3srce_refactor
ukmo-ccbunney Jul 25, 2024
f15870e
Merge branch 'NOAA-EMC:develop' into feature/gpu/w3srce_refactor
ukmo-ccbunney Sep 4, 2024
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
8 changes: 4 additions & 4 deletions model/inp/ww3_shel.inp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,10 @@ $ F T 5 3 CGE CGE Energy flux
$ F T 5 4 PHIAW FAW Air-sea energy flux
$ F T 5 5 TAUWI[X,Y] TAW Net wave-supported stress
$ F T 5 6 TAUWN[X,Y] TWA Negative part of the wave-supported stress
$ F F 5 7 WHITECAP WCC Whitecap coverage
$ F F 5 8 WHITECAP WCF Whitecap thickness
$ F F 5 9 WHITECAP WCH Mean breaking height
$ F F 5 10 WHITECAP WCM Whitecap moment
$ F F 5 7 WCAP_COV WCC Whitecap coverage
$ F F 5 8 WCAP_THK WCF Whitecap thickness
$ F F 5 9 WCAP_BHS WCH Mean breaking height
$ F F 5 10 WCAP_MNT WCM Whitecap moment
$ F F 5 11 FWS FWS Wind sea mean period
$ -------------------------------------------------
$ 6 Wave-ocean layer
Expand Down
8 changes: 4 additions & 4 deletions model/nml/ww3_shel.nml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,10 @@
! F T 5 4 PHIAW FAW Air-sea energy flux
! F T 5 5 TAUWI[X,Y] TAW Net wave-supported stress
! F T 5 6 TAUWN[X,Y] TWA Negative part of the wave-supported stress
! F F 5 7 WHITECAP WCC Whitecap coverage
! F F 5 8 WHITECAP WCF Whitecap thickness
! F F 5 9 WHITECAP WCH Mean breaking height
! F F 5 10 WHITECAP WCM Whitecap moment
! F F 5 7 WCAP_COV WCC Whitecap coverage
! F F 5 8 WCAP_THK WCF Whitecap thickness
! F F 5 9 WCAP_BHS WCH Mean breaking height
! F F 5 10 WCAP_MNT WCM Whitecap moment
! F F 5 11 FWS FWS Wind sea mean period
! -------------------------------------------------
! 6 Wave-ocean layer
Expand Down
2 changes: 1 addition & 1 deletion model/src/gx_outf.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ PROGRAM GXOUTF
TAUWIY, PHIAW, PHIOC, TUSX, TUSY, PRMS, TPMS,&
USSX, USSY, MSSX, MSSY, MSCX, MSCY, CHARN, &
TAUWNX, TAUWNY, BHD, P2SMS, DTDYN, &
CGE, T02, BEDFORMS, WHITECAP, TAUBBL, PHIBBL,&
CGE, T02, PHIBBL, &
CFLXYMAX, CFLTHMAX, CFLKMAX, US3D, STMAXE, &
STMAXD, HMAXE, HCMAXE, HMAXD, HCMAXD, WBT
USE W3ODATMD, ONLY: NDSE, NDST, NDSO, NOGRP, NGRPP, IDOUT, UNDEF,&
Expand Down
10 changes: 6 additions & 4 deletions model/src/gx_outp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,7 @@ SUBROUTINE GXEXPO
#endif
#ifdef W3_ST4
REAL :: FMEANWS, TAUWX, TAUWY, AMAX, &
TAUWNX, TAUWNY, FMEAN1, WHITECAP(1:4), DLWMEAN
TAUWNX, TAUWNY, FMEAN1, WCAP_DUM1, WCAP_DUM2, WCAP_DUM3, DLWMEAN
#endif
#ifdef W3_ST6
REAL :: AMAX, TAUWX, TAUWY, TAUWNX, TAUWNY
Expand Down Expand Up @@ -1231,7 +1231,8 @@ SUBROUTINE GXEXPO
#endif
#ifdef W3_ST4
CALL W3SDS4 ( A, WN, CG, &
USTAR, USTD, DEPTH, DAIR, XDS, DIA, IX, IY, LAMBDA, WHITECAP , DLWMEAN)
USTAR, USTD, DEPTH, DAIR, XDS, DIA, IX, IY, LAMBDA, &
WCAP_DUM1, WCAP_DUM2, WCAP_DUM3, DLWMEAN)
#endif
#ifdef W3_ST6
CALL W3SDS6 ( A, CG, WN, XDS, DIA )
Expand Down Expand Up @@ -1276,8 +1277,9 @@ SUBROUTINE GXEXPO
#endif

#ifdef W3_BT4
CALL W3SBT4 ( A, CG, WN, DEPTH, D50, PSIC, TAUBBL, &
BEDFORM, XBT, DIA, IX, IY )
CALL W3SBT4 ( A, CG, WN, DEPTH, D50, PSIC, TAUBBL(1), &
TAUBBL(2), BEDFORM(1), BEDFORM(2), BEDFORM(3), &
XBT, DIA, IX, IY )
#endif
!

Expand Down
54 changes: 28 additions & 26 deletions model/src/pdlib_field_vec.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,11 +824,13 @@ SUBROUTINE DO_OUTPUT_EXCHANGES(IMOD)
TAUOY, USSX, USSY, MSSX, MSSY, &
MSCX, MSCY, PRMS, TPMS, CHARN, &
TAUWNX, TAUWNY, BHD, CGE, &
CFLXYMAX, CFLTHMAX, CFLKMAX, WHITECAP, &
BEDFORMS, PHIBBL, TAUBBL, T01, &
CFLXYMAX, CFLTHMAX, CFLKMAX, &
WCAP_COV, WCAP_THK, WCAP_BHS, WCAP_MNT,&
BEDROUGH, BEDRIPX, BEDRIPY, PHIBBL, &
TAUBBLX, TAUBBLY, T01, &
P2SMS, US3D, EF, TH1M, STH1M, TH2M, &
STH2M, HSIG, TAUICE, PHICE, PTHP0, PQP,&
PPE, PGW, PSW, PTM1, PT1, PT2, PEP, &
STH2M, HSIG, TAUICEX, TAUICEY, PHICE, &
PTHP0, PQP, PPE, PGW, PSW, PTM1, PT1, PT2, PEP, &
QP, MSSD, MSCD, STMAXE, STMAXD, HMAXE, &
HCMAXE, HMAXD, HCMAXD, WBT, USSP
USE W3GDATMD, ONLY: NK, NSEAL
Expand Down Expand Up @@ -1130,19 +1132,19 @@ SUBROUTINE DO_OUTPUT_EXCHANGES(IMOD)
END IF
IF ( FLGRDALL( 5, 7) ) THEN
IH = IH + 1
Arrexch(IH,JSEA)=WHITECAP(JSEA,1)
Arrexch(IH,JSEA)=WCAP_COV(JSEA)
END IF
IF ( FLGRDALL( 5, 8) ) THEN
IH = IH + 1
Arrexch(IH,JSEA)=WHITECAP(JSEA,2)
Arrexch(IH,JSEA)=WCAP_THK(JSEA)
END IF
IF ( FLGRDALL( 5, 9) ) THEN
IH = IH + 1
Arrexch(IH,JSEA)=WHITECAP(JSEA,3)
Arrexch(IH,JSEA)=WCAP_BHS(JSEA)
END IF
IF ( FLGRDALL( 5,10) ) THEN
IH = IH + 1
Arrexch(IH,JSEA)=WHITECAP(JSEA,4)
Arrexch(IH,JSEA)=WCAP_MNT(JSEA)
END IF
IF ( FLGRDALL( 6, 1) ) THEN
IH = IH + 1
Expand Down Expand Up @@ -1198,9 +1200,9 @@ SUBROUTINE DO_OUTPUT_EXCHANGES(IMOD)
END IF
IF ( FLGRDALL( 6, 10) ) THEN
IH = IH + 1
Arrexch(IH,JSEA)=TAUICE(JSEA,1)
Arrexch(IH,JSEA)=TAUICEX(JSEA)
IH = IH + 1
Arrexch(IH,JSEA)=TAUICE(JSEA,2)
Arrexch(IH,JSEA)=TAUICEY(JSEA)
END IF
IF ( FLGRDALL( 6, 11) ) THEN
IH = IH + 1
Expand Down Expand Up @@ -1232,21 +1234,21 @@ SUBROUTINE DO_OUTPUT_EXCHANGES(IMOD)
END IF
IF ( FLGRDALL( 7, 3) ) THEN
IH = IH + 1
Arrexch(IH,JSEA)=BEDFORMS(JSEA,1)
Arrexch(IH,JSEA)=BEDROUGH(JSEA)
IH = IH + 1
Arrexch(IH,JSEA)=BEDFORMS(JSEA,2)
Arrexch(IH,JSEA)=BEDRIPX(JSEA)
IH = IH + 1
Arrexch(IH,JSEA)=BEDFORMS(JSEA,3)
Arrexch(IH,JSEA)=BEDRIPY(JSEA)
END IF
IF ( FLGRDALL( 7, 4) ) THEN
IH = IH + 1
Arrexch(IH,JSEA)=PHIBBL(JSEA)
END IF
IF ( FLGRDALL( 7, 5) ) THEN
IH = IH + 1
Arrexch(IH,JSEA)=TAUBBL(JSEA,1)
Arrexch(IH,JSEA)=TAUBBLX(JSEA)
IH = IH + 1
Arrexch(IH,JSEA)=TAUBBL(JSEA,2)
Arrexch(IH,JSEA)=TAUBBLY(JSEA)
END IF
IF ( FLGRDALL( 8, 1) ) THEN
IH = IH + 1
Expand Down Expand Up @@ -1573,19 +1575,19 @@ SUBROUTINE DO_OUTPUT_EXCHANGES(IMOD)
END IF
IF ( FLGRDALL( 5, 7) ) THEN
IH = IH + 1
WHITECAP(1:NSEA,1) = ARRtotal(IH,:)
WCAP_COV(1:NSEA) = ARRtotal(IH,:)
END IF
IF ( FLGRDALL( 5, 8) ) THEN
IH = IH + 1
WHITECAP(1:NSEA,2) = ARRtotal(IH,:)
WCAP_THK(1:NSEA) = ARRtotal(IH,:)
END IF
IF ( FLGRDALL( 5, 9) ) THEN
IH = IH + 1
WHITECAP(1:NSEA,3) = ARRtotal(IH,:)
WCAP_BHS(1:NSEA) = ARRtotal(IH,:)
END IF
IF ( FLGRDALL( 5,10) ) THEN
IH = IH + 1
WHITECAP(1:NSEA,4) = ARRtotal(IH,:)
WCAP_MNT(1:NSEA) = ARRtotal(IH,:)
END IF
IF ( FLGRDALL( 6, 1) ) THEN
IH = IH + 1
Expand Down Expand Up @@ -1641,9 +1643,9 @@ SUBROUTINE DO_OUTPUT_EXCHANGES(IMOD)
END IF
IF ( FLGRDALL( 6, 10) ) THEN
IH = IH + 1
TAUICE(1:NSEA,1) = ARRtotal(IH,:)
TAUICEX(1:NSEA) = ARRtotal(IH,:)
IH = IH + 1
TAUICE(1:NSEA,2) = ARRtotal(IH,:)
TAUICEY(1:NSEA) = ARRtotal(IH,:)
END IF
IF ( FLGRDALL( 6, 11) ) THEN
IH = IH + 1
Expand Down Expand Up @@ -1675,21 +1677,21 @@ SUBROUTINE DO_OUTPUT_EXCHANGES(IMOD)
END IF
IF ( FLGRDALL( 7, 3) ) THEN
IH = IH + 1
BEDFORMS(1:NSEA,1) = ARRtotal(IH,:)
BEDROUGH(1:NSEA) = ARRtotal(IH,:)
IH = IH + 1
BEDFORMS(1:NSEA,2) = ARRtotal(IH,:)
BEDRIPX(1:NSEA) = ARRtotal(IH,:)
IH = IH + 1
BEDFORMS(1:NSEA,3) = ARRtotal(IH,:)
BEDRIPY(1:NSEA) = ARRtotal(IH,:)
END IF
IF ( FLGRDALL( 7, 4) ) THEN
IH = IH + 1
PHIBBL(1:NSEA) = ARRtotal(IH,:)
END IF
IF ( FLGRDALL( 7, 5) ) THEN
IH = IH + 1
TAUBBL(1:NSEA,1) = ARRtotal(IH,:)
TAUBBLX(1:NSEA) = ARRtotal(IH,:)
IH = IH + 1
TAUBBL(1:NSEA,2) = ARRtotal(IH,:)
TAUBBLY(1:NSEA) = ARRtotal(IH,:)
END IF
IF ( FLGRDALL( 8, 1) ) THEN
IH = IH + 1
Expand Down
Loading
Loading