From 81ed1c3e7cfa1e7e410321427dfeba44c6394fab Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Fri, 5 Mar 2021 22:19:06 +0000 Subject: [PATCH] ECC-1213: Mapping for mars.levtype added (when typeOfFirstFixedSurface=174) --- definitions/grib2/tables/15/4.5.table | 2 +- definitions/grib2/tables/16/4.5.table | 2 +- definitions/grib2/tables/17/4.5.table | 2 +- definitions/grib2/tables/18/4.5.table | 2 +- definitions/grib2/tables/19/4.5.table | 2 +- definitions/grib2/tables/20/4.5.table | 2 +- definitions/grib2/tables/21/4.5.table | 2 +- definitions/grib2/tables/22/4.5.table | 2 +- definitions/grib2/tables/23/4.5.table | 2 +- definitions/grib2/tables/24/4.5.table | 2 +- definitions/grib2/tables/25/4.5.table | 2 +- definitions/grib2/tables/26/4.5.table | 2 +- definitions/grib2/tables/27/4.5.table | 2 +- tests/grib_levtype.sh | 1 - 14 files changed, 13 insertions(+), 14 deletions(-) diff --git a/definitions/grib2/tables/15/4.5.table b/definitions/grib2/tables/15/4.5.table index 8a184f4f4..ffbb29d24 100644 --- a/definitions/grib2/tables/15/4.5.table +++ b/definitions/grib2/tables/15/4.5.table @@ -47,7 +47,7 @@ 167 167 Bottom of root zone # 168-173 Reserved # 168-169 Reserved -174 174 Top surface of ice on sea, lake or river +174 sfc Top surface of ice on sea, lake or river 175 175 Top surface of ice, under snow cover, on sea, lake or river 176 176 Bottom surface (underside) ice on sea, lake or river 177 sfc Deep soil (of indefinite depth) diff --git a/definitions/grib2/tables/16/4.5.table b/definitions/grib2/tables/16/4.5.table index 9cabf1f73..430724c6a 100644 --- a/definitions/grib2/tables/16/4.5.table +++ b/definitions/grib2/tables/16/4.5.table @@ -46,7 +46,7 @@ 166 166 Mixing layer (-) 167 167 Bottom of root zone (-) # 168-173 Reserved -174 174 Top surface of ice on sea, lake or river +174 sfc Top surface of ice on sea, lake or river 175 175 Top surface of ice, under snow cover, on sea, lake or river 176 176 Bottom surface (underside) ice on sea, lake or river 177 sfc Deep soil (of indefinite depth) diff --git a/definitions/grib2/tables/17/4.5.table b/definitions/grib2/tables/17/4.5.table index 2e2695aa5..8adeaba31 100644 --- a/definitions/grib2/tables/17/4.5.table +++ b/definitions/grib2/tables/17/4.5.table @@ -51,7 +51,7 @@ 166 166 Mixing layer (-) 167 167 Bottom of root zone (-) # 168-173 Reserved -174 174 Top surface of ice on sea, lake or river +174 sfc Top surface of ice on sea, lake or river 175 175 Top surface of ice, under snow cover, on sea, lake or river 176 176 Bottom surface (underside) ice on sea, lake or river 177 sfc Deep soil (of indefinite depth) diff --git a/definitions/grib2/tables/18/4.5.table b/definitions/grib2/tables/18/4.5.table index c14343e74..cb125eb68 100644 --- a/definitions/grib2/tables/18/4.5.table +++ b/definitions/grib2/tables/18/4.5.table @@ -56,7 +56,7 @@ 166 166 Mixing layer (-) 167 167 Bottom of root zone (-) # 168-173 Reserved -174 174 Top surface of ice on sea, lake or river +174 sfc Top surface of ice on sea, lake or river 175 175 Top surface of ice, under snow cover, on sea, lake or river 176 176 Bottom surface (underside) ice on sea, lake or river 177 sfc Deep soil (of indefinite depth) diff --git a/definitions/grib2/tables/19/4.5.table b/definitions/grib2/tables/19/4.5.table index c14343e74..cb125eb68 100644 --- a/definitions/grib2/tables/19/4.5.table +++ b/definitions/grib2/tables/19/4.5.table @@ -56,7 +56,7 @@ 166 166 Mixing layer (-) 167 167 Bottom of root zone (-) # 168-173 Reserved -174 174 Top surface of ice on sea, lake or river +174 sfc Top surface of ice on sea, lake or river 175 175 Top surface of ice, under snow cover, on sea, lake or river 176 176 Bottom surface (underside) ice on sea, lake or river 177 sfc Deep soil (of indefinite depth) diff --git a/definitions/grib2/tables/20/4.5.table b/definitions/grib2/tables/20/4.5.table index c14343e74..cb125eb68 100644 --- a/definitions/grib2/tables/20/4.5.table +++ b/definitions/grib2/tables/20/4.5.table @@ -56,7 +56,7 @@ 166 166 Mixing layer (-) 167 167 Bottom of root zone (-) # 168-173 Reserved -174 174 Top surface of ice on sea, lake or river +174 sfc Top surface of ice on sea, lake or river 175 175 Top surface of ice, under snow cover, on sea, lake or river 176 176 Bottom surface (underside) ice on sea, lake or river 177 sfc Deep soil (of indefinite depth) diff --git a/definitions/grib2/tables/21/4.5.table b/definitions/grib2/tables/21/4.5.table index c14343e74..cb125eb68 100644 --- a/definitions/grib2/tables/21/4.5.table +++ b/definitions/grib2/tables/21/4.5.table @@ -56,7 +56,7 @@ 166 166 Mixing layer (-) 167 167 Bottom of root zone (-) # 168-173 Reserved -174 174 Top surface of ice on sea, lake or river +174 sfc Top surface of ice on sea, lake or river 175 175 Top surface of ice, under snow cover, on sea, lake or river 176 176 Bottom surface (underside) ice on sea, lake or river 177 sfc Deep soil (of indefinite depth) diff --git a/definitions/grib2/tables/22/4.5.table b/definitions/grib2/tables/22/4.5.table index c14343e74..cb125eb68 100644 --- a/definitions/grib2/tables/22/4.5.table +++ b/definitions/grib2/tables/22/4.5.table @@ -56,7 +56,7 @@ 166 166 Mixing layer (-) 167 167 Bottom of root zone (-) # 168-173 Reserved -174 174 Top surface of ice on sea, lake or river +174 sfc Top surface of ice on sea, lake or river 175 175 Top surface of ice, under snow cover, on sea, lake or river 176 176 Bottom surface (underside) ice on sea, lake or river 177 sfc Deep soil (of indefinite depth) diff --git a/definitions/grib2/tables/23/4.5.table b/definitions/grib2/tables/23/4.5.table index 9bd1b8993..1ec7d7302 100644 --- a/definitions/grib2/tables/23/4.5.table +++ b/definitions/grib2/tables/23/4.5.table @@ -57,7 +57,7 @@ 166 166 Mixing layer (-) 167 167 Bottom of root zone (-) # 168-173 Reserved -174 174 Top surface of ice on sea, lake or river +174 sfc Top surface of ice on sea, lake or river 175 175 Top surface of ice, under snow cover, on sea, lake or river 176 176 Bottom surface (underside) ice on sea, lake or river 177 sfc Deep soil (of indefinite depth) diff --git a/definitions/grib2/tables/24/4.5.table b/definitions/grib2/tables/24/4.5.table index 97795d3cc..2918f8522 100644 --- a/definitions/grib2/tables/24/4.5.table +++ b/definitions/grib2/tables/24/4.5.table @@ -60,7 +60,7 @@ 169 169 Ocean level defined by water density (sigma-theta) difference from near-surface to level (kg m-3) 170 170 Ocean level defined by water potential temperature difference from near-surface to level (K) # 171-173 Reserved -174 174 Top surface of ice on sea, lake or river +174 sfc Top surface of ice on sea, lake or river 175 175 Top surface of ice, under snow cover, on sea, lake or river 176 176 Bottom surface (underside) ice on sea, lake or river 177 sfc Deep soil (of indefinite depth) diff --git a/definitions/grib2/tables/25/4.5.table b/definitions/grib2/tables/25/4.5.table index bf8473c40..417beff43 100644 --- a/definitions/grib2/tables/25/4.5.table +++ b/definitions/grib2/tables/25/4.5.table @@ -68,7 +68,7 @@ 169 169 Ocean level defined by water density (sigma-theta) difference from near-surface to level (kg m-3) 170 170 Ocean level defined by water potential temperature difference from near-surface to level (K) # 171-173 Reserved -174 174 Top surface of ice on sea, lake or river +174 sfc Top surface of ice on sea, lake or river 175 175 Top surface of ice, under snow cover, on sea, lake or river 176 176 Bottom surface (underside) ice on sea, lake or river 177 sfc Deep soil (of indefinite depth) diff --git a/definitions/grib2/tables/26/4.5.table b/definitions/grib2/tables/26/4.5.table index 3a9861bcb..33296bda5 100644 --- a/definitions/grib2/tables/26/4.5.table +++ b/definitions/grib2/tables/26/4.5.table @@ -70,7 +70,7 @@ 169 169 Ocean level defined by water density (sigma-theta) difference from near-surface to level (kg m-3) 170 170 Ocean level defined by water potential temperature difference from near-surface to level (K) # 171-173 Reserved -174 174 Top surface of ice on sea, lake or river +174 sfc Top surface of ice on sea, lake or river 175 175 Top surface of ice, under snow cover, on sea, lake or river 176 176 Bottom surface (underside) ice on sea, lake or river 177 sfc Deep soil (of indefinite depth) diff --git a/definitions/grib2/tables/27/4.5.table b/definitions/grib2/tables/27/4.5.table index 9d0ead333..9ecc6e3c0 100644 --- a/definitions/grib2/tables/27/4.5.table +++ b/definitions/grib2/tables/27/4.5.table @@ -70,7 +70,7 @@ 169 169 Ocean level defined by water density (sigma-theta) difference from near-surface to level (kg m-3) 170 170 Ocean level defined by water potential temperature difference from near-surface to level (K) # 171-173 Reserved -174 174 Top surface of ice on sea, lake or river +174 sfc Top surface of ice on sea, lake or river 175 175 Top surface of ice, under snow cover, on sea, lake or river 176 176 Bottom surface (underside) ice on sea, lake or river 177 sfc Deep soil (of indefinite depth) diff --git a/tests/grib_levtype.sh b/tests/grib_levtype.sh index fcbfd8242..35ea7952f 100755 --- a/tests/grib_levtype.sh +++ b/tests/grib_levtype.sh @@ -24,7 +24,6 @@ latestOfficial=`${tools_dir}/grib_get -p tablesVersionLatestOfficial $sample2` # These level types are S2S ocean parameters and are dealt with differently (See products_s2s.def) exclude="20 160 169" -exclude="$exclude 174" ### TODO. See ECC-1213 paramId_file_wmo="$ECCODES_DEFINITION_PATH/grib2/paramId.def" paramId_file_ecm="$ECCODES_DEFINITION_PATH/grib2/localConcepts/ecmf/paramId.def"