Skip to content

Commit

Permalink
Feature #2780 grib tables (#3005)
Browse files Browse the repository at this point in the history 
* Per #2780, grib2_bom.txt only has minor change replacing 'Prelim:' with 'Prelim'

* Per #2780, grib2_tigge.txt add new table after eliminating whitespace from units strings

* Per #2780, grib2_all.txt increase the number of entries from 1019 to 1570.

* Per #2780, grib2_kma.txt add new grib2 table file.

* Per #2780, carefully merge the existing 175 MRMS GRIB2 table entries with updates from the 109 defined in the wgrib2 table.

* Per #2780, grib2_ecmwf.txt add new ECMWF GRIB2 table.

* Per #2780, grib2_dwd.txt add new DWD GRIB2 table.

* Per #2870, correct units out of order

* Per #2870, grib2_gpp_af.txt elimiate embedded whitespace from units string to avoid problems writing them to FCST_UNITS and OBS_UNITS output columns

* Per #2780, grib2_ecmwf.txt eliminate whitespace from units string

* Per #2780, add/update GRIB2 tables

* Per #2870, remove duplicate entries I'd added.

* Per #2870, grib2_all.txt update with more entries from this version of wgrib2: hera:/home/Wesley.Ebisuzaki/grib2/wgrib2/gribtables/ncep/gribtable.dat

* Per #2780, grib2_mrms.txt add entries for FRANA as requested by @MarcelCaron-NOAA.

* Per #2780, add new grib1_jra_55_200.txt file that did not previously exist for MET.

* Per #2780, remove embedded whitespace from GRIB1 DWD tables.

* Per #2780, fix all the units by removing embedded whitespace and making them more human-readable by replacing ** with ^ to indicate exponentiation. Also correct bad units for radiation flux in AF tables by listing them as W/m^2.

* Per #2780 eliminate trailing whitespace

* Per #2870, fix typo

* Per #2870, fix typos

* Per #2870, fix typo

* Per #2780, grib1_ncep_129_7.txt fix units by replacing 'µg' with 'mcg' to represent micrograms. Also replace 'mm6' with 'mm^6' by double-checking against the GRIB1 docs.

* Per #2780, switch to defining particulate matter units as '10^-6g/m^3' for consistent usage across NCEP GRIB tables.

* Per #2780, update GRIB2 units to show exponentiation correctly by comparing against documentation at https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc

* Per #2780, more tweaks for consistent and corrected units

* Per #2780, update Makefiles for new grib1_jra55_200.txt file

* Per #2870, more tweaks for consistent formatting of units to eliminate the use of parantheses in the denominator. For example, replace 'kg/(m*s)' with 'kg/m/s'.
  • Loading branch information
@JohnHalleyGotway
JohnHalleyGotway authored Nov 7, 2024
1 parent 396a665 commit c452010
Show file tree
Hide file tree
Showing 53 changed files with 7,961 additions and 3,017 deletions.
7 changes: 6 additions & 1 deletion data/table_files/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,18 @@ tablefiles_DATA = \
grib1_ncep_140_7.txt \
grib1_ncep_141_7.txt \
grib1_ncep_2_7.txt \
grib1_jra55_200.txt \
grib1_lidar2nc.txt \
grib2_all.txt \
grib2_bom.txt \
grib2_dwd.txt \
grib2_ecmwf.txt \
grib2_gpp_af.txt \
grib2_kma.txt \
grib2_mrms.txt \
grib2_nbm.txt \
grib2_ndfd.txt \
grib2_nbm.txt
grib2_tigge.txt

EXTRA_DIST = ${tablefiles_DATA}

Expand Down
7 changes: 6 additions & 1 deletion data/table_files/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -382,13 +382,18 @@ tablefiles_DATA = \
grib1_ncep_140_7.txt \
grib1_ncep_141_7.txt \
grib1_ncep_2_7.txt \
grib1_jra55_200.txt \
grib1_lidar2nc.txt \
grib2_all.txt \
grib2_bom.txt \
grib2_dwd.txt \
grib2_ecmwf.txt \
grib2_gpp_af.txt \
grib2_kma.txt \
grib2_mrms.txt \
grib2_nbm.txt \
grib2_ndfd.txt \
grib2_nbm.txt
grib2_tigge.txt

EXTRA_DIST = ${tablefiles_DATA}
MAINTAINERCLEANFILES = Makefile.in
Expand Down
44 changes: 22 additions & 22 deletions data/table_files/grib1_af_131_57.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ GRIB1
78 131 57 2 "SNOC" "Convective snow" "kg/m^2"
79 131 57 2 "SNOL" "Large scale snow" "kg/m^2"
80 131 57 2 "WTMP" "Water temp." "K"
81 131 57 2 "LAND" "Land-sea mask" "1=land; 0=sea"
81 131 57 2 "LAND" "Land-sea mask" "1=land;0=sea"
82 131 57 2 "DSLM" "Deviation of sea level from mean" "m"
83 131 57 2 "SFCR" "Surface roughness" "m"
84 131 57 2 "ALBDO" "Albedo" "%"
Expand All @@ -90,7 +90,7 @@ GRIB1
88 131 57 2 "SALTY" "Salinity" "kg/kg"
89 131 57 2 "DEN" "Density" "kg/m^3"
90 131 57 2 "RUNOF" "Runoff" "kg/m^2"
91 131 57 2 "ICEC" "Ice concentration" "ice=1;no ice=0"
91 131 57 2 "ICEC" "Ice concentration" "ice=1;no_ice=0"
92 131 57 2 "ICETK" "Ice thickness" "m"
93 131 57 2 "DICED" "Direction of ice drift" "deg"
94 131 57 2 "SICED" "Speed of ice drift" "m/s"
Expand Down Expand Up @@ -135,16 +135,16 @@ GRIB1
133 131 57 2 "var133" "undefined" ""
134 131 57 2 "var134" "undefined" ""
135 131 57 2 "dustVisibility" "Dust Visibility" "m"
136 131 57 2 "dustConcentration" "Dust Concentration" "?g m^-3"
136 131 57 2 "dustConcentration" "Dust Concentration" "g/m^3"
137 131 57 2 "var137" "undefined" ""
138 131 57 2 "var138" "undefined" ""
139 131 57 2 "var139" "undefined" ""
140 131 57 2 "cloudHeightCeiling" "Ceiling" "m"
141 131 57 2 "var141" "undefined" ""
142 131 57 2 "var142" "undefined" ""
143 131 57 2 "var143" "undefined" ""
144 131 57 2 "fluxLongWaveRadiationDownward" "Downward longwave radiation flux" "W m^2"
145 131 57 2 "fluxShortWaveRadiationDownward" "Downward shortwave radiation flux " "W m^2"
144 131 57 2 "fluxLongWaveRadiationDownward" "Downward longwave radiation flux" "W/m^2"
145 131 57 2 "fluxShortWaveRadiationDownward" "Downward shortwave radiation flux " "W/m^2"
146 131 57 2 "var146" "undefined" ""
147 131 57 2 "var147" "undefined" ""
148 131 57 2 "var148" "undefined" ""
Expand All @@ -154,7 +154,7 @@ GRIB1
152 131 57 2 "var152" "undefined" ""
153 131 57 2 "var153" "undefined" ""
154 131 57 2 "var154" "undefined" ""
155 131 57 2 "fluxHeatSurface" "Ground Heat Flux" "W m^2"
155 131 57 2 "fluxHeatSurface" "Ground Heat Flux" "W/m^2"
156 131 57 2 "var156" "undefined" ""
157 131 57 2 "var157" "undefined" ""
158 131 57 2 "var158" "undefined" ""
Expand Down Expand Up @@ -186,7 +186,7 @@ GRIB1
184 131 57 2 "var184" "undefined" ""
185 131 57 2 "cloudLayerOpticalDepth" "Layer Cloud Optical Depth" "number"
186 131 57 2 "cloudLayerIcePercentage" "Layer Cloud Ice Percentage" "%"
187 131 57 2 "cloudLayerWaterPath" "Layer Cloud Water Path" "g m^-2"
187 131 57 2 "cloudLayerWaterPath" "Layer Cloud Water Path" "g/m^2"
188 131 57 2 "cloudLayerParticleSize" "Layer Cloud Particle Size" "?m"
189 131 57 2 "var189" "undefined" ""
190 131 57 2 "cloudLayerNumber" "Cloud Layer Number" "number"
Expand All @@ -200,17 +200,17 @@ GRIB1
198 131 57 2 "precipitationDerivedGeostationarySatelliteBased" "Estimated precipitation - geostationary satellite based" "mm"
199 131 57 2 "precipitationRankGeostationarySatellite" "Geostationary Satellite precipitation rank" "category"
200 131 57 2 "soilMoistureRelative" "Relative soil moisture" "numeric"
201 131 57 2 "soilMoistureVolumetricTotal" "Volumetric Soil Moisture (liquid + frozen)" "volumetric; m^3 m^-3"
201 131 57 2 "soilMoistureVolumetricTotal" "Volumetric Soil Moisture (liquid + frozen)" "volumetric(m^3/m^3)"
202 131 57 2 "precipitationAccumulated" "Precipitation - real amounts" "mm"
203 131 57 2 "precipitationAccumulatedMerged" "Precipitation - merged analysis" "mm/24 hrs"
204 131 57 2 "evapotranspirationActual" "Evapotranspiration - actual" "mm/24 hrs"
203 131 57 2 "precipitationAccumulatedMerged" "Precipitation - merged analysis" "mm/24_hrs"
204 131 57 2 "evapotranspirationActual" "Evapotranspiration - actual" "mm/24_hrs"
205 131 57 2 "soilType" "Soil Type" "code"
206 131 57 2 "var206" "undefined" ""
207 131 57 2 "vegetationPlantCanopyMoistureContent" "Plant Canopy moisture content" "mm"
208 131 57 2 "evapotranspirationPotential" "Evapotranspiration - potential" "mm hr^-1"
209 131 57 2 "windRun" "Wind run" "km/24 hrs"
208 131 57 2 "evapotranspirationPotential" "Evapotranspiration - potential" "mm/hr"
209 131 57 2 "windRun" "Wind run" "km/24_hrs"
210 131 57 2 "humidityRelativeAtMinimumTemperature" "Relative Humidity at minimum temperature" "%"
211 131 57 2 "soilMoistureVolumetricLiquid" "Volumetric Soil Moisture (liquid only)" "volumetric; m^3 ^m-3"
211 131 57 2 "soilMoistureVolumetricLiquid" "Volumetric Soil Moisture (liquid only)" "volumetric(m^3/m^3)"
212 131 57 2 "vegetationType" "Vegetation Type Category" "category"
213 131 57 2 "vegetationGreennessCoverage" "Vegetation Greenness" "%"
214 131 57 2 "var214" "undefined" ""
Expand Down Expand Up @@ -255,7 +255,7 @@ GRIB1
253 131 57 2 "var253" "undefined" ""
254 131 57 2 "var254" "undefined" ""
255 131 57 2 "var255" "undefined" ""
256 133 57 1 "CWGST" "Convective gust windspeed" "m s^-1"
256 133 57 1 "CWGST" "Convective gust windspeed" "m/s"
257 133 57 1 "WBZHGT" "Wet Bulb Zero Height" "m"
258 133 57 1 "HAIL" "Hail size" "cm"
259 133 57 1 "CT1TOP" "Contrail Engine Type 1 Top" "m"
Expand All @@ -264,18 +264,18 @@ GRIB1
262 133 57 1 "CT2BASE" "Contrail Engine Type 2 Base" "m"
263 133 57 1 "CT3TOP" "Contrail Engine Type 3 Top" "m"
264 133 57 1 "CT3BASE" "Contrail Engine Type 3 Base" "m"
265 133 57 1 "PVORT" "Potential Vorticity" "km^2 kg s^-1"
265 133 57 1 "PVORT" "Potential Vorticity" "km^2*kg/s"
266 133 57 1 "STTOP" "SLAT Turbulence Top" "NA"
267 133 57 1 "STBASE" "SLAT Turbulence Base" "NA"
268 133 57 1 "STI" "SLAT Turbulence Index" "NA"
269 133 57 1 "PANIND" "Panofsky Turbulence Index" "-200-500"
270 133 57 1 "ALSTG" "Altimeter setting " "in Hg"
271 133 57 1 "CAPE" "Convective Available Potential Energy" "J kg^-1"
272 133 57 1 "CIN" "Convective Inhibition" "J kg^-1"
273 133 57 1 "COND" "Condensate" "kg kg^-1"
274 133 57 1 "QCLOUD" "Cloud water Mixing Ratio" "kg kg^-1"
275 133 57 1 "QICE" "Ice Water Mixing Ratio" "kg kg^-1"
276 133 57 1 "QRAIN" "Rain Water Mixing Ratio" "kg kg^-1"
270 133 57 1 "ALSTG" "Altimeter setting " "in_Hg"
271 133 57 1 "CAPE" "Convective Available Potential Energy" "J/kg"
272 133 57 1 "CIN" "Convective Inhibition" "J/kg"
273 133 57 1 "COND" "Condensate" "kg/kg"
274 133 57 1 "QCLOUD" "Cloud water Mixing Ratio" "kg/kg"
275 133 57 1 "QICE" "Ice Water Mixing Ratio" "kg/kg"
276 133 57 1 "QRAIN" "Rain Water Mixing Ratio" "kg/kg"
277 133 57 1 "MCONV" "Horizontal Moisture Convergence" "NA"
278 133 57 1 "TINT" "Turbulence Intensity" "NA"
279 133 57 1 "PCPTYPE" "Precipitation Type [0=none, 1=Rain, 2=TRW, 3=ZR, 4=mixed, 5=SN, 6=SVRTRW]" "NA"
Expand Down
42 changes: 21 additions & 21 deletions data/table_files/grib1_af_133_57.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,30 +149,30 @@ GRIB1
147 133 57 1 "PTOP" "Pressure at model top" "Pa"
148 133 57 1 "CT2TOP" "Contrail Engine Type 2 Top" "m"
149 133 57 1 "CT2BAS" "Contrail Engine Type 2 Base" "m"
150 133 57 1 "XLAND" "Land Mask" "1=land, 2=water"
150 133 57 1 "XLAND" "Land Mask" "1=land,2=water"
151 133 57 1 "CT3TOP" "Contrail Engine Type 3 Top" "m"
152 133 57 1 "CT3BAS" "Contrail Engine Type 3 Base" "m"
153 133 57 1 "ISLTYP" "Dominant Soil Type" "cat"
154 133 57 1 "IVGTYP" "Dominant Vegitation Type" "cat"
155 133 57 1 "ABSHUM" "Absolute Humidity" "g/m^3"
156 133 57 1 "ZS" "Depths of center of soil layers" "m"
157 133 57 1 "SNOWC" "Snow Cover flag" "0=no snow, 1=snow"
157 133 57 1 "SNOWC" "Snow Cover flag" "0=no_snow,1=snow"
158 133 57 1 "ITIMESTEP" "Inter Timesteps" "?"
159 133 57 1 "CANWAT" "Canopy Water" "kg/m^2"
160 133 57 1 "SOILL" "Volumetric soil moisture" "liq + frozen"
160 133 57 1 "SOILL" "Volumetric soil moisture" "liq+frozen"
161 133 57 1 "POVORT" "Potential Vorticity" ""
162 133 57 1 "DZS" "Thickness of soil layers" "m"
163 133 57 1 "EPSTS" "Timesteps ?" "?"
164 133 57 1 "PB" "Base State Pressure" "Pa"
165 133 57 1 "TPI" "Tunderstorm Potential Indicator" "0-100"
166 133 57 1 "SVTFG" "Severe Turbulence Flag" "0=off, 1=on"
167 133 57 1 "RAFG" "Rain Precipitation Flag" "0=off, 1=on"
168 133 57 1 "TSFG" "Thunderstorm Precipitation Flag" "0=off, 1=on"
169 133 57 1 "SVTSFG" "Severe Thunderstorm Precipitation Flag" "0=off, 1=on"
170 133 57 1 "SNFG" "Snow Precipitation Flag" "0=off, 1=on"
171 133 57 1 "MXDFG" "Mixed Precipitation Flag" "0=off, 1=on"
166 133 57 1 "SVTFG" "Severe Turbulence Flag" "0=off,1=on"
167 133 57 1 "RAFG" "Rain Precipitation Flag" "0=off,1=on"
168 133 57 1 "TSFG" "Thunderstorm Precipitation Flag" "0=off,1=on"
169 133 57 1 "SVTSFG" "Severe Thunderstorm Precipitation Flag" "0=off,1=on"
170 133 57 1 "SNFG" "Snow Precipitation Flag" "0=off,1=on"
171 133 57 1 "MXDFG" "Mixed Precipitation Flag" "0=off,1=on"
172 133 57 1 "RESM" "Time weight constant for small steps" "?"
173 133 57 1 "ZRAFG" "Freezing Rain Precipitation Flag" "0=off, 1=on"
173 133 57 1 "ZRAFG" "Freezing Rain Precipitation Flag" "0=off,1=on"
174 133 57 1 "GRDFLX" "Ground Heat Flux" "W/m^2"
175 133 57 1 "ACSNOW" "Accum. snow" "kg/m^2"
176 133 57 1 "TSK" "Surface Skin Temperature" "K"
Expand All @@ -184,7 +184,7 @@ GRIB1
182 133 57 1 "ZETATOP" "Zeta at model to" ""
183 133 57 1 "SINALPHA" "Local sine of map rotatio" ""
184 133 57 1 "COSALPHA" "Local cosine of map rotatio" ""
185 133 57 1 "RTHRATEN" "Coupled Theta tendency due to radiation" "kg/m^3 K"
185 133 57 1 "RTHRATEN" "Coupled Theta tendency due to radiation" "kg/m^3*K"
186 133 57 1 "DN" "DN Values on mass level" ""
187 133 57 1 "DNW" "DN values on w level" ""
188 133 57 1 "E" "Coriolis cosine latitude ter" ""
Expand All @@ -204,11 +204,11 @@ GRIB1
202 133 57 1 "ZNT" "Roughness Length" "m"
203 133 57 1 "RDX" "Inverse X grid lengt" ""
204 133 57 1 "QST" "Q* in Similarity Theory" "kg/kg"
205 133 57 1 "QFX" "Upward Moisture flux at surface" "kg/m^2 s"
205 133 57 1 "QFX" "Upward Moisture flux at surface" "kg/m^2*s"
206 133 57 1 "VIS_DUST" "Visibility due to dust only" "m"
207 133 57 1 "TOT_DUST" "Total dust concentration 0.1-20 um" "ug/m^3"
208 133 57 1 "PANIND" "Panofsky Turbulence Index" "-200-500"
209 133 57 1 "ALSTG" "Altimeter Setting" "in Hg"
209 133 57 1 "ALSTG" "Altimeter Setting" "in_Hg"
210 133 57 1 "KX" "K Index" "K"
211 133 57 1 "KO_X" "KO Index" "K"
212 133 57 1 "TT_X" "Total Totals Index" "K"
Expand All @@ -233,7 +233,7 @@ GRIB1
231 133 57 1 "XLONG" "Longitude, West is negative" "deg"
232 133 57 1 "THKNS" "Thickness" "m"
233 133 57 1 "HGT" "Terrain Height" "m"
234 133 57 1 "W_CHILL" "Wind Chill" "deg F"
234 133 57 1 "W_CHILL" "Wind Chill" "degF"
235 133 57 1 "DVAL" "Height D Values" "feet"
236 133 57 1 "MX_RH" "Maximum Relative Humidity" "%"
237 133 57 1 "MXABSH" "Maximum Absolute Humidity" "g/m^3"
Expand All @@ -243,15 +243,15 @@ GRIB1
241 133 57 1 "LANDUSE" "Land Use Category" "category"
242 133 57 1 "SNOWFALL" "Snowfall" "in"
243 133 57 1 "TOTSNOW" "Total Snowfall" "in"
244 133 57 1 "PCPTYPE" "Precipitation Type" "0=none, 1=Rain, 2=TRW, 3=ZR, 4=mixed, 5=SN, 6=SVRTRW"
245 133 57 1 "ICING" "Icing Category" "0=none, 1=light, 2=moderate, 3=severe"
244 133 57 1 "PCPTYPE" "Precipitation Type" "0=none,1=Rain,2=TRW,3=ZR,4=mixed,5=SN,6=SVRTRW"
245 133 57 1 "ICING" "Icing Category" "0=none,1=light,2=moderate,3=severe"
246 133 57 1 "RDFRAC" "Radio Refractivity" "non-dim"
247 133 57 1 "ZNU" "Eta values on mass level" ""
248 133 57 1 "LSI" "Lid Strength Index" "K"
249 133 57 1 "RADRF" "Radar Reflectivity" "dB"
250 133 57 1 "LGIFG" "Light Icing Flag" "0=off, 1=on"
251 133 57 1 "MDIFG" "Moderate Icing Flag" "0=off, 1=on"
252 133 57 1 "SVIFG" "Severe Icing Flag" "0=off, 1=on"
253 133 57 1 "LGTFG" "Light Turbulence Flag" "0=off, 1=on"
254 133 57 1 "MDTFG" "Moderate Turbulence Flag" "0=off, 1=on"
250 133 57 1 "LGIFG" "Light Icing Flag" "0=off,1=on"
251 133 57 1 "MDIFG" "Moderate Icing Flag" "0=off,1=on"
252 133 57 1 "SVIFG" "Severe Icing Flag" "0=off,1=on"
253 133 57 1 "LGTFG" "Light Turbulence Flag" "0=off,1=on"
254 133 57 1 "MDTFG" "Moderate Turbulence Flag" "0=off,1=on"
255 133 57 1 "ZNW" "Eta values on w level" ""
Loading

0 comments on commit c452010

Please sign in to comment.