Skip to content

Commit

Permalink
ECC-1842: GRIB2: Modification of ocean parameter encodings to support…
Browse files Browse the repository at this point in the history
… multiple typeOfLevel entries
  • Loading branch information
shahramn committed Jun 20, 2024
1 parent 99cfebb commit 3b7abcf
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 492 deletions.
12 changes: 0 additions & 12 deletions definitions/grib2/cfName.def
Original file line number Diff line number Diff line change
Expand Up @@ -282,12 +282,6 @@
discipline = 10 ;
parameterCategory = 3 ;
parameterNumber = 3 ;
typeOfFirstFixedSurface = 160 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
}
#Depth of 20 C isotherm
'depth_of_isosurface_of_sea_water_potential_temperature' = {
Expand Down Expand Up @@ -318,12 +312,6 @@
discipline = 10 ;
parameterCategory = 3 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 160 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
}
#Heat flux correction
'heat_flux_correction' = {
Expand Down
96 changes: 0 additions & 96 deletions definitions/grib2/cfVarName.def
Original file line number Diff line number Diff line change
Expand Up @@ -7807,12 +7807,6 @@
discipline = 10 ;
parameterCategory = 3 ;
parameterNumber = 3 ;
typeOfFirstFixedSurface = 160 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
}
#Sea surface temperature
'tos' = {
Expand Down Expand Up @@ -7903,36 +7897,18 @@
discipline = 10 ;
parameterCategory = 3 ;
parameterNumber = 4 ;
typeOfFirstFixedSurface = 160 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
}
#Northward surface stress
'tauvon' = {
discipline = 10 ;
parameterCategory = 3 ;
parameterNumber = 6 ;
typeOfFirstFixedSurface = 160 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
}
#Eastward surface stress
'tauuoe' = {
discipline = 10 ;
parameterCategory = 3 ;
parameterNumber = 5 ;
typeOfFirstFixedSurface = 160 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
}
#Y-component of surface stress
'tauvo' = {
Expand Down Expand Up @@ -8095,12 +8071,6 @@
discipline = 10 ;
parameterCategory = 3 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 160 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
}
#Steric change in sea surface height
'stheig' = {
Expand Down Expand Up @@ -8275,24 +8245,12 @@
discipline = 10 ;
parameterCategory = 3 ;
parameterNumber = 15 ;
typeOfFirstFixedSurface = 160 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
}
#Eastward surface sea water velocity
'sve' = {
discipline = 10 ;
parameterCategory = 3 ;
parameterNumber = 14 ;
typeOfFirstFixedSurface = 160 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
}
#Heat Content surface to 26C isotherm
'hct26' = {
Expand Down Expand Up @@ -8341,12 +8299,6 @@
discipline = 10 ;
parameterCategory = 3 ;
parameterNumber = 21 ;
typeOfFirstFixedSurface = 160 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
}
#Vertically integrated sea water practical salinity in the upper 300 m
'sc300v' = {
Expand Down Expand Up @@ -8934,12 +8886,6 @@
discipline = 10 ;
parameterCategory = 3 ;
parameterNumber = 3 ;
typeOfFirstFixedSurface = 160 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean sea surface temperature
Expand Down Expand Up @@ -9038,38 +8984,20 @@
discipline = 10 ;
parameterCategory = 3 ;
parameterNumber = 4 ;
typeOfFirstFixedSurface = 160 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean northward surface stress
'avg_tauvon' = {
discipline = 10 ;
parameterCategory = 3 ;
parameterNumber = 6 ;
typeOfFirstFixedSurface = 160 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean eastward surface stress
'avg_tauuoe' = {
discipline = 10 ;
parameterCategory = 3 ;
parameterNumber = 5 ;
typeOfFirstFixedSurface = 160 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Time mean Y-component of surface stress
Expand Down Expand Up @@ -9246,12 +9174,6 @@
discipline = 10 ;
parameterCategory = 3 ;
parameterNumber = 1 ;
typeOfFirstFixedSurface = 160 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean steric change in sea surface height
Expand Down Expand Up @@ -9441,25 +9363,13 @@
discipline = 10 ;
parameterCategory = 3 ;
parameterNumber = 15 ;
typeOfFirstFixedSurface = 160 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean eastward surface sea water velocity
'avg_sve' = {
discipline = 10 ;
parameterCategory = 3 ;
parameterNumber = 14 ;
typeOfFirstFixedSurface = 160 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean heat content surface to 26C isotherm
Expand Down Expand Up @@ -9513,12 +9423,6 @@
discipline = 10 ;
parameterCategory = 3 ;
parameterNumber = 21 ;
typeOfFirstFixedSurface = 160 ;
typeOfSecondFixedSurface = 255 ;
scaledValueOfFirstFixedSurface = 0 ;
scaleFactorOfFirstFixedSurface = 0 ;
scaledValueOfSecondFixedSurface = missing() ;
scaleFactorOfSecondFixedSurface = missing() ;
typeOfStatisticalProcessing = 0 ;
}
#Time-mean vertically integrated sea water practical salinity in the upper 300 m
Expand Down
Loading

0 comments on commit 3b7abcf

Please sign in to comment.