Merge pull request #488 from ketch/dim_syntax

Update I/O routines to reflect new Dimension initialization syntax.
clawpack · Dec 30, 2014 · e20a787 · e20a787
2 parents 41650ba + 89ecc09
commit e20a787
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/src/petclaw/io/petsc.py b/src/petclaw/io/petsc.py
@@ -176,7 +176,7 @@ def read(solution,frame,path='./',file_prefix='claw',read_aux=False,options={}):
         dimensions = []
         for i in xrange(num_dim):
             dimensions.append(
-                petclaw.Dimension(names[i],lower[i],lower[i] + n[i]*d[i],n[i]))
+                petclaw.Dimension(lower[i],lower[i] + n[i]*d[i],n[i],name=names[i]))
         patch = petclaw.Patch(dimensions)
         patch.level = level 
         state = petclaw.State(patch,num_eqn,num_aux)

diff --git a/src/pyclaw/io/ascii.py b/src/pyclaw/io/ascii.py
@@ -225,7 +225,8 @@ def read(solution,frame,path='./',file_prefix='fort',read_aux=False,
         names = ['x','y','z']
         import clawpack.pyclaw as pyclaw
         Dim = pyclaw.Dimension
-        dimensions = [Dim(names[i],lower[i],lower[i] + n[i]*d[i],n[i]) for i in xrange(num_dim)]
+        dimensions = [Dim(lower[i],lower[i] + n[i]*d[i],n[i],name=names[i]) \
+                for i in xrange(num_dim)]
         patch = pyclaw.geometry.Patch(dimensions)
         state= pyclaw.state.State(patch,num_eqn,num_aux)
         state.t = t

diff --git a/src/pyclaw/io/binary.py b/src/pyclaw/io/binary.py
@@ -97,7 +97,7 @@ def read(solution,frame,path='./',file_prefix='fort',read_aux=False,
         dimensions = []
         for i in xrange(num_dim):
             dimensions.append(
-                pyclaw.geometry.Dimension(names[i],lower[i],lower[i] + n[i]*d[i],n[i]))
+                pyclaw.geometry.Dimension(lower[i],lower[i] + n[i]*d[i],n[i]),name=names[i])
         patch = pyclaw.geometry.Patch(dimensions)
         state= pyclaw.state.State(patch,num_eqn,num_aux)
         state.t = t

diff --git a/src/pyclaw/io/hdf5.py b/src/pyclaw/io/hdf5.py
@@ -210,10 +210,11 @@ def read(solution,frame,path='./',file_prefix='claw',read_aux=True,
             dim_names = patch.attrs['dimensions']
             for dim_name in dim_names:
                 # Create dimension
-                dim = pyclaw.solution.Dimension(dim_name,
+                dim = pyclaw.solution.Dimension(
                                     patch.attrs["%s.lower" % dim_name],
                                     patch.attrs["%s.upper" % dim_name],
-                                    patch.attrs["%s.num_cells" % dim_name])                    
+                                    patch.attrs["%s.num_cells" % dim_name],
+                                    name = dim_name)
                 # Optional attributes
                 for attr in ['bc_lower','bc_upper','units']:
                     attr_name = "%s.%s" % (dim_name,attr)

diff --git a/src/pyclaw/io/netcdf.py b/src/pyclaw/io/netcdf.py
@@ -280,10 +280,11 @@ def read(solution,frame,path='./',file_prefix='claw',read_aux=True,
             # Read in dimension attribute to keep dimension order
             dim_names = getattr(subgroup,'dim_names')
             for dim_name in dim_names:
-                dim = pyclaw.solution.Dimension(dim_name, 
+                dim = pyclaw.solution.Dimension(
                                       getattr(subgroup,'%s.lower' % dim_name),
                                       getattr(subgroup,'%s.upper' % dim_name),
-                                      getattr(subgroup,'%s.n' % dim_name))
+                                      getattr(subgroup,'%s.n' % dim_name),
+                                      name = dim_name)
                  # Optional attributes
                 for attr in ['bc_lower','bc_upper','units']:
                     attr_name = "%s.%s" % (dim_name,attr)