diff --git a/.travis.yml b/.travis.yml index 4736a62e..4912106b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,35 +1,44 @@ language: python -dist: bionic +dist: focal +sudo: false arch: - amd64 - ppc64le -sudo: false addons: apt: packages: - - libgrib-api-dev + - libproj-dev + - proj-bin + - libeccodes-dev env: global: - - DEPENDS="numpy pyproj" - -python: - - "3.5" - - "3.6" - - "3.8" + - DEPENDS="numpy pyproj<3.0.0" + - PROJ_DIR=/usr + - PROJ_LIB=/usr/share/proj + +matrix: + fast_finish: true + include: + - name: "python-2.7" + env: PY=2.7 + - name: "python-3.7" + env: PY=3.7 + - name: "python-3.8" + env: PY=3.8 + - name: "python-3.9" + env: PY=3.9 notifications: email: false before_install: - - pip install pyproj==1.9.6 - - sudo apt-get install libeccodes-dev + - pip install --upgrade pip - pip install $DEPENDS install: - - python setup.py build - python setup.py install script: diff --git a/Changelog b/Changelog index 592c0af4..43bc0aca 100644 --- a/Changelog +++ b/Changelog @@ -1,5 +1,6 @@ -since version 2.0.5 -=================== +version 2.0.6 (git tag v2.0.6rel) +================================= +* restore python 2 compatability. * distinguish between run and build time dependenices in setup.py (PR #112). * Fix problem printing grib messages with NLDAS grib files (PR #141). diff --git a/MANIFEST.in b/MANIFEST.in index bfbc07dc..7ea38026 100755 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -11,10 +11,8 @@ include setup.cfg.template include setup.py include test.py include README.md -include README.macosx include utils/*grib* recursive-include docs * -recursive-include ports * recursive-include ncepgrib2_docs * include sampledata/*.grb include sampledata/*.grb2 diff --git a/README.macosx b/README.macosx deleted file mode 100644 index a2ab2958..00000000 --- a/README.macosx +++ /dev/null @@ -1,21 +0,0 @@ -pygrib is now available in macports (py-pygrib package), so the -instructions below are obsolete (unless you want to keep up to date with the -latest pygrib and let macports manage the installation). - --------------------- - -Although pygrib is not yet part of MacPorts (http://www.macports.org), you can use -the included Portfile to install it using a local Portfile repository. See -ports/README for more details. Once macports is installed, and your local -Portfile repo is set up, all you have to do to install pygrib and it's -dependencies is run "sudo port install py27-pygrib". - -This will install pygrib from svn HEAD. To periodically upgrade, just do - - sudo port uninstall py27-pygrib - - sudo port install py27-pygrib (this will re-download and rebuild) - -google "macports local portfile" for more information on creating a local Portfile -repository. - -pygrib has been submitted to the macports tracker, but has not yet been accepted. -The ticket is here: https://trac.macports.org/ticket/32192. diff --git a/README.md b/README.md index 95f568d7..09dcc17f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Python module for reading and writing GRIB files (edition 1 and edition 2). GRIB is the World Meteorological Organization (WMO) standard file format for the exchange of weather data. -Provides a interfaces for the ECWMF GRIB_API C library and +Provides a high-level interfaces for the ECWMF ECCODES C library and the NCEP grib2 C library, including command line utilities for listing (grib_list) and repacking (grib_repack) GRIB files. @@ -12,15 +12,17 @@ Quickstart: * Clone the github repository, or download a source release from https://pypi.python.org/pypi/pygrib. -* Copy setup.cfg.template to setup.cfg, open in text editor, follow instructions in -comments for editing. If you are using the old grib_api library instead of the new eccodes -library, be sure to uncomment the last line setup.cfg. +* install dependencies (eccodes library, numpy, pyproj). On linux, this can +be done via `pip install numpy pyproj; sudo apt-get install libeccodes-dev`. -* Run 'python setup.py build' +* Copy `setup.cfg.template` to `setup.cfg`, open in text editor, follow instructions in +comments for editing. -* Run 'python setup.py install' (with sudo if necessary) +* Run `python setup.py build` -* Run 'python test.py' to test your pygrib installation. +* Run `python setup.py install` (with sudo if necessary) + +* Run `python test.py` to test your pygrib installation. For full installation instructions and API documentation, see https://jswhit.github.io/pygrib. diff --git a/docs/api-objects.txt b/docs/api-objects.txt index 8346eed3..6d72e250 100644 --- a/docs/api-objects.txt +++ b/docs/api-objects.txt @@ -24,7 +24,7 @@ pygrib.datetime_to_julian pygrib-module.html#datetime_to_julian pygrib.tolerate_badgrib pygrib-module.html#tolerate_badgrib pygrib.gribmessage pygrib.gribmessage-class.html pygrib.gribmessage.latlons pygrib.gribmessage-class.html#latlons -pygrib.gribmessage.__getattribute__ pygrib.gribmessage-class.html#__getattribute__ +pygrib.gribmessage.__reduce__ pygrib.gribmessage-class.html#__reduce__ pygrib.gribmessage.has_key pygrib.gribmessage-class.html#has_key pygrib.gribmessage._all_keys pygrib.gribmessage-class.html#_all_keys pygrib.gribmessage.__init__ pygrib.gribmessage-class.html#__init__ @@ -42,7 +42,9 @@ pygrib.gribmessage._get_key pygrib.gribmessage-class.html#_get_key pygrib.gribmessage._reshape_mask pygrib.gribmessage-class.html#_reshape_mask pygrib.gribmessage.analDate pygrib.gribmessage-class.html#analDate pygrib.gribmessage.__getitem__ pygrib.gribmessage-class.html#__getitem__ +pygrib.gribmessage.__setstate__ pygrib.gribmessage-class.html#__setstate__ pygrib.gribmessage.keys pygrib.gribmessage-class.html#keys +pygrib.gribmessage.__getattribute__ pygrib.gribmessage-class.html#__getattribute__ pygrib.gribmessage.validDate pygrib.gribmessage-class.html#validDate pygrib.gribmessage.expand_grid pygrib.gribmessage-class.html#expand_grid pygrib.gribmessage.__setitem__ pygrib.gribmessage-class.html#__setitem__ @@ -56,15 +58,18 @@ pygrib.gribmessage.__repr__ pygrib.gribmessage-class.html#__repr__ pygrib.gribmessage.expand_reduced pygrib.gribmessage-class.html#expand_reduced pygrib.index pygrib.index-class.html pygrib.index.__new__ pygrib.index-class.html#__new__ +pygrib.index.__setstate__ pygrib.index-class.html#__setstate__ pygrib.index.keys pygrib.index-class.html#keys +pygrib.index.__reduce__ pygrib.index-class.html#__reduce__ pygrib.index.write pygrib.index-class.html#write pygrib.index.select pygrib.index-class.html#select -pygrib.index.types pygrib.index-class.html#types +pygrib.index.__init__ pygrib.index-class.html#__init__ pygrib.index.__call__ pygrib.index-class.html#__call__ pygrib.index.close pygrib.index-class.html#close -pygrib.index.__init__ pygrib.index-class.html#__init__ +pygrib.index.types pygrib.index-class.html#types pygrib.index.name pygrib.index-class.html#name pygrib.open pygrib.open-class.html +pygrib.open.__reduce__ pygrib.open-class.html#__reduce__ pygrib.open.close pygrib.open-class.html#close pygrib.open.message pygrib.open-class.html#message pygrib.open.next pygrib.open-class.html#next @@ -81,6 +86,7 @@ pygrib.open.tell pygrib.open-class.html#tell pygrib.open._advance pygrib.open-class.html#_advance pygrib.open.__exit__ pygrib.open-class.html#__exit__ pygrib.open.__getitem__ pygrib.open-class.html#__getitem__ +pygrib.open.__setstate__ pygrib.open-class.html#__setstate__ pygrib.open.read pygrib.open-class.html#read pygrib.open.__next__ pygrib.open-class.html#__next__ pygrib.open.has_multi_field_msgs pygrib.open-class.html#has_multi_field_msgs diff --git a/docs/class-tree.html b/docs/class-tree.html index 70960873..f77a3d34 100644 --- a/docs/class-tree.html +++ b/docs/class-tree.html @@ -49,9 +49,6 @@

Class Hierarchy

Class Hierarchy
+ + + + +
- Generated by Epydoc 3.0.1 on Mon Dec 29 14:23:16 2014 + Generated by Epydoc 3.0.1 + on Wed Nov 25 08:27:21 2020 The Navigation Bar - - + + - - + - - + - - + - + + + + + + + + + + - - + - + - - - + - - @@ -473,7 +489,8 @@

Identifier Index

- Generated by Epydoc 3.0.1 on Mon Dec 29 14:23:16 2014 + Generated by Epydoc 3.0.1 + on Wed Nov 25 08:27:21 2020 Identifier Index
__call__()
(in index)		__getitem__()
-(in open)		__package__
-(in pygrib)		__init__()
+(in index)		__repr__()
+(in gribmessage)
__call__()
(in open)		__init__()
-(in gribmessage)		__repr__()
+		__init__()
+(in open)		__setattr__()
(in gribmessage)
__delattr__()
(in gribmessage)		__init__()
-(in index)		__setattr__()
+		__iter__()
+(in open)		__setitem__()
(in gribmessage)
__delitem__()
(in gribmessage)		__init__()
-(in open)		__setitem__()
+		__new__()
+(in gribmessage)		__setstate__()
(in gribmessage)
__enter__()
(in open)		__iter__()
+		__new__()
+(in index)		__setstate__()
+(in index)
__exit__()
+(in open)		__new__()
+(in open)		__setstate__()
+(in open)
__getattr__()
+(in gribmessage)		__next__()
(in open)		 __version__
(in pygrib)
__exit__()
-(in open)		__new__()
+		__getattribute__()
(in gribmessage)		__package__
+(in pygrib)		 _ftimedict
(in pygrib)
__getattr__()
+		__getitem__()
+(in gribmessage)		__reduce__()
(in gribmessage)		__new__()
-(in index)		 _private_atts
(in pygrib)
__getattribute__()
-(in gribmessage)		__new__()
+		__getitem__()
(in open)		__reduce__()
+(in index)		  
__getitem__()
+		__init__()
(in gribmessage)		__next__()
+		__reduce__()
(in open)		  
- - - @@ -546,7 +540,7 @@

Documentation

@@ -560,7 +554,7 @@

Documentation

@@ -574,7 +568,7 @@

Documentation

@@ -707,7 +701,8 @@

setdates(

+ +
- Generated by Epydoc 3.0.1 on Mon Dec 29 14:23:16 2014 + Generated by Epydoc 3.0.1 + on Wed Nov 25 08:27:21 2020 Introduction href="http://www.wmo.ch/pages/prog/www/WMOCodes/GRIB.html" target="_top">standard for distributing gridded data. The module is a python interface to the GRIB API C library from the European Centre for + href="https://confluence.ecmwf.int/display/ECC" + target="_top">ECCODES C library from the European Centre for Medium-Range Weather Forecasts (ECMWF).

Required

@@ -81,8 +81,8 @@

Required

Python 3.
  • - GRIB API C library for encoding and decoding GRIB + ECCODES C library for encoding and decoding GRIB messages (edition 1 and edition 2). Version 1.8.0 or higher required. To be fully functional, the GRIB API library requires Documentation Whitaker

    Version: - 2.0.0 + 2.0.6

    Copyright: copyright 2010 by Jeffrey Whitaker. @@ -316,25 +316,19 @@

    Documentation

    Classes
    		•
    -   - + gribmessage
    Grib message object.
    -   - + index
    index(filename, *args)
    -   - + open
    open(filename)     		  - __version__ = '2.0.0' + __version__ = '2.0.6'
      - grib_api_version = '1.12.3' + grib_api_version = '2.17.0'
      - missingvalue_int = -1 + missingvalue_int = 2147483647
    - Generated by Epydoc 3.0.1 on Mon Dec 29 14:23:16 2014 + Generated by Epydoc 3.0.1 + on Wed Nov 25 08:27:21 2020 Module Hierarchy - - - @@ -546,7 +540,7 @@

    Documentation

    @@ -560,7 +554,7 @@

    Documentation

    @@ -574,7 +568,7 @@

    Documentation

    @@ -707,7 +701,8 @@

    setdates(

    - Generated by Epydoc 3.0.1 on Mon Dec 29 14:23:16 2014 + Generated by Epydoc 3.0.1 + on Wed Nov 25 08:27:21 2020 Introduction href="http://www.wmo.ch/pages/prog/www/WMOCodes/GRIB.html" target="_top">standard for distributing gridded data. The module is a python interface to the GRIB API C library from the European Centre for + href="https://confluence.ecmwf.int/display/ECC" + target="_top">ECCODES C library from the European Centre for Medium-Range Weather Forecasts (ECMWF).

    Required

    @@ -81,8 +81,8 @@

    Required

    Python 3.
  • - GRIB API C library for encoding and decoding GRIB + ECCODES C library for encoding and decoding GRIB messages (edition 1 and edition 2). Version 1.8.0 or higher required. To be fully functional, the GRIB API library requires Documentation Whitaker

    Version: - 2.0.0 + 2.0.6

    Copyright: copyright 2010 by Jeffrey Whitaker. @@ -316,25 +316,19 @@

    Documentation

    Classes
    		•
    -   - + gribmessage
    Grib message object.
    -   - + index
    index(filename, *args)
    -   - + open
    open(filename)     		  - __version__ = '2.0.0' + __version__ = '2.0.6'
      - grib_api_version = '1.12.3' + grib_api_version = '2.17.0'
      - missingvalue_int = -1 + missingvalue_int = 2147483647
    - Generated by Epydoc 3.0.1 on Mon Dec 29 14:23:16 2014 + Generated by Epydoc 3.0.1 + on Wed Nov 25 08:27:21 2020
    - -

    Class gribmessage

    + +

    type gribmessage

     object --+
          |
@@ -65,7 +65,7 @@ 
    Class gribmessage
    
   href="http://www.ecmwf.int/publications/manuals/d/gribapi/fm92/grib2/" 
   target="_top">GRIB2    . Parameter names are are given by the 
   name, shortName and paramID keys. pygrib also defines some special attributes which
   are defined below under the heading Instance Variables.
    
 
@@ -191,6 +191,22 @@ 
    Class gribmessage
    		+
    + +
    +   + + + + +
    __reduce__(...) + +
    @@ -242,6 +258,22 @@

    Class gribmessage

    		 +
    + + + + + +   + + + + +
    __setstate__(...) + +
    @@ -390,19 +422,6 @@

    Class gribmessage

    - - -

    Inherited from object: - __format__, - __hash__, - __reduce__, - __reduce_ex__, - __sizeof__, - __str__, - __subclasshook__ -

    - - @@ -466,22 +485,6 @@

    Class gribmessage

    - - - - - - - - - -
    - Properties
    -

    Inherited from object: - __class__ -

    -
    __new__(
    + +
    + +
    + + +
    +

    __reduce__(...) +

    +     		  +
    + + +
    +
    Overrides: + object.__reduce__ +
    (inherited documentation)
    + +
    +
    +
    validDate
    - Generated by Epydoc 3.0.1 on Mon Dec 29 14:23:16 2014 + Generated by Epydoc 3.0.1 + on Wed Nov 25 08:27:21 2020
    - -

    Class index

    + +

    type index

     object --+
          |
@@ -70,12 +70,12 @@ 
    Class index
    
   href="pygrib.open-class.html#select" class="link">open.select.
    
   
    Warning:  Searching for data within multi-field grib messages 
   does not work using an index (and is not supported by the GRIB API library).  NCEP often puts u and v winds 
-  together in a single multi-field grib message.  You will get incorrect 
-  results if you try to use an index to find data in these messages.  Use 
-  the slower, but more robust open.select in this case.
    
+  href="https://confluence.ecmwf.int/display/ECC" target="_top">ECCODES
+  library).  NCEP often puts u and v winds together in a single multi-field
+  grib message.  You will get incorrect results if you try to use an index 
+  to find data in these messages.  Use the slower, but more robust open.select in this
+  case.
    
   
    If no key are given (i.e. *args is empty), it is assumed the filename 
   represents a previously saved index (created using the 
   grib_index_build tool or Class index
    
           
             
             
+          
+        
+      
+      
+    
+  
+
+    
+       
+    
+      
+        
+          
+          
+        
+      
    __reduce__(...)
+            
+            
+          
    
+      
+    
+  
+
+    
+       
+    
+      
+        
+          
+          
    __setstate__(...)
+            
+            
           
         
    
       
    
@@ -220,23 +252,6 @@ 
    Class index
    
       
     
   
-  
-    
-    
    Inherited from object:
-      __delattr__,
-      __format__,
-      __getattribute__,
-      __hash__,
-      __reduce__,
-      __reduce_ex__,
-      __repr__,
-      __setattr__,
-      __sizeof__,
-      __str__,
-      __subclasshook__
-      
    
-    
-  
 
 
     
@@ -279,13 +294,6 @@ 
    Class index
    
         name
     
   
-  
-    
-    
    Inherited from object:
-      __class__
-      
    
-    
-  
 
 
 
@@ -345,6 +353,29 @@ 
    __new__(
    + +
    + +
    + + +
    +

    __reduce__(...) +

    +     		  +
    + + +
    +
    Overrides: + object.__reduce__ +
    (inherited documentation)
    + +
    +
    +
    types
    - Generated by Epydoc 3.0.1 on Mon Dec 29 14:23:16 2014 + Generated by Epydoc 3.0.1 + on Wed Nov 25 08:27:21 2020
    - -

    Class open

    + +

    type open

     object --+
          |
@@ -217,6 +217,38 @@ 
    Class open
    
           
             
             
+          
+        
+      
+      
+    
+  
+
+    
+       
+    
+      
+        
+          
+          
+        
+      
    __reduce__(...)
+            
+            
+          
    
+      
+    
+  
+
+    
+       
+    
+      
+        
+          
+          
    __setstate__(...)
+            
+            
           
         
    
       
    
@@ -384,23 +416,6 @@ 
    Class open
    
       
     
   
-  
-    
-    
    Inherited from object:
-      __delattr__,
-      __format__,
-      __getattribute__,
-      __hash__,
-      __reduce__,
-      __reduce_ex__,
-      __repr__,
-      __setattr__,
-      __sizeof__,
-      __str__,
-      __subclasshook__
-      
    
-    
-  
 
 
 
@@ -459,13 +474,6 @@ 
    Class open
    
         has_multi_field_msgs
     
   
-  
-    
-    
    Inherited from object:
-      __class__
-      
    
-    
-  
 
 
 
@@ -524,6 +532,29 @@ 
    __new__(
    + +
    + +
    + + +
    +

    __reduce__(...) +

    +     		  +
    + + +
    +
    Overrides: + object.__reduce__ +
    (inherited documentation)
    + +
    +
    +
    select(
    - Generated by Epydoc 3.0.1 on Mon Dec 29 14:23:16 2014 + Generated by Epydoc 3.0.1 + on Wed Nov 25 08:27:21 2020 Class Hierarchy
    - Generated by Epydoc 3.0.1 on Mon Dec 29 14:23:16 2014 + Generated by Epydoc 3.0.1 + on Wed Nov 25 08:27:22 2020 The Navigation Bar
    - Generated by Epydoc 3.0.1 on Mon Dec 29 14:23:16 2014 + Generated by Epydoc 3.0.1 + on Wed Nov 25 08:27:22 2020 Identifier Index - - @@ -247,7 +243,8 @@

    dump(

    - Generated by Epydoc 3.0.1 on Mon Dec 29 14:23:16 2014 + Generated by Epydoc 3.0.1 + on Wed Nov 25 08:27:22 2020 Module ncepgrib2

    source code

    Version: - 2.0.0 + 2.0.2

    @@ -62,17 +62,13 @@

    Module ncepgrib2

    Classes
    -   - + Grib2Encode
    Class for encoding data into a GRIB2 message.
    -   - + Grib2Message
    Class for accessing data in a GRIB Edition 2 message.
    - Generated by Epydoc 3.0.1 on Mon Dec 29 14:23:16 2014 + Generated by Epydoc 3.0.1 + on Wed Nov 25 08:27:22 2020 Module Hierarchy - - @@ -247,7 +243,8 @@

    dump(

    - Generated by Epydoc 3.0.1 on Mon Dec 29 14:23:16 2014 + Generated by Epydoc 3.0.1 + on Wed Nov 25 08:27:22 2020 Module ncepgrib2

    source code

    Version: - 2.0.0 + 2.0.2

    @@ -62,17 +62,13 @@

    Module ncepgrib2

    Classes
    -   - + Grib2Encode
    Class for encoding data into a GRIB2 message.
    -   - + Grib2Message
    Class for accessing data in a GRIB Edition 2 message.
    - Generated by Epydoc 3.0.1 on Mon Dec 29 14:23:16 2014 + Generated by Epydoc 3.0.1 + on Wed Nov 25 08:27:22 2020

    Source Code for Module ncepgrib2

    -   1  __version__ = '2.0.0' 
+   1  __version__ = '2.0.2' 
    2  import g2clib 
    3  import struct 
    4  import string 
@@ -525,7 +525,7 @@ 
    Source Code for Module ncepgr
  474              self.points_in_y_direction = gdtmpl[8] 
  475          if not reggrid and gdtnum == 40: # 'reduced' gaussian grid. 
  476              self.points_in_y_direction = gdtmpl[8] 
- 477          if gdtnum in [0,1,203,205,32768]: # regular or rotated lat/lon grid 
+ 477          if gdtnum in [0,1,203,205,32768,32769]: # regular or rotated lat/lon grid 
  478              scalefact = float(gdtmpl[9]) 
  479              divisor = float(gdtmpl[10]) 
  480              if scalefact == 0: scalefact = 1. 
@@ -719,527 +719,527 @@ 
    Source Code for Module ncepgr
  668                  order = 1 
  669          try: 
  670              f = open(self._grib_filename,'rb') 
- 671          except (TypeError,IOError): 
- 672              f = StringIO(self._grib_filename) 
- 673          f.seek(self._grib_message_byteoffset) 
- 674          gribmsg = f.read(self._grib_message_length) 
- 675          f.close() 
- 676          gdtnum = self.grid_definition_template_number 
- 677          gdtmpl = self.grid_definition_template 
- 678          ndpts = self.number_of_data_points_to_unpack 
- 679          gdsinfo = self.grid_definition_info 
- 680          ngrdpts = gdsinfo[1] 
- 681          ipos = self._section7_byte_offset 
- 682          fld1=g2clib.unpack7(gribmsg,gdtnum,gdtmpl,drtnum,drtmpl,ndpts,ipos,np.empty,storageorder=storageorder) 
- 683          # apply bitmap. 
- 684          if bitmapflag == 0: 
- 685              bitmap=self._bitmap 
- 686              fld = fill_value*np.ones(ngrdpts,'f') 
- 687              np.put(fld,np.nonzero(bitmap),fld1) 
- 688              if masked_array: 
- 689                  fld = ma.masked_values(fld,fill_value) 
- 690          # missing values instead of bitmap 
- 691          elif masked_array and hasattr(self,'missing_value'): 
- 692              if hasattr(self, 'missing_value2'): 
- 693                  mask = np.logical_or(fld1 == self.missing_value, fld1 == self.missing_value2) 
- 694              else: 
- 695                  mask = fld1 == self.missing_value 
- 696              fld = ma.array(fld1,mask=mask) 
- 697          else: 
- 698              fld = fld1 
- 699          nx = None; ny = None 
- 700          if hasattr(self,'points_in_x_direction'): 
- 701              nx = self.points_in_x_direction 
- 702          if hasattr(self,'points_in_y_direction'): 
- 703              ny = self.points_in_y_direction 
- 704          if nx is not None and ny is not None: # rectangular grid. 
- 705              if ma.isMA(fld): 
- 706                  fld = ma.reshape(fld,(ny,nx)) 
- 707              else: 
- 708                  fld = np.reshape(fld,(ny,nx)) 
- 709          else: 
- 710              if gdsinfo[2] and gdtnum == 40: # ECMWF 'reduced' global gaussian grid. 
- 711                  if expand: 
- 712                      nx = 2*ny 
- 713                      lonsperlat = self.grid_definition_list 
- 714                      if ma.isMA(fld): 
- 715                          fld = ma.filled(fld) 
- 716                          fld = _redtoreg(nx, lonsperlat.astype(np.long),\ 
- 717                                  fld.astype(np.double), fill_value) 
- 718                          fld = ma.masked_values(fld,fill_value) 
- 719                      else: 
- 720                          fld = _redtoreg(nx, lonsperlat.astype(np.long),\ 
- 721                                  fld.astype(np.double), fill_value) 
- 722          # check scan modes for rect grids. 
- 723          if nx is not None and ny is not None: 
- 724              # rows scan in the -x direction (so flip) 
- 725              #if self.scanmodeflags[0]: 
- 726              #    fldsave = fld.astype('f') # casting makes a copy 
- 727              #    fld[:,:] = fldsave[:,::-1] 
- 728              # columns scan in the -y direction (so flip) 
- 729              #if not self.scanmodeflags[1]: 
- 730              #    fldsave = fld.astype('f') # casting makes a copy 
- 731              #    fld[:,:] = fldsave[::-1,:] 
- 732              # adjacent rows scan in opposite direction. 
- 733              # (flip every other row) 
- 734              if self.scanmodeflags[3]: 
- 735                  fldsave = fld.astype('f') # casting makes a copy 
- 736                  fld[1::2,:] = fldsave[1::2,::-1] 
- 737          return fld 
- 738   
- 739      values = property(data) 
- 740   
-
     741 -    def latlons(self): 
-
     742          """alias for L{grid}""" 
- 743          return self.grid() 
-
     744   
-
     745 -    def grid(self): 
-
     746          """ 
- 747   return lats,lons (in degrees) of grid. 
- 748   currently can handle reg. lat/lon, global gaussian, mercator, stereographic, 
- 749   lambert conformal, albers equal-area, space-view and azimuthal 
- 750   equidistant grids.  L{latlons} method does the same thing. 
- 751   
- 752   @return: C{B{lats},B{lons}}, float32 numpy arrays 
- 753   containing latitudes and longitudes of grid (in degrees). 
- 754          """ 
- 755          from pygrib import gaulats 
- 756          gdsinfo = self.grid_definition_info 
- 757          gdtnum = self.grid_definition_template_number 
- 758          gdtmpl = self.grid_definition_template 
- 759          reggrid = gdsinfo[2] == 0 # gdsinfo[2]=0 means regular 2-d grid 
- 760          projparams = {} 
- 761          projparams['a']=self.earthRmajor 
- 762          projparams['b']=self.earthRminor 
- 763          if gdtnum == 0: # regular lat/lon grid 
- 764              lon1, lat1 = self.longitude_first_gridpoint, self.latitude_first_gridpoint 
- 765              lon2, lat2 = self.longitude_last_gridpoint, self.latitude_last_gridpoint 
- 766              delon = self.gridlength_in_x_direction 
- 767              delat = self.gridlength_in_y_direction 
- 768              lats = np.arange(lat1,lat2+delat,delat) 
- 769              lons = np.arange(lon1,lon2+delon,delon) 
- 770              # flip if scan mode says to. 
- 771              #if self.scanmodeflags[0]: 
- 772              #    lons = lons[::-1] 
- 773              #if not self.scanmodeflags[1]: 
- 774              #    lats = lats[::-1] 
- 775              projparams['proj'] = 'cyl' 
- 776              lons,lats = np.meshgrid(lons,lats) # make 2-d arrays. 
- 777          elif gdtnum == 40: # gaussian grid (only works for global!) 
- 778              lon1, lat1 = self.longitude_first_gridpoint, self.latitude_first_gridpoint 
- 779              lon2, lat2 = self.longitude_last_gridpoint, self.latitude_last_gridpoint 
- 780              nlats = self.points_in_y_direction 
- 781              if not reggrid: # ECMWF 'reduced' gaussian grid. 
- 782                  nlons = 2*nlats 
- 783                  delon = 360./nlons 
- 784              else: 
- 785                  nlons = self.points_in_x_direction 
- 786                  delon = self.gridlength_in_x_direction 
- 787              lons = np.arange(lon1,lon2+delon,delon) 
- 788              # compute gaussian lats (north to south) 
- 789              lats = gaulats(nlats) 
- 790              if lat1 < lat2:  # reverse them if necessary 
- 791                  lats = lats[::-1] 
- 792              # flip if scan mode says to. 
- 793              #if self.scanmodeflags[0]: 
- 794              #    lons = lons[::-1] 
- 795              #if not self.scanmodeflags[1]: 
- 796              #    lats = lats[::-1] 
- 797              projparams['proj'] = 'cyl' 
- 798              lons,lats = np.meshgrid(lons,lats) # make 2-d arrays 
- 799          # mercator, lambert conformal, stereographic, albers equal area, azimuthal equidistant 
- 800          elif gdtnum in [10,20,30,31,110]: 
- 801              nx = self.points_in_x_direction 
- 802              ny = self.points_in_y_direction 
- 803              dx = self.gridlength_in_x_direction 
- 804              dy = self.gridlength_in_y_direction 
- 805              lon1, lat1 = self.longitude_first_gridpoint, self.latitude_first_gridpoint 
- 806              if gdtnum == 10: # mercator. 
- 807                  projparams['lat_ts']=self.proj4_lat_ts 
- 808                  projparams['proj']=self.proj4_proj 
- 809                  projparams['lon_0']=self.proj4_lon_0 
- 810                  pj = pyproj.Proj(projparams) 
- 811                  llcrnrx, llcrnry = pj(lon1,lat1) 
- 812                  x = llcrnrx+dx*np.arange(nx) 
- 813                  y = llcrnry+dy*np.arange(ny) 
- 814                  x, y = np.meshgrid(x, y) 
- 815                  lons, lats = pj(x, y, inverse=True) 
- 816              elif gdtnum == 20:  # stereographic 
- 817                  projparams['lat_ts']=self.proj4_lat_ts 
- 818                  projparams['proj']=self.proj4_proj 
- 819                  projparams['lat_0']=self.proj4_lat_0 
- 820                  projparams['lon_0']=self.proj4_lon_0 
- 821                  pj = pyproj.Proj(projparams) 
- 822                  llcrnrx, llcrnry = pj(lon1,lat1) 
- 823                  x = llcrnrx+dx*np.arange(nx) 
- 824                  y = llcrnry+dy*np.arange(ny) 
- 825                  x, y = np.meshgrid(x, y) 
- 826                  lons, lats = pj(x, y, inverse=True) 
- 827              elif gdtnum in [30,31]: # lambert, albers 
- 828                  projparams['lat_1']=self.proj4_lat_1 
- 829                  projparams['lat_2']=self.proj4_lat_2 
- 830                  projparams['proj']=self.proj4_proj 
- 831                  projparams['lon_0']=self.proj4_lon_0 
- 832                  pj = pyproj.Proj(projparams) 
- 833                  llcrnrx, llcrnry = pj(lon1,lat1) 
- 834                  x = llcrnrx+dx*np.arange(nx) 
- 835                  y = llcrnry+dy*np.arange(ny) 
- 836                  x, y = np.meshgrid(x, y) 
- 837                  lons, lats = pj(x, y, inverse=True) 
- 838              elif gdtnum == 110: # azimuthal equidistant 
- 839                  projparams['proj']=self.proj4_proj 
- 840                  projparams['lat_0']=self.proj4_lat_0 
- 841                  projparams['lon_0']=self.proj4_lon_0 
- 842                  pj = pyproj.Proj(projparams) 
- 843                  llcrnrx, llcrnry = pj(lon1,lat1) 
- 844                  x = llcrnrx+dx*np.arange(nx) 
- 845                  y = llcrnry+dy*np.arange(ny) 
- 846                  x, y = np.meshgrid(x, y) 
- 847                  lons, lats = pj(x, y, inverse=True) 
- 848          elif gdtnum == 90: # satellite projection. 
- 849              nx = self.points_in_x_direction 
- 850              ny = self.points_in_y_direction 
- 851              dx = self.gridlength_in_x_direction 
- 852              dy = self.gridlength_in_y_direction 
- 853              projparams['proj']=self.proj4_proj 
- 854              projparams['lon_0']=self.proj4_lon_0 
- 855              projparams['lat_0']=self.proj4_lat_0 
- 856              projparams['h']=self.proj4_h 
- 857              pj = pyproj.Proj(projparams) 
- 858              x = dx*np.indices((ny,nx),'f')[1,:,:] 
- 859              x = x - 0.5*x.max() 
- 860              y = dy*np.indices((ny,nx),'f')[0,:,:] 
- 861              y = y - 0.5*y.max() 
- 862              lons, lats = pj(x,y,inverse=True) 
- 863              # set lons,lats to 1.e30 where undefined 
- 864              abslons = np.fabs(lons); abslats = np.fabs(lats) 
- 865              lons = np.where(abslons < 1.e20, lons, 1.e30) 
- 866              lats = np.where(abslats < 1.e20, lats, 1.e30) 
- 867          else: 
- 868              raise ValueError('unsupported grid') 
- 869          self.projparams = projparams 
- 870          return lats.astype('f'), lons.astype('f') 
-
     871   
-
     872 -def Grib2Decode(filename,gribmsg=False): 
-
     873      """ 
- 874   Read the contents of a GRIB2 file. 
- 875   
- 876   @param filename: name of GRIB2 file (default, gribmsg=False) or binary string 
- 877   representing a grib message (if gribmsg=True). 
- 878   
- 879   @return:  a list of L{Grib2Message} instances representing all of the 
- 880   grib messages in the file.  Messages with multiple fields are split 
- 881   into separate messages (so that each L{Grib2Message} instance contains 
- 882   just one data field). The metadata in each GRIB2 message can be 
- 883   accessed via L{Grib2Message} instance variables, the actual data 
- 884   can be read using L{Grib2Message.data}, and the lat/lon values of the grid 
- 885   can be accesses using L{Grib2Message.grid}. If there is only one grib 
- 886   message, just the L{Grib2Message} instance is returned, instead of a list 
- 887   with one element. 
- 888      """ 
- 889      if gribmsg: 
- 890          f = StringIO(filename) 
- 891      else: 
- 892          f = open(filename,'rb') 
- 893      nmsg = 0 
- 894      # loop over grib messages, read section 0, get entire grib message. 
- 895      disciplines = [] 
- 896      startingpos = [] 
- 897      msglen = [] 
- 898      while 1: 
- 899          # find next occurence of string 'GRIB' (or EOF). 
- 900          nbyte = f.tell() 
- 901          while 1: 
- 902              f.seek(nbyte) 
- 903              start = f.read(4).decode('ascii','ignore') 
- 904              if start == '' or start == 'GRIB': break 
- 905              nbyte = nbyte + 1 
- 906          if start == '': break # at EOF 
- 907          # otherwise, start (='GRIB') contains indicator message (section 0) 
- 908          startpos = f.tell()-4 
- 909          f.seek(2,1)  # next two octets are reserved 
- 910          # get discipline info. 
- 911          disciplines.append(struct.unpack('>B',f.read(1))[0]) 
- 912          # check to see it's a grib edition 2 file. 
- 913          vers = struct.unpack('>B',f.read(1))[0] 
- 914          if vers != 2: 
- 915              raise IOError('not a GRIB2 file (version number %d)' % vers) 
- 916          lengrib = struct.unpack('>q',f.read(8))[0] 
- 917          msglen.append(lengrib) 
- 918          startingpos.append(startpos) 
- 919          # read in entire grib message. 
- 920          f.seek(startpos) 
- 921          gribmsg = f.read(lengrib) 
- 922          # make sure the message ends with '7777' 
- 923          end = gribmsg[-4:lengrib].decode('ascii','ignore') 
- 924          if end != '7777': 
- 925             raise IOError('partial GRIB message (no "7777" at end)') 
- 926          # do next message. 
- 927          nmsg=nmsg+1 
- 928      # if no grib messages found, nmsg is still 0 and it's not GRIB. 
- 929      if nmsg==0: 
- 930         raise IOError('not a GRIB file') 
- 931      # now for each grib message, find number of fields. 
- 932      numfields = [] 
- 933      f.seek(0) # rewind file. 
- 934      for n in range(nmsg): 
- 935          f.seek(startingpos[n]) 
- 936          gribmsg = f.read(msglen[n]) 
- 937          pos = 0 
- 938          numflds = 0 
- 939          while 1: 
- 940              if gribmsg[pos:pos+4].decode('ascii','ignore') == 'GRIB': 
- 941                  sectnum = 0 
- 942                  lensect = 16 
- 943              elif gribmsg[pos:pos+4].decode('ascii','ignore') == '7777': 
- 944                  break 
- 945              else: 
- 946                  lensect = struct.unpack('>i',gribmsg[pos:pos+4])[0] 
- 947                  sectnum = struct.unpack('>B',gribmsg[pos+4:pos+5])[0] 
- 948                  if sectnum == 4: numflds=numflds+1 
- 949                  #if sectnum == 2: numlocal=numlocal+1 
- 950              pos = pos + lensect 
- 951              #print sectnum,lensect,pos 
- 952          #print n+1,len(gribmsg),numfields,numlocal 
- 953          numfields.append(numflds) 
- 954      # decode each section in grib message (sections 1 and above). 
- 955      gdtnum = [] # grid defn template number from sxn 3 
- 956      gdtmpl = [] # grid defn template from sxn 3 
- 957      gdeflist = [] # optional grid definition list from sxn 3 
- 958      gdsinfo = [] # grid definition section info from sxn3 
- 959      pdtmpl = [] # product defn template from sxn 4 
- 960      pdtnum = [] # product defn template number from sxn 4 
- 961      coordlist = [] # vertical coordinate info from sxn 4 
- 962      drtmpl = [] # data representation template from sxn 5 
- 963      drtnum = [] # data representation template number from sxn 5 
- 964      ndpts = [] # number of data points to be unpacked (from sxn 5) 
- 965      bitmapflag = [] # bit-map indicator flag from sxn 6 
- 966      bitmap = [] # bitmap from sxn 6. 
- 967      pos7 = [] # byte offset for section 7. 
- 968      localsxn = [] # local use sections. 
- 969      msgstart = [] # byte offset in file for message start. 
- 970      msglength = [] # length of the message in bytes. 
- 971      message = [] # the actual grib message. 
- 972      identsect = [] # identification section (section 1). 
- 973      discipline = [] # discipline code. 
- 974      for n in range(nmsg): 
- 975          spos = startingpos[n] 
- 976          lengrib = msglen[n] 
- 977          #gribmsg = gribmsgs[n] 
- 978          f.seek(spos) 
- 979          gribmsg = f.read(lengrib) 
- 980          discipl = disciplines[n] 
- 981          lensect0 = 16 
- 982          # get length of section 1 and section number. 
- 983          #lensect1 = struct.unpack('>i',gribmsg[lensect0:lensect0+4])[0] 
- 984          #sectnum1 = struct.unpack('>B',gribmsg[lensect0+4])[0] 
- 985          #print 'sectnum1, lensect1 = ',sectnum1,lensect1 
- 986          # unpack section 1, octets 1-21 (13 parameters).  This section 
- 987          # can occur only once per grib message. 
- 988          #idsect,pos = _unpack1(gribmsg,lensect0) # python version 
- 989          idsect,pos = g2clib.unpack1(gribmsg,lensect0,np.empty) # c version 
- 990          # loop over rest of sections in message. 
- 991          gdtnums = [] 
- 992          gdtmpls = [] 
- 993          gdeflists = [] 
- 994          gdsinfos = [] 
- 995          pdtmpls = [] 
- 996          coordlists = [] 
- 997          pdtnums = [] 
- 998          drtmpls = [] 
- 999          drtnums = [] 
-1000          ndptslist = [] 
-1001          bitmapflags = [] 
-1002          bitmaps = [] 
-1003          sxn7pos = [] 
-1004          localsxns = [] 
-1005          while 1: 
-1006              # check to see if this is the end of the message. 
-1007              if gribmsg[pos:pos+4].decode('ascii','ignore') == '7777': break 
-1008              lensect = struct.unpack('>i',gribmsg[pos:pos+4])[0] 
-1009              sectnum = struct.unpack('>B',gribmsg[pos+4:pos+5])[0] 
-1010              # section 2, local use section. 
-1011              if sectnum == 2: 
-1012                  # "local use section", used by NDFD to store WX 
-1013                  # strings.  This section is returned as a raw 
-1014                  # bytestring for further dataset-specific parsing, 
-1015                  # not as a numpy array. 
-1016                  localsxns.append(gribmsg[pos+5:pos+lensect]) 
-1017                  pos = pos + lensect 
-1018              # section 3, grid definition section. 
-1019              elif sectnum == 3: 
-1020                  gds,gdtempl,deflist,pos = g2clib.unpack3(gribmsg,pos,np.empty) 
-1021                  gdtnums.append(gds[4]) 
-1022                  gdtmpls.append(gdtempl) 
-1023                  gdeflists.append(deflist) 
-1024                  gdsinfos.append(gds) 
-1025              # section, product definition section. 
-1026              elif sectnum == 4: 
-1027                  pdtempl,pdtn,coordlst,pos = g2clib.unpack4(gribmsg,pos,np.empty) 
-1028                  pdtmpls.append(pdtempl) 
-1029                  coordlists.append(coordlst) 
-1030                  pdtnums.append(pdtn) 
-1031              # section 5, data representation section. 
-1032              elif sectnum == 5: 
-1033                  drtempl,drtn,npts,pos = g2clib.unpack5(gribmsg,pos,np.empty) 
-1034                  drtmpls.append(drtempl) 
-1035                  drtnums.append(drtn) 
-1036                  ndptslist.append(npts) 
-1037              # section 6, bit-map section. 
-1038              elif sectnum == 6: 
-1039                  bmap,bmapflag = g2clib.unpack6(gribmsg,gds[1],pos,np.empty) 
-1040                  #bitmapflag = struct.unpack('>B',gribmsg[pos+5])[0] 
-1041                  if bmapflag == 0: 
-1042                      bitmaps.append(bmap.astype('b')) 
-1043                  # use last defined bitmap. 
-1044                  elif bmapflag == 254: 
-1045                      bmapflag = 0 
-1046                      for bmp in bitmaps[::-1]: 
-1047                          if bmp is not None: bitmaps.append(bmp) 
-1048                  else: 
-1049                      bitmaps.append(None) 
-1050                  bitmapflags.append(bmapflag) 
-1051                  pos = pos + lensect 
-1052              # section 7, data section (nothing done here, 
-1053              # data unpacked when getfld method is invoked). 
-1054              else: 
-1055                  if sectnum != 7: 
-1056                     msg = 'unknown section = %i' % sectnum 
-1057                     raise ValueError(msg) 
-1058                  sxn7pos.append(pos) 
-1059                  pos = pos + lensect 
-1060          # extend by repeating last value for all remaining fields. 
-1061          gdtnum.append(_repeatlast(numfields[n],gdtnums)) 
-1062          gdtmpl.append(_repeatlast(numfields[n],gdtmpls)) 
-1063          gdeflist.append(_repeatlast(numfields[n],gdeflists)) 
-1064          gdsinfo.append(_repeatlast(numfields[n],gdsinfos)) 
-1065          pdtmpl.append(_repeatlast(numfields[n],pdtmpls)) 
-1066          pdtnum.append(_repeatlast(numfields[n],pdtnums)) 
-1067          coordlist.append(_repeatlast(numfields[n],coordlists)) 
-1068          drtmpl.append(_repeatlast(numfields[n],drtmpls)) 
-1069          drtnum.append(_repeatlast(numfields[n],drtnums)) 
-1070          ndpts.append(_repeatlast(numfields[n],ndptslist)) 
-1071          bitmapflag.append(_repeatlast(numfields[n],bitmapflags)) 
-1072          bitmap.append(_repeatlast(numfields[n],bitmaps)) 
-1073          pos7.append(_repeatlast(numfields[n],sxn7pos)) 
-1074          if len(localsxns) == 0: 
-1075              localsxns = [None] 
-1076          localsxn.append(_repeatlast(numfields[n],localsxns)) 
-1077          msgstart.append(_repeatlast(numfields[n],[spos])) 
-1078          msglength.append(_repeatlast(numfields[n],[lengrib])) 
-1079          identsect.append(_repeatlast(numfields[n],[idsect])) 
-1080          discipline.append(_repeatlast(numfields[n],[discipl])) 
-1081   
-1082      gdtnum = _flatten(gdtnum) 
-1083      gdtmpl = _flatten(gdtmpl) 
-1084      gdeflist = _flatten(gdeflist) 
-1085      gdsinfo = _flatten(gdsinfo) 
-1086      pdtmpl = _flatten(pdtmpl) 
-1087      pdtnum = _flatten(pdtnum) 
-1088      coordlist = _flatten(coordlist) 
-1089      drtmpl = _flatten(drtmpl) 
-1090      drtnum = _flatten(drtnum) 
-1091      ndpts = _flatten(ndpts) 
-1092      bitmapflag = _flatten(bitmapflag) 
-1093      bitmap = _flatten(bitmap) 
-1094      pos7 = _flatten(pos7) 
-1095      localsxn = _flatten(localsxn) 
-1096      msgstart = _flatten(msgstart) 
-1097      msglength = _flatten(msglength) 
-1098      identsect = _flatten(identsect) 
-1099      discipline = _flatten(discipline) 
-1100   
-1101      gribs = [] 
-1102      for n in range(len(msgstart)): 
-1103          kwargs = {} 
-1104          kwargs['originating_center']=_table0[identsect[n][0]][0] 
-1105          wmo_code = _table0[identsect[n][0]][1] 
-1106          if wmo_code is not None: 
-1107              kwargs['center_wmo_code']=wmo_code 
-1108          kwargs['grid_definition_template_number']=gdtnum[n] 
-1109          kwargs['grid_definition_template']=gdtmpl[n] 
-1110          if gdeflist[n] != []: 
-1111              kwargs['grid_definition_list']=gdeflist[n] 
-1112          kwargs['grid_definition_info']=gdsinfo[n] 
-1113          kwargs['discipline_code']=discipline[n] 
-1114          kwargs['product_definition_template_number']=pdtnum[n] 
-1115          kwargs['product_definition_template']=pdtmpl[n] 
-1116          kwargs['data_representation_template_number']=drtnum[n] 
-1117          kwargs['data_representation_template']=drtmpl[n] 
-1118          if coordlist[n] != []: 
-1119              kwargs['extra_vertical_coordinate_info']=coordlist[n] 
-1120          kwargs['number_of_data_points_to_unpack']=ndpts[n] 
-1121          kwargs['bitmap_indicator_flag']=bitmapflag[n] 
-1122          if bitmap[n] is not []: 
-1123              kwargs['_bitmap']=bitmap[n] 
-1124          kwargs['_section7_byte_offset']=pos7[n] 
-1125          kwargs['_grib_message_byteoffset']=msgstart[n] 
-1126          kwargs['_grib_message_length']=msglength[n] 
-1127          kwargs['_grib_filename']=filename 
-1128          kwargs['identification_section']=identsect[n] 
-1129          kwargs['_grib_message_number']=n+1 
-1130          if localsxn[n] is not None: 
-1131              kwargs['has_local_use_section'] = True 
-1132              kwargs['_local_use_section']=localsxn[n] 
-1133          else: 
-1134              kwargs['has_local_use_section'] = False 
-1135          gribs.append(Grib2Message(**kwargs)) 
-1136      f.close() 
-1137      if len(gribs) == 1: 
-1138          return gribs[0] 
-1139      else: 
-1140          return gribs 
-
    1141   
-
    1142 -def dump(filename, grbs): 
-
    1143      """ 
-1144   write the given L{Grib2Message} instances to a grib file. 
-1145   
-1146   @param filename: file to write grib data to. 
-1147   @param grbs: a list of L{Grib2Message} instances. 
-1148      """ 
-1149      gribfile = open(filename,'wb') 
-1150      for grb in grbs: 
-1151          try: 
-1152              f = open(grb._grib_filename,'rb') 
-1153          except TypeError: 
-1154              f = StringIO(grb._grib_filename) 
-1155          f.seek(grb._grib_message_byteoffset) 
-1156          gribmsg = f.read(grb._grib_message_length) 
-1157          f.close() 
-1158          gribfile.write(gribmsg) 
-1159      gribfile.close() 
-
    1160   
-1161  # private methods and functions below here. 
-1162   
-
    1163 -def _getdate(idsect): 
-
    1164      """return yyyy,mm,dd,min,ss from section 1""" 
-1165      yyyy=idsect[5] 
-1166      mm=idsect[6] 
-1167      dd=idsect[7] 
-1168      hh=idsect[8] 
-1169      min=idsect[9] 
-1170      ss=idsect[10] 
-1171      return yyyy,mm,dd,hh,min,ss 
-
    1172   
-
    1173 -def _unpack1(gribmsg,pos): 
-
    1174      """unpack section 1 given starting point in bytes 
-1175      used to test pyrex interface to g2_unpack1""" 
-1176      idsect = [] 
-1177      pos = pos + 5 
-1178      idsect.append(struct.unpack('>h',gribmsg[pos:pos+2])[0]) 
-1179      pos = pos + 2 
+ 671          # self._grib_filename can be a grib message binary string 
+ 672          # if it is, ValueError is returned in python 3.5 (issue #24) 
+ 673          except (ValueError,TypeError,IOError): 
+ 674              f = StringIO(self._grib_filename) 
+ 675          f.seek(self._grib_message_byteoffset) 
+ 676          gribmsg = f.read(self._grib_message_length) 
+ 677          f.close() 
+ 678          gdtnum = self.grid_definition_template_number 
+ 679          gdtmpl = self.grid_definition_template 
+ 680          ndpts = self.number_of_data_points_to_unpack 
+ 681          gdsinfo = self.grid_definition_info 
+ 682          ngrdpts = gdsinfo[1] 
+ 683          ipos = self._section7_byte_offset 
+ 684          fld1=g2clib.unpack7(gribmsg,gdtnum,gdtmpl,drtnum,drtmpl,ndpts,ipos,np.empty,storageorder=storageorder) 
+ 685          # apply bitmap. 
+ 686          if bitmapflag == 0: 
+ 687              bitmap=self._bitmap 
+ 688              fld = fill_value*np.ones(ngrdpts,'f') 
+ 689              np.put(fld,np.nonzero(bitmap),fld1) 
+ 690              if masked_array: 
+ 691                  fld = ma.masked_values(fld,fill_value) 
+ 692          # missing values instead of bitmap 
+ 693          elif masked_array and hasattr(self,'missing_value'): 
+ 694              if hasattr(self, 'missing_value2'): 
+ 695                  mask = np.logical_or(fld1 == self.missing_value, fld1 == self.missing_value2) 
+ 696              else: 
+ 697                  mask = fld1 == self.missing_value 
+ 698              fld = ma.array(fld1,mask=mask) 
+ 699          else: 
+ 700              fld = fld1 
+ 701          nx = None; ny = None 
+ 702          if hasattr(self,'points_in_x_direction'): 
+ 703              nx = self.points_in_x_direction 
+ 704          if hasattr(self,'points_in_y_direction'): 
+ 705              ny = self.points_in_y_direction 
+ 706          if nx is not None and ny is not None: # rectangular grid. 
+ 707              if ma.isMA(fld): 
+ 708                  fld = ma.reshape(fld,(ny,nx)) 
+ 709              else: 
+ 710                  fld = np.reshape(fld,(ny,nx)) 
+ 711          else: 
+ 712              if gdsinfo[2] and gdtnum == 40: # ECMWF 'reduced' global gaussian grid. 
+ 713                  if expand: 
+ 714                      nx = 2*ny 
+ 715                      lonsperlat = self.grid_definition_list 
+ 716                      if ma.isMA(fld): 
+ 717                          fld = ma.filled(fld) 
+ 718                          fld = _redtoreg(nx, lonsperlat.astype(np.long),\ 
+ 719                                  fld.astype(np.double), fill_value) 
+ 720                          fld = ma.masked_values(fld,fill_value) 
+ 721                      else: 
+ 722                          fld = _redtoreg(nx, lonsperlat.astype(np.long),\ 
+ 723                                  fld.astype(np.double), fill_value) 
+ 724          # check scan modes for rect grids. 
+ 725          if nx is not None and ny is not None: 
+ 726              # rows scan in the -x direction (so flip) 
+ 727              #if self.scanmodeflags[0]: 
+ 728              #    fldsave = fld.astype('f') # casting makes a copy 
+ 729              #    fld[:,:] = fldsave[:,::-1] 
+ 730              # columns scan in the -y direction (so flip) 
+ 731              #if not self.scanmodeflags[1]: 
+ 732              #    fldsave = fld.astype('f') # casting makes a copy 
+ 733              #    fld[:,:] = fldsave[::-1,:] 
+ 734              # adjacent rows scan in opposite direction. 
+ 735              # (flip every other row) 
+ 736              if self.scanmodeflags[3]: 
+ 737                  fldsave = fld.astype('f') # casting makes a copy 
+ 738                  fld[1::2,:] = fldsave[1::2,::-1] 
+ 739          return fld 
+
     740   
+ 741      values = property(data) 
+ 742   
+
     743 -    def latlons(self): 
+
     744          """alias for L{grid}""" 
+ 745          return self.grid() 
+
     746   
+
     747 -    def grid(self): 
+
     748          """ 
+ 749   return lats,lons (in degrees) of grid. 
+ 750   currently can handle reg. lat/lon, global gaussian, mercator, stereographic, 
+ 751   lambert conformal, albers equal-area, space-view and azimuthal 
+ 752   equidistant grids.  L{latlons} method does the same thing. 
+ 753   
+ 754   @return: C{B{lats},B{lons}}, float32 numpy arrays 
+ 755   containing latitudes and longitudes of grid (in degrees). 
+ 756          """ 
+ 757          from pygrib import gaulats 
+ 758          gdsinfo = self.grid_definition_info 
+ 759          gdtnum = self.grid_definition_template_number 
+ 760          gdtmpl = self.grid_definition_template 
+ 761          reggrid = gdsinfo[2] == 0 # gdsinfo[2]=0 means regular 2-d grid 
+ 762          projparams = {} 
+ 763          projparams['a']=self.earthRmajor 
+ 764          projparams['b']=self.earthRminor 
+ 765          if gdtnum == 0: # regular lat/lon grid 
+ 766              lon1, lat1 = self.longitude_first_gridpoint, self.latitude_first_gridpoint 
+ 767              lon2, lat2 = self.longitude_last_gridpoint, self.latitude_last_gridpoint 
+ 768              delon = self.gridlength_in_x_direction 
+ 769              delat = self.gridlength_in_y_direction 
+ 770              lats = np.arange(lat1,lat2+delat,delat) 
+ 771              lons = np.arange(lon1,lon2+delon,delon) 
+ 772              # flip if scan mode says to. 
+ 773              #if self.scanmodeflags[0]: 
+ 774              #    lons = lons[::-1] 
+ 775              #if not self.scanmodeflags[1]: 
+ 776              #    lats = lats[::-1] 
+ 777              projparams['proj'] = 'cyl' 
+ 778              lons,lats = np.meshgrid(lons,lats) # make 2-d arrays. 
+ 779          elif gdtnum == 40: # gaussian grid (only works for global!) 
+ 780              lon1, lat1 = self.longitude_first_gridpoint, self.latitude_first_gridpoint 
+ 781              lon2, lat2 = self.longitude_last_gridpoint, self.latitude_last_gridpoint 
+ 782              nlats = self.points_in_y_direction 
+ 783              if not reggrid: # ECMWF 'reduced' gaussian grid. 
+ 784                  nlons = 2*nlats 
+ 785                  delon = 360./nlons 
+ 786              else: 
+ 787                  nlons = self.points_in_x_direction 
+ 788                  delon = self.gridlength_in_x_direction 
+ 789              lons = np.arange(lon1,lon2+delon,delon) 
+ 790              # compute gaussian lats (north to south) 
+ 791              lats = gaulats(nlats) 
+ 792              if lat1 < lat2:  # reverse them if necessary 
+ 793                  lats = lats[::-1] 
+ 794              # flip if scan mode says to. 
+ 795              #if self.scanmodeflags[0]: 
+ 796              #    lons = lons[::-1] 
+ 797              #if not self.scanmodeflags[1]: 
+ 798              #    lats = lats[::-1] 
+ 799              projparams['proj'] = 'cyl' 
+ 800              lons,lats = np.meshgrid(lons,lats) # make 2-d arrays 
+ 801          # mercator, lambert conformal, stereographic, albers equal area, azimuthal equidistant 
+ 802          elif gdtnum in [10,20,30,31,110]: 
+ 803              nx = self.points_in_x_direction 
+ 804              ny = self.points_in_y_direction 
+ 805              dx = self.gridlength_in_x_direction 
+ 806              dy = self.gridlength_in_y_direction 
+ 807              lon1, lat1 = self.longitude_first_gridpoint, self.latitude_first_gridpoint 
+ 808              if gdtnum == 10: # mercator. 
+ 809                  projparams['lat_ts']=self.proj4_lat_ts 
+ 810                  projparams['proj']=self.proj4_proj 
+ 811                  projparams['lon_0']=self.proj4_lon_0 
+ 812                  pj = pyproj.Proj(projparams) 
+ 813                  llcrnrx, llcrnry = pj(lon1,lat1) 
+ 814                  x = llcrnrx+dx*np.arange(nx) 
+ 815                  y = llcrnry+dy*np.arange(ny) 
+ 816                  x, y = np.meshgrid(x, y) 
+ 817                  lons, lats = pj(x, y, inverse=True) 
+ 818              elif gdtnum == 20:  # stereographic 
+ 819                  projparams['lat_ts']=self.proj4_lat_ts 
+ 820                  projparams['proj']=self.proj4_proj 
+ 821                  projparams['lat_0']=self.proj4_lat_0 
+ 822                  projparams['lon_0']=self.proj4_lon_0 
+ 823                  pj = pyproj.Proj(projparams) 
+ 824                  llcrnrx, llcrnry = pj(lon1,lat1) 
+ 825                  x = llcrnrx+dx*np.arange(nx) 
+ 826                  y = llcrnry+dy*np.arange(ny) 
+ 827                  x, y = np.meshgrid(x, y) 
+ 828                  lons, lats = pj(x, y, inverse=True) 
+ 829              elif gdtnum in [30,31]: # lambert, albers 
+ 830                  projparams['lat_1']=self.proj4_lat_1 
+ 831                  projparams['lat_2']=self.proj4_lat_2 
+ 832                  projparams['proj']=self.proj4_proj 
+ 833                  projparams['lon_0']=self.proj4_lon_0 
+ 834                  pj = pyproj.Proj(projparams) 
+ 835                  llcrnrx, llcrnry = pj(lon1,lat1) 
+ 836                  x = llcrnrx+dx*np.arange(nx) 
+ 837                  y = llcrnry+dy*np.arange(ny) 
+ 838                  x, y = np.meshgrid(x, y) 
+ 839                  lons, lats = pj(x, y, inverse=True) 
+ 840              elif gdtnum == 110: # azimuthal equidistant 
+ 841                  projparams['proj']=self.proj4_proj 
+ 842                  projparams['lat_0']=self.proj4_lat_0 
+ 843                  projparams['lon_0']=self.proj4_lon_0 
+ 844                  pj = pyproj.Proj(projparams) 
+ 845                  llcrnrx, llcrnry = pj(lon1,lat1) 
+ 846                  x = llcrnrx+dx*np.arange(nx) 
+ 847                  y = llcrnry+dy*np.arange(ny) 
+ 848                  x, y = np.meshgrid(x, y) 
+ 849                  lons, lats = pj(x, y, inverse=True) 
+ 850          elif gdtnum == 90: # satellite projection. 
+ 851              nx = self.points_in_x_direction 
+ 852              ny = self.points_in_y_direction 
+ 853              dx = self.gridlength_in_x_direction 
+ 854              dy = self.gridlength_in_y_direction 
+ 855              projparams['proj']=self.proj4_proj 
+ 856              projparams['lon_0']=self.proj4_lon_0 
+ 857              projparams['lat_0']=self.proj4_lat_0 
+ 858              projparams['h']=self.proj4_h 
+ 859              pj = pyproj.Proj(projparams) 
+ 860              x = dx*np.indices((ny,nx),'f')[1,:,:] 
+ 861              x = x - 0.5*x.max() 
+ 862              y = dy*np.indices((ny,nx),'f')[0,:,:] 
+ 863              y = y - 0.5*y.max() 
+ 864              lons, lats = pj(x,y,inverse=True) 
+ 865              # set lons,lats to 1.e30 where undefined 
+ 866              abslons = np.fabs(lons); abslats = np.fabs(lats) 
+ 867              lons = np.where(abslons < 1.e20, lons, 1.e30) 
+ 868              lats = np.where(abslats < 1.e20, lats, 1.e30) 
+ 869          else: 
+ 870              raise ValueError('unsupported grid') 
+ 871          self.projparams = projparams 
+ 872          return lats.astype('f'), lons.astype('f') 
+
     873   
+
     874 -def Grib2Decode(filename,gribmsg=False): 
+
     875      """ 
+ 876   Read the contents of a GRIB2 file. 
+ 877   
+ 878   @param filename: name of GRIB2 file (default, gribmsg=False) or binary string 
+ 879   representing a grib message (if gribmsg=True). 
+ 880   
+ 881   @return:  a list of L{Grib2Message} instances representing all of the 
+ 882   grib messages in the file.  Messages with multiple fields are split 
+ 883   into separate messages (so that each L{Grib2Message} instance contains 
+ 884   just one data field). The metadata in each GRIB2 message can be 
+ 885   accessed via L{Grib2Message} instance variables, the actual data 
+ 886   can be read using L{Grib2Message.data}, and the lat/lon values of the grid 
+ 887   can be accesses using L{Grib2Message.grid}. If there is only one grib 
+ 888   message, just the L{Grib2Message} instance is returned, instead of a list 
+ 889   with one element. 
+ 890      """ 
+ 891      if gribmsg: 
+ 892          f = StringIO(filename) 
+ 893      else: 
+ 894          f = open(filename,'rb') 
+ 895      nmsg = 0 
+ 896      # loop over grib messages, read section 0, get entire grib message. 
+ 897      disciplines = [] 
+ 898      startingpos = [] 
+ 899      msglen = [] 
+ 900      while 1: 
+ 901          # find next occurence of string 'GRIB' (or EOF). 
+ 902          nbyte = f.tell() 
+ 903          while 1: 
+ 904              f.seek(nbyte) 
+ 905              start = f.read(4).decode('ascii','ignore') 
+ 906              if start == '' or start == 'GRIB': break 
+ 907              nbyte = nbyte + 1 
+ 908          if start == '': break # at EOF 
+ 909          # otherwise, start (='GRIB') contains indicator message (section 0) 
+ 910          startpos = f.tell()-4 
+ 911          f.seek(2,1)  # next two octets are reserved 
+ 912          # get discipline info. 
+ 913          disciplines.append(struct.unpack('>B',f.read(1))[0]) 
+ 914          # check to see it's a grib edition 2 file. 
+ 915          vers = struct.unpack('>B',f.read(1))[0] 
+ 916          if vers != 2: 
+ 917              raise IOError('not a GRIB2 file (version number %d)' % vers) 
+ 918          lengrib = struct.unpack('>q',f.read(8))[0] 
+ 919          msglen.append(lengrib) 
+ 920          startingpos.append(startpos) 
+ 921          # read in entire grib message. 
+ 922          f.seek(startpos) 
+ 923          gribmsg = f.read(lengrib) 
+ 924          # make sure the message ends with '7777' 
+ 925          end = gribmsg[-4:lengrib].decode('ascii','ignore') 
+ 926          if end != '7777': 
+ 927             raise IOError('partial GRIB message (no "7777" at end)') 
+ 928          # do next message. 
+ 929          nmsg=nmsg+1 
+ 930      # if no grib messages found, nmsg is still 0 and it's not GRIB. 
+ 931      if nmsg==0: 
+ 932         raise IOError('not a GRIB file') 
+ 933      # now for each grib message, find number of fields. 
+ 934      numfields = [] 
+ 935      f.seek(0) # rewind file. 
+ 936      for n in range(nmsg): 
+ 937          f.seek(startingpos[n]) 
+ 938          gribmsg = f.read(msglen[n]) 
+ 939          pos = 0 
+ 940          numflds = 0 
+ 941          while 1: 
+ 942              if gribmsg[pos:pos+4].decode('ascii','ignore') == 'GRIB': 
+ 943                  sectnum = 0 
+ 944                  lensect = 16 
+ 945              elif gribmsg[pos:pos+4].decode('ascii','ignore') == '7777': 
+ 946                  break 
+ 947              else: 
+ 948                  lensect = struct.unpack('>i',gribmsg[pos:pos+4])[0] 
+ 949                  sectnum = struct.unpack('>B',gribmsg[pos+4:pos+5])[0] 
+ 950                  if sectnum == 4: numflds=numflds+1 
+ 951                  #if sectnum == 2: numlocal=numlocal+1 
+ 952              pos = pos + lensect 
+ 953              #print sectnum,lensect,pos 
+ 954          #print n+1,len(gribmsg),numfields,numlocal 
+ 955          numfields.append(numflds) 
+ 956      # decode each section in grib message (sections 1 and above). 
+ 957      gdtnum = [] # grid defn template number from sxn 3 
+ 958      gdtmpl = [] # grid defn template from sxn 3 
+ 959      gdeflist = [] # optional grid definition list from sxn 3 
+ 960      gdsinfo = [] # grid definition section info from sxn3 
+ 961      pdtmpl = [] # product defn template from sxn 4 
+ 962      pdtnum = [] # product defn template number from sxn 4 
+ 963      coordlist = [] # vertical coordinate info from sxn 4 
+ 964      drtmpl = [] # data representation template from sxn 5 
+ 965      drtnum = [] # data representation template number from sxn 5 
+ 966      ndpts = [] # number of data points to be unpacked (from sxn 5) 
+ 967      bitmapflag = [] # bit-map indicator flag from sxn 6 
+ 968      bitmap = [] # bitmap from sxn 6. 
+ 969      pos7 = [] # byte offset for section 7. 
+ 970      localsxn = [] # local use sections. 
+ 971      msgstart = [] # byte offset in file for message start. 
+ 972      msglength = [] # length of the message in bytes. 
+ 973      message = [] # the actual grib message. 
+ 974      identsect = [] # identification section (section 1). 
+ 975      discipline = [] # discipline code. 
+ 976      for n in range(nmsg): 
+ 977          spos = startingpos[n] 
+ 978          lengrib = msglen[n] 
+ 979          #gribmsg = gribmsgs[n] 
+ 980          f.seek(spos) 
+ 981          gribmsg = f.read(lengrib) 
+ 982          discipl = disciplines[n] 
+ 983          lensect0 = 16 
+ 984          # get length of section 1 and section number. 
+ 985          #lensect1 = struct.unpack('>i',gribmsg[lensect0:lensect0+4])[0] 
+ 986          #sectnum1 = struct.unpack('>B',gribmsg[lensect0+4])[0] 
+ 987          #print 'sectnum1, lensect1 = ',sectnum1,lensect1 
+ 988          # unpack section 1, octets 1-21 (13 parameters).  This section 
+ 989          # can occur only once per grib message. 
+ 990          #idsect,pos = _unpack1(gribmsg,lensect0) # python version 
+ 991          idsect,pos = g2clib.unpack1(gribmsg,lensect0,np.empty) # c version 
+ 992          # loop over rest of sections in message. 
+ 993          gdtnums = [] 
+ 994          gdtmpls = [] 
+ 995          gdeflists = [] 
+ 996          gdsinfos = [] 
+ 997          pdtmpls = [] 
+ 998          coordlists = [] 
+ 999          pdtnums = [] 
+1000          drtmpls = [] 
+1001          drtnums = [] 
+1002          ndptslist = [] 
+1003          bitmapflags = [] 
+1004          bitmaps = [] 
+1005          sxn7pos = [] 
+1006          localsxns = [] 
+1007          while 1: 
+1008              # check to see if this is the end of the message. 
+1009              if gribmsg[pos:pos+4].decode('ascii','ignore') == '7777': break 
+1010              lensect = struct.unpack('>i',gribmsg[pos:pos+4])[0] 
+1011              sectnum = struct.unpack('>B',gribmsg[pos+4:pos+5])[0] 
+1012              # section 2, local use section. 
+1013              if sectnum == 2: 
+1014                  # "local use section", used by NDFD to store WX 
+1015                  # strings.  This section is returned as a raw 
+1016                  # bytestring for further dataset-specific parsing, 
+1017                  # not as a numpy array. 
+1018                  localsxns.append(gribmsg[pos+5:pos+lensect]) 
+1019                  pos = pos + lensect 
+1020              # section 3, grid definition section. 
+1021              elif sectnum == 3: 
+1022                  gds,gdtempl,deflist,pos = g2clib.unpack3(gribmsg,pos,np.empty) 
+1023                  gdtnums.append(gds[4]) 
+1024                  gdtmpls.append(gdtempl) 
+1025                  gdeflists.append(deflist) 
+1026                  gdsinfos.append(gds) 
+1027              # section, product definition section. 
+1028              elif sectnum == 4: 
+1029                  pdtempl,pdtn,coordlst,pos = g2clib.unpack4(gribmsg,pos,np.empty) 
+1030                  pdtmpls.append(pdtempl) 
+1031                  coordlists.append(coordlst) 
+1032                  pdtnums.append(pdtn) 
+1033              # section 5, data representation section. 
+1034              elif sectnum == 5: 
+1035                  drtempl,drtn,npts,pos = g2clib.unpack5(gribmsg,pos,np.empty) 
+1036                  drtmpls.append(drtempl) 
+1037                  drtnums.append(drtn) 
+1038                  ndptslist.append(npts) 
+1039              # section 6, bit-map section. 
+1040              elif sectnum == 6: 
+1041                  bmap,bmapflag = g2clib.unpack6(gribmsg,gds[1],pos,np.empty) 
+1042                  #bitmapflag = struct.unpack('>B',gribmsg[pos+5])[0] 
+1043                  if bmapflag == 0: 
+1044                      bitmaps.append(bmap.astype('b')) 
+1045                  # use last defined bitmap. 
+1046                  elif bmapflag == 254: 
+1047                      bmapflag = 0 
+1048                      for bmp in bitmaps[::-1]: 
+1049                          if bmp is not None: bitmaps.append(bmp) 
+1050                  else: 
+1051                      bitmaps.append(None) 
+1052                  bitmapflags.append(bmapflag) 
+1053                  pos = pos + lensect 
+1054              # section 7, data section (nothing done here, 
+1055              # data unpacked when getfld method is invoked). 
+1056              else: 
+1057                  if sectnum != 7: 
+1058                     msg = 'unknown section = %i' % sectnum 
+1059                     raise ValueError(msg) 
+1060                  sxn7pos.append(pos) 
+1061                  pos = pos + lensect 
+1062          # extend by repeating last value for all remaining fields. 
+1063          gdtnum.append(_repeatlast(numfields[n],gdtnums)) 
+1064          gdtmpl.append(_repeatlast(numfields[n],gdtmpls)) 
+1065          gdeflist.append(_repeatlast(numfields[n],gdeflists)) 
+1066          gdsinfo.append(_repeatlast(numfields[n],gdsinfos)) 
+1067          pdtmpl.append(_repeatlast(numfields[n],pdtmpls)) 
+1068          pdtnum.append(_repeatlast(numfields[n],pdtnums)) 
+1069          coordlist.append(_repeatlast(numfields[n],coordlists)) 
+1070          drtmpl.append(_repeatlast(numfields[n],drtmpls)) 
+1071          drtnum.append(_repeatlast(numfields[n],drtnums)) 
+1072          ndpts.append(_repeatlast(numfields[n],ndptslist)) 
+1073          bitmapflag.append(_repeatlast(numfields[n],bitmapflags)) 
+1074          bitmap.append(_repeatlast(numfields[n],bitmaps)) 
+1075          pos7.append(_repeatlast(numfields[n],sxn7pos)) 
+1076          if len(localsxns) == 0: 
+1077              localsxns = [None] 
+1078          localsxn.append(_repeatlast(numfields[n],localsxns)) 
+1079          msgstart.append(_repeatlast(numfields[n],[spos])) 
+1080          msglength.append(_repeatlast(numfields[n],[lengrib])) 
+1081          identsect.append(_repeatlast(numfields[n],[idsect])) 
+1082          discipline.append(_repeatlast(numfields[n],[discipl])) 
+1083   
+1084      gdtnum = _flatten(gdtnum) 
+1085      gdtmpl = _flatten(gdtmpl) 
+1086      gdeflist = _flatten(gdeflist) 
+1087      gdsinfo = _flatten(gdsinfo) 
+1088      pdtmpl = _flatten(pdtmpl) 
+1089      pdtnum = _flatten(pdtnum) 
+1090      coordlist = _flatten(coordlist) 
+1091      drtmpl = _flatten(drtmpl) 
+1092      drtnum = _flatten(drtnum) 
+1093      ndpts = _flatten(ndpts) 
+1094      bitmapflag = _flatten(bitmapflag) 
+1095      bitmap = _flatten(bitmap) 
+1096      pos7 = _flatten(pos7) 
+1097      localsxn = _flatten(localsxn) 
+1098      msgstart = _flatten(msgstart) 
+1099      msglength = _flatten(msglength) 
+1100      identsect = _flatten(identsect) 
+1101      discipline = _flatten(discipline) 
+1102   
+1103      gribs = [] 
+1104      for n in range(len(msgstart)): 
+1105          kwargs = {} 
+1106          kwargs['originating_center']=_table0[identsect[n][0]][0] 
+1107          wmo_code = _table0[identsect[n][0]][1] 
+1108          if wmo_code is not None: 
+1109              kwargs['center_wmo_code']=wmo_code 
+1110          kwargs['grid_definition_template_number']=gdtnum[n] 
+1111          kwargs['grid_definition_template']=gdtmpl[n] 
+1112          if gdeflist[n] != []: 
+1113              kwargs['grid_definition_list']=gdeflist[n] 
+1114          kwargs['grid_definition_info']=gdsinfo[n] 
+1115          kwargs['discipline_code']=discipline[n] 
+1116          kwargs['product_definition_template_number']=pdtnum[n] 
+1117          kwargs['product_definition_template']=pdtmpl[n] 
+1118          kwargs['data_representation_template_number']=drtnum[n] 
+1119          kwargs['data_representation_template']=drtmpl[n] 
+1120          if coordlist[n] != []: 
+1121              kwargs['extra_vertical_coordinate_info']=coordlist[n] 
+1122          kwargs['number_of_data_points_to_unpack']=ndpts[n] 
+1123          kwargs['bitmap_indicator_flag']=bitmapflag[n] 
+1124          if bitmap[n] is not []: 
+1125              kwargs['_bitmap']=bitmap[n] 
+1126          kwargs['_section7_byte_offset']=pos7[n] 
+1127          kwargs['_grib_message_byteoffset']=msgstart[n] 
+1128          kwargs['_grib_message_length']=msglength[n] 
+1129          kwargs['_grib_filename']=filename 
+1130          kwargs['identification_section']=identsect[n] 
+1131          kwargs['_grib_message_number']=n+1 
+1132          if localsxn[n] is not None: 
+1133              kwargs['has_local_use_section'] = True 
+1134              kwargs['_local_use_section']=localsxn[n] 
+1135          else: 
+1136              kwargs['has_local_use_section'] = False 
+1137          gribs.append(Grib2Message(**kwargs)) 
+1138      f.close() 
+1139      if len(gribs) == 1: 
+1140          return gribs[0] 
+1141      else: 
+1142          return gribs 
+
    1143   
+
    1144 -def dump(filename, grbs): 
+
    1145      """ 
+1146   write the given L{Grib2Message} instances to a grib file. 
+1147   
+1148   @param filename: file to write grib data to. 
+1149   @param grbs: a list of L{Grib2Message} instances. 
+1150      """ 
+1151      gribfile = open(filename,'wb') 
+1152      for grb in grbs: 
+1153          try: 
+1154              f = open(grb._grib_filename,'rb') 
+1155          except TypeError: 
+1156              f = StringIO(grb._grib_filename) 
+1157          f.seek(grb._grib_message_byteoffset) 
+1158          gribmsg = f.read(grb._grib_message_length) 
+1159          f.close() 
+1160          gribfile.write(gribmsg) 
+1161      gribfile.close() 
+
    1162   
+1163  # private methods and functions below here. 
+1164   
+
    1165 -def _getdate(idsect): 
+
    1166      """return yyyy,mm,dd,min,ss from section 1""" 
+1167      yyyy=idsect[5] 
+1168      mm=idsect[6] 
+1169      dd=idsect[7] 
+1170      hh=idsect[8] 
+1171      min=idsect[9] 
+1172      ss=idsect[10] 
+1173      return yyyy,mm,dd,hh,min,ss 
+
    1174   
+
    1175 -def _unpack1(gribmsg,pos): 
+
    1176      """unpack section 1 given starting point in bytes 
+1177      used to test pyrex interface to g2_unpack1""" 
+1178      idsect = [] 
+1179      pos = pos + 5 
 1180      idsect.append(struct.unpack('>h',gribmsg[pos:pos+2])[0]) 
 1181      pos = pos + 2 
-1182      idsect.append(struct.unpack('>B',gribmsg[pos:pos+1])[0]) 
-1183      pos = pos + 1 
+1182      idsect.append(struct.unpack('>h',gribmsg[pos:pos+2])[0]) 
+1183      pos = pos + 2 
 1184      idsect.append(struct.unpack('>B',gribmsg[pos:pos+1])[0]) 
 1185      pos = pos + 1 
 1186      idsect.append(struct.unpack('>B',gribmsg[pos:pos+1])[0]) 
 1187      pos = pos + 1 
-1188      idsect.append(struct.unpack('>h',gribmsg[pos:pos+2])[0]) 
-1189      pos = pos + 2 
-1190      idsect.append(struct.unpack('>B',gribmsg[pos:pos+1])[0]) 
-1191      pos = pos + 1 
+1188      idsect.append(struct.unpack('>B',gribmsg[pos:pos+1])[0]) 
+1189      pos = pos + 1 
+1190      idsect.append(struct.unpack('>h',gribmsg[pos:pos+2])[0]) 
+1191      pos = pos + 2 
 1192      idsect.append(struct.unpack('>B',gribmsg[pos:pos+1])[0]) 
 1193      pos = pos + 1 
 1194      idsect.append(struct.unpack('>B',gribmsg[pos:pos+1])[0]) 
@@ -1252,236 +1252,238 @@ 
    Source Code for Module ncepgr
 1201      pos = pos + 1 
 1202      idsect.append(struct.unpack('>B',gribmsg[pos:pos+1])[0]) 
 1203      pos = pos + 1 
-1204      return np.array(idsect,'i'),pos 
-
    1205   
-
    1206 -def _repeatlast(numfields,listin): 
-
    1207      """repeat last item in listin, until len(listin) = numfields""" 
-1208      if len(listin) < numfields: 
-1209          last = listin[-1] 
-1210          for n in range(len(listin),numfields): 
-1211              listin.append(last) 
-1212      return listin 
-
    1213   
-
    1214 -def _flatten(lst): 
-
    1215      try: 
-1216          flist = functools.reduce(operator.add,lst) 
-1217      except NameError: # no reduce in python 3. 
-1218          import functools 
-1219          flist = functools.reduce(operator.add,lst) 
-1220      return flist 
-
    1221   
-1222   
-
    1223 -class Grib2Encode: 
-
    1224      """ 
-1225   Class for encoding data into a GRIB2 message. 
-1226    - Creating a class instance (L{__init__}) initializes the message and adds 
-1227      sections 0 and 1 (the indicator and identification sections), 
-1228    - method L{addgrid} adds a grid definition (section 3) to the messsage. 
-1229    - method L{addfield} adds sections 4-7 to the message (the product 
-1230      definition, data representation, bitmap and data sections). 
-1231    - method L{end} adds the end section (section 8) and terminates the message. 
-1232   
-1233   
-1234   A GRIB Edition 2 message is a machine independent format for storing 
-1235   one or more gridded data fields.  Each GRIB2 message consists of the 
-1236   following sections: 
-1237    - SECTION 0: Indicator Section - only one per message 
-1238    - SECTION 1: Identification Section - only one per message 
-1239    - SECTION 2: (Local Use Section) - optional 
-1240    - SECTION 3: Grid Definition Section 
-1241    - SECTION 4: Product Definition Section 
-1242    - SECTION 5: Data Representation Section 
-1243    - SECTION 6: Bit-map Section 
-1244    - SECTION 7: Data Section 
-1245    - SECTION 8: End Section 
-1246   
-1247   Sequences of GRIB sections 2 to 7, 3 to 7, or sections 4 to 7 may be repeated 
-1248   within a single GRIB message.  All sections within such repeated sequences 
-1249   must be present and shall appear in the numerical order noted above. 
-1250   Unrepeated sections remain in effect until redefined. 
-1251   
-1252   Note:  Writing section 2 (the 'local use section') is 
-1253   not yet supported. 
-1254   
-1255   @ivar msg: A binary string containing the GRIB2 message. 
-1256   After the message has been terminated by calling 
-1257   the L{end} method, this string can be written to a file. 
-1258      """ 
-1259   
-
    1260 -    def __init__(self, discipline, idsect): 
-
    1261          """ 
-1262   create a Grib2Enecode class instance given the GRIB2 discipline 
-1263   parameter and the identification section (sections 0 and 1). 
-1264   
-1265   The GRIB2 message is stored as a binary string in instance variable L{msg}. 
+1204      idsect.append(struct.unpack('>B',gribmsg[pos:pos+1])[0]) 
+1205      pos = pos + 1 
+1206      return np.array(idsect,'i'),pos 
+
    1207   
+
    1208 -def _repeatlast(numfields,listin): 
+
    1209      """repeat last item in listin, until len(listin) = numfields""" 
+1210      if len(listin) < numfields: 
+1211          last = listin[-1] 
+1212          for n in range(len(listin),numfields): 
+1213              listin.append(last) 
+1214      return listin 
+
    1215   
+
    1216 -def _flatten(lst): 
+
    1217      try: 
+1218          flist = functools.reduce(operator.add,lst) 
+1219      except NameError: # no reduce in python 3. 
+1220          import functools 
+1221          flist = functools.reduce(operator.add,lst) 
+1222      return flist 
+
    1223   
+1224   
+
    1225 -class Grib2Encode: 
+
    1226      """ 
+1227   Class for encoding data into a GRIB2 message. 
+1228    - Creating a class instance (L{__init__}) initializes the message and adds 
+1229      sections 0 and 1 (the indicator and identification sections), 
+1230    - method L{addgrid} adds a grid definition (section 3) to the messsage. 
+1231    - method L{addfield} adds sections 4-7 to the message (the product 
+1232      definition, data representation, bitmap and data sections). 
+1233    - method L{end} adds the end section (section 8) and terminates the message. 
+1234   
+1235   
+1236   A GRIB Edition 2 message is a machine independent format for storing 
+1237   one or more gridded data fields.  Each GRIB2 message consists of the 
+1238   following sections: 
+1239    - SECTION 0: Indicator Section - only one per message 
+1240    - SECTION 1: Identification Section - only one per message 
+1241    - SECTION 2: (Local Use Section) - optional 
+1242    - SECTION 3: Grid Definition Section 
+1243    - SECTION 4: Product Definition Section 
+1244    - SECTION 5: Data Representation Section 
+1245    - SECTION 6: Bit-map Section 
+1246    - SECTION 7: Data Section 
+1247    - SECTION 8: End Section 
+1248   
+1249   Sequences of GRIB sections 2 to 7, 3 to 7, or sections 4 to 7 may be repeated 
+1250   within a single GRIB message.  All sections within such repeated sequences 
+1251   must be present and shall appear in the numerical order noted above. 
+1252   Unrepeated sections remain in effect until redefined. 
+1253   
+1254   Note:  Writing section 2 (the 'local use section') is 
+1255   not yet supported. 
+1256   
+1257   @ivar msg: A binary string containing the GRIB2 message. 
+1258   After the message has been terminated by calling 
+1259   the L{end} method, this string can be written to a file. 
+1260      """ 
+1261   
+
    1262 -    def __init__(self, discipline, idsect): 
+
    1263          """ 
+1264   create a Grib2Enecode class instance given the GRIB2 discipline 
+1265   parameter and the identification section (sections 0 and 1). 
 1266   
-1267   L{addgrid}, L{addfield} and L{end} class methods must be called to complete 
-1268   the GRIB2 message. 
-1269   
-1270   @param discipline:  Discipline or GRIB Master Table Number (Code Table 0.0). 
-1271   (0 for meteorlogical, 1 for hydrological, 2 for land surface, 3 for space, 
-1272   10 for oceanographic products). 
-1273   
-1274   @param idsect:  Sequence containing identification section (section 1). 
-1275    - idsect[0]=Id of orginating centre (Common Code 
-1276      U{Table C-1<http://www.nws.noaa.gov/tg/GRIB_C1.htm>}) 
-1277    - idsect[1]=Id of orginating sub-centre (local table) 
-1278    - idsect[2]=GRIB Master Tables Version Number (Code 
-1279      U{Table 1.0 
-1280      <http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table1-0.shtml>}) 
-1281    - idsect[3]=GRIB Local Tables Version Number (Code 
-1282      U{Table 1.1 
-1283      <http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table1-1.shtml>}) 
-1284    - idsect[4]=Significance of Reference Time (Code 
-1285      U{Table 1.2 
-1286      <http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table1-2.shtml>}) 
-1287    - idsect[5]=Reference Time - Year (4 digits) 
-1288    - idsect[6]=Reference Time - Month 
-1289    - idsect[7]=Reference Time - Day 
-1290    - idsect[8]=Reference Time - Hour 
-1291    - idsect[9]=Reference Time - Minute 
-1292    - idsect[10]=Reference Time - Second 
-1293    - idsect[11]=Production status of data (Code 
-1294      U{Table 1.3 
-1295      <http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table1-3.shtml>}) 
-1296    - idsect[12]=Type of processed data (Code 
-1297      U{Table 
-1298      1.4<http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table1-4.shtml>}) 
-1299          """ 
-1300          self.msg,msglen=g2clib.grib2_create(np.array([discipline,2],np.int32),np.array(idsect,np.int32)) 
-
    1301   
-
    1302 -    def addgrid(self,gdsinfo,gdtmpl,deflist=None): 
-
    1303          """ 
-1304   Add a grid definition section (section 3) to the GRIB2 message. 
-1305   
-1306   @param gdsinfo: Sequence containing information needed for the grid definition section. 
-1307    - gdsinfo[0] = Source of grid definition (see Code 
-1308      U{Table 3.0 
-1309      <http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table3-0.shtml>}) 
-1310    - gdsinfo[1] = Number of grid points in the defined grid. 
-1311    - gdsinfo[2] = Number of octets needed for each additional grid points defn. 
-1312      Used to define number of points in each row for non-reg grids (=0 for 
-1313      regular grid). 
-1314    - gdsinfo[3] = Interp. of list for optional points defn (Code 
-1315      U{Table 3.11 
-1316      <http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table3-11.shtml>}) 
-1317    - gdsinfo[4] = Grid Definition Template Number (Code 
-1318      U{Table 3.1 
-1319      <http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table3-1.shtml>}) 
-1320   
-1321   @param gdtmpl: Contains the data values for the specified Grid Definition 
-1322   Template ( NN=gdsinfo[4] ).  Each element of this integer 
-1323   array contains an entry (in the order specified) of Grid 
-1324   Definition Template 3.NN 
-1325   
-1326   @param deflist: (Used if gdsinfo[2] != 0)  Sequence containing the 
-1327   number of grid points contained in each row (or column) 
-1328   of a non-regular grid. 
-1329          """ 
-1330          if deflist is not None: 
-1331              dflist = np.array(deflist,'i') 
-1332          else: 
-1333              dflist = None 
-1334          self.scanmodeflags = None 
-1335          gdtnum = gdsinfo[4] 
-1336          if gdtnum in [0,1,2,3,40,41,42,43,44,203,205,32768,32769]: 
-1337              self.scanmodeflags = _dec2bin(gdtmpl[18])[0:4] 
-1338          elif gdtnum == 10: # mercator 
-1339              self.scanmodeflags = _dec2bin(gdtmpl[15])[0:4] 
-1340          elif gdtnum == 20: # stereographic 
-1341              self.scanmodeflags = _dec2bin(gdtmpl[17])[0:4] 
-1342          elif gdtnum == 30: # lambert conformal 
+1267   The GRIB2 message is stored as a binary string in instance variable L{msg}. 
+1268   
+1269   L{addgrid}, L{addfield} and L{end} class methods must be called to complete 
+1270   the GRIB2 message. 
+1271   
+1272   @param discipline:  Discipline or GRIB Master Table Number (Code Table 0.0). 
+1273   (0 for meteorlogical, 1 for hydrological, 2 for land surface, 3 for space, 
+1274   10 for oceanographic products). 
+1275   
+1276   @param idsect:  Sequence containing identification section (section 1). 
+1277    - idsect[0]=Id of orginating centre (Common Code 
+1278      U{Table C-1<http://www.nws.noaa.gov/tg/GRIB_C1.htm>}) 
+1279    - idsect[1]=Id of orginating sub-centre (local table) 
+1280    - idsect[2]=GRIB Master Tables Version Number (Code 
+1281      U{Table 1.0 
+1282      <http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table1-0.shtml>}) 
+1283    - idsect[3]=GRIB Local Tables Version Number (Code 
+1284      U{Table 1.1 
+1285      <http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table1-1.shtml>}) 
+1286    - idsect[4]=Significance of Reference Time (Code 
+1287      U{Table 1.2 
+1288      <http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table1-2.shtml>}) 
+1289    - idsect[5]=Reference Time - Year (4 digits) 
+1290    - idsect[6]=Reference Time - Month 
+1291    - idsect[7]=Reference Time - Day 
+1292    - idsect[8]=Reference Time - Hour 
+1293    - idsect[9]=Reference Time - Minute 
+1294    - idsect[10]=Reference Time - Second 
+1295    - idsect[11]=Production status of data (Code 
+1296      U{Table 1.3 
+1297      <http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table1-3.shtml>}) 
+1298    - idsect[12]=Type of processed data (Code 
+1299      U{Table 
+1300      1.4<http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table1-4.shtml>}) 
+1301          """ 
+1302          self.msg,msglen=g2clib.grib2_create(np.array([discipline,2],np.int32),np.array(idsect,np.int32)) 
+
    1303   
+
    1304 -    def addgrid(self,gdsinfo,gdtmpl,deflist=None): 
+
    1305          """ 
+1306   Add a grid definition section (section 3) to the GRIB2 message. 
+1307   
+1308   @param gdsinfo: Sequence containing information needed for the grid definition section. 
+1309    - gdsinfo[0] = Source of grid definition (see Code 
+1310      U{Table 3.0 
+1311      <http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table3-0.shtml>}) 
+1312    - gdsinfo[1] = Number of grid points in the defined grid. 
+1313    - gdsinfo[2] = Number of octets needed for each additional grid points defn. 
+1314      Used to define number of points in each row for non-reg grids (=0 for 
+1315      regular grid). 
+1316    - gdsinfo[3] = Interp. of list for optional points defn (Code 
+1317      U{Table 3.11 
+1318      <http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table3-11.shtml>}) 
+1319    - gdsinfo[4] = Grid Definition Template Number (Code 
+1320      U{Table 3.1 
+1321      <http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table3-1.shtml>}) 
+1322   
+1323   @param gdtmpl: Contains the data values for the specified Grid Definition 
+1324   Template ( NN=gdsinfo[4] ).  Each element of this integer 
+1325   array contains an entry (in the order specified) of Grid 
+1326   Definition Template 3.NN 
+1327   
+1328   @param deflist: (Used if gdsinfo[2] != 0)  Sequence containing the 
+1329   number of grid points contained in each row (or column) 
+1330   of a non-regular grid. 
+1331          """ 
+1332          if deflist is not None: 
+1333              dflist = np.array(deflist,'i') 
+1334          else: 
+1335              dflist = None 
+1336          self.scanmodeflags = None 
+1337          gdtnum = gdsinfo[4] 
+1338          if gdtnum in [0,1,2,3,40,41,42,43,44,203,205,32768,32769]: 
+1339              self.scanmodeflags = _dec2bin(gdtmpl[18])[0:4] 
+1340          elif gdtnum == 10: # mercator 
+1341              self.scanmodeflags = _dec2bin(gdtmpl[15])[0:4] 
+1342          elif gdtnum == 20: # stereographic 
 1343              self.scanmodeflags = _dec2bin(gdtmpl[17])[0:4] 
-1344          elif gdtnum == 31: # albers equal area. 
+1344          elif gdtnum == 30: # lambert conformal 
 1345              self.scanmodeflags = _dec2bin(gdtmpl[17])[0:4] 
-1346          elif gdtnum == 90: # near-sided vertical perspective satellite projection 
-1347              self.scanmodeflags = _dec2bin(gdtmpl[16])[0:4] 
-1348          elif gdtnum == 110: # azimuthal equidistant. 
-1349              self.scanmodeflags = _dec2bin(gdtmpl[15])[0:4] 
-1350          elif gdtnum == 120: 
-1351              self.scanmodeflags = _dec2bin(gdtmpl[6])[0:4] 
-1352          elif gdtnum == 204: # curvilinear orthogonal 
-1353              self.scanmodeflags = _dec2bin(gdtmpl[18])[0:4] 
-1354          elif gdtnum in [1000,1100]: 
-1355              self.scanmodeflags = _dec2bin(gdtmpl[12])[0:4] 
-1356          self.msg,msglen=g2clib.grib2_addgrid(self.msg,np.array(gdsinfo,'i'),np.array(gdtmpl,'i'),dflist) 
-
    1357   
-
    1358 -    def addfield(self,pdtnum,pdtmpl,drtnum,drtmpl,field,coordlist=None): 
-
    1359          """ 
-1360   Add a product definition section, data representation section, 
-1361   bitmap section and data section to the GRIB2 message (sections 4-7). 
-1362   Must be called after grid definition section is created with L{addgrid}. 
-1363   
-1364   @param pdtnum: Product Definition Template Number (see Code U{Table 
-1365   4.0<http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table4-0.shtml>}) 
-1366   
-1367   @param pdtmpl: Sequence with the data values for the specified Product Definition 
-1368   Template (N=pdtnum).  Each element of this integer 
-1369   array contains an entry (in the order specified) of Product 
-1370   Definition Template 4.N 
-1371   
-1372   @param drtnum: Data Representation Template Number (see Code 
-1373   U{Table 5.0 
-1374   <http://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_table5-0.shtml>}) 
-1375   
-1376   @param drtmpl: Sequence with the data values for the specified Data Representation 
-1377   Template (N=drtnum).  Each element of this integer 
-1378   array contains an entry (in the order specified) of Data 
-1379   Representation Template 5.N 
-1380   Note that some values in this template (eg. reference 
-1381   values, number of bits, etc...) may be changed by the 
-1382   data packing algorithms. 
-1383   Use this to specify scaling factors and order of 
-1384   spatial differencing, if desired. 
-1385   
-1386   @param field:  numpy array of data points to pack. 
-1387   If field is a masked array, then a bitmap is created from 
-1388   the mask. 
-1389   
-1390   @param coordlist: Sequence containing floating point values intended to document 
-1391   the vertical discretization with model data 
-1392   on hybrid coordinate vertical levels. Default None. 
-1393          """ 
-1394          if not hasattr(self,'scanmodeflags'): 
-1395              raise ValueError('addgrid must be called before addfield') 
-1396          # reorder array to be consistent with 
-1397          # specified scan order. 
-1398          if self.scanmodeflags is not None: 
-1399              #if self.scanmodeflags[0]: 
-1400              ## rows scan in the -x direction (so flip) 
-1401              #    fieldsave = field.astype('f') # casting makes a copy 
-1402              #    field[:,:] = fieldsave[:,::-1] 
-1403              ## columns scan in the -y direction (so flip) 
-1404              #if not self.scanmodeflags[1]: 
-1405              #    fieldsave = field.astype('f') # casting makes a copy 
-1406              #    field[:,:] = fieldsave[::-1,:] 
-1407              # adjacent rows scan in opposite direction. 
-1408              # (flip every other row) 
-1409              if self.scanmodeflags[3]: 
-1410                  fieldsave = field.astype('f') # casting makes a copy 
-1411                  field[1::2,:] = fieldsave[1::2,::-1] 
-1412          fld = field.astype('f') 
-1413          if ma.isMA(field): 
-1414              bmap = 1 - np.ravel(field.mask.astype('i')) 
-1415              bitmapflag  = 0 
-1416          else: 
-1417              bitmapflag = 255 
-1418              bmap = None 
-1419          if coordlist is not None: 
-1420              crdlist = np.array(coordlist,'f') 
-1421          else: 
-1422              crdlist = None 
-1423          self.msg,msglen=g2clib.grib2_addfield(self.msg,pdtnum,np.array(pdtmpl,'i'),crdlist,drtnum,np.array(drtmpl,'i'),np.ravel(fld),bitmapflag,bmap) 
-
    1424   
-
    1425 -    def end(self): 
-
    1426          """ 
-1427   Add an end section (section 8) to the GRIB2 message. 
-1428   A GRIB2 message is not complete without an end section. 
-1429   Once an end section is added, the GRIB2 message can be 
-1430   output to a file. 
-1431          """ 
-1432          self.msg,msglen=g2clib.grib2_end(self.msg) 
-
    1433