From 245f056d79f56f9a17e83c5fff473622abf7398e Mon Sep 17 00:00:00 2001 From: Sebastien Villaume Date: Fri, 28 Jan 2022 09:29:18 +0000 Subject: [PATCH 1/3] ECC-1334 adding missing typeOfLevel concepts --- definitions/grib2/typeOfLevelConcept.def | 117 +++++++++++++---------- 1 file changed, 66 insertions(+), 51 deletions(-) diff --git a/definitions/grib2/typeOfLevelConcept.def b/definitions/grib2/typeOfLevelConcept.def index 18eaa52f3..21ebf3a1a 100644 --- a/definitions/grib2/typeOfLevelConcept.def +++ b/definitions/grib2/typeOfLevelConcept.def @@ -1,54 +1,69 @@ # Concept typeOfLevel -'surface' = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=255;} -'cloudBase' = {typeOfFirstFixedSurface=2; typeOfSecondFixedSurface=255;} -'cloudTop' = {typeOfFirstFixedSurface=3; typeOfSecondFixedSurface=255;} -'isothermZero' = {typeOfFirstFixedSurface=4; typeOfSecondFixedSurface=255;} -'adiabaticCondensation' = {typeOfFirstFixedSurface=5; typeOfSecondFixedSurface=255;} -'maxWind' = {typeOfFirstFixedSurface=6; typeOfSecondFixedSurface=255;} -'tropopause' = {typeOfFirstFixedSurface=7; typeOfSecondFixedSurface=255;} -'nominalTop' = {typeOfFirstFixedSurface=8; typeOfSecondFixedSurface=255;} -'seaBottom' = {typeOfFirstFixedSurface=9; typeOfSecondFixedSurface=255;} +'surface' = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=255;} +'entireAtmosphere' = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=8;} +'entireOcean' = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=9;} +'entireLake' = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=162;} +'cloudBase' = {typeOfFirstFixedSurface=2; typeOfSecondFixedSurface=255;} +'cloudTop' = {typeOfFirstFixedSurface=3; typeOfSecondFixedSurface=255;} +'isothermZero' = {typeOfFirstFixedSurface=4; typeOfSecondFixedSurface=255;} +'adiabaticCondensation' = {typeOfFirstFixedSurface=5; typeOfSecondFixedSurface=255;} +'maxWind' = {typeOfFirstFixedSurface=6; typeOfSecondFixedSurface=255;} +'tropopause' = {typeOfFirstFixedSurface=7; typeOfSecondFixedSurface=255;} +'nominalTop' = {typeOfFirstFixedSurface=8; typeOfSecondFixedSurface=255;} +'seaBottom' = {typeOfFirstFixedSurface=9; typeOfSecondFixedSurface=255;} # Note: We already had 'entireAtmosphere' mapped before adding this one so had to choose another name -'atmosphere' = {typeOfFirstFixedSurface=10; typeOfSecondFixedSurface=255;} -'mostUnstableParcel' = {typeOfFirstFixedSurface=17; typeOfSecondFixedSurface=255;} -'mixedLayerParcel' = {typeOfFirstFixedSurface=18; typeOfSecondFixedSurface=255;} -'isothermal' = {typeOfFirstFixedSurface=20; typeOfSecondFixedSurface=255;} -'isobaricInPa' = {typeOfFirstFixedSurface=100; typeOfSecondFixedSurface=255; pressureUnits='Pa';} -'isobaricInhPa' = {typeOfFirstFixedSurface=100; pressureUnits='hPa'; typeOfSecondFixedSurface=255;} -'isobaricLayer' = {typeOfFirstFixedSurface=100; typeOfSecondFixedSurface=100;} -'meanSea' = {typeOfFirstFixedSurface=101; typeOfSecondFixedSurface=255;} -'heightAboveSea' = {typeOfFirstFixedSurface=102; typeOfSecondFixedSurface=255;} -'heightAboveSeaLayer' = {typeOfFirstFixedSurface=102; typeOfSecondFixedSurface=102;} -'heightAboveGround' = {typeOfFirstFixedSurface=103; typeOfSecondFixedSurface=255;} -'heightAboveGroundLayer' = {typeOfFirstFixedSurface=103; typeOfSecondFixedSurface=103;} -'sigma' = {typeOfFirstFixedSurface=104; typeOfSecondFixedSurface=255;} -'sigmaLayer' = {typeOfFirstFixedSurface=104; typeOfSecondFixedSurface=104;} -'hybrid' = {typeOfFirstFixedSurface=105; typeOfSecondFixedSurface=255;} -'hybridHeight' = {typeOfFirstFixedSurface=118; typeOfSecondFixedSurface=255;} -'hybridLayer' = {typeOfFirstFixedSurface=105; typeOfSecondFixedSurface=105;} -'depthBelowLand' = {typeOfFirstFixedSurface=106; typeOfSecondFixedSurface=255;} -'depthBelowLandLayer' = {typeOfFirstFixedSurface=106; typeOfSecondFixedSurface=106;} -'theta' = {typeOfFirstFixedSurface=107; typeOfSecondFixedSurface=255;} -'thetaLayer' = {typeOfFirstFixedSurface=107; typeOfSecondFixedSurface=107;} -'pressureFromGround' = {typeOfFirstFixedSurface=108; typeOfSecondFixedSurface=255;} -'pressureFromGroundLayer' = {typeOfFirstFixedSurface=108; typeOfSecondFixedSurface=108;} -'potentialVorticity' = {typeOfFirstFixedSurface=109; typeOfSecondFixedSurface=255;} -'eta' = {typeOfFirstFixedSurface=111; typeOfSecondFixedSurface=255;} -'soil' = {typeOfFirstFixedSurface=151; typeOfSecondFixedSurface=255;} -'soilLayer' = {typeOfFirstFixedSurface=151; typeOfSecondFixedSurface=151;} +'atmosphere' = {typeOfFirstFixedSurface=10; typeOfSecondFixedSurface=255;} +'mostUnstableParcel' = {typeOfFirstFixedSurface=17; typeOfSecondFixedSurface=255;} +'mixedLayerParcel' = {typeOfFirstFixedSurface=18; typeOfSecondFixedSurface=255;} +'isothermal' = {typeOfFirstFixedSurface=20; typeOfSecondFixedSurface=255;} +'isobaricInPa' = {typeOfFirstFixedSurface=100; typeOfSecondFixedSurface=255; pressureUnits='Pa';} +'isobaricInhPa' = {typeOfFirstFixedSurface=100; pressureUnits='hPa'; typeOfSecondFixedSurface=255;} +'isobaricLayer' = {typeOfFirstFixedSurface=100; typeOfSecondFixedSurface=100;} +'meanSea' = {typeOfFirstFixedSurface=101; typeOfSecondFixedSurface=255;} +'heightAboveSea' = {typeOfFirstFixedSurface=102; typeOfSecondFixedSurface=255;} +'heightAboveSeaLayer' = {typeOfFirstFixedSurface=102; typeOfSecondFixedSurface=102;} +'heightAboveGround' = {typeOfFirstFixedSurface=103; typeOfSecondFixedSurface=255;} +'heightAboveGroundLayer' = {typeOfFirstFixedSurface=103; typeOfSecondFixedSurface=103;} +'sigma' = {typeOfFirstFixedSurface=104; typeOfSecondFixedSurface=255;} +'sigmaLayer' = {typeOfFirstFixedSurface=104; typeOfSecondFixedSurface=104;} +'hybrid' = {typeOfFirstFixedSurface=105; typeOfSecondFixedSurface=255;} +'hybridLayer' = {typeOfFirstFixedSurface=105; typeOfSecondFixedSurface=105;} +'depthBelowLand' = {typeOfFirstFixedSurface=106; typeOfSecondFixedSurface=255;} +'depthBelowLandLayer' = {typeOfFirstFixedSurface=106; typeOfSecondFixedSurface=106;} +'theta' = {typeOfFirstFixedSurface=107; typeOfSecondFixedSurface=255;} +'thetaLayer' = {typeOfFirstFixedSurface=107; typeOfSecondFixedSurface=107;} +'pressureFromGround' = {typeOfFirstFixedSurface=108; typeOfSecondFixedSurface=255;} +'pressureFromGroundLayer' = {typeOfFirstFixedSurface=108; typeOfSecondFixedSurface=108;} +'potentialVorticity' = {typeOfFirstFixedSurface=109; typeOfSecondFixedSurface=255;} +'eta' = {typeOfFirstFixedSurface=111; typeOfSecondFixedSurface=255;} +'snow' = {typeOfFirstFixedSurface=114; typeOfSecondFixedSurface=255;} +'snowLayer' = {typeOfFirstFixedSurface=114; typeOfSecondFixedSurface=114;} +'mixedLayerDepthGeneric' = {typeOfFirstFixedSurface=117; typeOfSecondFixedSurface=255;} +'hybridHeight' = {typeOfFirstFixedSurface=118; typeOfSecondFixedSurface=255;} +'hybridPressure' = {typeOfFirstFixedSurface=119; typeOfSecondFixedSurface=255;} # In the case of Generalized vertical height coordinates, NV must be 6 -'generalVertical' = {genVertHeightCoords=1; typeOfFirstFixedSurface=150; NV=6;} -'generalVerticalLayer' = {genVertHeightCoords=1; typeOfFirstFixedSurface=150; - typeOfSecondFixedSurface=150; NV=6;} -'depthBelowSea' = {typeOfFirstFixedSurface=160; typeOfSecondFixedSurface=255;} -'oceanSurface' = {typeOfFirstFixedSurface=160; scaleFactorOfFirstFixedSurface=0; - scaledValueOfFirstFixedSurface=0; typeOfSecondFixedSurface=255;} -'oceanLayer' = {typeOfFirstFixedSurface=160; typeOfSecondFixedSurface=160;} -'entireAtmosphere' = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=8;} -'entireOcean' = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=9;} -'entireLake' = {typeOfFirstFixedSurface=1; typeOfSecondFixedSurface=162;} -'snow' = {typeOfFirstFixedSurface=114; typeOfSecondFixedSurface=255;} -'snowLayer' = {typeOfFirstFixedSurface=114; typeOfSecondFixedSurface=114;} -'seaIce' = {typeOfFirstFixedSurface=152; typeOfSecondFixedSurface=255;} -'seaIceLayer' = {typeOfFirstFixedSurface=152; typeOfSecondFixedSurface=152;} -'mixedLayerDepth' = {typeOfFirstFixedSurface=169; typeOfSecondFixedSurface=255;} +'generalVertical' = {genVertHeightCoords=1; typeOfFirstFixedSurface=150; NV=6;} +'generalVerticalLayer' = {genVertHeightCoords=1; typeOfFirstFixedSurface=150; typeOfSecondFixedSurface=150; NV=6;} +'soil' = {typeOfFirstFixedSurface=151; typeOfSecondFixedSurface=255;} +'soilLayer' = {typeOfFirstFixedSurface=151; typeOfSecondFixedSurface=151;} +'seaIce' = {typeOfFirstFixedSurface=152; typeOfSecondFixedSurface=255;} +'seaIceLayer' = {typeOfFirstFixedSurface=152; typeOfSecondFixedSurface=152;} +'depthBelowSea' = {typeOfFirstFixedSurface=160; typeOfSecondFixedSurface=255;} +'oceanSurface' = {typeOfFirstFixedSurface=160; scaleFactorOfFirstFixedSurface=0; + scaledValueOfFirstFixedSurface=0; typeOfSecondFixedSurface=255;} +'depthBelowSeaLayer' = {typeOfFirstFixedSurface=160; typeOfSecondFixedSurface=160;} +'oceanSurfaceToBottom' = {typeOfFirstFixedSurface=160; typeOfSecondFixedSurface=9;} +'lakeBottom' = {typeOfFirstFixedSurface=162; typeOfSecondFixedSurface=255;} +'mixingLayer' = {typeOfFirstFixedSurface=166; typeOfSecondFixedSurface=255;} +'oceanModel' = {typeOfFirstFixedSurface=168; typeOfSecondFixedSurface=255;} +'oceanModelLayer' = {typeOfFirstFixedSurface=168; typeOfSecondFixedSurface=168;} +'mixedLayerDepthByDensity' = {typeOfFirstFixedSurface=169; typeOfSecondFixedSurface=255;} +'mixedLayerDepthByTemperature' = {typeOfFirstFixedSurface=170; typeOfSecondFixedSurface=255;} +'mixedLayerDepthByDiffusivity' = {typeOfFirstFixedSurface=171; typeOfSecondFixedSurface=255;} +'iceTopOnWater' = {typeOfFirstFixedSurface=174; typeOfSecondFixedSurface=255;} +'iceLayerOnWater' = {typeOfFirstFixedSurface=174; typeOfSecondFixedSurface=176;} +'iceTopUnderSnowOnWater' = {typeOfFirstFixedSurface=175; typeOfSecondFixedSurface=255;} +'iceLayerUnderSnowOnWater' = {typeOfFirstFixedSurface=175; typeOfSecondFixedSurface=176;} +'iceBottomOnWater' = {typeOfFirstFixedSurface=176; typeOfSecondFixedSurface=255;} +'infiniteSoilDepth' = {typeOfFirstFixedSurface=177; typeOfSecondFixedSurface=255;} + From e23bf4ce9846db2d95bf1cc1c2984606816a4ee2 Mon Sep 17 00:00:00 2001 From: Sebastien Villaume Date: Fri, 28 Jan 2022 13:51:43 +0000 Subject: [PATCH 2/3] ECC-1334 fix typo in inDEfiniteSoilDepth --- definitions/grib2/typeOfLevelConcept.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/definitions/grib2/typeOfLevelConcept.def b/definitions/grib2/typeOfLevelConcept.def index 21ebf3a1a..3f05b84f0 100644 --- a/definitions/grib2/typeOfLevelConcept.def +++ b/definitions/grib2/typeOfLevelConcept.def @@ -65,5 +65,5 @@ 'iceTopUnderSnowOnWater' = {typeOfFirstFixedSurface=175; typeOfSecondFixedSurface=255;} 'iceLayerUnderSnowOnWater' = {typeOfFirstFixedSurface=175; typeOfSecondFixedSurface=176;} 'iceBottomOnWater' = {typeOfFirstFixedSurface=176; typeOfSecondFixedSurface=255;} -'infiniteSoilDepth' = {typeOfFirstFixedSurface=177; typeOfSecondFixedSurface=255;} +'indefiniteSoilDepth' = {typeOfFirstFixedSurface=177; typeOfSecondFixedSurface=255;} From aff3441c31015a6b378c3e17ca1cb26c2ff5d035 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Fri, 28 Jan 2022 14:13:33 +0000 Subject: [PATCH 3/3] ECC-1334: cleanup --- definitions/grib2/typeOfLevelConcept.def | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/definitions/grib2/typeOfLevelConcept.def b/definitions/grib2/typeOfLevelConcept.def index 3f05b84f0..3d151cff2 100644 --- a/definitions/grib2/typeOfLevelConcept.def +++ b/definitions/grib2/typeOfLevelConcept.def @@ -65,5 +65,4 @@ 'iceTopUnderSnowOnWater' = {typeOfFirstFixedSurface=175; typeOfSecondFixedSurface=255;} 'iceLayerUnderSnowOnWater' = {typeOfFirstFixedSurface=175; typeOfSecondFixedSurface=176;} 'iceBottomOnWater' = {typeOfFirstFixedSurface=176; typeOfSecondFixedSurface=255;} -'indefiniteSoilDepth' = {typeOfFirstFixedSurface=177; typeOfSecondFixedSurface=255;} - +'indefiniteSoilDepth' = {typeOfFirstFixedSurface=177; typeOfSecondFixedSurface=255;}