jgrib-commits Mailing List for Java GRIB reader

Update of /cvsroot/jgrib/jgrib/tables
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13516/tables

Modified Files:
	tablelookup.lst 
Added Files:
	jje_dnmi_grib.tab ukmetoffice_AML.tab ukmetoffice_AML2.tab 
Log Message:
* Correctly read parameters for rotated grids (rotated latitude/longitude projection)
* Grib table lookup list (tablelookup.lst)
	-ignore comments
	-handle center/tabels (unknown=-1):
		88/128:	 jje_dnmi_grib.tab
		74/130:  ncep_opn.tab
		-1/1:    ncep_opn.tab
		-1/2:    ncep_reanal_2.tab
		-1/3:    nc72_ecmwf_3.tab
		-1/130:  ncep_opn.tab
		74/128:	 ukmetoffice_AML2.tab

--- NEW FILE: ukmetoffice_AML.tab ---
-1:74:-1:128
0:var0:undefined
1:PRES:Pressure [Pa]
2:PRMSL:Pressure reduced to MSL [Pa]
3:PTEND:Pressure tendency [Pa/s]
4:var0:undefined
5:var0:undefined
6:GP:Geopotential [m^2/s^2]
7:HGT:Geopotential height [gpm]
8:DIST:Geometric height [m]
9:HSTDV:Std dev of height [m]
10:var0:undefined
11:TMP:Temp. [K]
12:VTMP:Virtual temp. [K]
13:POT:Potential temp. [K]
14:EPOT:Pseudo-adiabatic pot. temp. [K]
15:TMAX:Max. temp. [K]
16:TMIN:Min. temp. [K]
17:DPT:Dew point temp. [K]
18:DEPR:Dew point depression [K]
19:LAPR:Lapse rate [K/m]
20:VIS:Visibility [m]
21:RDSP1:Radar spectra (1) [non-dim]
22:RDSP2:Radar spectra (2) [non-dim]
23:RDSP3:Radar spectra (3) [non-dim]
24:var0:undefined
25:TMPA:Temp. anomaly [K]
26:PRESA:Pressure anomaly [Pa]
27:GPA:Geopotential height anomaly [gpm]
28:WVSP1:Wave spectra (1) [non-dim]
29:WVSP2:Wave spectra (2) [non-dim]
30:WVSP3:Wave spectra (3) [non-dim]
31:WDIR:Wind direction [deg]
32:WIND:Wind speed [m/s]
33:UGRD:u wind [m/s]
34:VGRD:v wind [m/s]
35:STRM:Stream function [m^2/s]
36:VPOT:Velocity potential [m^2/s]
37:MNTSF:Montgomery stream function [m^2/s^2]
38:SGCVV:Sigma coord. vertical velocity [/s]
39:VVEL:Pressure vertical velocity [Pa/s]
40:DZDT:Geometric vertical velocity [m/s]
41:ABSV:Absolute vorticity [/s]
42:ABSD:Absolute divergence [/s]
43:RELV:Relative vorticity [/s]
44:RELD:Relative divergence [/s]
45:VUCSH:Vertical u shear [/s]
46:VVCSH:Vertical v shear [/s]
47:DIRC:Direction of current [deg]
48:SPC:Speed of current [m/s]
49:UOGRD:u of current [m/s]
50:VOGRD:v of current [m/s]
51:SPFH:Specific humidity [kg/kg]
52:RH:Relative humidity [%]
53:MIXR:Humidity mixing ratio [kg/kg]
54:PWAT:Precipitable water [kg/m^2]
55:VAPP:Vapor pressure [Pa]
56:SATD:Saturation deficit [Pa]
57:EVP:Evaporation [kg/m^2]
58:CICE:Cloud Ice [kg/kg]
59:PRATE:Precipitation rate [kg/m^2/s]
60:TSTM:Thunderstorm probability [%]
61:APCP:Total precipitation [kg/m^2]
62:NCPCP:Large scale precipitation [kg/m^2]
63:ACPCP:Convective precipitation [kg/m^2]
64:SRWEQ:Snowfall rate water equiv. [kg/m^2/s]
65:WEASD:Accum. snow [kg/m^2]
66:SNOD:Snow depth [m]
67:MIXHT:Mixed layer depth [m]
68:TTHDP:Transient thermocline depth [m]
69:MTHD:Main thermocline depth [m]
70:MTHA:Main thermocline anomaly [m]
71:TCDC:Total cloud cover [%]
72:CDCON:Convective cloud cover [%]
73:LCDC:Low level cloud cover [%]
74:MCDC:Mid level cloud cover [%]
75:HCDC:High level cloud cover [%]
76:CWAT:Cloud water [kg/kg]
77:var0:undefined
78:SNOC:Convective snow [kg/m^2]
79:SNOL:Large scale snow [kg/m^2]
80:WTMP:Water temp. [K]
81:LAND:Land cover (land=1;sea=0) [fraction]
82:DSLM:Deviation of sea level from mean [m]
83:SFCR:Surface roughness [m]
84:ALBDO:Albedo [%]
85:TSOIL:Soil temp. [K]
86:SOILM:Soil moisture content [kg/m^2]
87:VEG:Vegetation [%]
88:SALTY:Salinity [kg/kg]
89:DEN:Density [kg/m^3]
90:WATR:Water runoff [kg/m^2]
91:ICEC:Ice concentration (ice=1;no ice=0) [fraction]
92:ICETK:Ice thickness [m]
93:DICED:Direction of ice drift [deg]
94:SICED:Speed of ice drift [m/s]
95:UICE:u of ice drift [m/s]
96:VICE:v of ice drift [m/s]
97:ICEG:Ice growth rate [m/s]
98:ICED:Ice divergence [/s]
99:SNOM:Snow melt [kg/m^2]
100:HTSGW:Sig height of wind waves and swell [m]
101:WVDIR:Direction of wind waves [deg]
102:WVHGT:Sig height of wind waves [m]
103:WVPER:Mean period of wind waves [s]
104:SWDIR:Direction of swell waves [deg]
105:SWELL:Sig height of swell waves [m]
106:SWPER:Mean period of swell waves [s]
107:DIRPW:Primary wave direction [deg]
108:PERPW:Primary wave mean period [s]
109:DIRSW:Secondary wave direction [deg]
110:PERSW:Secondary wave mean period [s]
111:NSWRS:Net short wave (surface) [W/m^2]
112:NLWRS:Net long wave (surface) [W/m^2]
113:NSWRT:Net short wave (top) [W/m^2]
114:NLWRT:Net long wave (top) [W/m^2]
115:LWAVR:Long wave [W/m^2]
116:SWAVR:Short wave [W/m^2]
117:GRAD:Global radiation [W/m^2]
118:var0:undefined
119:var0:undefined
120:var0:undefined
121:SCALS:Mean scalar speed of wind [m/s]
122:TD:Mean dew point [K]
123:GP:Mean height of pressure surface [gpm]
124:10SS:Mean 10-m scalar speed of wind [m/s]
126:TPPN:Mean accum'd total ppn [kg/m^2]
130:T:Mean temperature [K]
131:U:Mean u-speed of wind [m/s]
132:V:Mean V-speed of wind [m/s]
151:MSLP:Mean MSL pressure [Pa]
157:R:Mean relative humidity [%]
164:TCC:Mean total cloud cover [fraction]
165:10U:Mean 10-m u-wind [m/s]
166:10V:Mean 10-m v-wind [m/s]
167:2T:Mean 2-m temperature [K]
168:2D:Mean 2-m dew point [K]
186:LCC:Mean low cloud cover [fraction]
187:MCC:Mean medium cloud cover [fraction]
188:HCC:Mean high cloud cover [fraction]
Index: tablelookup.lst
===================================================================
RCS file: /cvsroot/jgrib/jgrib/tables/tablelookup.lst,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** tablelookup.lst	24 Nov 2004 13:41:58 -0000	1.5
--- tablelookup.lst	30 Mar 2005 07:34:28 -0000	1.6
***************
*** 6,7 ****
--- 6,17 ----
  96: -1:       1:    ncep_opn.tab
  88: -1:     190:	dnmi_grib.tab
+ 88: -1:     128:	jje_dnmi_grib.tab  // 141:ODEPTH, 144:DSLM
+ 
+ 74: -1:       130:    ncep_opn.tab
+ //default mapping table 1,2,3 ?
+ -1: -1:       1:    ncep_opn.tab
+ -1: -1:       2:    ncep_reanal_2.tab
+ -1: -1:       3:    nc72_ecmwf_3.tab
+ -1: -1:       130:    ncep_opn.tab
+ 
+ 74: -1:     128:	ukmetoffice_AML2.tab

--- NEW FILE: jje_dnmi_grib.tab ---
-1:88:-1:190

1:PRES:Pressure [Pa]
2:PRMSL:Pressure reduced to MSL [Pa]

13:POT:Potential temp. [C]

33:UGRD:u wind [m/s]
34:VGRD:v wind [m/s]
49:UOGRD:u of current [m/s]
50:VOGRD:v of current [m/s]
61:APCP:Total precipitation [kg/m^2]
62:NCPCP:Large scale precipitation [kg/m^2]
63:ACPCP:Convective precipitation [kg/m^2]
71:TCDC:Total cloud cover [%]
//88:SALTY:Salinity [kg/kg]

88:SALTY:Salinity [g/kg]
141:ODEPTH:Ocean Depth [m]
144:DSLM:Deviation of sea level from mean [m]

--- NEW FILE: ukmetoffice_AML2.tab ---
-1:74:-1:128
0:var0:undefined
1:PRES:Pressure [Pa]
2:PRMSL:Pressure reduced to MSL [Pa]
3:PTEND:Pressure tendency [Pa/s]
4:var0:undefined
5:var0:undefined
6:GP:Geopotential [m^2/s^2]
7:HGT:Geopotential height [gpm]
8:DIST:Geometric height [m]
9:HSTDV:Std dev of height [m]
10:var0:undefined
11:TMP:Temp. [K]
12:VTMP:Virtual temp. [K]
13:POT:Potential temp. [K]
14:EPOT:Pseudo-adiabatic pot. temp. [K]
15:TMAX:Max. temp. [K]
16:TMIN:Min. temp. [K]
17:DPT:Dew point temp. [K]
18:DEPR:Dew point depression [K]
19:LAPR:Lapse rate [K/m]
20:VIS:Visibility [m]
21:RDSP1:Radar spectra (1) [non-dim]
22:RDSP2:Radar spectra (2) [non-dim]
23:RDSP3:Radar spectra (3) [non-dim]
24:var0:undefined
25:TMPA:Temp. anomaly [K]
26:PRESA:Pressure anomaly [Pa]
27:GPA:Geopotential height anomaly [gpm]
28:WVSP1:Wave spectra (1) [non-dim]
29:WVSP2:Wave spectra (2) [non-dim]
30:WVSP3:Wave spectra (3) [non-dim]
31:WDIR:Wind direction [deg]
32:WIND:Wind speed [m/s]
33:UGRD:u wind [m/s]
34:VGRD:v wind [m/s]
35:STRM:Stream function [m^2/s]
36:VPOT:Velocity potential [m^2/s]
37:MNTSF:Montgomery stream function [m^2/s^2]
38:SGCVV:Sigma coord. vertical velocity [/s]
39:VVEL:Pressure vertical velocity [Pa/s]
40:DZDT:Geometric vertical velocity [m/s]
41:ABSV:Absolute vorticity [/s]
42:ABSD:Absolute divergence [/s]
43:RELV:Relative vorticity [/s]
44:RELD:Relative divergence [/s]
45:VUCSH:Vertical u shear [/s]
46:VVCSH:Vertical v shear [/s]
47:DIRC:Direction of current [deg]
48:SPC:Speed of current [m/s]
49:UOGRD:u of current [m/s]
50:VOGRD:v of current [m/s]
51:SPFH:Specific humidity [kg/kg]
52:RH:Relative humidity [%]
53:MIXR:Humidity mixing ratio [kg/kg]
54:PWAT:Precipitable water [kg/m^2]
55:VAPP:Vapor pressure [Pa]
56:SATD:Saturation deficit [Pa]
57:EVP:Evaporation [kg/m^2]
58:CICE:Cloud Ice [kg/kg]
59:PRATE:Precipitation rate [kg/m^2/s]
60:TSTM:Thunderstorm probability [%]
61:APCP:Total precipitation [kg/m^2]
62:NCPCP:Large scale precipitation [kg/m^2]
63:ACPCP:Convective precipitation [kg/m^2]
64:SRWEQ:Snowfall rate water equiv. [kg/m^2/s]
65:WEASD:Accum. snow [kg/m^2]
66:SNOD:Snow depth [m]
67:MIXHT:Mixed layer depth [m]
68:TTHDP:Transient thermocline depth [m]
69:MTHD:Main thermocline depth [m]
70:MTHA:Main thermocline anomaly [m]
71:TCDC:Total cloud cover [%]
72:CDCON:Convective cloud cover [%]
73:LCDC:Low level cloud cover [%]
74:MCDC:Mid level cloud cover [%]
75:HCDC:High level cloud cover [%]
76:CWAT:Cloud water [kg/kg]
77:var0:undefined
78:SNOC:Convective snow [kg/m^2]
79:SNOL:Large scale snow [kg/m^2]
80:WTMP:Water temp. [K]
81:LAND:Land cover (land=1;sea=0) [fraction]
82:DSLM:Deviation of sea level from mean [m]
83:SFCR:Surface roughness [m]
84:ALBDO:Albedo [%]
85:TSOIL:Soil temp. [K]
86:SOILM:Soil moisture content [kg/m^2]
87:VEG:Vegetation [%]
88:SALTY:Salinity [kg/kg]
89:DEN:Density [kg/m^3]
90:WATR:Water runoff [kg/m^2]
91:ICEC:Ice concentration (ice=1;no ice=0) [fraction]
92:ICETK:Ice thickness [m]
93:DICED:Direction of ice drift [deg]
94:SICED:Speed of ice drift [m/s]
95:UICE:u of ice drift [m/s]
96:VICE:v of ice drift [m/s]
97:ICEG:Ice growth rate [m/s]
98:ICED:Ice divergence [/s]
99:SNOM:Snow melt [kg/m^2]
100:HTSGW:Sig height of wind waves and swell [m]
101:WVDIR:Direction of wind waves [deg]
102:WVHGT:Sig height of wind waves [m]
103:WVPER:Mean period of wind waves [s]
104:SWDIR:Direction of swell waves [deg]
105:SWELL:Sig height of swell waves [m]
106:SWPER:Mean period of swell waves [s]
107:DIRPW:Primary wave direction [deg]
108:PERPW:Primary wave mean period [s]
109:DIRSW:Secondary wave direction [deg]
110:PERSW:Secondary wave mean period [s]
111:NSWRS:Net short wave (surface) [W/m^2]
112:NLWRS:Net long wave (surface) [W/m^2]
113:NSWRT:Net short wave (top) [W/m^2]
114:NLWRT:Net long wave (top) [W/m^2]
115:LWAVR:Long wave [W/m^2]
116:SWAVR:Short wave [W/m^2]
117:GRAD:Global radiation [W/m^2]
118:var0:undefined
119:var0:undefined
120:var0:undefined
121:SCALS:Mean scalar speed of wind [m/s]
122:TD:Mean dew point [K]
123:GP:Mean height of pressure surface [gpm]
124:10SS:Mean 10-m scalar speed of wind [m/s]
126:TPPN:Mean accum'd total ppn [kg/m^2]
130:T:Mean temperature [K]
131:U:Mean u-speed of wind [m/s]
132:V:Mean v-speed of wind [m/s]
141:SD:Snow Depth [m]
144:SF:Snowfall [kg/m^2/s]
151:MSLP:Mean MSL pressure [Pa]
157:R:Mean relative humidity [%]
164:TCC:Mean total cloud cover [fraction]
165:10U:Mean 10-m u-wind [m/s]
166:10V:Mean 10-m v-wind [m/s]
167:2T:Mean 2-m temperature [K]
168:2D:Mean 2-m dew point [K]
186:LCC:Mean low cloud cover [fraction]
187:MCC:Mean medium cloud cover [fraction]
188:HCC:Mean high cloud cover [fraction]
250:SDMSLP:Std. Dev. of MSL pressure [Pa]
251:SDT:Std. Dev. of temperature [C]
252:SVD:Standard vector deviation [m/s]

Update of /cvsroot/jgrib/jgrib/src/net/sourceforge/jgrib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13516/src/net/sourceforge/jgrib

Modified Files:
	GribGDSLatLon.java GribPDSParamTable.java 
Log Message:
* Correctly read parameters for rotated grids (rotated latitude/longitude projection)
* Grib table lookup list (tablelookup.lst)
	-ignore comments
	-handle center/tabels (unknown=-1):
		88/128:	 jje_dnmi_grib.tab
		74/130:  ncep_opn.tab
		-1/1:    ncep_opn.tab
		-1/2:    ncep_reanal_2.tab
		-1/3:    nc72_ecmwf_3.tab
		-1/130:  ncep_opn.tab
		74/128:	 ukmetoffice_AML2.tab

Index: GribPDSParamTable.java
===================================================================
RCS file: /cvsroot/jgrib/jgrib/src/net/sourceforge/jgrib/GribPDSParamTable.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GribPDSParamTable.java	20 Aug 2004 08:45:45 -0000	1.6
--- GribPDSParamTable.java	30 Mar 2005 07:34:27 -0000	1.7
***************
*** 35,38 ****
--- 35,40 ----
  public class GribPDSParamTable
  {
+    public static final String PROPERTY_GRIBTABURL = "GribTabURL";
+ 
     private static final int NPARAMETERS=256;
     /**
***************
*** 88,96 ****
           initFromJAR(tables);
  
!          if (tables.size() == 0)
           {
              // Try from property
!             String gribtab = System.getProperty("GribTabURL");
!             System.out.println("GribTabURL=" + gribtab);
              if (gribtab != null)
              {
--- 90,98 ----
           initFromJAR(tables);
  
!          if (true || tables.size() == 0)
           {
              // Try from property
!             String gribtab = System.getProperty(PROPERTY_GRIBTABURL);
!             System.out.println(PROPERTY_GRIBTABURL + "=" + gribtab);
              if (gribtab != null)
              {
***************
*** 466,474 ****
  
        String line;
!       while ((line = br.readLine()) != null && line.length() != 0)
        {
           GribPDSParamTable table = new GribPDSParamTable();
           String[] tableDefArr = SmartStringArray.split(":", line);
! 
           table.center_id = Integer.parseInt(tableDefArr[0].trim());
           table.subcenter_id = Integer.parseInt(tableDefArr[1].trim());
--- 468,482 ----
  
        String line;
!       while ((line = br.readLine()) != null)
        {
+          if (line.length() == 0 || line.startsWith("//")) continue;
           GribPDSParamTable table = new GribPDSParamTable();
+          int cix = line.indexOf("//"); //comment index
+          if (cix > 0)
+          {
+             line = line.substring(0, cix);
+          }
           String[] tableDefArr = SmartStringArray.split(":", line);
!          if (tableDefArr == null || tableDefArr.length < 4) continue;
           table.center_id = Integer.parseInt(tableDefArr[0].trim());
           table.subcenter_id = Integer.parseInt(tableDefArr[1].trim());
***************
*** 498,504 ****
        throws NotSupportedException
     {
! 
!       for (int i=0; i < paramTables.length; i++){
           GribPDSParamTable table = paramTables[i];
           if (center == table.center_id){
              if (table.subcenter_id == -1 ||
--- 506,516 ----
        throws NotSupportedException
     {
!       /* 1) search excact match                   (center, table)
!          2) if (1) failed, search matching table  ( - ,table(1..3))
!       */
!       for (int i = paramTables.length - 1; i >= 0; i--){
! //      for (int i=0; i < paramTables.length; i++){
           GribPDSParamTable table = paramTables[i];
+          if (table.center_id == -1) continue;
           if (center == table.center_id){
              if (table.subcenter_id == -1 ||
***************
*** 514,517 ****
--- 526,539 ----
            }
        }
+       //search matching table  ( - ,table(1..3))
+       for (int i = paramTables.length - 1; i >= 0; i--){
+ //      for (int i = 0; i < paramTables.length; i++){
+          GribPDSParamTable table = paramTables[i];
+          if (table.center_id == -1 && number == table.table_number)
+          {
+             table.readParameterTable();
+             return table;
+          }
+       }
  
        throw new NotSupportedException("Grib table not supported; cent "
***************
*** 600,607 ****
     }
  
! 
     /**
      * Read parameter table
-     * @param aFileName Name of input file
      */
     //public void readParameterTable(String aFileName)
--- 622,628 ----
     }
  
!    private static Map fileTabMap = new HashMap();
     /**
      * Read parameter table
      */
     //public void readParameterTable(String aFileName)
***************
*** 620,623 ****
--- 641,653 ----
  
        BufferedReader br;
+       if (filename != null && filename.length() > 0)
+       {
+          GribPDSParamTable tab = (GribPDSParamTable) fileTabMap.get(filename);
+          if (tab != null)
+          {
+             this.parameters = tab.parameters;
+             return;
+          }
+       }
        if (url != null){
           InputStream is = url.openStream();
***************
*** 647,651 ****
        while ((line = br.readLine()) != null )
        {
!          if (line.length() == 0) continue;
  
           GribPDSParameter parameter = new GribPDSParameter();
--- 677,682 ----
        while ((line = br.readLine()) != null )
        {
!          line = line.trim();
!          if (line.length() == 0 || line.startsWith("//")) continue;
  
           GribPDSParameter parameter = new GribPDSParameter();
***************
*** 672,675 ****
--- 703,710 ----
           }
        }
+          if (filename != null && filename.length() > 0){
+             GribPDSParamTable loadedTable = new GribPDSParamTable(filename, center, subcenter, number, this.parameters);
+             fileTabMap.put(filename, loadedTable);
+          }
        } catch (IOException ioError) {
           System.err.println("An error occurred in GribPDSParamTable while " +
***************
*** 681,688 ****
--- 716,725 ----
        StringBuffer str = new StringBuffer();
        str.append("-1:" + center_id + ":" + subcenter_id + ":" + table_number + "\n");
+       if (parameters != null){
        for (int i=0;i<parameters.length;i++){
           if (parameters[i] == null) continue;
           str.append(parameters[i].toString()+"\n");
        }
+       }
        return str.toString();
     }

Index: GribGDSLatLon.java
===================================================================
RCS file: /cvsroot/jgrib/jgrib/src/net/sourceforge/jgrib/GribGDSLatLon.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GribGDSLatLon.java	24 Nov 2004 13:41:57 -0000	1.2
--- GribGDSLatLon.java	30 Mar 2005 07:34:27 -0000	1.3
***************
*** 148,154 ****
           case 10:
              // Rotated Lat/Lon grid, Lat (octets 33-35), Lon (octets 36-38), rotang (octets 39-42)
!             this.grid_latsp = Bytes2Number.int3(data[29], data[30], data[31]) / 1000.0;
!             this.grid_lonsp = Bytes2Number.int3(data[32], data[33], data[34]) / 1000.0;
!             this.grid_rotang = Bytes2Number.int4(data[35], data[36], data[37], data[38]) / 1000.0;
              break;
  
--- 148,155 ----
           case 10:
              // Rotated Lat/Lon grid, Lat (octets 33-35), Lon (octets 36-38), rotang (octets 39-42)
!             //NB offset = 7 (octet = array index + 7)
!             this. grid_latsp = Bytes2Number.int3(data[26], data[27], data[28]) / 1000.0;
!             this. grid_lonsp = Bytes2Number.int3(data[29], data[30], data[31]) / 1000.0;
!             this. grid_rotang = Bytes2Number.float4(data[32], data[33], data[34], data[35]);
              break;