core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ECC-1810: GRIB: Surface sea water velocity encodings

This commit is contained in:
Shahram Najm 2024-04-23 16:35:52 +00:00
parent 58124eedac
commit 453122aee8
20 changed files with 113 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
definitions/grib1/localConcepts/ecmf/cfName.def
View File

@ -909,12 +909,12 @@
table2Version = 151 ;
indicatorOfParameter = 130 ;
}
#Eastward sea water velocity
#Eastward surface sea water velocity
'eastward_sea_water_velocity' = {
table2Version = 151 ;
indicatorOfParameter = 131 ;
}
#Northward sea water velocity
#Northward surface sea water velocity
'northward_sea_water_velocity' = {
table2Version = 151 ;
indicatorOfParameter = 132 ;

4
definitions/grib1/localConcepts/ecmf/cfVarName.def
View File

@ -13024,12 +13024,12 @@
table2Version = 151 ;
indicatorOfParameter = 130 ;
}
#Eastward sea water velocity
#Eastward surface sea water velocity
'uoe' = {
table2Version = 151 ;
indicatorOfParameter = 131 ;
}
#Northward sea water velocity
#Northward surface sea water velocity
'von' = {
table2Version = 151 ;
indicatorOfParameter = 132 ;

8
definitions/grib1/localConcepts/ecmf/name.def
View File

@ -13024,13 +13024,13 @@
table2Version = 151 ;
indicatorOfParameter = 130 ;
}
#Eastward sea water velocity
'Eastward sea water velocity' = {
#Eastward surface sea water velocity
'Eastward surface sea water velocity' = {
table2Version = 151 ;
indicatorOfParameter = 131 ;
}
#Northward sea water velocity
'Northward sea water velocity' = {
#Northward surface sea water velocity
'Northward surface sea water velocity' = {
table2Version = 151 ;
indicatorOfParameter = 132 ;
}

4
definitions/grib1/localConcepts/ecmf/paramId.def
View File

@ -13024,12 +13024,12 @@
table2Version = 151 ;
indicatorOfParameter = 130 ;
}
#Eastward sea water velocity
#Eastward surface sea water velocity
'151131' = {
table2Version = 151 ;
indicatorOfParameter = 131 ;
}
#Northward sea water velocity
#Northward surface sea water velocity
'151132' = {
table2Version = 151 ;
indicatorOfParameter = 132 ;

4
definitions/grib1/localConcepts/ecmf/shortName.def
View File

@ -13024,12 +13024,12 @@
table2Version = 151 ;
indicatorOfParameter = 130 ;
}
#Eastward sea water velocity
#Eastward surface sea water velocity
'ocu' = {
table2Version = 151 ;
indicatorOfParameter = 131 ;
}
#Northward sea water velocity
#Northward surface sea water velocity
'ocv' = {
table2Version = 151 ;
indicatorOfParameter = 132 ;

4
definitions/grib1/localConcepts/ecmf/units.def
View File

@ -13024,12 +13024,12 @@
table2Version = 151 ;
indicatorOfParameter = 130 ;
}
#Eastward sea water velocity
#Eastward surface sea water velocity
'm s**-1' = {
table2Version = 151 ;
indicatorOfParameter = 131 ;
}
#Northward sea water velocity
#Northward surface sea water velocity
'm s**-1' = {
table2Version = 151 ;
indicatorOfParameter = 132 ;

14
definitions/grib2/cfName.def
View File

@ -343,20 +343,6 @@
parameterCategory = 1 ;
parameterNumber = 10 ;
}
#Eastward sea water velocity
'eastward_sea_water_velocity' = {
discipline = 10 ;
parameterCategory = 1 ;
parameterNumber = 2 ;
typeOfFirstFixedSurface = 160 ;
}
#Northward sea water velocity
'northward_sea_water_velocity' = {
discipline = 10 ;
parameterCategory = 1 ;
parameterNumber = 3 ;
typeOfFirstFixedSurface = 160 ;
}
#Nitrogen dioxide mass mixing ratio
'mass_fraction_of_nitrogen_dioxide_in_air' = {
discipline = 0 ;

14
definitions/grib2/cfVarName.def
View File

@ -10565,20 +10565,6 @@
parameterCategory = 0 ;
parameterNumber = 44 ;
}
#Eastward sea water velocity
'uoe' = {
discipline = 10 ;
parameterCategory = 1 ;
parameterNumber = 2 ;
typeOfFirstFixedSurface = 160 ;
}
#Northward sea water velocity
'von' = {
discipline = 10 ;
parameterCategory = 1 ;
parameterNumber = 3 ;
typeOfFirstFixedSurface = 160 ;
}
#Skin reservoir content
'srcrea' = {
discipline = 2 ;

16
definitions/grib2/localConcepts/s2s/cfName.def
View File

@ -56,6 +56,22 @@
scaleFactorOfSecondFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Eastward surface sea water velocity
'eastward_sea_water_velocity' = {
discipline = 10 ;
parameterCategory = 1 ;
parameterNumber = 2 ;
typeOfFirstFixedSurface = 160 ;
typeOfStatisticalProcessing = 0 ;
}
#Northward surface sea water velocity
'northward_sea_water_velocity' = {
discipline = 10 ;
parameterCategory = 1 ;
parameterNumber = 3 ;
typeOfFirstFixedSurface = 160 ;
typeOfStatisticalProcessing = 0 ;
}
#Sea surface height
'sea_surface_height_above_geoid' = {
discipline = 10 ;

16
definitions/grib2/localConcepts/s2s/cfVarName.def
View File

@ -173,6 +173,22 @@
scaleFactorOfSecondFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Eastward surface sea water velocity
'ocu' = {
discipline = 10 ;
parameterCategory = 1 ;
parameterNumber = 2 ;
typeOfFirstFixedSurface = 160 ;
typeOfStatisticalProcessing = 0 ;
}
#Northward surface sea water velocity
'ocv' = {
discipline = 10 ;
parameterCategory = 1 ;
parameterNumber = 3 ;
typeOfFirstFixedSurface = 160 ;
typeOfStatisticalProcessing = 0 ;
}
#Sea surface height
'zos' = {
discipline = 10 ;

16
definitions/grib2/localConcepts/s2s/name.def
View File

@ -173,6 +173,22 @@
scaleFactorOfSecondFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Eastward surface sea water velocity
'Eastward surface sea water velocity' = {
discipline = 10 ;
parameterCategory = 1 ;
parameterNumber = 2 ;
typeOfFirstFixedSurface = 160 ;
typeOfStatisticalProcessing = 0 ;
}
#Northward surface sea water velocity
'Northward surface sea water velocity' = {
discipline = 10 ;
parameterCategory = 1 ;
parameterNumber = 3 ;
typeOfFirstFixedSurface = 160 ;
typeOfStatisticalProcessing = 0 ;
}
#Sea surface height
'Sea surface height' = {
discipline = 10 ;

16
definitions/grib2/localConcepts/s2s/paramId.def
View File

@ -173,6 +173,22 @@
scaleFactorOfSecondFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Eastward surface sea water velocity
'151131' = {
discipline = 10 ;
parameterCategory = 1 ;
parameterNumber = 2 ;
typeOfFirstFixedSurface = 160 ;
typeOfStatisticalProcessing = 0 ;
}
#Northward surface sea water velocity
'151132' = {
discipline = 10 ;
parameterCategory = 1 ;
parameterNumber = 3 ;
typeOfFirstFixedSurface = 160 ;
typeOfStatisticalProcessing = 0 ;
}
#Sea surface height
'151145' = {
discipline = 10 ;

16
definitions/grib2/localConcepts/s2s/shortName.def
View File

@ -173,6 +173,22 @@
scaleFactorOfSecondFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Eastward surface sea water velocity
'ocu' = {
discipline = 10 ;
parameterCategory = 1 ;
parameterNumber = 2 ;
typeOfFirstFixedSurface = 160 ;
typeOfStatisticalProcessing = 0 ;
}
#Northward surface sea water velocity
'ocv' = {
discipline = 10 ;
parameterCategory = 1 ;
parameterNumber = 3 ;
typeOfFirstFixedSurface = 160 ;
typeOfStatisticalProcessing = 0 ;
}
#Sea surface height
'zos' = {
discipline = 10 ;

16
definitions/grib2/localConcepts/s2s/units.def
View File

@ -173,6 +173,22 @@
scaleFactorOfSecondFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Eastward surface sea water velocity
'm s**-1' = {
discipline = 10 ;
parameterCategory = 1 ;
parameterNumber = 2 ;
typeOfFirstFixedSurface = 160 ;
typeOfStatisticalProcessing = 0 ;
}
#Northward surface sea water velocity
'm s**-1' = {
discipline = 10 ;
parameterCategory = 1 ;
parameterNumber = 3 ;
typeOfFirstFixedSurface = 160 ;
typeOfStatisticalProcessing = 0 ;
}
#Sea surface height
'm' = {
discipline = 10 ;

14
definitions/grib2/name.def
View File

@ -10565,20 +10565,6 @@
parameterCategory = 0 ;
parameterNumber = 44 ;
}
#Eastward sea water velocity
'Eastward sea water velocity' = {
discipline = 10 ;
parameterCategory = 1 ;
parameterNumber = 2 ;
typeOfFirstFixedSurface = 160 ;
}
#Northward sea water velocity
'Northward sea water velocity' = {
discipline = 10 ;
parameterCategory = 1 ;
parameterNumber = 3 ;
typeOfFirstFixedSurface = 160 ;
}
#Skin reservoir content
'Skin reservoir content' = {
discipline = 2 ;

14
definitions/grib2/paramId.def
View File

@ -10565,20 +10565,6 @@
parameterCategory = 0 ;
parameterNumber = 44 ;
}
#Eastward sea water velocity
'151131' = {
discipline = 10 ;
parameterCategory = 1 ;
parameterNumber = 2 ;
typeOfFirstFixedSurface = 160 ;
}
#Northward sea water velocity
'151132' = {
discipline = 10 ;
parameterCategory = 1 ;
parameterNumber = 3 ;
typeOfFirstFixedSurface = 160 ;
}
#Skin reservoir content
'160198' = {
discipline = 2 ;

14
definitions/grib2/shortName.def
View File

@ -10565,20 +10565,6 @@
parameterCategory = 0 ;
parameterNumber = 44 ;
}
#Eastward sea water velocity
'ocu' = {
discipline = 10 ;
parameterCategory = 1 ;
parameterNumber = 2 ;
typeOfFirstFixedSurface = 160 ;
}
#Northward sea water velocity
'ocv' = {
discipline = 10 ;
parameterCategory = 1 ;
parameterNumber = 3 ;
typeOfFirstFixedSurface = 160 ;
}
#Skin reservoir content
'srcrea' = {
discipline = 2 ;

14
definitions/grib2/units.def
View File

@ -10565,20 +10565,6 @@
parameterCategory = 0 ;
parameterNumber = 44 ;
}
#Eastward sea water velocity
'm s**-1' = {
discipline = 10 ;
parameterCategory = 1 ;
parameterNumber = 2 ;
typeOfFirstFixedSurface = 160 ;
}
#Northward sea water velocity
'm s**-1' = {
discipline = 10 ;
parameterCategory = 1 ;
parameterNumber = 3 ;
typeOfFirstFixedSurface = 160 ;
}
#Skin reservoir content
'kg m**-2' = {
discipline = 2 ;

2
definitions/param_limits.def
View File

@ -18,6 +18,7 @@ concept param_value_min(default_min_val) {
-60000 = { paramId=228001; }
0 = { paramId=151163; }
-3.5 = { paramId=151131; }
-3.5 = { paramId=262140; }
-10 = { paramId=260259; }
-13000 = { paramId=129; }
-1300 = { paramId=156; }
@ -103,6 +104,7 @@ concept param_value_max(default_max_val) {
1000 = { paramId=228001; }
1500 = { paramId=151163; }
3.5 = { paramId=151131; }
3.5 = { paramId=262140; }
5 = { paramId=260259; }
3500000 = { paramId=129; }
35000 = { paramId=156; }

18
tests/grib_data_quality_checks.sh
View File

@ -88,15 +88,10 @@ grep -q 'allowable limit' $tempErr
echo "Test limits which are doubles..."
# -------------------------------------
pid=151131 # has limits -3.5 and +3.5
${tools_dir}/grib_set -s paramId=$pid $input1 $tempGrib1
pid=262140 # has limits -3.5 and +3.5
${tools_dir}/grib_set -s paramId=$pid $input2 $tempGrib2
minval1=`${tools_dir}/grib_get -p param_value_min:d $tempGrib1`
maxval1=`${tools_dir}/grib_get -p param_value_max:d $tempGrib1`
minval2=`${tools_dir}/grib_get -p param_value_min:d $tempGrib2`
maxval2=`${tools_dir}/grib_get -p param_value_max:d $tempGrib2`
[ "$minval1" = "-3.5" ]
[ "$maxval1" = "3.5" ]
[ "$minval2" = "-3.5" ]
[ "$maxval2" = "3.5" ]
@ -104,16 +99,12 @@ maxval2=`${tools_dir}/grib_get -p param_value_max:d $tempGrib2`
grib_check_key_equals $tempGrib2 'param_value_min:s,param_value_max:s' '-3.5 3.5'
set +e
${tools_dir}/grib_set -s scaleValuesBy=1.1 $tempGrib1 $tempOut 2>$tempErr
stat1=$?
${tools_dir}/grib_set -s scaleValuesBy=1.1 $tempGrib2 $tempOut 2>$tempErr
stat2=$?
set -e
[ $stat1 -ne 0 ]
[ $stat2 -ne 0 ]
# Should succeed. Change paramId first and then scale all values down
${tools_dir}/grib_set -s paramId=$pid,scaleValuesBy=0.01 $input1 $tempOut
${tools_dir}/grib_set -s paramId=$pid,scaleValuesBy=0.01 $input2 $tempOut
echo "Test close to the limit..."
@ -126,13 +117,6 @@ ${tools_dir}/grib_set -s scaleValuesBy=3.6 $tempGrib2 $tempOut
set -e
[ $status -ne 0 ]
${tools_dir}/grib_set -s edition=1 $tempGrib2 $tempGrib1
${tools_dir}/grib_set -s scaleValuesBy=-3 $tempGrib1 $tempOut # OK
set +e
${tools_dir}/grib_set -s scaleValuesBy=-3.55 $tempGrib1 $tempOut
set -e
[ $status -ne 0 ]
echo "Test limits with steps..."
# -----------------------------