bottom friction BT4

[mickaelaccensi]

Pull Request Summary

correct bottom friction computation in BT4

Description

a constant is not correct in WW3 for PSIC computation: 0.55 is used instead of 0.055

The original code in the CREST model indeed had :

Sstar=(D/(4*nu))*SQRT((sg-1)gD)

! Critical Shields number, Soulsby, R.L. and R J S W Whitehouse
! Threshold of sed. motion in coastal environments, Proc. Pacific Coasts and
! ports, 1997 conference, Christchurch, p149-154, University of Cantebury, NZ
Dstar=(g*(sg-1)/nu2)(0.3333)D !dimensionless grain size
psic=0.3/(1+1.2Dstar) + 0.055*(1-exp(-0.02*Dstar))

And indeed WW3 now has:

SED_PSIC(ISEA)=0.3/(1+1.2SED_DSTAR)+0.55(1-exp(-0.02*SED_DSTAR))

Issue(s) addressed

• fixes bottom friction BT4 computation #1434

Commit Message

correct bottom friction computation in BT4 based on CREST model formula

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? matrix
• Are the changes covered by regression tests? (If not, why? Do new tests need to be added?) ww3_tp2.14 and ww3_tp2.17
• Have the matrix regression tests been run (if yes, please note HPC and compiler)? datarmor with intel
• Please indicate the expected changes in the regression test output, (Note the list of known non-identical tests.)ww3_tp2.14 and ww3_tp2.17
• Please provide the summary output of matrix.comp (matrix.Diff.txt, matrixCompFull.txt and matrixCompSummary.txt):
  matrixCompFull.txt
  matrixCompSummary.txt

[JessicaMeixner-NOAA]

Thanks @mickaelaccensi - I'll get the tests started at some point today

[JessicaMeixner-NOAA]

Confirmed reference for change.

Here are my regtest logs, they are consistent with files changing when we have a BT4 switch:

ww3_tp2.14/input_oasacm2/switch_OASACM2:NOGRB TRKNC DIST MPI PR3 UQ FLX0 LN1 ST4 STAB0 NL1 BT4 DB1 MLIM TR0 BS0 IC2 IS0 REF1 WNT0 WNX1 RWND CRT1 CRX1 COU OASIS OASACM O0 O1 O2 O2a O2b O2c O3 O4 O5 O6 O7
ww3_tp2.14/input_oasacm3/switch_OASACM3:NOGRB TRKNC DIST MPI PR3 UQ FLX0 LN1 ST4 STAB0 NL1 BT4 DB1 MLIM TR0 BS0 IC2 IS0 REF1 WNT0 WNX1 RWND CRT1 CRX1 O0 O1 O2 O2a O2b O2c O3 O4 O5 O6 O7
ww3_tp2.14/input_oasacm4/switch_OASACM4:NOGRB TRKNC DIST MPI PR3 UQ FLX0 LN1 ST4 STAB0 NL1 BT4 DB1 MLIM TR0 BS0 IC2 IS0 REF1 WNT0 WNX1 RWND CRT1 CRX1 COU OASIS OASACM O0 O1 O2 O2a O2b O2c O3 O4 O5 O6 O7
ww3_tp2.14/input_oasacm5/switch_OASACM5:NOGRB TRKNC DIST MPI PR3 UQ FLX0 LN1 ST4 STAB0 NL1 BT4 DB1 MLIM TR0 BS0 IC2 IS0 REF1 WNT0 WNX1 RWND CRT1 CRX1 COU OASIS OASACM O0 O1 O2 O2a O2b O2c O3 O4 O5 O6 O7
ww3_tp2.14/input_oasacm6/switch_OASACM6:NOGRB TRKNC DIST MPI SMC PR2 UNO FLX0 LN1 ST4 STAB0 NL1 BT4 DB1 MLIM TR0 BS0 IC2 IS0 REF1 WNT0 WNX1 RWND CRT1 CRX1 COU OASIS OASACM O0 O1 O2 O2a O2b O2c O3 O4 O5 O6 O7
ww3_tp2.14/input_oasacm/switch_OASACM:NOGRB TRKNC DIST MPI PR3 UQ FLX0 LN1 ST4 STAB0 NL1 BT4 DB1 MLIM TR0 BS0 IC2 IS0 REF1 WNT0 WNX1 RWND CRT1 CRX1 COU OASIS OASACM O0 O1 O2 O2a O2b O2c O3 O4 O5 O6 O7
ww3_tp2.14/input_oasicm/switch_OASICM:NOGRB TRKNC DIST MPI PR3 UQ FLX0 LN1 ST4 STAB0 NL1 BT4 DB1 MLIM TR0 BS0 IC2 IS2 REF1 WNT0 WNX1 RWND CRT1 CRX1 COU OASIS OASICM O0 O1 O2 O2a O2b O2c O3 O4 O5 O6 O7
ww3_tp2.14/input_oasocm/switch_OASOCM:NOGRB TRKNC DIST MPI PR3 UQ FLX0 LN1 ST4 STAB0 NL1 BT4 DB1 MLIM TR0 BS0 IC2 IS0 REF1 WNT2 WNX1 RWND CRT0 CRX1 COU OASIS OASOCM O0 O1 O2 O2a O2b O2c O3 O4 O5 O6 O7
ww3_tp2.17/input/switch_NO_PDLIB:NOGRB TRKNC DIST MPI SCRIP MLIM PR3 UQ FLX0 LN1 ST4 STAB0 NL1 BT4 DB1 TR0 BS0 IS0 IC0 REF0 WNT2 WNX1 RWND CRT1 CRX1 O0 O1 O2 O2a O2b O2c O3 O4 O5 O6 O7
ww3_tp2.17/input/switch_PDLIB:NOGRB TRKNC DIST MPI SCRIP MLIM PR3 UQ FLX0 PDLIB SCOTCH LN1 ST4 STAB0 NL1 BT4 DB1 TR0 BS0 IS0 IC0 REF0 WNT2 WNX1 RWND CRT1 CRX1 O0 O1 O2 O2a O2b O2c O3 O4 O5 O6 O7

Regtests:

**********************************************************************
********************* non-identical cases ****************************
**********************************************************************
mww3_test_03/./work_PR1_MPI_e                     (1 files differ)
mww3_test_03/./work_PR3_UNO_MPI_e                     (1 files differ)
mww3_test_03/./work_PR2_UQ_MPI_e                     (1 files differ)
mww3_test_03/./work_PR2_UNO_MPI_e                     (1 files differ)
mww3_test_03/./work_PR2_UNO_MPI_d2                     (17 files differ)
mww3_test_03/./work_PR1_MPI_d2                     (12 files differ)
mww3_test_03/./work_PR3_UNO_MPI_d2_c                     (17 files differ)
mww3_test_03/./work_PR3_UQ_MPI_d2_c                     (16 files differ)
mww3_test_03/./work_PR3_UNO_MPI_d2                     (14 files differ)
mww3_test_03/./work_PR2_UQ_MPI_d2                     (16 files differ)
mww3_test_03/./work_PR3_UQ_MPI_e                     (1 files differ)
mww3_test_03/./work_PR3_UNO_MPI_e_c                     (1 files differ)
mww3_test_03/./work_PR3_UQ_MPI_d2                     (15 files differ)
mww3_test_09/./work_MPI_ASCII                     (0 files differ)
ww3_tp2.10/./work_MPI_OMPH                     (7 files differ)
ww3_tp2.14/./work_OASACM6                     (3 files differ)
ww3_tp2.14/./work_OASACM3                     (4 files differ)
ww3_tp2.14/./work_OASACM5                     (6 files differ)
ww3_tp2.14/./work_OASACM4                     (7 files differ)
ww3_tp2.14/./work_OASACM                     (6 files differ)
ww3_tp2.14/./work_OASICM                     (3 files differ)
ww3_tp2.14/./work_OASACM2                     (6 files differ)
ww3_tp2.14/./work_OASOCM                     (9 files differ)
ww3_tp2.16/./work_MPI_OMPH                     (4 files differ)
ww3_tp2.17/./work_ma                     (7 files differ)
ww3_tp2.17/./work_a                     (10 files differ)
ww3_tp2.17/./work_mc1                     (5 files differ)
ww3_tp2.17/./work_mb                     (7 files differ)
ww3_tp2.17/./work_mc                     (5 files differ)
ww3_tp2.17/./work_ma1                     (7 files differ)
ww3_tp2.17/./work_c                     (8 files differ)
ww3_tp2.17/./work_b                     (10 files differ)
ww3_tp2.6/./work_ST4_ASCII                     (0 files differ)
ww3_ufs1.3/./work_a                     (3 files differ)

BT4 related changes:

ww3_tp2.14/./work_OASACM6                     (3 files differ)
ww3_tp2.14/./work_OASACM3                     (4 files differ)
ww3_tp2.14/./work_OASACM5                     (6 files differ)
ww3_tp2.14/./work_OASACM4                     (7 files differ)
ww3_tp2.14/./work_OASACM                     (6 files differ)
ww3_tp2.14/./work_OASICM                     (3 files differ)
ww3_tp2.14/./work_OASACM2                     (6 files differ)
ww3_tp2.14/./work_OASOCM                     (9 files differ)
ww3_tp2.16/./work_MPI_OMPH                     (4 files differ)
ww3_tp2.17/./work_ma                     (7 files differ)
ww3_tp2.17/./work_a                     (10 files differ)
ww3_tp2.17/./work_mc1                     (5 files differ)
ww3_tp2.17/./work_mb                     (7 files differ)
ww3_tp2.17/./work_mc                     (5 files differ)
ww3_tp2.17/./work_ma1                     (7 files differ)
ww3_tp2.17/./work_c                     (8 files differ)
ww3_tp2.17/./work_b                     (10 files differ)

[JessicaMeixner-NOAA]

Posting logs in case we need them in the future:

matrixCompFull.txt
matrixCompSummary.txt

Diff was too big to post.