From 80f53f83d99592c4dad61d55be5a2acb076cc098 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Tue, 9 Jul 2024 12:26:35 +0000 Subject: [PATCH 1/6] ECC-1862: Fix Soil moisture --- definitions/grib2/cfVarName.def | 6 ------ definitions/grib2/name.def | 6 ------ definitions/grib2/paramId.def | 6 ------ definitions/grib2/shortName.def | 6 ------ definitions/grib2/units.def | 6 ------ 5 files changed, 30 deletions(-) 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 ; From 90efaac811e3a950f7ec800d26780b9eb184155a Mon Sep 17 00:00:00 2001 From: shahramn Date: Tue, 9 Jul 2024 13:39:11 +0100 Subject: [PATCH 2/6] Testing: ECC-1862 soil moisture --- tests/grib_level.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From c2d22fc36559548935e026c540e20de5cffb31e0 Mon Sep 17 00:00:00 2001 From: Eugen Betke Date: Tue, 9 Jul 2024 11:24:38 +0000 Subject: [PATCH 3/6] Switch to Regression Suite Tests on GitHub --- .github/ci-nightly-test.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/ci-nightly-test.sh b/.github/ci-nightly-test.sh index 4eb4a54a9..eea7af99a 100644 --- a/.github/ci-nightly-test.sh +++ b/.github/ci-nightly-test.sh @@ -14,7 +14,9 @@ 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 ./par-suite.sh -w $TMPDIR/install/eccodes/$version # For debugging specific test(s) From 775c372c9ed72ccd9173fd2d722e85a221f6b664 Mon Sep 17 00:00:00 2001 From: Eugen Betke Date: Tue, 9 Jul 2024 11:30:24 +0000 Subject: [PATCH 4/6] Change directory to Regression Suite --- .github/ci-nightly-test.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ci-nightly-test.sh b/.github/ci-nightly-test.sh index eea7af99a..cf0ddd4b1 100644 --- a/.github/ci-nightly-test.sh +++ b/.github/ci-nightly-test.sh @@ -17,6 +17,7 @@ version=$(cat $TMPDIR/eccodes/VERSION) 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) From aabde97e0b69c94472862be784d8816f4c5534ad Mon Sep 17 00:00:00 2001 From: Eugen Betke Date: Tue, 9 Jul 2024 11:32:46 +0000 Subject: [PATCH 5/6] Clone using web URL --- .github/ci-nightly-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ci-nightly-test.sh b/.github/ci-nightly-test.sh index cf0ddd4b1..5c8a35ef8 100644 --- a/.github/ci-nightly-test.sh +++ b/.github/ci-nightly-test.sh @@ -16,7 +16,7 @@ version=$(cat $TMPDIR/eccodes/VERSION) 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 +git clone https://github.com/ecmwf/eccodes.git $regression_suite_dir cd $regression_suite_dir ./par-suite.sh -w $TMPDIR/install/eccodes/$version From dceb761abb588377fcf7966d18a89066b7d6ad0b Mon Sep 17 00:00:00 2001 From: shahramn Date: Tue, 9 Jul 2024 22:11:14 +0100 Subject: [PATCH 6/6] Regression test suite: Use the right URL --- .github/ci-nightly-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ci-nightly-test.sh b/.github/ci-nightly-test.sh index 5c8a35ef8..cf0ddd4b1 100644 --- a/.github/ci-nightly-test.sh +++ b/.github/ci-nightly-test.sh @@ -16,7 +16,7 @@ version=$(cat $TMPDIR/eccodes/VERSION) regression_suite_dir=$TMPDIR/eccodes-regression-tests mkdir -p $regression_suite_dir -git clone https://github.com/ecmwf/eccodes.git $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