Skip to content

Commit d6c52ea

Browse files
sbanihashsbanihash
authored
Bug fix for NOAA-EMC#1412 for IC_NUMERICS (NOAA-EMC#1413)
Addition of regtest that turns on the IC_NUMERICS in IC4_M10 test case
1 parent 0a9e10f commit d6c52ea

17 files changed

+387
-3
lines changed

‎model/inp/ww3_grid.inp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -501,6 +501,10 @@ $ P2SF : ......
501501
$ CALTYPE: Calendar type. The only accepted
502502
$ values are 'standard' (default),
503503
$ '365_day', or '360_day'.
504+
$ IC_NUMERICS: Logical variable (T/F). Set to T to
505+
$ allow the user to place the 'sea ice'
506+
$ source terms with other source terms
507+
$ Default is F (PR_1294)
504508
$
505509
$ Diagnostic Sea-state Dependent Stress- - - - - - - - - - - - - - - - -
506510
$ Reichl et al. 2014 : Namelist FLD1

‎model/src/w3iogrmd.F90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -899,7 +899,7 @@ SUBROUTINE W3IOGR ( INXOUT, NDSM, IMOD, FEXT &
899899
FLCK, FLSOU, FLBPI, FLBPO, CLATS, CLATIS, CTHG0S, &
900900
STEXU, STEYU, STEDU, IICEHMIN, IICEHINIT, IICEDISP, &
901901
ICESCALES(1:4), CALTYPE, CMPRTRCK, IICEHFAC, IICEHDISP,&
902-
IICEDDISP, IICEFDISP, BTBETA, &
902+
IICEDDISP, IICEFDISP, BTBETA,IC_NUMERICS, &
903903
AAIRCMIN, AAIRGB
904904
#ifdef W3_ASCII
905905
WRITE (NDSA,*) &
@@ -915,7 +915,7 @@ SUBROUTINE W3IOGR ( INXOUT, NDSM, IMOD, FEXT &
915915
FLCK, FLSOU, FLBPI, FLBPO, CLATS, CLATIS, CTHG0S, &
916916
STEXU, STEYU, STEDU, IICEHMIN, IICEHINIT, IICEDISP, &
917917
ICESCALES(1:4), CALTYPE, CMPRTRCK, IICEHFAC, IICEHDISP,&
918-
IICEDDISP, IICEFDISP, BTBETA, &
918+
IICEDDISP, IICEFDISP, BTBETA,IC_NUMERICS, &
919919
AAIRCMIN, AAIRGB
920920
#endif
921921

@@ -1060,7 +1060,7 @@ SUBROUTINE W3IOGR ( INXOUT, NDSM, IMOD, FEXT &
10601060
FLCTH, FLCK, FLSOU, FLBPI, FLBPO, CLATS, CLATIS, &
10611061
CTHG0S, STEXU, STEYU, STEDU, IICEHMIN, IICEHINIT, &
10621062
IICEDISP, ICESCALES(1:4), CALTYPE, CMPRTRCK, IICEHFAC, &
1063-
IICEDDISP, IICEHDISP, IICEFDISP, BTBETA, &
1063+
IICEDDISP, IICEHDISP, IICEFDISP, BTBETA,IC_NUMERICS, &
10641064
AAIRCMIN, AAIRGB
10651065

10661066
READ(NDSM,END=801,ERR=802,IOSTAT=IERR)GRIDSHIFT

‎regtests/bin/matrix.base‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1959,6 +1959,7 @@
19591959
echo "$rtst -w work_IC4_M8 -i input_IC4_M8 $ww3 ww3_tic1.1" >> matrix.body
19601960
echo "$rtst -w work_IC4_M9 -i input_IC4_M9 $ww3 ww3_tic1.1" >> matrix.body
19611961
echo "$rtst -w work_IC4_M10 -i input_IC4_M10 $ww3 ww3_tic1.1" >> matrix.body
1962+
echo "$rtst -w work_IC4_M10_icenum -i input_IC4_M10_icenum $ww3 ww3_tic1.1" >> matrix.body
19621963
echo "$rtst -g 1000m -w work_IC5_M1 -i input_IC5_M1 $ww3 ww3_tic1.1" >> matrix.body
19631964
echo "$rtst -g 1000m -w work_IC5_M2 -i input_IC5_M2 $ww3 ww3_tic1.1" >> matrix.body
19641965
echo "$rtst -g 1000m -w work_IC5_M3 -i input_IC5_M3 $ww3 ww3_tic1.1" >> matrix.body

‎regtests/ww3_tic1.1/input_IC4_M10_icenum/namelists_1-D.nml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
&SIC4 IC4METHOD = 10 /
2+
END OF NAMELISTS

‎regtests/ww3_tic1.1/input_IC4_M10_icenum/points.list‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
0.00 0. 'Point 1 '
2+
1.00E3 0. 'Point 2 '
3+
2.00E3 0. 'Point 3 '
4+
3.00E3 0. 'Point 4 '
5+
4.00E3 0. 'Point 5 '
6+
5.00E3 0. 'Point 6 '
7+
6.00E3 0. 'Point 7 '
8+
7.00E3 0. 'Point 8 '
9+
8.00E3 0. 'Point 9 '
10+
9.00E3 0. 'Point 10 '
11+
10.00E3 0. 'Point 11 '
12+
11.00E3 0. 'Point 12 '
13+
12.00E3 0. 'Point 13 '
14+
13.00E3 0. 'Point 14 '
15+
14.00E3 0. 'Point 15 '
16+
15.00E3 0. 'Point 16 '

‎regtests/ww3_tic1.1/input_IC4_M10_icenum/switch‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
NOGRB SHRD PR3 UQ FLX2 LN0 ST0 NL0 BT0 DB0 TR0 BS0 IC4 IS0 REF0 WNT1 WNX1 CRT1 CRX1 O0 O1 O2 O3 O4 O5 O6 O7

‎regtests/ww3_tic1.1/input_IC4_M10_icenum/ww3_grid.inp‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
$ WAVEWATCH III Grid preprocessor input file
2+
$ ------------------------------------------
3+
'1-D parameterized ice test '
4+
$
5+
$ 1.1 0.04118 25 24 0.0
6+
1.1 0.0418 31 36 5.0
7+
$
8+
F T F F F T
9+
60. 60. 60. 60.
10+
$
11+
$ IC4METHOD determines calculation
12+
$ IC4METHOD = 1 - Wadhams et al. (1988)
13+
$ IC4METHOD = 2 - Meylan et al. (2014)
14+
$ IC4METHOD = 3 - Kohout & Meylan (2008) in Horvat & Tziperman (2015)
15+
$ IC4METHOD = 4 - Kohout et al. (2014)
16+
$ IC4METHOD = 5 - Simple ki step function
17+
$ IC4METHOD = 6 - Simple ki step function via namelist
18+
$ IC4METHOD = 7 - Doble et al. (GRL 2015)
19+
$ IC4METHOD = 8 - Meylan et al. (2018) ; Liu et al. (2020)
20+
$ IC4METHOD = 9 - RYW (2021) ; Yu et al. (2022)
21+
$ IC4M8 Fit to R21A L ChfM2=0.059
22+
$ IC4M10
23+
&SIC4 IC4METHOD = 10 , IC4CN = 0.059/
24+
$ IC_NUMERICS
25+
&MISC ICNUMERICS = T/
26+
END OF NAMELISTS
27+
$
28+
'RECT' F 'NONE'
29+
156 3
30+
1.0E3 1.0E3 1.
31+
-1.0E3 -1.0E3 1.
32+
$ dlim dmin file# scale layout# format# formatdescrip filetype# filenm
33+
-0.1 0.1 401 -1.0 1 1 '(....)' 'NAME' '../input_IC1/depth1d.flat'
34+
$
35+
10 1 1 '(....)' 'PART' 'input'
36+
$
37+
$ First grid
38+
$
39+
2 2 F
40+
$
41+
0 0 F
42+
0 0 F
43+
0 0
44+
$
45+
0. 0. 0. 0. 0

‎regtests/ww3_tic1.1/input_IC4_M10_icenum/ww3_grid.nml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
! -------------------------------------------------------------------- !
2+
! WAVEWATCH III - ww3_grid.nml - Grid pre-processing !
3+
! -------------------------------------------------------------------- !
4+
5+
! -------------------------------------------------------------------- !
6+
! Define the spectrum parameterization via SPECTRUM_NML namelist
7+
! -------------------------------------------------------------------- !
8+
&SPECTRUM_NML
9+
SPECTRUM%XFR = 1.1
10+
SPECTRUM%FREQ1 = 0.0418
11+
SPECTRUM%NK = 31
12+
SPECTRUM%NTH = 36
13+
SPECTRUM%THOFF = 5.0
14+
/
15+
16+
! -------------------------------------------------------------------- !
17+
! Define the run parameterization via RUN_NML namelist
18+
! -------------------------------------------------------------------- !
19+
&RUN_NML
20+
RUN%FLCX = T
21+
RUN%FLSOU = T
22+
/
23+
24+
! -------------------------------------------------------------------- !
25+
! Define the timesteps parameterization via TIMESTEPS_NML namelist
26+
! -------------------------------------------------------------------- !
27+
&TIMESTEPS_NML
28+
TIMESTEPS%DTMAX = 60.
29+
TIMESTEPS%DTXY = 60.
30+
TIMESTEPS%DTKTH = 60.
31+
TIMESTEPS%DTMIN = 60.
32+
/
33+
34+
! -------------------------------------------------------------------- !
35+
! Define the grid to preprocess via GRID_NML namelist
36+
! -------------------------------------------------------------------- !
37+
&GRID_NML
38+
GRID%NAME = '1-D parameterized ice test'
39+
GRID%NML = '../input_IC4_M10/namelists_1-D.nml'
40+
GRID%TYPE = 'RECT'
41+
GRID%COORD = 'CART'
42+
GRID%CLOS = 'NONE'
43+
GRID%ZLIM = -0.1
44+
GRID%DMIN = 0.1
45+
/
46+
47+
! -------------------------------------------------------------------- !
48+
! Define the rectilinear grid type via RECT_NML namelist
49+
! -------------------------------------------------------------------- !
50+
&RECT_NML
51+
RECT%NX = 156
52+
RECT%NY = 3
53+
RECT%SX = 1.0E3
54+
RECT%SY = 1.0E3
55+
RECT%X0 = -1.0E3
56+
RECT%Y0 = -1.0E3
57+
/
58+
59+
! -------------------------------------------------------------------- !
60+
! Define the depth to preprocess via DEPTH_NML namelist
61+
! -------------------------------------------------------------------- !
62+
&DEPTH_NML
63+
DEPTH%SF = -1.0
64+
DEPTH%FILENAME = '../input_IC1/depth1d.flat'
65+
/
66+
67+
! -------------------------------------------------------------------- !
68+
! Define the input boundary points via INBND_COUNT_NML and
69+
! INBND_POINT_NML namelist
70+
! -------------------------------------------------------------------- !
71+
&INBND_COUNT_NML
72+
INBND_COUNT%N_POINT = 1
73+
/
74+
75+
&INBND_POINT_NML
76+
INBND_POINT(1) = 2 2 F
77+
/
78+
79+
! -------------------------------------------------------------------- !
80+
! WAVEWATCH III - end of namelist !
81+
! -------------------------------------------------------------------- !

‎regtests/ww3_tic1.1/input_IC4_M10_icenum/ww3_ounf.inp‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
$ WAVEWATCH III Grid output post-processing (netcdf)
2+
$---------------------------------------------------
3+
19680606 000000 3600. 99
4+
N
5+
$ Options: DPT CUR WND DT WLV ICE HS L T02 T01 TM1 FP DIR SPR DP EF
6+
$ TH1M STH1M PHS PTP PLP PDIR PSP WSF TWS PNR UST CHA CGE FAW
7+
$ TAW TWA WCC WCF WCH WCM SXY TWO BHD FOC TUS USS P2S WN USF
8+
$ P2L ABR UBR BED FBB TBB MSS MSC DTD FCT CFX CFT CFK US1 US2
9+
DPT WLV HS DIR
10+
$
11+
3 4
12+
0 1 2
13+
F
14+
ww3.
15+
4
16+
1 999 1 999 3 2
17+
$
18+
$ -------------------------------------------------------------------- $
19+
$ End of input file $
20+
$ -------------------------------------------------------------------- $

‎regtests/ww3_tic1.1/input_IC4_M10_icenum/ww3_ounf.nml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
! -------------------------------------------------------------------- !
2+
! WAVEWATCH III ww3_ounf.nml - Grid output post-processing !
3+
! -------------------------------------------------------------------- !
4+
5+
! -------------------------------------------------------------------- !
6+
! Define the output fields to postprocess via FIELD_NML namelist
7+
! -------------------------------------------------------------------- !
8+
&FIELD_NML
9+
FIELD%TIMESTART = '19680606 000000'
10+
FIELD%TIMESTRIDE = '3600.'
11+
FIELD%TIMECOUNT = '99'
12+
FIELD%TIMESPLIT = 4
13+
FIELD%LIST = 'DPT WLV HS DIR'
14+
FIELD%PARTITION = '0 1 2'
15+
FIELD%SAMEFILE = F
16+
FIELD%TYPE = 4
17+
/
18+
19+
! -------------------------------------------------------------------- !
20+
! Define the content of the output file via FILE_NML namelist
21+
! -------------------------------------------------------------------- !
22+
&FILE_NML
23+
FILE%IXN = 999
24+
FILE%IYN = 999
25+
/
26+
27+
! -------------------------------------------------------------------- !
28+
! WAVEWATCH III - end of namelist !
29+
! -------------------------------------------------------------------- !

0 commit comments

Comments
 (0)