diff --git a/definitions/grib1/section.1.def b/definitions/grib1/section.1.def index 30f8fa627..5e116c985 100644 --- a/definitions/grib1/section.1.def +++ b/definitions/grib1/section.1.def @@ -149,7 +149,7 @@ if(table2Version >= 128) { concept paramIdECMF (defaultParameter,"paramId.def",conceptsMasterDir,conceptsLocalDirECMF): no_copy; concept paramId (paramIdECMF,"paramId.def",conceptsMasterDir,conceptsLocalDirAll): long_type,dump; -transient pid = paramId : hidden; +# transient pid = paramId : hidden; concept cfNameECMF(defaultName,"cfName.def",conceptsMasterDir,conceptsLocalDirECMF) : dump,no_copy,read_only; concept cfName(cfNameECMF,"cfName.def",conceptsMasterDir,conceptsLocalDirAll) : dump,no_copy,read_only; diff --git a/definitions/grib2/parameters.def b/definitions/grib2/parameters.def index 2b29da1ba..500c6d27c 100644 --- a/definitions/grib2/parameters.def +++ b/definitions/grib2/parameters.def @@ -7,7 +7,7 @@ constant conceptsLocalDirECMF="grib2/localConcepts/ecmf" : hidden; concept paramIdECMF (defaultParameter,"paramId.def",conceptsMasterDir,conceptsLocalDirECMF): long_type,no_copy; concept paramId (paramIdECMF,"paramId.def",conceptsMasterDir,conceptsLocalDirAll): long_type; -transient pid = paramId : hidden; +# transient pid = paramId : hidden; concept shortNameECMF (defaultShortName,"shortName.def",conceptsMasterDir,conceptsLocalDirECMF) : no_copy,dump; concept ls.shortName (shortNameECMF,"shortName.def",conceptsMasterDir,conceptsLocalDirAll) : no_copy,dump; diff --git a/definitions/param_limits.def b/definitions/param_limits.def index 3b7199a38..8d57fea11 100644 --- a/definitions/param_limits.def +++ b/definitions/param_limits.def @@ -2,161 +2,161 @@ constant default_min_val = -1e9 : double_type, hidden; constant default_max_val = +1e9 : double_type, hidden; concept param_value_min(default_min_val) { - -150 = { pid=165; } - -100 = { pid=166; } - 0 = { pid=260260; } - 0 = { pid=228028; } - 0 = { pid=49; } - 0 = { pid=207; } - 25 = { pid=168; } - 0 = { pid=260242; } - 160 = { pid=167; } - 0 = { pid=260509; } - 5 = { pid=151175; } - 0 = { pid=260257; } - 0 = { pid=59; } - -60000 = { pid=228001; } - 0 = { pid=151163; } - -3.5 = { pid=151131; } - -10 = { pid=260259; } - -13000 = { pid=129; } - -1300 = { pid=156; } - 0 = { pid=3075; } - 0 = { pid=172; } - -0.05 = { pid=3062; } - 0 = { pid=260210; } - 0 = { pid=3073; } - 160 = { pid=121; } - 85000 = { pid=151; } - 270 = { pid=151126; } - -1 = { pid=140230; } - 0 = { pid=140221; } - 0 = { pid=3074; } - 150 = { pid=122; } - 0 = { pid=140214; } - -3.5 = { pid=151132; } - 0 = { pid=151225; } - -1300 = { pid=228002; } - 0 = { pid=140231; } - 0 = { pid=260430; } - 170 = { pid=3; } - -1 = { pid=60; } - 100 = { pid=54; } - 0 = { pid=157; } - -4 = { pid=151145; } - 0 = { pid=151219; } - 160 = { pid=34; } - 0 = { pid=31; } - 0 = { pid=174098; } - 0 = { pid=140229; } - 120 = { pid=235; } - 20 = { pid=228032; } - 10 = { pid=33; } - 0 = { pid=3066; } - -1e-10 = { pid=228141; } - 0.005 = { pid=260367; } - -1000 = { pid=260364; } - 0 = { pid=228039; } - 0 = { pid=228087; } - -20 = { pid=228086; } - 170 = { pid=260360; } - 170 = { pid=228139; } - 170 = { pid=228096; } - 170 = { pid=228095; } - 0 = { pid=43; } - 0 = { pid=247; } - 0 = { pid=246; } - -0.1 = { pid=133; } - 0 = { pid=189; } - 43000 = { pid=134; } - 0 = { pid=173; } - 140 = { pid=130; } - -3 = { pid=260057; } - -50 = { pid=136; } - -250 = { pid=131; } - -250 = { pid=132; } - -30 = { pid=135; } - 0 = { pid=260199; } - 0 = { pid=3031; } - 0 = { pid=10; } + -150 = { paramId=165; } + -100 = { paramId=166; } + 0 = { paramId=260260; } + 0 = { paramId=228028; } + 0 = { paramId=49; } + 0 = { paramId=207; } + 25 = { paramId=168; } + 0 = { paramId=260242; } + 160 = { paramId=167; } + 0 = { paramId=260509; } + 5 = { paramId=151175; } + 0 = { paramId=260257; } + 0 = { paramId=59; } + -60000 = { paramId=228001; } + 0 = { paramId=151163; } + -3.5 = { paramId=151131; } + -10 = { paramId=260259; } + -13000 = { paramId=129; } + -1300 = { paramId=156; } + 0 = { paramId=3075; } + 0 = { paramId=172; } + -0.05 = { paramId=3062; } + 0 = { paramId=260210; } + 0 = { paramId=3073; } + 160 = { paramId=121; } + 85000 = { paramId=151; } + 270 = { paramId=151126; } + -1 = { paramId=140230; } + 0 = { paramId=140221; } + 0 = { paramId=3074; } + 150 = { paramId=122; } + 0 = { paramId=140214; } + -3.5 = { paramId=151132; } + 0 = { paramId=151225; } + -1300 = { paramId=228002; } + 0 = { paramId=140231; } + 0 = { paramId=260430; } + 170 = { paramId=3; } + -1 = { paramId=60; } + 100 = { paramId=54; } + 0 = { paramId=157; } + -4 = { paramId=151145; } + 0 = { paramId=151219; } + 160 = { paramId=34; } + 0 = { paramId=31; } + 0 = { paramId=174098; } + 0 = { paramId=140229; } + 120 = { paramId=235; } + 20 = { paramId=228032; } + 10 = { paramId=33; } + 0 = { paramId=3066; } + -1e-10 = { paramId=228141; } + 0.005 = { paramId=260367; } + -1000 = { paramId=260364; } + 0 = { paramId=228039; } + 0 = { paramId=228087; } + -20 = { paramId=228086; } + 170 = { paramId=260360; } + 170 = { paramId=228139; } + 170 = { paramId=228096; } + 170 = { paramId=228095; } + 0 = { paramId=43; } + 0 = { paramId=247; } + 0 = { paramId=246; } + -0.1 = { paramId=133; } + 0 = { paramId=189; } + 43000 = { paramId=134; } + 0 = { paramId=173; } + 140 = { paramId=130; } + -3 = { paramId=260057; } + -50 = { paramId=136; } + -250 = { paramId=131; } + -250 = { paramId=132; } + -30 = { paramId=135; } + 0 = { paramId=260199; } + 0 = { paramId=3031; } + 0 = { paramId=10; } } : double_type, hidden; concept param_value_max(default_max_val) { - 150 = { pid=165; } - 100 = { pid=166; } - 360.1 = { pid=260260; } - 140 = { pid=228028; } - 100 = { pid=49; } - 300 = { pid=207; } - 350 = { pid=168; } - 160 = { pid=260242; } - 370 = { pid=167; } - 100 = { pid=260509; } - 50 = { pid=151175; } - 100 = { pid=260257; } - 40000 = { pid=59; } - 5 = { pid=228001; } - 1500 = { pid=151163; } - 3.5 = { pid=151131; } - 5 = { pid=260259; } - 350000 = { pid=129; } - 35000 = { pid=156; } - 100 = { pid=3075; } - 1 = { pid=172; } - 130 = { pid=3062; } - 1 = { pid=260210; } - 100 = { pid=3073; } - 380 = { pid=121; } - 125000 = { pid=151; } - 308 = { pid=151126; } - 360.5 = { pid=140230; } - 35 = { pid=140221; } - 100 = { pid=3074; } - 330 = { pid=122; } - 35 = { pid=140214; } - 3.5 = { pid=151132; } - 4000 = { pid=151225; } - 8888 = { pid=228002; } - 50 = { pid=140231; } - 30 = { pid=260430; } - 1200 = { pid=3; } - 1 = { pid=60; } - 108000 = { pid=54; } - 180 = { pid=157; } - 4 = { pid=151145; } - 50 = { pid=151219; } - 320 = { pid=34; } - 1.001 = { pid=31; } - 15 = { pid=174098; } - 35 = { pid=140229; } - 380 = { pid=235; } - 100 = { pid=228032; } - 1000 = { pid=33; } - 5 = { pid=3066; } - 15000 = { pid=228141; } - 100 = { pid=260367; } - 1000 = { pid=260364; } - 2000 = { pid=228039; } - 2000 = { pid=228087; } - 2000 = { pid=228086; } - 350 = { pid=260360; } - 350 = { pid=228139; } - 350 = { pid=228096; } - 350 = { pid=228095; } - 10 = { pid=43; } - 0.01 = { pid=247; } - 1e+06 = { pid=246; } - 0.1 = { pid=133; } - 3600 = { pid=189; } - 115000 = { pid=134; } - 10 = { pid=173; } - 400 = { pid=130; } - 150 = { pid=260057; } - 220 = { pid=136; } - 250 = { pid=131; } - 250 = { pid=132; } - 30 = { pid=135; } - 1 = { pid=260199; } - 360.1 = { pid=3031; } - 300 = { pid=10; } + 150 = { paramId=165; } + 100 = { paramId=166; } + 360.1 = { paramId=260260; } + 140 = { paramId=228028; } + 100 = { paramId=49; } + 300 = { paramId=207; } + 350 = { paramId=168; } + 160 = { paramId=260242; } + 370 = { paramId=167; } + 100 = { paramId=260509; } + 50 = { paramId=151175; } + 100 = { paramId=260257; } + 40000 = { paramId=59; } + 5 = { paramId=228001; } + 1500 = { paramId=151163; } + 3.5 = { paramId=151131; } + 5 = { paramId=260259; } + 350000 = { paramId=129; } + 35000 = { paramId=156; } + 100 = { paramId=3075; } + 1 = { paramId=172; } + 130 = { paramId=3062; } + 1 = { paramId=260210; } + 100 = { paramId=3073; } + 380 = { paramId=121; } + 125000 = { paramId=151; } + 308 = { paramId=151126; } + 360.5 = { paramId=140230; } + 35 = { paramId=140221; } + 100 = { paramId=3074; } + 330 = { paramId=122; } + 35 = { paramId=140214; } + 3.5 = { paramId=151132; } + 4000 = { paramId=151225; } + 8888 = { paramId=228002; } + 50 = { paramId=140231; } + 30 = { paramId=260430; } + 1200 = { paramId=3; } + 1 = { paramId=60; } + 108000 = { paramId=54; } + 180 = { paramId=157; } + 4 = { paramId=151145; } + 50 = { paramId=151219; } + 320 = { paramId=34; } + 1.001 = { paramId=31; } + 15 = { paramId=174098; } + 35 = { paramId=140229; } + 380 = { paramId=235; } + 100 = { paramId=228032; } + 1000 = { paramId=33; } + 5 = { paramId=3066; } + 15000 = { paramId=228141; } + 100 = { paramId=260367; } + 1000 = { paramId=260364; } + 2000 = { paramId=228039; } + 2000 = { paramId=228087; } + 2000 = { paramId=228086; } + 350 = { paramId=260360; } + 350 = { paramId=228139; } + 350 = { paramId=228096; } + 350 = { paramId=228095; } + 10 = { paramId=43; } + 0.01 = { paramId=247; } + 1e+06 = { paramId=246; } + 0.1 = { paramId=133; } + 3600 = { paramId=189; } + 115000 = { paramId=134; } + 10 = { paramId=173; } + 400 = { paramId=130; } + 150 = { paramId=260057; } + 220 = { paramId=136; } + 250 = { paramId=131; } + 250 = { paramId=132; } + 30 = { paramId=135; } + 1 = { paramId=260199; } + 360.1 = { paramId=3031; } + 300 = { paramId=10; } } : double_type, hidden; diff --git a/tests/grib_data_quality_checks.sh b/tests/grib_data_quality_checks.sh index a3cae1196..b3a38c686 100755 --- a/tests/grib_data_quality_checks.sh +++ b/tests/grib_data_quality_checks.sh @@ -101,6 +101,9 @@ set -e [ $stat1 -ne 0 ] [ $stat2 -ne 0 ] +# Should succeed. Change paramId first and then scale all values down +${tools_dir}/grib_set -s paramId=$pid,scaleValuesBy=0.01 $input1 $tempOut +${tools_dir}/grib_set -s paramId=$pid,scaleValuesBy=0.01 $input2 $tempOut echo "Test close to the limit..." # ---------------------------------