From 99d741a6d0aec5455ac436567789a18cdc9c2f38 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Wed, 1 Aug 2018 12:54:41 +0100 Subject: [PATCH 1/2] Fix BUFR element columns --- definitions/bufr/tables/0/local/19-1/98/0/element.table | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/definitions/bufr/tables/0/local/19-1/98/0/element.table b/definitions/bufr/tables/0/local/19-1/98/0/element.table index 4a3467b89..063d74532 100644 --- a/definitions/bufr/tables/0/local/19-1/98/0/element.table +++ b/definitions/bufr/tables/0/local/19-1/98/0/element.table @@ -14,15 +14,10 @@ 022191|numberOfValidPointsForSpecificBand|long|NUMBER OF VALID POINTS FOR SPECIFIC BAND|Numeric|0|0|10|Numeric|0|4 022192|rmsSpecificBandSignificnatWaveHeight|double|RMS SPECIFIC BAND SIGNIFICANT WAVE HEIGHT|m|3|0|16|m|3|5 022193|numberOfValidPointsForSpecificBandSing|long|NUMBER OF VALID POINTS FOR SPECIFIC BAND SIGN. WAVE HEIGHT|NUMERIC|0|0|10|NUMERIC|0|4 -022194|specificBandNetInstrCorrectionForSigWaveHeight|double|SPECIFIC BAND NET INSTR. CORRECTION FOR SIGNIFICANT WAVE HEIGHT|M|3|-1000|11|M 3 4 +022194|specificBandNetInstrCorrectionForSigWaveHeight|double|SPECIFIC BAND NET INSTR. CORRECTION FOR SIGNIFICANT WAVE HEIGHT|M|3|-1000|11|M|3|4 022195|numberOfValidPointsForSpecificBandBackscatter|long|NUMBER OF VALID POINTS FOR SPECIFIC BAND BACKSCATTER|NUMERIC|0|0|10|NUMERIC|0|4 025112|bandSpecificAltimeterDataQualityFlag|flag|BAND SPECIFIC ALTIMETER DATA QUALITY FLAG|FLAG TABLE|0|0|9|FLAG TABLE|0|3 025113|bandSpecificAltimeterCorrectionQualityFlag|flag|BAND SPECIFIC ALTIMETER CORRECTION QUALITY FLAG|FLAG TABLE|0|0|9|FLAG TABLE|0|3 025165|ionosphericCorrectionFromModelOnSpecificBand|double|IONOSPHERIC CORRECTION FROM MODEL ON SPECIFIC BAND|m|4|-32768|16|m|4|5 025166|seaStateBiasCorrectionOnSpecificBand|double|SEA STATE BIAS CORRECTION ON SPECIFIC BAND|m|4|-32768|16|m|4|5 025167|specificBandNetInstrumentalCorrection|double|SPECIFIC BAND NET INSTRUMENTAL CORRECTION|m|4|-120000|18|m|4|6 - - - - - From 450bf91f95f4c6ef1796b3e501f57fce6aace6f0 Mon Sep 17 00:00:00 2001 From: Shahram Najm Date: Wed, 1 Aug 2018 13:10:26 +0100 Subject: [PATCH 2/2] ECC-712: Update defintions of ocean parameters (DGOV-93) --- .../grib1/localConcepts/ecmf/cfVarName.def | 54 +++++++++---------- definitions/grib1/localConcepts/ecmf/name.def | 52 +++++++++--------- .../grib1/localConcepts/ecmf/paramId.def | 26 ++++----- .../grib1/localConcepts/ecmf/shortName.def | 48 ++++++++--------- .../grib1/localConcepts/ecmf/units.def | 26 ++++----- .../grib1/localConcepts/rjtd/cfVarName.def | 2 +- definitions/grib1/localConcepts/rjtd/name.def | 4 +- .../grib1/localConcepts/rjtd/paramId.def | 2 +- .../grib1/localConcepts/rjtd/shortName.def | 2 +- .../grib1/localConcepts/rjtd/units.def | 2 +- definitions/grib2/cfVarName.def | 4 +- definitions/grib2/localConcepts/cnmc/name.def | 8 +-- .../grib2/localConcepts/cnmc/paramId.def | 4 +- .../grib2/localConcepts/cnmc/shortName.def | 4 +- .../grib2/localConcepts/cnmc/units.def | 4 +- .../grib2/localConcepts/ecmf/cfVarName.def | 46 ++++++++-------- definitions/grib2/localConcepts/ecmf/name.def | 44 +++++++-------- .../grib2/localConcepts/ecmf/paramId.def | 22 ++++---- .../grib2/localConcepts/ecmf/shortName.def | 42 +++++++-------- .../grib2/localConcepts/ecmf/units.def | 22 ++++---- definitions/grib2/name.def | 4 +- definitions/grib2/paramId.def | 2 +- definitions/grib2/shortName.def | 2 +- definitions/grib2/units.def | 2 +- 24 files changed, 214 insertions(+), 214 deletions(-) diff --git a/definitions/grib1/localConcepts/ecmf/cfVarName.def b/definitions/grib1/localConcepts/ecmf/cfVarName.def index dfae04dbe..8d23708dd 100644 --- a/definitions/grib1/localConcepts/ecmf/cfVarName.def +++ b/definitions/grib1/localConcepts/ecmf/cfVarName.def @@ -204,8 +204,8 @@ table2Version = 128 ; indicatorOfParameter = 30 ; } -#Sea-ice cover -'ci' = { +#Sea ice area fraction +'siconc' = { table2Version = 128 ; indicatorOfParameter = 31 ; } @@ -3774,8 +3774,8 @@ table2Version = 174 ; indicatorOfParameter = 96 ; } -#Sea-ice Snow Thickness -'sist' = { +#Sea ice snow thickness +'sisnthick' = { table2Version = 174 ; indicatorOfParameter = 97 ; } @@ -12389,28 +12389,28 @@ table2Version = 151 ; indicatorOfParameter = 128 ; } -#Ocean potential temperature -'ocpt' = { +#Sea water potential temperature +'thetao' = { table2Version = 151 ; indicatorOfParameter = 129 ; } -#Salinity -'s' = { +#Sea water practical salinity +'so' = { table2Version = 151 ; indicatorOfParameter = 130 ; } -#Ocean current zonal component -'ocu' = { +#Eastward sea water velocity +'uoe' = { table2Version = 151 ; indicatorOfParameter = 131 ; } -#Ocean current meridional component -'ocv' = { +#Northward sea water velocity +'von' = { table2Version = 151 ; indicatorOfParameter = 132 ; } -#Ocean current vertical component -'ocw' = { +#Upward sea water velocity +'wo' = { table2Version = 151 ; indicatorOfParameter = 133 ; } @@ -12434,8 +12434,8 @@ table2Version = 151 ; indicatorOfParameter = 137 ; } -#Sigma-theta -'sth' = { +#Sea water sigma theta +'sigmat' = { table2Version = 151 ; indicatorOfParameter = 138 ; } @@ -12469,8 +12469,8 @@ table2Version = 151 ; indicatorOfParameter = 144 ; } -#Sea level -'sl' = { +#Sea surface height +'zos' = { table2Version = 151 ; indicatorOfParameter = 145 ; } @@ -12479,8 +12479,8 @@ table2Version = 151 ; indicatorOfParameter = 146 ; } -#Barotropic stream function -'bsf' = { +#Ocean barotropic stream function +'stfbarot' = { table2Version = 151 ; indicatorOfParameter = 147 ; } @@ -12509,13 +12509,13 @@ table2Version = 151 ; indicatorOfParameter = 152 ; } -#U stress -'tax' = { +#Surface downward eastward stress +'taueo' = { table2Version = 151 ; indicatorOfParameter = 153 ; } -#V stress -'tay' = { +#Surface downward northward stress +'tauno' = { table2Version = 151 ; indicatorOfParameter = 154 ; } @@ -12559,8 +12559,8 @@ table2Version = 151 ; indicatorOfParameter = 162 ; } -#20 degrees isotherm depth -'d20' = { +#Depth of 20C isotherm +'t20d' = { table2Version = 151 ; indicatorOfParameter = 163 ; } @@ -14810,7 +14810,7 @@ indicatorOfParameter = 95 ; } #Sea-ice thickness -'p98.174' = { +'sithick' = { table2Version = 174 ; indicatorOfParameter = 98 ; } diff --git a/definitions/grib1/localConcepts/ecmf/name.def b/definitions/grib1/localConcepts/ecmf/name.def index f8a71f8ed..b500f5e60 100644 --- a/definitions/grib1/localConcepts/ecmf/name.def +++ b/definitions/grib1/localConcepts/ecmf/name.def @@ -204,8 +204,8 @@ table2Version = 128 ; indicatorOfParameter = 30 ; } -#Sea-ice cover -'Sea-ice cover' = { +#Sea ice area fraction +'Sea ice area fraction' = { table2Version = 128 ; indicatorOfParameter = 31 ; } @@ -3774,8 +3774,8 @@ table2Version = 174 ; indicatorOfParameter = 96 ; } -#Sea-ice Snow Thickness -'Sea-ice Snow Thickness' = { +#Sea ice snow thickness +'Sea ice snow thickness' = { table2Version = 174 ; indicatorOfParameter = 97 ; } @@ -12389,28 +12389,28 @@ table2Version = 151 ; indicatorOfParameter = 128 ; } -#Ocean potential temperature -'Ocean potential temperature' = { +#Sea water potential temperature +'Sea water potential temperature' = { table2Version = 151 ; indicatorOfParameter = 129 ; } -#Salinity -'Salinity' = { +#Sea water practical salinity +'Sea water practical salinity' = { table2Version = 151 ; indicatorOfParameter = 130 ; } -#Ocean current zonal component -'Ocean current zonal component' = { +#Eastward sea water velocity +'Eastward sea water velocity' = { table2Version = 151 ; indicatorOfParameter = 131 ; } -#Ocean current meridional component -'Ocean current meridional component' = { +#Northward sea water velocity +'Northward sea water velocity' = { table2Version = 151 ; indicatorOfParameter = 132 ; } -#Ocean current vertical component -'Ocean current vertical component' = { +#Upward sea water velocity +'Upward sea water velocity' = { table2Version = 151 ; indicatorOfParameter = 133 ; } @@ -12434,8 +12434,8 @@ table2Version = 151 ; indicatorOfParameter = 137 ; } -#Sigma-theta -'Sigma-theta' = { +#Sea water sigma theta +'Sea water sigma theta' = { table2Version = 151 ; indicatorOfParameter = 138 ; } @@ -12469,8 +12469,8 @@ table2Version = 151 ; indicatorOfParameter = 144 ; } -#Sea level -'Sea level' = { +#Sea surface height +'Sea surface height' = { table2Version = 151 ; indicatorOfParameter = 145 ; } @@ -12479,8 +12479,8 @@ table2Version = 151 ; indicatorOfParameter = 146 ; } -#Barotropic stream function -'Barotropic stream function' = { +#Ocean barotropic stream function +'Ocean barotropic stream function' = { table2Version = 151 ; indicatorOfParameter = 147 ; } @@ -12509,13 +12509,13 @@ table2Version = 151 ; indicatorOfParameter = 152 ; } -#U stress -'U stress' = { +#Surface downward eastward stress +'Surface downward eastward stress' = { table2Version = 151 ; indicatorOfParameter = 153 ; } -#V stress -'V stress' = { +#Surface downward northward stress +'Surface downward northward stress' = { table2Version = 151 ; indicatorOfParameter = 154 ; } @@ -12559,8 +12559,8 @@ table2Version = 151 ; indicatorOfParameter = 162 ; } -#20 degrees isotherm depth -'20 degrees isotherm depth' = { +#Depth of 20C isotherm +'Depth of 20C isotherm' = { table2Version = 151 ; indicatorOfParameter = 163 ; } diff --git a/definitions/grib1/localConcepts/ecmf/paramId.def b/definitions/grib1/localConcepts/ecmf/paramId.def index ceab331c9..7e1f22add 100644 --- a/definitions/grib1/localConcepts/ecmf/paramId.def +++ b/definitions/grib1/localConcepts/ecmf/paramId.def @@ -204,7 +204,7 @@ table2Version = 128 ; indicatorOfParameter = 30 ; } -#Sea-ice cover +#Sea ice area fraction '31' = { table2Version = 128 ; indicatorOfParameter = 31 ; @@ -3774,7 +3774,7 @@ table2Version = 174 ; indicatorOfParameter = 96 ; } -#Sea-ice Snow Thickness +#Sea ice snow thickness '174097' = { table2Version = 174 ; indicatorOfParameter = 97 ; @@ -12389,27 +12389,27 @@ table2Version = 151 ; indicatorOfParameter = 128 ; } -#Ocean potential temperature +#Sea water potential temperature '151129' = { table2Version = 151 ; indicatorOfParameter = 129 ; } -#Salinity +#Sea water practical salinity '151130' = { table2Version = 151 ; indicatorOfParameter = 130 ; } -#Ocean current zonal component +#Eastward sea water velocity '151131' = { table2Version = 151 ; indicatorOfParameter = 131 ; } -#Ocean current meridional component +#Northward sea water velocity '151132' = { table2Version = 151 ; indicatorOfParameter = 132 ; } -#Ocean current vertical component +#Upward sea water velocity '151133' = { table2Version = 151 ; indicatorOfParameter = 133 ; @@ -12434,7 +12434,7 @@ table2Version = 151 ; indicatorOfParameter = 137 ; } -#Sigma-theta +#Sea water sigma theta '151138' = { table2Version = 151 ; indicatorOfParameter = 138 ; @@ -12469,7 +12469,7 @@ table2Version = 151 ; indicatorOfParameter = 144 ; } -#Sea level +#Sea surface height '151145' = { table2Version = 151 ; indicatorOfParameter = 145 ; @@ -12479,7 +12479,7 @@ table2Version = 151 ; indicatorOfParameter = 146 ; } -#Barotropic stream function +#Ocean barotropic stream function '151147' = { table2Version = 151 ; indicatorOfParameter = 147 ; @@ -12509,12 +12509,12 @@ table2Version = 151 ; indicatorOfParameter = 152 ; } -#U stress +#Surface downward eastward stress '151153' = { table2Version = 151 ; indicatorOfParameter = 153 ; } -#V stress +#Surface downward northward stress '151154' = { table2Version = 151 ; indicatorOfParameter = 154 ; @@ -12559,7 +12559,7 @@ table2Version = 151 ; indicatorOfParameter = 162 ; } -#20 degrees isotherm depth +#Depth of 20C isotherm '151163' = { table2Version = 151 ; indicatorOfParameter = 163 ; diff --git a/definitions/grib1/localConcepts/ecmf/shortName.def b/definitions/grib1/localConcepts/ecmf/shortName.def index 5ef3a5bba..0f25fae6e 100644 --- a/definitions/grib1/localConcepts/ecmf/shortName.def +++ b/definitions/grib1/localConcepts/ecmf/shortName.def @@ -204,7 +204,7 @@ table2Version = 128 ; indicatorOfParameter = 30 ; } -#Sea-ice cover +#Sea ice area fraction 'ci' = { table2Version = 128 ; indicatorOfParameter = 31 ; @@ -3774,8 +3774,8 @@ table2Version = 174 ; indicatorOfParameter = 96 ; } -#Sea-ice Snow Thickness -'sist' = { +#Sea ice snow thickness +'sisnthick' = { table2Version = 174 ; indicatorOfParameter = 97 ; } @@ -12389,28 +12389,28 @@ table2Version = 151 ; indicatorOfParameter = 128 ; } -#Ocean potential temperature -'ocpt' = { +#Sea water potential temperature +'thetao' = { table2Version = 151 ; indicatorOfParameter = 129 ; } -#Salinity -'s' = { +#Sea water practical salinity +'so' = { table2Version = 151 ; indicatorOfParameter = 130 ; } -#Ocean current zonal component +#Eastward sea water velocity 'ocu' = { table2Version = 151 ; indicatorOfParameter = 131 ; } -#Ocean current meridional component +#Northward sea water velocity 'ocv' = { table2Version = 151 ; indicatorOfParameter = 132 ; } -#Ocean current vertical component -'ocw' = { +#Upward sea water velocity +'wo' = { table2Version = 151 ; indicatorOfParameter = 133 ; } @@ -12434,8 +12434,8 @@ table2Version = 151 ; indicatorOfParameter = 137 ; } -#Sigma-theta -'sth' = { +#Sea water sigma theta +'sigmat' = { table2Version = 151 ; indicatorOfParameter = 138 ; } @@ -12469,8 +12469,8 @@ table2Version = 151 ; indicatorOfParameter = 144 ; } -#Sea level -'sl' = { +#Sea surface height +'zos' = { table2Version = 151 ; indicatorOfParameter = 145 ; } @@ -12479,8 +12479,8 @@ table2Version = 151 ; indicatorOfParameter = 146 ; } -#Barotropic stream function -'bsf' = { +#Ocean barotropic stream function +'stfbarot' = { table2Version = 151 ; indicatorOfParameter = 147 ; } @@ -12509,13 +12509,13 @@ table2Version = 151 ; indicatorOfParameter = 152 ; } -#U stress -'tax' = { +#Surface downward eastward stress +'taueo' = { table2Version = 151 ; indicatorOfParameter = 153 ; } -#V stress -'tay' = { +#Surface downward northward stress +'tauno' = { table2Version = 151 ; indicatorOfParameter = 154 ; } @@ -12559,8 +12559,8 @@ table2Version = 151 ; indicatorOfParameter = 162 ; } -#20 degrees isotherm depth -'20d' = { +#Depth of 20C isotherm +'t20d' = { table2Version = 151 ; indicatorOfParameter = 163 ; } @@ -14810,7 +14810,7 @@ indicatorOfParameter = 95 ; } #Sea-ice thickness -'sit' = { +'sithick' = { table2Version = 174 ; indicatorOfParameter = 98 ; } diff --git a/definitions/grib1/localConcepts/ecmf/units.def b/definitions/grib1/localConcepts/ecmf/units.def index c44becd31..6ca99ce32 100644 --- a/definitions/grib1/localConcepts/ecmf/units.def +++ b/definitions/grib1/localConcepts/ecmf/units.def @@ -204,7 +204,7 @@ table2Version = 128 ; indicatorOfParameter = 30 ; } -#Sea-ice cover +#Sea ice area fraction '(0 - 1)' = { table2Version = 128 ; indicatorOfParameter = 31 ; @@ -3774,7 +3774,7 @@ table2Version = 174 ; indicatorOfParameter = 96 ; } -#Sea-ice Snow Thickness +#Sea ice snow thickness 'm' = { table2Version = 174 ; indicatorOfParameter = 97 ; @@ -12389,27 +12389,27 @@ table2Version = 151 ; indicatorOfParameter = 128 ; } -#Ocean potential temperature +#Sea water potential temperature 'deg C' = { table2Version = 151 ; indicatorOfParameter = 129 ; } -#Salinity +#Sea water practical salinity 'psu' = { table2Version = 151 ; indicatorOfParameter = 130 ; } -#Ocean current zonal component +#Eastward sea water velocity 'm s**-1' = { table2Version = 151 ; indicatorOfParameter = 131 ; } -#Ocean current meridional component +#Northward sea water velocity 'm s**-1' = { table2Version = 151 ; indicatorOfParameter = 132 ; } -#Ocean current vertical component +#Upward sea water velocity 'm s**-1' = { table2Version = 151 ; indicatorOfParameter = 133 ; @@ -12434,7 +12434,7 @@ table2Version = 151 ; indicatorOfParameter = 137 ; } -#Sigma-theta +#Sea water sigma theta 'kg m**-3' = { table2Version = 151 ; indicatorOfParameter = 138 ; @@ -12469,7 +12469,7 @@ table2Version = 151 ; indicatorOfParameter = 144 ; } -#Sea level +#Sea surface height 'm' = { table2Version = 151 ; indicatorOfParameter = 145 ; @@ -12479,7 +12479,7 @@ table2Version = 151 ; indicatorOfParameter = 146 ; } -#Barotropic stream function +#Ocean barotropic stream function 'm**3 s**-1' = { table2Version = 151 ; indicatorOfParameter = 147 ; @@ -12509,12 +12509,12 @@ table2Version = 151 ; indicatorOfParameter = 152 ; } -#U stress +#Surface downward eastward stress 'N m**-2' = { table2Version = 151 ; indicatorOfParameter = 153 ; } -#V stress +#Surface downward northward stress 'N m**-2' = { table2Version = 151 ; indicatorOfParameter = 154 ; @@ -12559,7 +12559,7 @@ table2Version = 151 ; indicatorOfParameter = 162 ; } -#20 degrees isotherm depth +#Depth of 20C isotherm 'm' = { table2Version = 151 ; indicatorOfParameter = 163 ; diff --git a/definitions/grib1/localConcepts/rjtd/cfVarName.def b/definitions/grib1/localConcepts/rjtd/cfVarName.def index dcfc62dea..d91932f9b 100644 --- a/definitions/grib1/localConcepts/rjtd/cfVarName.def +++ b/definitions/grib1/localConcepts/rjtd/cfVarName.def @@ -19,7 +19,7 @@ table2Version = 200 ; indicatorOfParameter = 32 ; } -#Sea-ice cover +#Sea ice area fraction 'ci' = { table2Version = 200 ; indicatorOfParameter = 91 ; diff --git a/definitions/grib1/localConcepts/rjtd/name.def b/definitions/grib1/localConcepts/rjtd/name.def index abf47d5ea..bd139be7c 100644 --- a/definitions/grib1/localConcepts/rjtd/name.def +++ b/definitions/grib1/localConcepts/rjtd/name.def @@ -19,8 +19,8 @@ table2Version = 200 ; indicatorOfParameter = 32 ; } -#Sea-ice cover -'Sea-ice cover' = { +#Sea ice area fraction +'Sea ice area fraction' = { table2Version = 200 ; indicatorOfParameter = 91 ; } diff --git a/definitions/grib1/localConcepts/rjtd/paramId.def b/definitions/grib1/localConcepts/rjtd/paramId.def index 5a914b7d2..300ecdf85 100644 --- a/definitions/grib1/localConcepts/rjtd/paramId.def +++ b/definitions/grib1/localConcepts/rjtd/paramId.def @@ -19,7 +19,7 @@ table2Version = 200 ; indicatorOfParameter = 32 ; } -#Sea-ice cover +#Sea ice area fraction '31' = { table2Version = 200 ; indicatorOfParameter = 91 ; diff --git a/definitions/grib1/localConcepts/rjtd/shortName.def b/definitions/grib1/localConcepts/rjtd/shortName.def index 5fbe1ab5c..b65dce323 100644 --- a/definitions/grib1/localConcepts/rjtd/shortName.def +++ b/definitions/grib1/localConcepts/rjtd/shortName.def @@ -19,7 +19,7 @@ table2Version = 200 ; indicatorOfParameter = 32 ; } -#Sea-ice cover +#Sea ice area fraction 'ci' = { table2Version = 200 ; indicatorOfParameter = 91 ; diff --git a/definitions/grib1/localConcepts/rjtd/units.def b/definitions/grib1/localConcepts/rjtd/units.def index 148d1ec5d..9e951ab1a 100644 --- a/definitions/grib1/localConcepts/rjtd/units.def +++ b/definitions/grib1/localConcepts/rjtd/units.def @@ -19,7 +19,7 @@ table2Version = 200 ; indicatorOfParameter = 32 ; } -#Sea-ice cover +#Sea ice area fraction '(0 - 1)' = { table2Version = 200 ; indicatorOfParameter = 91 ; diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def index d11e84ce6..6f585416e 100644 --- a/definitions/grib2/cfVarName.def +++ b/definitions/grib2/cfVarName.def @@ -17,8 +17,8 @@ parameterCategory = 2 ; parameterNumber = 45 ; } -#Sea-ice cover -'ci' = { +#Sea ice area fraction +'siconc' = { discipline = 10 ; parameterCategory = 2 ; parameterNumber = 0 ; diff --git a/definitions/grib2/localConcepts/cnmc/name.def b/definitions/grib2/localConcepts/cnmc/name.def index 996c1e65f..11c5d7d05 100644 --- a/definitions/grib2/localConcepts/cnmc/name.def +++ b/definitions/grib2/localConcepts/cnmc/name.def @@ -1,12 +1,12 @@ # Automatically generated by ./create_def.pl, do not edit -#Sea-ice cover -'Sea-ice cover' = { +#Sea ice area fraction +'Sea ice area fraction' = { discipline = 10 ; parameterCategory = 2 ; parameterNumber = 0 ; } -#Sea-ice cover -'Sea-ice cover' = { +#Sea ice area fraction +'Sea ice area fraction' = { discipline = 10 ; parameterCategory = 2 ; parameterNumber = 0 ; diff --git a/definitions/grib2/localConcepts/cnmc/paramId.def b/definitions/grib2/localConcepts/cnmc/paramId.def index 3187e0634..471baaf52 100644 --- a/definitions/grib2/localConcepts/cnmc/paramId.def +++ b/definitions/grib2/localConcepts/cnmc/paramId.def @@ -1,11 +1,11 @@ # Automatically generated by ./create_def.pl, do not edit -#Sea-ice cover +#Sea ice area fraction '31' = { discipline = 10 ; parameterCategory = 2 ; parameterNumber = 0 ; } -#Sea-ice cover +#Sea ice area fraction '31' = { discipline = 10 ; parameterCategory = 2 ; diff --git a/definitions/grib2/localConcepts/cnmc/shortName.def b/definitions/grib2/localConcepts/cnmc/shortName.def index f8adc83fb..26cbde6ff 100644 --- a/definitions/grib2/localConcepts/cnmc/shortName.def +++ b/definitions/grib2/localConcepts/cnmc/shortName.def @@ -1,11 +1,11 @@ # Automatically generated by ./create_def.pl, do not edit -#Sea-ice cover +#Sea ice area fraction 'ci' = { discipline = 10 ; parameterCategory = 2 ; parameterNumber = 0 ; } -#Sea-ice cover +#Sea ice area fraction 'ci' = { discipline = 10 ; parameterCategory = 2 ; diff --git a/definitions/grib2/localConcepts/cnmc/units.def b/definitions/grib2/localConcepts/cnmc/units.def index 7b302f336..bb7e21be9 100644 --- a/definitions/grib2/localConcepts/cnmc/units.def +++ b/definitions/grib2/localConcepts/cnmc/units.def @@ -1,11 +1,11 @@ # Automatically generated by ./create_def.pl, do not edit -#Sea-ice cover +#Sea ice area fraction '(0 - 1)' = { discipline = 10 ; parameterCategory = 2 ; parameterNumber = 0 ; } -#Sea-ice cover +#Sea ice area fraction '(0 - 1)' = { discipline = 10 ; parameterCategory = 2 ; diff --git a/definitions/grib2/localConcepts/ecmf/cfVarName.def b/definitions/grib2/localConcepts/ecmf/cfVarName.def index e56397455..73473bd95 100644 --- a/definitions/grib2/localConcepts/ecmf/cfVarName.def +++ b/definitions/grib2/localConcepts/ecmf/cfVarName.def @@ -16255,32 +16255,32 @@ parameterCategory = 151 ; parameterNumber = 128 ; } -#Ocean potential temperature -'ocpt' = { +#Sea water potential temperature +'thetao' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 129 ; } -#Salinity -'s' = { +#Sea water practical salinity +'so' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 130 ; } -#Ocean current zonal component -'ocu' = { +#Eastward sea water velocity +'uoe' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 131 ; } -#Ocean current meridional component -'ocv' = { +#Northward sea water velocity +'von' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 132 ; } -#Ocean current vertical component -'ocw' = { +#Upward sea water velocity +'wo' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 133 ; @@ -16309,8 +16309,8 @@ parameterCategory = 151 ; parameterNumber = 137 ; } -#Sigma-theta -'sth' = { +#Sea water sigma theta +'sigmat' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 138 ; @@ -16351,8 +16351,8 @@ parameterCategory = 151 ; parameterNumber = 144 ; } -#Sea level -'sl' = { +#Sea surface height +'zos' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 145 ; @@ -16363,8 +16363,8 @@ parameterCategory = 151 ; parameterNumber = 146 ; } -#Barotropic stream function -'bsf' = { +#Ocean barotropic stream function +'stfbarot' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 147 ; @@ -16399,14 +16399,14 @@ parameterCategory = 151 ; parameterNumber = 152 ; } -#U stress -'tax' = { +#Surface downward eastward stress +'taueo' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 153 ; } -#V stress -'tay' = { +#Surface downward northward stress +'tauno' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 154 ; @@ -16459,8 +16459,8 @@ parameterCategory = 151 ; parameterNumber = 162 ; } -#20 degrees isotherm depth -'d20' = { +#Depth of 20C isotherm +'t20d' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 163 ; @@ -19154,7 +19154,7 @@ parameterNumber = 95 ; } #Sea-ice thickness -'sit' = { +'sithick' = { discipline = 192 ; parameterCategory = 174 ; parameterNumber = 98 ; diff --git a/definitions/grib2/localConcepts/ecmf/name.def b/definitions/grib2/localConcepts/ecmf/name.def index af07a97cb..39cd6ba59 100644 --- a/definitions/grib2/localConcepts/ecmf/name.def +++ b/definitions/grib2/localConcepts/ecmf/name.def @@ -16255,32 +16255,32 @@ parameterCategory = 151 ; parameterNumber = 128 ; } -#Ocean potential temperature -'Ocean potential temperature' = { +#Sea water potential temperature +'Sea water potential temperature' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 129 ; } -#Salinity -'Salinity' = { +#Sea water practical salinity +'Sea water practical salinity' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 130 ; } -#Ocean current zonal component -'Ocean current zonal component' = { +#Eastward sea water velocity +'Eastward sea water velocity' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 131 ; } -#Ocean current meridional component -'Ocean current meridional component' = { +#Northward sea water velocity +'Northward sea water velocity' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 132 ; } -#Ocean current vertical component -'Ocean current vertical component' = { +#Upward sea water velocity +'Upward sea water velocity' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 133 ; @@ -16309,8 +16309,8 @@ parameterCategory = 151 ; parameterNumber = 137 ; } -#Sigma-theta -'Sigma-theta' = { +#Sea water sigma theta +'Sea water sigma theta' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 138 ; @@ -16351,8 +16351,8 @@ parameterCategory = 151 ; parameterNumber = 144 ; } -#Sea level -'Sea level' = { +#Sea surface height +'Sea surface height' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 145 ; @@ -16363,8 +16363,8 @@ parameterCategory = 151 ; parameterNumber = 146 ; } -#Barotropic stream function -'Barotropic stream function' = { +#Ocean barotropic stream function +'Ocean barotropic stream function' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 147 ; @@ -16399,14 +16399,14 @@ parameterCategory = 151 ; parameterNumber = 152 ; } -#U stress -'U stress' = { +#Surface downward eastward stress +'Surface downward eastward stress' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 153 ; } -#V stress -'V stress' = { +#Surface downward northward stress +'Surface downward northward stress' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 154 ; @@ -16459,8 +16459,8 @@ parameterCategory = 151 ; parameterNumber = 162 ; } -#20 degrees isotherm depth -'20 degrees isotherm depth' = { +#Depth of 20C isotherm +'Depth of 20C isotherm' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 163 ; diff --git a/definitions/grib2/localConcepts/ecmf/paramId.def b/definitions/grib2/localConcepts/ecmf/paramId.def index 83b98b956..aaad0374e 100644 --- a/definitions/grib2/localConcepts/ecmf/paramId.def +++ b/definitions/grib2/localConcepts/ecmf/paramId.def @@ -16255,31 +16255,31 @@ parameterCategory = 151 ; parameterNumber = 128 ; } -#Ocean potential temperature +#Sea water potential temperature '151129' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 129 ; } -#Salinity +#Sea water practical salinity '151130' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 130 ; } -#Ocean current zonal component +#Eastward sea water velocity '151131' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 131 ; } -#Ocean current meridional component +#Northward sea water velocity '151132' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 132 ; } -#Ocean current vertical component +#Upward sea water velocity '151133' = { discipline = 192 ; parameterCategory = 151 ; @@ -16309,7 +16309,7 @@ parameterCategory = 151 ; parameterNumber = 137 ; } -#Sigma-theta +#Sea water sigma theta '151138' = { discipline = 192 ; parameterCategory = 151 ; @@ -16351,7 +16351,7 @@ parameterCategory = 151 ; parameterNumber = 144 ; } -#Sea level +#Sea surface height '151145' = { discipline = 192 ; parameterCategory = 151 ; @@ -16363,7 +16363,7 @@ parameterCategory = 151 ; parameterNumber = 146 ; } -#Barotropic stream function +#Ocean barotropic stream function '151147' = { discipline = 192 ; parameterCategory = 151 ; @@ -16399,13 +16399,13 @@ parameterCategory = 151 ; parameterNumber = 152 ; } -#U stress +#Surface downward eastward stress '151153' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 153 ; } -#V stress +#Surface downward northward stress '151154' = { discipline = 192 ; parameterCategory = 151 ; @@ -16459,7 +16459,7 @@ parameterCategory = 151 ; parameterNumber = 162 ; } -#20 degrees isotherm depth +#Depth of 20C isotherm '151163' = { discipline = 192 ; parameterCategory = 151 ; diff --git a/definitions/grib2/localConcepts/ecmf/shortName.def b/definitions/grib2/localConcepts/ecmf/shortName.def index 11f3a10f9..c5d9afc37 100644 --- a/definitions/grib2/localConcepts/ecmf/shortName.def +++ b/definitions/grib2/localConcepts/ecmf/shortName.def @@ -16255,32 +16255,32 @@ parameterCategory = 151 ; parameterNumber = 128 ; } -#Ocean potential temperature -'ocpt' = { +#Sea water potential temperature +'thetao' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 129 ; } -#Salinity -'s' = { +#Sea water practical salinity +'so' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 130 ; } -#Ocean current zonal component +#Eastward sea water velocity 'ocu' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 131 ; } -#Ocean current meridional component +#Northward sea water velocity 'ocv' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 132 ; } -#Ocean current vertical component -'ocw' = { +#Upward sea water velocity +'wo' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 133 ; @@ -16309,8 +16309,8 @@ parameterCategory = 151 ; parameterNumber = 137 ; } -#Sigma-theta -'sth' = { +#Sea water sigma theta +'sigmat' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 138 ; @@ -16351,8 +16351,8 @@ parameterCategory = 151 ; parameterNumber = 144 ; } -#Sea level -'sl' = { +#Sea surface height +'zos' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 145 ; @@ -16363,8 +16363,8 @@ parameterCategory = 151 ; parameterNumber = 146 ; } -#Barotropic stream function -'bsf' = { +#Ocean barotropic stream function +'stfbarot' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 147 ; @@ -16399,14 +16399,14 @@ parameterCategory = 151 ; parameterNumber = 152 ; } -#U stress -'tax' = { +#Surface downward eastward stress +'taueo' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 153 ; } -#V stress -'tay' = { +#Surface downward northward stress +'tauno' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 154 ; @@ -16459,8 +16459,8 @@ parameterCategory = 151 ; parameterNumber = 162 ; } -#20 degrees isotherm depth -'20d' = { +#Depth of 20C isotherm +'t20d' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 163 ; @@ -19154,7 +19154,7 @@ parameterNumber = 95 ; } #Sea-ice thickness -'sit' = { +'sithick' = { discipline = 192 ; parameterCategory = 174 ; parameterNumber = 98 ; diff --git a/definitions/grib2/localConcepts/ecmf/units.def b/definitions/grib2/localConcepts/ecmf/units.def index 998d261bd..fca9e6ebd 100644 --- a/definitions/grib2/localConcepts/ecmf/units.def +++ b/definitions/grib2/localConcepts/ecmf/units.def @@ -16255,31 +16255,31 @@ parameterCategory = 151 ; parameterNumber = 128 ; } -#Ocean potential temperature +#Sea water potential temperature 'deg C' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 129 ; } -#Salinity +#Sea water practical salinity 'psu' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 130 ; } -#Ocean current zonal component +#Eastward sea water velocity 'm s**-1' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 131 ; } -#Ocean current meridional component +#Northward sea water velocity 'm s**-1' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 132 ; } -#Ocean current vertical component +#Upward sea water velocity 'm s**-1' = { discipline = 192 ; parameterCategory = 151 ; @@ -16309,7 +16309,7 @@ parameterCategory = 151 ; parameterNumber = 137 ; } -#Sigma-theta +#Sea water sigma theta 'kg m**-3' = { discipline = 192 ; parameterCategory = 151 ; @@ -16351,7 +16351,7 @@ parameterCategory = 151 ; parameterNumber = 144 ; } -#Sea level +#Sea surface height 'm' = { discipline = 192 ; parameterCategory = 151 ; @@ -16363,7 +16363,7 @@ parameterCategory = 151 ; parameterNumber = 146 ; } -#Barotropic stream function +#Ocean barotropic stream function 'm**3 s**-1' = { discipline = 192 ; parameterCategory = 151 ; @@ -16399,13 +16399,13 @@ parameterCategory = 151 ; parameterNumber = 152 ; } -#U stress +#Surface downward eastward stress 'N m**-2' = { discipline = 192 ; parameterCategory = 151 ; parameterNumber = 153 ; } -#V stress +#Surface downward northward stress 'N m**-2' = { discipline = 192 ; parameterCategory = 151 ; @@ -16459,7 +16459,7 @@ parameterCategory = 151 ; parameterNumber = 162 ; } -#20 degrees isotherm depth +#Depth of 20C isotherm 'm' = { discipline = 192 ; parameterCategory = 151 ; diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def index 67580fe3a..b913aae52 100644 --- a/definitions/grib2/name.def +++ b/definitions/grib2/name.def @@ -17,8 +17,8 @@ parameterCategory = 2 ; parameterNumber = 45 ; } -#Sea-ice cover -'Sea-ice cover' = { +#Sea ice area fraction +'Sea ice area fraction' = { discipline = 10 ; parameterCategory = 2 ; parameterNumber = 0 ; diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def index 4b3187a16..ab49495d0 100644 --- a/definitions/grib2/paramId.def +++ b/definitions/grib2/paramId.def @@ -17,7 +17,7 @@ parameterCategory = 2 ; parameterNumber = 45 ; } -#Sea-ice cover +#Sea ice area fraction '31' = { discipline = 10 ; parameterCategory = 2 ; diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def index fc03817df..170bb9c29 100644 --- a/definitions/grib2/shortName.def +++ b/definitions/grib2/shortName.def @@ -17,7 +17,7 @@ parameterCategory = 2 ; parameterNumber = 45 ; } -#Sea-ice cover +#Sea ice area fraction 'ci' = { discipline = 10 ; parameterCategory = 2 ; diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def index cf5ddbb22..de6f842a9 100644 --- a/definitions/grib2/units.def +++ b/definitions/grib2/units.def @@ -17,7 +17,7 @@ parameterCategory = 2 ; parameterNumber = 45 ; } -#Sea-ice cover +#Sea ice area fraction '(0 - 1)' = { discipline = 10 ; parameterCategory = 2 ;