diff --git a/model/nml/ww3_ounf.nml b/model/nml/ww3_ounf.nml index 3a3431920..a70cf9eae 100644 --- a/model/nml/ww3_ounf.nml +++ b/model/nml/ww3_ounf.nml @@ -14,7 +14,7 @@ ! UST CHA CGE FAW TAW TWA WCC WCF WCH WCM FWS ! SXY TWO BHD FOC TUS USS P2S USF P2L TWI FIC TOC ! ABR UBR BED FBB TBB -! MSS MSC MSD MCD QP QKK SKW EMB EMC +! MSS MSC MSD MCD QP QKK SKW EMB EMC ! DTD FC CFX CFD CFK ! U1 U2 ! diff --git a/model/tools/bash/ww3_ounf_inp2nml.sh b/model/tools/bash/ww3_ounf_inp2nml.sh index e9a34d7b8..1edd05562 100755 --- a/model/tools/bash/ww3_ounf_inp2nml.sh +++ b/model/tools/bash/ww3_ounf_inp2nml.sh @@ -184,7 +184,7 @@ cat >> $nmlfile << EOF ! UST CHA CGE FAW TAW TWA WCC WCF WCH WCM FWS ! SXY TWO BHD FOC TUS USS P2S USF P2L TWI FIC USP TOC ! ABR UBR BED FBB TBB -! MSS MSC WL02 AXT AYT AXY +! MSS MSC MSD MCD QP QKK SKW EMB EMC ! DTD FC CFX CFD CFK ! U1 U2 ! diff --git a/model/tools/bash/ww3_shel_inp2nml.sh b/model/tools/bash/ww3_shel_inp2nml.sh index 619002aa8..8ea336e13 100755 --- a/model/tools/bash/ww3_shel_inp2nml.sh +++ b/model/tools/bash/ww3_shel_inp2nml.sh @@ -970,6 +970,9 @@ cat >> $nmlfile << EOF ! F F 8 4 MSCD MCD Tail slope direction ! F F 8 5 QP QP Goda peakedness parameter ! F F 8 6 QKK QKK Wavenumber peakedness +! F F 8 7 SKEW SKW Skewness of elevation for zero slopes +! F F 8 8 EMBIA1 EMB Mean sea level at zero slopes / Hs +! F F 8 9 EMBIA2 EMC Tracker bias for LRM least square altimetry ! ------------------------------------------------- ! 9 Numerical diagnostics ! ------------------------------------------------- diff --git a/regtests/ww3_ts1/input/ww3_ounf.inp b/regtests/ww3_ts1/input/ww3_ounf.inp index 52a2dd2c6..0b89ef01e 100644 --- a/regtests/ww3_ts1/input/ww3_ounf.inp +++ b/regtests/ww3_ts1/input/ww3_ounf.inp @@ -11,7 +11,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 - DPT WND ICE HS MSS MSD FAW WCC WCF WCH WCM FOC TAW CHA FWS WBT + DPT WND ICE HS MSS MSD FAW WCC WCF WCH WCM FOC TAW CHA FWS WBT SKW EMB EMC $ $--------------------------------------------------------------------- $ $ NetCDF version [3,4] and variable type 4 [2 = SHORT, 3 = it depends , 4 = REAL] diff --git a/regtests/ww3_ts1/input/ww3_ounf.nml b/regtests/ww3_ts1/input/ww3_ounf.nml index fb0f02d3e..f9992f0ce 100644 --- a/regtests/ww3_ts1/input/ww3_ounf.nml +++ b/regtests/ww3_ts1/input/ww3_ounf.nml @@ -9,7 +9,7 @@ FIELD%TIMESTART = '19680101 120000' FIELD%TIMESTRIDE = '10' FIELD%TIMECOUNT = '8000' - FIELD%LIST = 'DPT WND ICE HS MSS MSD FAW WCC WCF WCH WCM FOC TAW CHA FWS WBT' + FIELD%LIST = 'DPT WND ICE HS MSS MSD FAW WCC WCF WCH WCM FOC TAW CHA FWS WBT SKW EMB EMC' FIELD%PARTITION = '0 1 2' FIELD%TYPE = 4 / diff --git a/regtests/ww3_ts1/input/ww3_shel.inp b/regtests/ww3_ts1/input/ww3_shel.inp index fca96fb7e..5171bd9ab 100644 --- a/regtests/ww3_ts1/input/ww3_shel.inp +++ b/regtests/ww3_ts1/input/ww3_shel.inp @@ -19,7 +19,7 @@ $ $ N $ -DPT WND MSS MSD ICE HS MSS FAW WCC WCF WCH WCM FOC TAW CHA FWS WBT +DPT WND MSS MSD ICE HS MSS FAW WCC WCF WCH WCM FOC TAW CHA FWS WBT SKW EMB EMC $ 19680606 000000 60 19680618 000000 0.0 0.0 'The_point' diff --git a/regtests/ww3_ts1/input/ww3_shel.nml b/regtests/ww3_ts1/input/ww3_shel.nml index b4837d6e1..1ecf48c51 100644 --- a/regtests/ww3_ts1/input/ww3_shel.nml +++ b/regtests/ww3_ts1/input/ww3_shel.nml @@ -21,7 +21,7 @@ ! Define the output types point parameters via OUTPUT_TYPE_NML namelist ! -------------------------------------------------------------------- ! &OUTPUT_TYPE_NML - TYPE%FIELD%LIST = 'DPT WND MSS MSD ICE HS MSS FAW WCC WCF WCH WCM FOC TAW CHA FWS WBT' + TYPE%FIELD%LIST = 'DPT WND MSS MSD ICE HS MSS FAW WCC WCF WCH WCM FOC TAW CHA FWS WBT SKW EMB EMC' TYPE%POINT%FILE = '../input/points.list' /