From d40e6627b802a9a797491f811ba99eccf25f5d8d Mon Sep 17 00:00:00 2001 From: shahramn Date: Tue, 20 Feb 2024 13:33:43 +0000 Subject: [PATCH] ECC-1765: GRIB2: Move upward sea water velocity encoding to correct typeOfLevel --- definitions/grib2/cfVarName.def | 8 ++++++-- definitions/grib2/cfVarName.legacy.def | 17 +++++++++++++++++ definitions/grib2/name.def | 8 ++++++-- definitions/grib2/name.legacy.def | 17 +++++++++++++++++ definitions/grib2/paramId.def | 8 ++++++-- definitions/grib2/paramId.legacy.def | 17 +++++++++++++++++ definitions/grib2/shortName.def | 8 ++++++-- definitions/grib2/shortName.legacy.def | 17 +++++++++++++++++ definitions/grib2/units.def | 8 ++++++-- definitions/grib2/units.legacy.def | 17 +++++++++++++++++ 10 files changed, 115 insertions(+), 10 deletions(-) diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def index 3a2f1f247..889c839e3 100644 --- a/definitions/grib2/cfVarName.def +++ b/definitions/grib2/cfVarName.def @@ -7841,7 +7841,9 @@ parameterCategory = 4 ; parameterNumber = 27 ; typeOfFirstFixedSurface = 168 ; - typeOfSecondFixedSurface = 168 ; + typeOfSecondFixedSurface = 255 ; + scaledValueOfSecondFixedSurface = missing() ; + scaleFactorOfSecondFixedSurface = missing() ; } #Sea water potential temperature tendency due to newtonian relaxation 'thetaodmp' = { @@ -9028,7 +9030,9 @@ parameterCategory = 4 ; parameterNumber = 27 ; typeOfFirstFixedSurface = 168 ; - typeOfSecondFixedSurface = 168 ; + typeOfSecondFixedSurface = 255 ; + scaledValueOfSecondFixedSurface = missing() ; + scaleFactorOfSecondFixedSurface = missing() ; typeOfStatisticalProcessing = 0 ; } #Time-mean sea water potential temperature tendency due to newtonian relaxation diff --git a/definitions/grib2/cfVarName.legacy.def b/definitions/grib2/cfVarName.legacy.def index 40534b276..38c2868e6 100644 --- a/definitions/grib2/cfVarName.legacy.def +++ b/definitions/grib2/cfVarName.legacy.def @@ -157,3 +157,20 @@ typeOfStatisticalProcessing = 1 ; lengthOfTimeRange = 24 ; } +#Upward sea water velocity +'wo' = { + discipline = 10 ; + parameterCategory = 4 ; + parameterNumber = 27 ; + typeOfFirstFixedSurface = 168 ; + typeOfSecondFixedSurface = 168 ; +} +#Time-mean upward sea water velocity +'avg_wo' = { + discipline = 10 ; + parameterCategory = 4 ; + parameterNumber = 27 ; + typeOfFirstFixedSurface = 168 ; + typeOfSecondFixedSurface = 168 ; + typeOfStatisticalProcessing = 0 ; +} diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def index 2a8c0a64b..b3b91952a 100644 --- a/definitions/grib2/name.def +++ b/definitions/grib2/name.def @@ -7841,7 +7841,9 @@ parameterCategory = 4 ; parameterNumber = 27 ; typeOfFirstFixedSurface = 168 ; - typeOfSecondFixedSurface = 168 ; + typeOfSecondFixedSurface = 255 ; + scaledValueOfSecondFixedSurface = missing() ; + scaleFactorOfSecondFixedSurface = missing() ; } #Sea water potential temperature tendency due to newtonian relaxation 'Sea water potential temperature tendency due to newtonian relaxation' = { @@ -9028,7 +9030,9 @@ parameterCategory = 4 ; parameterNumber = 27 ; typeOfFirstFixedSurface = 168 ; - typeOfSecondFixedSurface = 168 ; + typeOfSecondFixedSurface = 255 ; + scaledValueOfSecondFixedSurface = missing() ; + scaleFactorOfSecondFixedSurface = missing() ; typeOfStatisticalProcessing = 0 ; } #Time-mean sea water potential temperature tendency due to newtonian relaxation diff --git a/definitions/grib2/name.legacy.def b/definitions/grib2/name.legacy.def index 62e965b1c..d55237eb9 100644 --- a/definitions/grib2/name.legacy.def +++ b/definitions/grib2/name.legacy.def @@ -157,3 +157,20 @@ typeOfStatisticalProcessing = 1 ; lengthOfTimeRange = 24 ; } +#Upward sea water velocity +'Upward sea water velocity' = { + discipline = 10 ; + parameterCategory = 4 ; + parameterNumber = 27 ; + typeOfFirstFixedSurface = 168 ; + typeOfSecondFixedSurface = 168 ; +} +#Time-mean upward sea water velocity +'Time-mean upward sea water velocity' = { + discipline = 10 ; + parameterCategory = 4 ; + parameterNumber = 27 ; + typeOfFirstFixedSurface = 168 ; + typeOfSecondFixedSurface = 168 ; + typeOfStatisticalProcessing = 0 ; +} diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def index 453a51920..4c79c56a5 100644 --- a/definitions/grib2/paramId.def +++ b/definitions/grib2/paramId.def @@ -7841,7 +7841,9 @@ parameterCategory = 4 ; parameterNumber = 27 ; typeOfFirstFixedSurface = 168 ; - typeOfSecondFixedSurface = 168 ; + typeOfSecondFixedSurface = 255 ; + scaledValueOfSecondFixedSurface = missing() ; + scaleFactorOfSecondFixedSurface = missing() ; } #Sea water potential temperature tendency due to newtonian relaxation '262508' = { @@ -9028,7 +9030,9 @@ parameterCategory = 4 ; parameterNumber = 27 ; typeOfFirstFixedSurface = 168 ; - typeOfSecondFixedSurface = 168 ; + typeOfSecondFixedSurface = 255 ; + scaledValueOfSecondFixedSurface = missing() ; + scaleFactorOfSecondFixedSurface = missing() ; typeOfStatisticalProcessing = 0 ; } #Time-mean sea water potential temperature tendency due to newtonian relaxation diff --git a/definitions/grib2/paramId.legacy.def b/definitions/grib2/paramId.legacy.def index 489f33c41..ad0ba7521 100644 --- a/definitions/grib2/paramId.legacy.def +++ b/definitions/grib2/paramId.legacy.def @@ -157,3 +157,20 @@ typeOfStatisticalProcessing = 1 ; lengthOfTimeRange = 24 ; } +#Upward sea water velocity +'262507' = { + discipline = 10 ; + parameterCategory = 4 ; + parameterNumber = 27 ; + typeOfFirstFixedSurface = 168 ; + typeOfSecondFixedSurface = 168 ; +} +#Time-mean upward sea water velocity +'263507' = { + discipline = 10 ; + parameterCategory = 4 ; + parameterNumber = 27 ; + typeOfFirstFixedSurface = 168 ; + typeOfSecondFixedSurface = 168 ; + typeOfStatisticalProcessing = 0 ; +} diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def index 806350301..614a8454d 100644 --- a/definitions/grib2/shortName.def +++ b/definitions/grib2/shortName.def @@ -7841,7 +7841,9 @@ parameterCategory = 4 ; parameterNumber = 27 ; typeOfFirstFixedSurface = 168 ; - typeOfSecondFixedSurface = 168 ; + typeOfSecondFixedSurface = 255 ; + scaledValueOfSecondFixedSurface = missing() ; + scaleFactorOfSecondFixedSurface = missing() ; } #Sea water potential temperature tendency due to newtonian relaxation 'thetaodmp' = { @@ -9028,7 +9030,9 @@ parameterCategory = 4 ; parameterNumber = 27 ; typeOfFirstFixedSurface = 168 ; - typeOfSecondFixedSurface = 168 ; + typeOfSecondFixedSurface = 255 ; + scaledValueOfSecondFixedSurface = missing() ; + scaleFactorOfSecondFixedSurface = missing() ; typeOfStatisticalProcessing = 0 ; } #Time-mean sea water potential temperature tendency due to newtonian relaxation diff --git a/definitions/grib2/shortName.legacy.def b/definitions/grib2/shortName.legacy.def index 40534b276..38c2868e6 100644 --- a/definitions/grib2/shortName.legacy.def +++ b/definitions/grib2/shortName.legacy.def @@ -157,3 +157,20 @@ typeOfStatisticalProcessing = 1 ; lengthOfTimeRange = 24 ; } +#Upward sea water velocity +'wo' = { + discipline = 10 ; + parameterCategory = 4 ; + parameterNumber = 27 ; + typeOfFirstFixedSurface = 168 ; + typeOfSecondFixedSurface = 168 ; +} +#Time-mean upward sea water velocity +'avg_wo' = { + discipline = 10 ; + parameterCategory = 4 ; + parameterNumber = 27 ; + typeOfFirstFixedSurface = 168 ; + typeOfSecondFixedSurface = 168 ; + typeOfStatisticalProcessing = 0 ; +} diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def index 411ec5996..d96d6bd9e 100644 --- a/definitions/grib2/units.def +++ b/definitions/grib2/units.def @@ -7841,7 +7841,9 @@ parameterCategory = 4 ; parameterNumber = 27 ; typeOfFirstFixedSurface = 168 ; - typeOfSecondFixedSurface = 168 ; + typeOfSecondFixedSurface = 255 ; + scaledValueOfSecondFixedSurface = missing() ; + scaleFactorOfSecondFixedSurface = missing() ; } #Sea water potential temperature tendency due to newtonian relaxation 'K s**-1' = { @@ -9028,7 +9030,9 @@ parameterCategory = 4 ; parameterNumber = 27 ; typeOfFirstFixedSurface = 168 ; - typeOfSecondFixedSurface = 168 ; + typeOfSecondFixedSurface = 255 ; + scaledValueOfSecondFixedSurface = missing() ; + scaleFactorOfSecondFixedSurface = missing() ; typeOfStatisticalProcessing = 0 ; } #Time-mean sea water potential temperature tendency due to newtonian relaxation diff --git a/definitions/grib2/units.legacy.def b/definitions/grib2/units.legacy.def index 145f4aaac..f05dae694 100644 --- a/definitions/grib2/units.legacy.def +++ b/definitions/grib2/units.legacy.def @@ -157,3 +157,20 @@ typeOfStatisticalProcessing = 1 ; lengthOfTimeRange = 24 ; } +#Upward sea water velocity +'m s**-1' = { + discipline = 10 ; + parameterCategory = 4 ; + parameterNumber = 27 ; + typeOfFirstFixedSurface = 168 ; + typeOfSecondFixedSurface = 168 ; +} +#Time-mean upward sea water velocity +'m s**-1' = { + discipline = 10 ; + parameterCategory = 4 ; + parameterNumber = 27 ; + typeOfFirstFixedSurface = 168 ; + typeOfSecondFixedSurface = 168 ; + typeOfStatisticalProcessing = 0 ; +}