diff --git a/data/tigge_pf_ecmwf.grib2.ref b/data/tigge_pf_ecmwf.grib2.ref index f7fdbb09b..238323dc0 100644 --- a/data/tigge_pf_ecmwf.grib2.ref +++ b/data/tigge_pf_ecmwf.grib2.ref @@ -3,7 +3,7 @@ ecmf 166 10v m s**-1 10 metre V wind component ecmf 59 cape J kg**-1 Convective available potential energy ecmf 156 gh gpm Geopotential height ecmf 151 msl Pa Mean sea level pressure -ecmf 179 ttr J m**-2 Top net thermal radiation +ecmf 179 ttr J m**-2 Top net long-wave radiation ecmf 3 pt K Potential temperature ecmf 60 pv K m**2 kg**-1 s**-1 Potential vorticity ecmf 235 skt K Skin temperature @@ -18,15 +18,15 @@ ecmf 121 mx2t6 K Maximum temperature at 2 metres in the last 6 hours ecmf 122 mn2t6 K Minimum temperature at 2 metres in the last 6 hours ecmf 167 2t K 2 metre temperature ecmf 147 slhf J m**-2 Surface latent heat flux -ecmf 176 ssr J m**-2 Surface net solar radiation -ecmf 177 str J m**-2 Surface net thermal radiation +ecmf 176 ssr J m**-2 Surface net short-wave radiation +ecmf 177 str J m**-2 Surface net long-wave radiation ecmf 134 sp Pa Surface pressure ecmf 146 sshf J m**-2 Surface sensible heat flux ecmf 130 t K Temperature -ecmf 179 ttr J m**-2 Top net thermal radiation +ecmf 179 ttr J m**-2 Top net long-wave radiation ecmf 147 slhf J m**-2 Surface latent heat flux -ecmf 176 ssr J m**-2 Surface net solar radiation -ecmf 177 str J m**-2 Surface net thermal radiation +ecmf 176 ssr J m**-2 Surface net short-wave radiation +ecmf 177 str J m**-2 Surface net long-wave radiation ecmf 146 sshf J m**-2 Surface sensible heat flux ecmf 228164 tcc % Total Cloud Cover ecmf 136 tcw kg m**-2 Total column water diff --git a/definitions/grib1/localConcepts/ecmf/cfName.def b/definitions/grib1/localConcepts/ecmf/cfName.def index 73c986045..d3db8d450 100644 --- a/definitions/grib1/localConcepts/ecmf/cfName.def +++ b/definitions/grib1/localConcepts/ecmf/cfName.def @@ -449,12 +449,12 @@ table2Version = 190 ; indicatorOfParameter = 164 ; } -#Surface solar radiation downwards +#Surface short-wave radiation downwards 'surface_downwelling_shortwave_flux_in_air' = { table2Version = 128 ; indicatorOfParameter = 169 ; } -#Surface solar radiation downwards +#Surface short-wave radiation downwards 'surface_downwelling_shortwave_flux_in_air' = { table2Version = 190 ; indicatorOfParameter = 169 ; @@ -519,72 +519,72 @@ table2Version = 190 ; indicatorOfParameter = 174 ; } -#Surface net solar radiation +#Surface net short-wave radiation 'surface_net_downward_shortwave_flux' = { table2Version = 128 ; indicatorOfParameter = 176 ; } -#Surface net solar radiation +#Surface net short-wave radiation 'surface_net_downward_shortwave_flux' = { table2Version = 160 ; indicatorOfParameter = 176 ; } -#Surface net solar radiation +#Surface net short-wave radiation 'surface_net_downward_shortwave_flux' = { table2Version = 170 ; indicatorOfParameter = 176 ; } -#Surface net solar radiation +#Surface net short-wave radiation 'surface_net_downward_shortwave_flux' = { table2Version = 190 ; indicatorOfParameter = 176 ; } -#Surface net thermal radiation +#Surface net long-wave radiation 'surface_net_upward_longwave_flux' = { table2Version = 128 ; indicatorOfParameter = 177 ; } -#Surface net thermal radiation +#Surface net long-wave radiation 'surface_net_upward_longwave_flux' = { table2Version = 160 ; indicatorOfParameter = 177 ; } -#Surface net thermal radiation +#Surface net long-wave radiation 'surface_net_upward_longwave_flux' = { table2Version = 170 ; indicatorOfParameter = 177 ; } -#Surface net thermal radiation +#Surface net long-wave radiation 'surface_net_upward_longwave_flux' = { table2Version = 190 ; indicatorOfParameter = 177 ; } -#Top net solar radiation +#Top net short-wave radiation 'toa_net_upward_shortwave_flux' = { table2Version = 128 ; indicatorOfParameter = 178 ; } -#Top net solar radiation +#Top net short-wave radiation 'toa_net_upward_shortwave_flux' = { table2Version = 160 ; indicatorOfParameter = 178 ; } -#Top net solar radiation +#Top net short-wave radiation 'toa_net_upward_shortwave_flux' = { table2Version = 190 ; indicatorOfParameter = 178 ; } -#Top net thermal radiation +#Top net long-wave radiation 'toa_outgoing_longwave_flux' = { table2Version = 128 ; indicatorOfParameter = 179 ; } -#Top net thermal radiation +#Top net long-wave radiation 'toa_outgoing_longwave_flux' = { table2Version = 160 ; indicatorOfParameter = 179 ; } -#Top net thermal radiation +#Top net long-wave radiation 'toa_outgoing_longwave_flux' = { table2Version = 190 ; indicatorOfParameter = 179 ; @@ -664,12 +664,12 @@ table2Version = 128 ; indicatorOfParameter = 206 ; } -#Surface net solar radiation, clear sky +#Surface net short-wave radiation, clear sky 'surface_net_downward_shortwave_flux_assuming_clear_sky' = { table2Version = 128 ; indicatorOfParameter = 210 ; } -#Surface net thermal radiation, clear sky +#Surface net long-wave radiation, clear sky 'surface_net_downward_longwave_flux_assuming_clear_sky' = { table2Version = 128 ; indicatorOfParameter = 211 ; diff --git a/definitions/grib1/localConcepts/ecmf/cfVarName.def b/definitions/grib1/localConcepts/ecmf/cfVarName.def index c9c3b4748..c7127c6b8 100644 --- a/definitions/grib1/localConcepts/ecmf/cfVarName.def +++ b/definitions/grib1/localConcepts/ecmf/cfVarName.def @@ -1294,12 +1294,12 @@ table2Version = 190 ; indicatorOfParameter = 168 ; } -#Surface solar radiation downwards +#Surface short-wave radiation downwards 'ssrd' = { table2Version = 128 ; indicatorOfParameter = 169 ; } -#Surface solar radiation downwards +#Surface short-wave radiation downwards 'ssrd' = { table2Version = 190 ; indicatorOfParameter = 169 ; @@ -1379,82 +1379,82 @@ table2Version = 190 ; indicatorOfParameter = 174 ; } -#Surface thermal radiation downwards +#Surface long-wave radiation downwards 'strd' = { table2Version = 128 ; indicatorOfParameter = 175 ; } -#Surface thermal radiation downwards +#Surface long-wave radiation downwards 'strd' = { table2Version = 190 ; indicatorOfParameter = 175 ; } -#Surface net solar radiation +#Surface net short-wave radiation 'ssr' = { table2Version = 128 ; indicatorOfParameter = 176 ; } -#Surface net solar radiation +#Surface net short-wave radiation 'ssr' = { table2Version = 160 ; indicatorOfParameter = 176 ; } -#Surface net solar radiation +#Surface net short-wave radiation 'ssr' = { table2Version = 170 ; indicatorOfParameter = 176 ; } -#Surface net solar radiation +#Surface net short-wave radiation 'ssr' = { table2Version = 190 ; indicatorOfParameter = 176 ; } -#Surface net thermal radiation +#Surface net long-wave radiation 'str' = { table2Version = 128 ; indicatorOfParameter = 177 ; } -#Surface net thermal radiation +#Surface net long-wave radiation 'str' = { table2Version = 160 ; indicatorOfParameter = 177 ; } -#Surface net thermal radiation +#Surface net long-wave radiation 'str' = { table2Version = 170 ; indicatorOfParameter = 177 ; } -#Surface net thermal radiation +#Surface net long-wave radiation 'str' = { table2Version = 190 ; indicatorOfParameter = 177 ; } -#Top net solar radiation +#Top net short-wave radiation 'tsr' = { table2Version = 128 ; indicatorOfParameter = 178 ; } -#Top net solar radiation +#Top net short-wave radiation 'tsr' = { table2Version = 160 ; indicatorOfParameter = 178 ; } -#Top net solar radiation +#Top net short-wave radiation 'tsr' = { table2Version = 190 ; indicatorOfParameter = 178 ; } -#Top net thermal radiation +#Top net long-wave radiation 'ttr' = { table2Version = 128 ; indicatorOfParameter = 179 ; } -#Top net thermal radiation +#Top net long-wave radiation 'ttr' = { table2Version = 160 ; indicatorOfParameter = 179 ; } -#Top net thermal radiation +#Top net long-wave radiation 'ttr' = { table2Version = 190 ; indicatorOfParameter = 179 ; @@ -1749,12 +1749,12 @@ table2Version = 128 ; indicatorOfParameter = 209 ; } -#Surface net solar radiation, clear sky +#Surface net short-wave radiation, clear sky 'ssrc' = { table2Version = 128 ; indicatorOfParameter = 210 ; } -#Surface net thermal radiation, clear sky +#Surface net long-wave radiation, clear sky 'strc' = { table2Version = 128 ; indicatorOfParameter = 211 ; diff --git a/definitions/grib1/localConcepts/ecmf/name.def b/definitions/grib1/localConcepts/ecmf/name.def index 14be7a42d..771bdb452 100644 --- a/definitions/grib1/localConcepts/ecmf/name.def +++ b/definitions/grib1/localConcepts/ecmf/name.def @@ -1294,13 +1294,13 @@ table2Version = 190 ; indicatorOfParameter = 168 ; } -#Surface solar radiation downwards -'Surface solar radiation downwards' = { +#Surface short-wave radiation downwards +'Surface short-wave radiation downwards' = { table2Version = 128 ; indicatorOfParameter = 169 ; } -#Surface solar radiation downwards -'Surface solar radiation downwards' = { +#Surface short-wave radiation downwards +'Surface short-wave radiation downwards' = { table2Version = 190 ; indicatorOfParameter = 169 ; } @@ -1379,83 +1379,83 @@ table2Version = 190 ; indicatorOfParameter = 174 ; } -#Surface thermal radiation downwards -'Surface thermal radiation downwards' = { +#Surface long-wave radiation downwards +'Surface long-wave radiation downwards' = { table2Version = 128 ; indicatorOfParameter = 175 ; } -#Surface thermal radiation downwards -'Surface thermal radiation downwards' = { +#Surface long-wave radiation downwards +'Surface long-wave radiation downwards' = { table2Version = 190 ; indicatorOfParameter = 175 ; } -#Surface net solar radiation -'Surface net solar radiation' = { +#Surface net short-wave radiation +'Surface net short-wave radiation' = { table2Version = 128 ; indicatorOfParameter = 176 ; } -#Surface net solar radiation -'Surface net solar radiation' = { +#Surface net short-wave radiation +'Surface net short-wave radiation' = { table2Version = 160 ; indicatorOfParameter = 176 ; } -#Surface net solar radiation -'Surface net solar radiation' = { +#Surface net short-wave radiation +'Surface net short-wave radiation' = { table2Version = 170 ; indicatorOfParameter = 176 ; } -#Surface net solar radiation -'Surface net solar radiation' = { +#Surface net short-wave radiation +'Surface net short-wave radiation' = { table2Version = 190 ; indicatorOfParameter = 176 ; } -#Surface net thermal radiation -'Surface net thermal radiation' = { +#Surface net long-wave radiation +'Surface net long-wave radiation' = { table2Version = 128 ; indicatorOfParameter = 177 ; } -#Surface net thermal radiation -'Surface net thermal radiation' = { +#Surface net long-wave radiation +'Surface net long-wave radiation' = { table2Version = 160 ; indicatorOfParameter = 177 ; } -#Surface net thermal radiation -'Surface net thermal radiation' = { +#Surface net long-wave radiation +'Surface net long-wave radiation' = { table2Version = 170 ; indicatorOfParameter = 177 ; } -#Surface net thermal radiation -'Surface net thermal radiation' = { +#Surface net long-wave radiation +'Surface net long-wave radiation' = { table2Version = 190 ; indicatorOfParameter = 177 ; } -#Top net solar radiation -'Top net solar radiation' = { +#Top net short-wave radiation +'Top net short-wave radiation' = { table2Version = 128 ; indicatorOfParameter = 178 ; } -#Top net solar radiation -'Top net solar radiation' = { +#Top net short-wave radiation +'Top net short-wave radiation' = { table2Version = 160 ; indicatorOfParameter = 178 ; } -#Top net solar radiation -'Top net solar radiation' = { +#Top net short-wave radiation +'Top net short-wave radiation' = { table2Version = 190 ; indicatorOfParameter = 178 ; } -#Top net thermal radiation -'Top net thermal radiation' = { +#Top net long-wave radiation +'Top net long-wave radiation' = { table2Version = 128 ; indicatorOfParameter = 179 ; } -#Top net thermal radiation -'Top net thermal radiation' = { +#Top net long-wave radiation +'Top net long-wave radiation' = { table2Version = 160 ; indicatorOfParameter = 179 ; } -#Top net thermal radiation -'Top net thermal radiation' = { +#Top net long-wave radiation +'Top net long-wave radiation' = { table2Version = 190 ; indicatorOfParameter = 179 ; } @@ -1749,13 +1749,13 @@ table2Version = 128 ; indicatorOfParameter = 209 ; } -#Surface net solar radiation, clear sky -'Surface net solar radiation, clear sky' = { +#Surface net short-wave radiation, clear sky +'Surface net short-wave radiation, clear sky' = { table2Version = 128 ; indicatorOfParameter = 210 ; } -#Surface net thermal radiation, clear sky -'Surface net thermal radiation, clear sky' = { +#Surface net long-wave radiation, clear sky +'Surface net long-wave radiation, clear sky' = { table2Version = 128 ; indicatorOfParameter = 211 ; } diff --git a/definitions/grib1/localConcepts/ecmf/paramId.def b/definitions/grib1/localConcepts/ecmf/paramId.def index 0989df4bd..f91ce39c0 100644 --- a/definitions/grib1/localConcepts/ecmf/paramId.def +++ b/definitions/grib1/localConcepts/ecmf/paramId.def @@ -1294,12 +1294,12 @@ table2Version = 190 ; indicatorOfParameter = 168 ; } -#Surface solar radiation downwards +#Surface short-wave radiation downwards '169' = { table2Version = 128 ; indicatorOfParameter = 169 ; } -#Surface solar radiation downwards +#Surface short-wave radiation downwards '169' = { table2Version = 190 ; indicatorOfParameter = 169 ; @@ -1379,82 +1379,82 @@ table2Version = 190 ; indicatorOfParameter = 174 ; } -#Surface thermal radiation downwards +#Surface long-wave radiation downwards '175' = { table2Version = 128 ; indicatorOfParameter = 175 ; } -#Surface thermal radiation downwards +#Surface long-wave radiation downwards '175' = { table2Version = 190 ; indicatorOfParameter = 175 ; } -#Surface net solar radiation +#Surface net short-wave radiation '176' = { table2Version = 128 ; indicatorOfParameter = 176 ; } -#Surface net solar radiation +#Surface net short-wave radiation '176' = { table2Version = 160 ; indicatorOfParameter = 176 ; } -#Surface net solar radiation +#Surface net short-wave radiation '176' = { table2Version = 170 ; indicatorOfParameter = 176 ; } -#Surface net solar radiation +#Surface net short-wave radiation '176' = { table2Version = 190 ; indicatorOfParameter = 176 ; } -#Surface net thermal radiation +#Surface net long-wave radiation '177' = { table2Version = 128 ; indicatorOfParameter = 177 ; } -#Surface net thermal radiation +#Surface net long-wave radiation '177' = { table2Version = 160 ; indicatorOfParameter = 177 ; } -#Surface net thermal radiation +#Surface net long-wave radiation '177' = { table2Version = 170 ; indicatorOfParameter = 177 ; } -#Surface net thermal radiation +#Surface net long-wave radiation '177' = { table2Version = 190 ; indicatorOfParameter = 177 ; } -#Top net solar radiation +#Top net short-wave radiation '178' = { table2Version = 128 ; indicatorOfParameter = 178 ; } -#Top net solar radiation +#Top net short-wave radiation '178' = { table2Version = 160 ; indicatorOfParameter = 178 ; } -#Top net solar radiation +#Top net short-wave radiation '178' = { table2Version = 190 ; indicatorOfParameter = 178 ; } -#Top net thermal radiation +#Top net long-wave radiation '179' = { table2Version = 128 ; indicatorOfParameter = 179 ; } -#Top net thermal radiation +#Top net long-wave radiation '179' = { table2Version = 160 ; indicatorOfParameter = 179 ; } -#Top net thermal radiation +#Top net long-wave radiation '179' = { table2Version = 190 ; indicatorOfParameter = 179 ; @@ -1749,12 +1749,12 @@ table2Version = 128 ; indicatorOfParameter = 209 ; } -#Surface net solar radiation, clear sky +#Surface net short-wave radiation, clear sky '210' = { table2Version = 128 ; indicatorOfParameter = 210 ; } -#Surface net thermal radiation, clear sky +#Surface net long-wave radiation, clear sky '211' = { table2Version = 128 ; indicatorOfParameter = 211 ; diff --git a/definitions/grib1/localConcepts/ecmf/shortName.def b/definitions/grib1/localConcepts/ecmf/shortName.def index ba1b56168..38f2257db 100644 --- a/definitions/grib1/localConcepts/ecmf/shortName.def +++ b/definitions/grib1/localConcepts/ecmf/shortName.def @@ -1294,12 +1294,12 @@ table2Version = 190 ; indicatorOfParameter = 168 ; } -#Surface solar radiation downwards +#Surface short-wave radiation downwards 'ssrd' = { table2Version = 128 ; indicatorOfParameter = 169 ; } -#Surface solar radiation downwards +#Surface short-wave radiation downwards 'ssrd' = { table2Version = 190 ; indicatorOfParameter = 169 ; @@ -1379,82 +1379,82 @@ table2Version = 190 ; indicatorOfParameter = 174 ; } -#Surface thermal radiation downwards +#Surface long-wave radiation downwards 'strd' = { table2Version = 128 ; indicatorOfParameter = 175 ; } -#Surface thermal radiation downwards +#Surface long-wave radiation downwards 'strd' = { table2Version = 190 ; indicatorOfParameter = 175 ; } -#Surface net solar radiation +#Surface net short-wave radiation 'ssr' = { table2Version = 128 ; indicatorOfParameter = 176 ; } -#Surface net solar radiation +#Surface net short-wave radiation 'ssr' = { table2Version = 160 ; indicatorOfParameter = 176 ; } -#Surface net solar radiation +#Surface net short-wave radiation 'ssr' = { table2Version = 170 ; indicatorOfParameter = 176 ; } -#Surface net solar radiation +#Surface net short-wave radiation 'ssr' = { table2Version = 190 ; indicatorOfParameter = 176 ; } -#Surface net thermal radiation +#Surface net long-wave radiation 'str' = { table2Version = 128 ; indicatorOfParameter = 177 ; } -#Surface net thermal radiation +#Surface net long-wave radiation 'str' = { table2Version = 160 ; indicatorOfParameter = 177 ; } -#Surface net thermal radiation +#Surface net long-wave radiation 'str' = { table2Version = 170 ; indicatorOfParameter = 177 ; } -#Surface net thermal radiation +#Surface net long-wave radiation 'str' = { table2Version = 190 ; indicatorOfParameter = 177 ; } -#Top net solar radiation +#Top net short-wave radiation 'tsr' = { table2Version = 128 ; indicatorOfParameter = 178 ; } -#Top net solar radiation +#Top net short-wave radiation 'tsr' = { table2Version = 160 ; indicatorOfParameter = 178 ; } -#Top net solar radiation +#Top net short-wave radiation 'tsr' = { table2Version = 190 ; indicatorOfParameter = 178 ; } -#Top net thermal radiation +#Top net long-wave radiation 'ttr' = { table2Version = 128 ; indicatorOfParameter = 179 ; } -#Top net thermal radiation +#Top net long-wave radiation 'ttr' = { table2Version = 160 ; indicatorOfParameter = 179 ; } -#Top net thermal radiation +#Top net long-wave radiation 'ttr' = { table2Version = 190 ; indicatorOfParameter = 179 ; @@ -1749,12 +1749,12 @@ table2Version = 128 ; indicatorOfParameter = 209 ; } -#Surface net solar radiation, clear sky +#Surface net short-wave radiation, clear sky 'ssrc' = { table2Version = 128 ; indicatorOfParameter = 210 ; } -#Surface net thermal radiation, clear sky +#Surface net long-wave radiation, clear sky 'strc' = { table2Version = 128 ; indicatorOfParameter = 211 ; diff --git a/definitions/grib1/localConcepts/ecmf/units.def b/definitions/grib1/localConcepts/ecmf/units.def index 6ff99939a..8a57c3b5f 100644 --- a/definitions/grib1/localConcepts/ecmf/units.def +++ b/definitions/grib1/localConcepts/ecmf/units.def @@ -1294,12 +1294,12 @@ table2Version = 190 ; indicatorOfParameter = 168 ; } -#Surface solar radiation downwards +#Surface short-wave radiation downwards 'J m**-2' = { table2Version = 128 ; indicatorOfParameter = 169 ; } -#Surface solar radiation downwards +#Surface short-wave radiation downwards 'J m**-2' = { table2Version = 190 ; indicatorOfParameter = 169 ; @@ -1379,82 +1379,82 @@ table2Version = 190 ; indicatorOfParameter = 174 ; } -#Surface thermal radiation downwards +#Surface long-wave radiation downwards 'J m**-2' = { table2Version = 128 ; indicatorOfParameter = 175 ; } -#Surface thermal radiation downwards +#Surface long-wave radiation downwards 'J m**-2' = { table2Version = 190 ; indicatorOfParameter = 175 ; } -#Surface net solar radiation +#Surface net short-wave radiation 'J m**-2' = { table2Version = 128 ; indicatorOfParameter = 176 ; } -#Surface net solar radiation +#Surface net short-wave radiation 'J m**-2' = { table2Version = 160 ; indicatorOfParameter = 176 ; } -#Surface net solar radiation +#Surface net short-wave radiation 'J m**-2' = { table2Version = 170 ; indicatorOfParameter = 176 ; } -#Surface net solar radiation +#Surface net short-wave radiation 'J m**-2' = { table2Version = 190 ; indicatorOfParameter = 176 ; } -#Surface net thermal radiation +#Surface net long-wave radiation 'J m**-2' = { table2Version = 128 ; indicatorOfParameter = 177 ; } -#Surface net thermal radiation +#Surface net long-wave radiation 'J m**-2' = { table2Version = 160 ; indicatorOfParameter = 177 ; } -#Surface net thermal radiation +#Surface net long-wave radiation 'J m**-2' = { table2Version = 170 ; indicatorOfParameter = 177 ; } -#Surface net thermal radiation +#Surface net long-wave radiation 'J m**-2' = { table2Version = 190 ; indicatorOfParameter = 177 ; } -#Top net solar radiation +#Top net short-wave radiation 'J m**-2' = { table2Version = 128 ; indicatorOfParameter = 178 ; } -#Top net solar radiation +#Top net short-wave radiation 'J m**-2' = { table2Version = 160 ; indicatorOfParameter = 178 ; } -#Top net solar radiation +#Top net short-wave radiation 'J m**-2' = { table2Version = 190 ; indicatorOfParameter = 178 ; } -#Top net thermal radiation +#Top net long-wave radiation 'J m**-2' = { table2Version = 128 ; indicatorOfParameter = 179 ; } -#Top net thermal radiation +#Top net long-wave radiation 'J m**-2' = { table2Version = 160 ; indicatorOfParameter = 179 ; } -#Top net thermal radiation +#Top net long-wave radiation 'J m**-2' = { table2Version = 190 ; indicatorOfParameter = 179 ; @@ -1749,12 +1749,12 @@ table2Version = 128 ; indicatorOfParameter = 209 ; } -#Surface net solar radiation, clear sky +#Surface net short-wave radiation, clear sky 'J m**-2' = { table2Version = 128 ; indicatorOfParameter = 210 ; } -#Surface net thermal radiation, clear sky +#Surface net long-wave radiation, clear sky 'J m**-2' = { table2Version = 128 ; indicatorOfParameter = 211 ; diff --git a/definitions/grib2/cfName.def b/definitions/grib2/cfName.def index 1e7ecb41c..8166c4477 100644 --- a/definitions/grib2/cfName.def +++ b/definitions/grib2/cfName.def @@ -11,7 +11,7 @@ parameterCategory = 1 ; parameterNumber = 64 ; } -#Surface solar radiation downwards +#Surface short-wave radiation downwards 'surface_downwelling_shortwave_flux_in_air' = { discipline = 0 ; parameterCategory = 4 ; @@ -19,7 +19,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Top net solar radiation +#Top net short-wave radiation 'toa_net_upward_shortwave_flux' = { discipline = 0 ; parameterCategory = 4 ; @@ -45,7 +45,7 @@ parameterCategory = 14 ; parameterNumber = 1 ; } -#Surface net solar radiation, clear sky +#Surface net short-wave radiation, clear sky 'surface_net_downward_shortwave_flux_assuming_clear_sky' = { discipline = 0 ; parameterCategory = 4 ; @@ -53,7 +53,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Surface net thermal radiation, clear sky +#Surface net long-wave radiation, clear sky 'surface_net_downward_longwave_flux_assuming_clear_sky' = { discipline = 0 ; parameterCategory = 5 ; @@ -331,7 +331,7 @@ parameterCategory = 0 ; parameterNumber = 1 ; } -#Surface net solar radiation +#Surface net short-wave radiation 'surface_net_downward_shortwave_flux' = { discipline = 0 ; parameterCategory = 4 ; @@ -339,7 +339,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Surface net thermal radiation +#Surface net long-wave radiation 'surface_net_upward_longwave_flux' = { discipline = 0 ; parameterCategory = 5 ; @@ -347,7 +347,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Top net thermal radiation +#Top net long-wave radiation 'toa_outgoing_longwave_flux' = { discipline = 0 ; parameterCategory = 5 ; diff --git a/definitions/grib2/cfVarName.def b/definitions/grib2/cfVarName.def index 5afe2f812..a8ee234f9 100644 --- a/definitions/grib2/cfVarName.def +++ b/definitions/grib2/cfVarName.def @@ -205,7 +205,7 @@ parameterCategory = 1 ; parameterNumber = 64 ; } -#Surface solar radiation downwards +#Surface short-wave radiation downwards 'ssrd' = { discipline = 0 ; parameterCategory = 4 ; @@ -213,7 +213,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Surface thermal radiation downwards +#Surface long-wave radiation downwards 'strd' = { discipline = 0 ; parameterCategory = 5 ; @@ -221,7 +221,7 @@ typeOfStatisticalProcessing = 1 ; typeOfFirstFixedSurface = 1 ; } -#Top net solar radiation +#Top net short-wave radiation 'tsr' = { discipline = 0 ; parameterCategory = 4 ; @@ -247,7 +247,7 @@ parameterCategory = 14 ; parameterNumber = 1 ; } -#Surface net solar radiation, clear sky +#Surface net short-wave radiation, clear sky 'ssrc' = { discipline = 0 ; parameterCategory = 4 ; @@ -255,7 +255,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Surface net thermal radiation, clear sky +#Surface net long-wave radiation, clear sky 'strc' = { discipline = 0 ; parameterCategory = 5 ; @@ -5090,7 +5090,7 @@ parameterCategory = 0 ; parameterNumber = 1 ; } -#Surface net solar radiation +#Surface net short-wave radiation 'ssr' = { discipline = 0 ; parameterCategory = 4 ; @@ -5098,7 +5098,7 @@ typeOfStatisticalProcessing = 1 ; typeOfFirstFixedSurface = 1 ; } -#Surface net thermal radiation +#Surface net long-wave radiation 'str' = { discipline = 0 ; parameterCategory = 5 ; @@ -5106,7 +5106,7 @@ typeOfStatisticalProcessing = 1 ; typeOfFirstFixedSurface = 1 ; } -#Top net thermal radiation +#Top net long-wave radiation 'ttr' = { discipline = 0 ; parameterCategory = 5 ; diff --git a/definitions/grib2/name.def b/definitions/grib2/name.def index c48ce5f72..4b92ea64d 100644 --- a/definitions/grib2/name.def +++ b/definitions/grib2/name.def @@ -205,24 +205,24 @@ parameterCategory = 1 ; parameterNumber = 64 ; } -#Surface solar radiation downwards -'Surface solar radiation downwards' = { +#Surface short-wave radiation downwards +'Surface short-wave radiation downwards' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 7 ; typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Surface thermal radiation downwards -'Surface thermal radiation downwards' = { +#Surface long-wave radiation downwards +'Surface long-wave radiation downwards' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 3 ; typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Top net solar radiation -'Top net solar radiation' = { +#Top net short-wave radiation +'Top net short-wave radiation' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 1 ; @@ -247,16 +247,16 @@ parameterCategory = 14 ; parameterNumber = 1 ; } -#Surface net solar radiation, clear sky -'Surface net solar radiation, clear sky' = { +#Surface net short-wave radiation, clear sky +'Surface net short-wave radiation, clear sky' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 11 ; typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Surface net thermal radiation, clear sky -'Surface net thermal radiation, clear sky' = { +#Surface net long-wave radiation, clear sky +'Surface net long-wave radiation, clear sky' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 6 ; @@ -5090,24 +5090,24 @@ parameterCategory = 0 ; parameterNumber = 1 ; } -#Surface net solar radiation -'Surface net solar radiation' = { +#Surface net short-wave radiation +'Surface net short-wave radiation' = { discipline = 0 ; parameterCategory = 4 ; parameterNumber = 9 ; typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Surface net thermal radiation -'Surface net thermal radiation' = { +#Surface net long-wave radiation +'Surface net long-wave radiation' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 5 ; typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Top net thermal radiation -'Top net thermal radiation' = { +#Top net long-wave radiation +'Top net long-wave radiation' = { discipline = 0 ; parameterCategory = 5 ; parameterNumber = 5 ; diff --git a/definitions/grib2/paramId.def b/definitions/grib2/paramId.def index 4980db601..2df8518c3 100644 --- a/definitions/grib2/paramId.def +++ b/definitions/grib2/paramId.def @@ -205,7 +205,7 @@ parameterCategory = 1 ; parameterNumber = 64 ; } -#Surface solar radiation downwards +#Surface short-wave radiation downwards '169' = { discipline = 0 ; parameterCategory = 4 ; @@ -213,7 +213,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Surface thermal radiation downwards +#Surface long-wave radiation downwards '175' = { discipline = 0 ; parameterCategory = 5 ; @@ -221,7 +221,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Top net solar radiation +#Top net short-wave radiation '178' = { discipline = 0 ; parameterCategory = 4 ; @@ -247,7 +247,7 @@ parameterCategory = 14 ; parameterNumber = 1 ; } -#Surface net solar radiation, clear sky +#Surface net short-wave radiation, clear sky '210' = { discipline = 0 ; parameterCategory = 4 ; @@ -255,7 +255,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Surface net thermal radiation, clear sky +#Surface net long-wave radiation, clear sky '211' = { discipline = 0 ; parameterCategory = 5 ; @@ -5090,7 +5090,7 @@ parameterCategory = 0 ; parameterNumber = 1 ; } -#Surface net solar radiation +#Surface net short-wave radiation '176' = { discipline = 0 ; parameterCategory = 4 ; @@ -5098,7 +5098,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Surface net thermal radiation +#Surface net long-wave radiation '177' = { discipline = 0 ; parameterCategory = 5 ; @@ -5106,7 +5106,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Top net thermal radiation +#Top net long-wave radiation '179' = { discipline = 0 ; parameterCategory = 5 ; diff --git a/definitions/grib2/shortName.def b/definitions/grib2/shortName.def index 288af2e19..cb33afb18 100644 --- a/definitions/grib2/shortName.def +++ b/definitions/grib2/shortName.def @@ -205,7 +205,7 @@ parameterCategory = 1 ; parameterNumber = 64 ; } -#Surface solar radiation downwards +#Surface short-wave radiation downwards 'ssrd' = { discipline = 0 ; parameterCategory = 4 ; @@ -213,7 +213,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Surface thermal radiation downwards +#Surface long-wave radiation downwards 'strd' = { discipline = 0 ; parameterCategory = 5 ; @@ -221,7 +221,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Top net solar radiation +#Top net short-wave radiation 'tsr' = { discipline = 0 ; parameterCategory = 4 ; @@ -247,7 +247,7 @@ parameterCategory = 14 ; parameterNumber = 1 ; } -#Surface net solar radiation, clear sky +#Surface net short-wave radiation, clear sky 'ssrc' = { discipline = 0 ; parameterCategory = 4 ; @@ -255,7 +255,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Surface net thermal radiation, clear sky +#Surface net long-wave radiation, clear sky 'strc' = { discipline = 0 ; parameterCategory = 5 ; @@ -5090,7 +5090,7 @@ parameterCategory = 0 ; parameterNumber = 1 ; } -#Surface net solar radiation +#Surface net short-wave radiation 'ssr' = { discipline = 0 ; parameterCategory = 4 ; @@ -5098,7 +5098,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Surface net thermal radiation +#Surface net long-wave radiation 'str' = { discipline = 0 ; parameterCategory = 5 ; @@ -5106,7 +5106,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Top net thermal radiation +#Top net long-wave radiation 'ttr' = { discipline = 0 ; parameterCategory = 5 ; diff --git a/definitions/grib2/units.def b/definitions/grib2/units.def index b052cd4e9..7b4dad3c0 100644 --- a/definitions/grib2/units.def +++ b/definitions/grib2/units.def @@ -205,7 +205,7 @@ parameterCategory = 1 ; parameterNumber = 64 ; } -#Surface solar radiation downwards +#Surface short-wave radiation downwards 'J m**-2' = { discipline = 0 ; parameterCategory = 4 ; @@ -213,7 +213,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Surface thermal radiation downwards +#Surface long-wave radiation downwards 'J m**-2' = { discipline = 0 ; parameterCategory = 5 ; @@ -221,7 +221,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Top net solar radiation +#Top net short-wave radiation 'J m**-2' = { discipline = 0 ; parameterCategory = 4 ; @@ -247,7 +247,7 @@ parameterCategory = 14 ; parameterNumber = 1 ; } -#Surface net solar radiation, clear sky +#Surface net short-wave radiation, clear sky 'J m**-2' = { discipline = 0 ; parameterCategory = 4 ; @@ -255,7 +255,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Surface net thermal radiation, clear sky +#Surface net long-wave radiation, clear sky 'J m**-2' = { discipline = 0 ; parameterCategory = 5 ; @@ -5090,7 +5090,7 @@ parameterCategory = 0 ; parameterNumber = 1 ; } -#Surface net solar radiation +#Surface net short-wave radiation 'J m**-2' = { discipline = 0 ; parameterCategory = 4 ; @@ -5098,7 +5098,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Surface net thermal radiation +#Surface net long-wave radiation 'J m**-2' = { discipline = 0 ; parameterCategory = 5 ; @@ -5106,7 +5106,7 @@ typeOfFirstFixedSurface = 1 ; typeOfStatisticalProcessing = 1 ; } -#Top net thermal radiation +#Top net long-wave radiation 'J m**-2' = { discipline = 0 ; parameterCategory = 5 ;