core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ECC-1504: GRIB2: Make deprecated WMO parameters legacy

This commit is contained in:
Shahram Najm 2023-06-23 14:09:45 +00:00
parent 3ac52316c7
commit 9dd080de8a
10 changed files with 237 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
definitions/grib2/cfVarName.def
View File

@ -8210,12 +8210,6 @@
parameterCategory = 0 ; parameterCategory = 0 ;
parameterNumber = 8 ; parameterNumber = 8 ;
} }
#Volumetric soil moisture content
'soilw' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 9 ;
}
#Ground heat flux #Ground heat flux
'gflux' = { 'gflux' = {
discipline = 2 ; discipline = 2 ;
@ -8306,60 +8300,12 @@
parameterCategory = 0 ; parameterCategory = 0 ;
parameterNumber = 27 ; parameterNumber = 27 ;
} }
#Upper layer soil temperature
'uplst' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 1 ;
}
#Upper layer soil moisture
'uplsm' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 2 ;
}
#Lower layer soil moisture
'lowlsm' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 3 ;
}
#Bottom layer soil temperature
'botlst' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 4 ;
}
#Liquid volumetric soil moisture (non-frozen)
'soill' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 5 ;
}
#Number of soil layers in root zone #Number of soil layers in root zone
'rlyrs' = { 'rlyrs' = {
discipline = 2 ; discipline = 2 ;
parameterCategory = 3 ; parameterCategory = 3 ;
parameterNumber = 6 ; parameterNumber = 6 ;
} }
#Transpiration stress-onset (soil moisture)
'smref' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 7 ;
}
#Direct evaporation cease (soil moisture)
'smdry' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 8 ;
}
#Soil porosity
'poros' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 9 ;
}
#Liquid volumetric soil moisture (non-frozen) #Liquid volumetric soil moisture (non-frozen)
'liqvsm' = { 'liqvsm' = {
discipline = 2 ; discipline = 2 ;

54
definitions/grib2/name.def
View File

@ -8210,12 +8210,6 @@
parameterCategory = 0 ; parameterCategory = 0 ;
parameterNumber = 8 ; parameterNumber = 8 ;
} }
#Volumetric soil moisture content
'Volumetric soil moisture content' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 9 ;
}
#Ground heat flux #Ground heat flux
'Ground heat flux' = { 'Ground heat flux' = {
discipline = 2 ; discipline = 2 ;
@ -8306,60 +8300,12 @@
parameterCategory = 0 ; parameterCategory = 0 ;
parameterNumber = 27 ; parameterNumber = 27 ;
} }
#Upper layer soil temperature
'Upper layer soil temperature' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 1 ;
}
#Upper layer soil moisture
'Upper layer soil moisture' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 2 ;
}
#Lower layer soil moisture
'Lower layer soil moisture' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 3 ;
}
#Bottom layer soil temperature
'Bottom layer soil temperature' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 4 ;
}
#Liquid volumetric soil moisture (non-frozen)
'Liquid volumetric soil moisture (non-frozen)' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 5 ;
}
#Number of soil layers in root zone #Number of soil layers in root zone
'Number of soil layers in root zone' = { 'Number of soil layers in root zone' = {
discipline = 2 ; discipline = 2 ;
parameterCategory = 3 ; parameterCategory = 3 ;
parameterNumber = 6 ; parameterNumber = 6 ;
} }
#Transpiration stress-onset (soil moisture)
'Transpiration stress-onset (soil moisture)' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 7 ;
}
#Direct evaporation cease (soil moisture)
'Direct evaporation cease (soil moisture)' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 8 ;
}
#Soil porosity
'Soil porosity' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 9 ;
}
#Liquid volumetric soil moisture (non-frozen) #Liquid volumetric soil moisture (non-frozen)
'Liquid volumetric soil moisture (non-frozen)' = { 'Liquid volumetric soil moisture (non-frozen)' = {
discipline = 2 ; discipline = 2 ;

54
definitions/grib2/name.legacy.def Normal file
View File

@ -0,0 +1,54 @@
#Volumetric soil moisture content
'Volumetric soil moisture content' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 9 ;
}
#Upper layer soil temperature
'Upper layer soil temperature' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 1 ;
}
#Upper layer soil moisture
'Upper layer soil moisture' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 2 ;
}
#Lower layer soil moisture
'Lower layer soil moisture' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 3 ;
}
#Bottom layer soil temperature
'Bottom layer soil temperature' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 4 ;
}
#Liquid volumetric soil moisture (non-frozen)
'Liquid volumetric soil moisture (non-frozen)' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 5 ;
}
#Transpiration stress-onset (soil moisture)
'Transpiration stress-onset (soil moisture)' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 7 ;
}
#Direct evaporation cease (soil moisture)
'Direct evaporation cease (soil moisture)' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 8 ;
}
#Soil porosity
'Soil porosity' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 9 ;
}

54
definitions/grib2/paramId.def
View File

@ -8210,12 +8210,6 @@
parameterCategory = 0 ; parameterCategory = 0 ;
parameterNumber = 8 ; parameterNumber = 8 ;
} }
#Volumetric soil moisture content
'260185' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 9 ;
}
#Ground heat flux #Ground heat flux
'260186' = { '260186' = {
discipline = 2 ; discipline = 2 ;
@ -8306,60 +8300,12 @@
parameterCategory = 0 ; parameterCategory = 0 ;
parameterNumber = 27 ; parameterNumber = 27 ;
} }
#Upper layer soil temperature
'260201' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 1 ;
}
#Upper layer soil moisture
'260202' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 2 ;
}
#Lower layer soil moisture
'260203' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 3 ;
}
#Bottom layer soil temperature
'260204' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 4 ;
}
#Liquid volumetric soil moisture (non-frozen)
'260205' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 5 ;
}
#Number of soil layers in root zone #Number of soil layers in root zone
'260206' = { '260206' = {
discipline = 2 ; discipline = 2 ;
parameterCategory = 3 ; parameterCategory = 3 ;
parameterNumber = 6 ; parameterNumber = 6 ;
} }
#Transpiration stress-onset (soil moisture)
'260207' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 7 ;
}
#Direct evaporation cease (soil moisture)
'260208' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 8 ;
}
#Soil porosity
'260209' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 9 ;
}
#Liquid volumetric soil moisture (non-frozen) #Liquid volumetric soil moisture (non-frozen)
'260210' = { '260210' = {
discipline = 2 ; discipline = 2 ;

54
definitions/grib2/paramId.legacy.def Normal file
View File

@ -0,0 +1,54 @@
#Volumetric soil moisture content
'260185' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 9 ;
}
#Upper layer soil temperature
'260201' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 1 ;
}
#Upper layer soil moisture
'260202' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 2 ;
}
#Lower layer soil moisture
'260203' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 3 ;
}
#Bottom layer soil temperature
'260204' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 4 ;
}
#Liquid volumetric soil moisture (non-frozen)
'260205' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 5 ;
}
#Transpiration stress-onset (soil moisture)
'260207' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 7 ;
}
#Direct evaporation cease (soil moisture)
'260208' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 8 ;
}
#Soil porosity
'260209' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 9 ;
}

54
definitions/grib2/shortName.def
View File

@ -8210,12 +8210,6 @@
parameterCategory = 0 ; parameterCategory = 0 ;
parameterNumber = 8 ; parameterNumber = 8 ;
} }
#Volumetric soil moisture content
'soilw' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 9 ;
}
#Ground heat flux #Ground heat flux
'gflux' = { 'gflux' = {
discipline = 2 ; discipline = 2 ;
@ -8306,60 +8300,12 @@
parameterCategory = 0 ; parameterCategory = 0 ;
parameterNumber = 27 ; parameterNumber = 27 ;
} }
#Upper layer soil temperature
'uplst' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 1 ;
}
#Upper layer soil moisture
'uplsm' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 2 ;
}
#Lower layer soil moisture
'lowlsm' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 3 ;
}
#Bottom layer soil temperature
'botlst' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 4 ;
}
#Liquid volumetric soil moisture (non-frozen)
'soill' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 5 ;
}
#Number of soil layers in root zone #Number of soil layers in root zone
'rlyrs' = { 'rlyrs' = {
discipline = 2 ; discipline = 2 ;
parameterCategory = 3 ; parameterCategory = 3 ;
parameterNumber = 6 ; parameterNumber = 6 ;
} }
#Transpiration stress-onset (soil moisture)
'smref' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 7 ;
}
#Direct evaporation cease (soil moisture)
'smdry' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 8 ;
}
#Soil porosity
'poros' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 9 ;
}
#Liquid volumetric soil moisture (non-frozen) #Liquid volumetric soil moisture (non-frozen)
'liqvsm' = { 'liqvsm' = {
discipline = 2 ; discipline = 2 ;

54
definitions/grib2/shortName.legacy.def Normal file
View File

@ -0,0 +1,54 @@
#Volumetric soil moisture content
'soilw' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 9 ;
}
#Upper layer soil temperature
'uplst' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 1 ;
}
#Upper layer soil moisture
'uplsm' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 2 ;
}
#Lower layer soil moisture
'lowlsm' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 3 ;
}
#Bottom layer soil temperature
'botlst' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 4 ;
}
#Liquid volumetric soil moisture (non-frozen)
'soill' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 5 ;
}
#Transpiration stress-onset (soil moisture)
'smref' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 7 ;
}
#Direct evaporation cease (soil moisture)
'smdry' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 8 ;
}
#Soil porosity
'poros' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 9 ;
}

54
definitions/grib2/units.def
View File

@ -8210,12 +8210,6 @@
parameterCategory = 0 ; parameterCategory = 0 ;
parameterNumber = 8 ; parameterNumber = 8 ;
} }
#Volumetric soil moisture content
'Proportion' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 9 ;
}
#Ground heat flux #Ground heat flux
'W m**-2' = { 'W m**-2' = {
discipline = 2 ; discipline = 2 ;
@ -8306,60 +8300,12 @@
parameterCategory = 0 ; parameterCategory = 0 ;
parameterNumber = 27 ; parameterNumber = 27 ;
} }
#Upper layer soil temperature
'K' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 1 ;
}
#Upper layer soil moisture
'kg m**-3' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 2 ;
}
#Lower layer soil moisture
'kg m**-3' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 3 ;
}
#Bottom layer soil temperature
'K' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 4 ;
}
#Liquid volumetric soil moisture (non-frozen)
'Proportion' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 5 ;
}
#Number of soil layers in root zone #Number of soil layers in root zone
'Numeric' = { 'Numeric' = {
discipline = 2 ; discipline = 2 ;
parameterCategory = 3 ; parameterCategory = 3 ;
parameterNumber = 6 ; parameterNumber = 6 ;
} }
#Transpiration stress-onset (soil moisture)
'Proportion' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 7 ;
}
#Direct evaporation cease (soil moisture)
'Proportion' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 8 ;
}
#Soil porosity
'Proportion' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 9 ;
}
#Liquid volumetric soil moisture (non-frozen) #Liquid volumetric soil moisture (non-frozen)
'm**3 m**-3' = { 'm**3 m**-3' = {
discipline = 2 ; discipline = 2 ;

54
definitions/grib2/units.legacy.def Normal file
View File

@ -0,0 +1,54 @@
#Volumetric soil moisture content
'Proportion' = {
discipline = 2 ;
parameterCategory = 0 ;
parameterNumber = 9 ;
}
#Upper layer soil temperature
'K' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 1 ;
}
#Upper layer soil moisture
'kg m**-3' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 2 ;
}
#Lower layer soil moisture
'kg m**-3' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 3 ;
}
#Bottom layer soil temperature
'K' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 4 ;
}
#Liquid volumetric soil moisture (non-frozen)
'Proportion' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 5 ;
}
#Transpiration stress-onset (soil moisture)
'Proportion' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 7 ;
}
#Direct evaporation cease (soil moisture)
'Proportion' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 8 ;
}
#Soil porosity
'Proportion' = {
discipline = 2 ;
parameterCategory = 3 ;
parameterNumber = 9 ;
}

21
tests/grib_check_param_concepts.sh
View File

@ -78,6 +78,25 @@ done
cd $test_dir cd $test_dir
# -------------------------------
echo "WMO legacy parameters..."
# -------------------------------
ECMF_DIR=$ECCODES_DEFINITION_PATH/grib2
tempDir=temp.${label}.dir
rm -fr $tempDir
mkdir -p $tempDir
cd $tempDir
#cp $ECMF_DIR/cfName.legacy.def cfName.def
#cp $ECMF_DIR/cfVarName.legacy.def cfVarName.def
cp $ECMF_DIR/name.legacy.def name.def
cp $ECMF_DIR/paramId.legacy.def paramId.def
cp $ECMF_DIR/shortName.legacy.def shortName.def
cp $ECMF_DIR/units.legacy.def units.def
$CHECK_DEFS
cd $test_dir
rm -fr $tempDir
# ------------------------------- # -------------------------------
echo "ECMWF legacy parameters..." echo "ECMWF legacy parameters..."
# ------------------------------- # -------------------------------
@ -94,6 +113,8 @@ cp $ECMF_DIR/paramId.legacy.def paramId.def
cp $ECMF_DIR/shortName.legacy.def shortName.def cp $ECMF_DIR/shortName.legacy.def shortName.def
cp $ECMF_DIR/units.legacy.def units.def cp $ECMF_DIR/units.legacy.def units.def
$CHECK_DEFS $CHECK_DEFS
cd $test_dir
rm -fr $tempDir
# ------------------------------- # -------------------------------
echo "Check duplicates" echo "Check duplicates"