diff --git a/.github/ci-nightly-test.sh b/.github/ci-nightly-test.sh index f46b916df..d76cc8e84 100644 --- a/.github/ci-nightly-test.sh +++ b/.github/ci-nightly-test.sh @@ -14,7 +14,10 @@ module load python3 version=$(cat $TMPDIR/eccodes/VERSION) -cd ~masn/REGRESSION_TESTING/ecCodes +regression_suite_dir=$TMPDIR/eccodes-regression-tests +mkdir -p $regression_suite_dir +git clone git@github.com:ecmwf/eccodes-regression-tests.git $regression_suite_dir +cd $regression_suite_dir ./par-suite.sh -w $TMPDIR/install/eccodes/$version # For debugging specific test(s) diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def index 8502798d2..35cf7c79a 100644 --- a/definitions/grib2/cfVarName.def +++ b/definitions/grib2/cfVarName.def @@ -11258,12 +11258,6 @@ parameterCategory = 19 ; parameterNumber = 43 ; } -#Soil moisture -'sm' = { - discipline = 2 ; - parameterCategory = 3 ; - parameterNumber = 19 ; - } #10 metre u-component of neutral wind 'u10n' = { discipline = 0 ; diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def index 819ad1af9..1891762ec 100644 --- a/definitions/grib2/name.def +++ b/definitions/grib2/name.def @@ -11258,12 +11258,6 @@ parameterCategory = 19 ; parameterNumber = 43 ; } -#Soil moisture -'Soil moisture' = { - discipline = 2 ; - parameterCategory = 3 ; - parameterNumber = 19 ; - } #10 metre u-component of neutral wind '10 metre u-component of neutral wind' = { discipline = 0 ; diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def index e60c16b6d..be91d6934 100644 --- a/definitions/grib2/paramId.def +++ b/definitions/grib2/paramId.def @@ -11258,12 +11258,6 @@ parameterCategory = 19 ; parameterNumber = 43 ; } -#Soil moisture -'228039' = { - discipline = 2 ; - parameterCategory = 3 ; - parameterNumber = 19 ; - } #10 metre u-component of neutral wind '228131' = { discipline = 0 ; diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def index a35b7af85..2f9975fcf 100644 --- a/definitions/grib2/shortName.def +++ b/definitions/grib2/shortName.def @@ -11258,12 +11258,6 @@ parameterCategory = 19 ; parameterNumber = 43 ; } -#Soil moisture -'sm' = { - discipline = 2 ; - parameterCategory = 3 ; - parameterNumber = 19 ; - } #10 metre u-component of neutral wind 'u10n' = { discipline = 0 ; diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def index ca27212b5..46a9ab110 100644 --- a/definitions/grib2/units.def +++ b/definitions/grib2/units.def @@ -11258,12 +11258,6 @@ parameterCategory = 19 ; parameterNumber = 43 ; } -#Soil moisture -'kg m**-3' = { - discipline = 2 ; - parameterCategory = 3 ; - parameterNumber = 19 ; - } #10 metre u-component of neutral wind 'm s**-1' = { discipline = 0 ; diff --git a/tests/grib_level.sh b/tests/grib_level.sh index 578095c62..718362c01 100755 --- a/tests/grib_level.sh +++ b/tests/grib_level.sh @@ -116,8 +116,8 @@ grib_check_key_equals $temp2 level 5 # ${tools_dir}/grib_filter level.filter $sample_g2 # Related to ECC-530: make sure GRIB2 parameters with typeOfSecondFixedSurface -# have correct parameter definitions (grib_set does not cause scale factor/value loss -params="228086 228087 228095 228096 228170 228171 228039 228139" +# have correct parameter definitions (grib_set does not cause scale factor/value loss) +params="228086 228087 228095 228096 228170 228171 228139" for pid in $params; do ${tools_dir}/grib_set -s paramId=$pid $sample_g2 $temp grib_check_key_equals $temp paramId $pid