Python Module improvements

- cellIntervalToSlice more flexible

python/waLBerla/core_extension.py

@@ -58,13 +58,16 @@ def sliceToCellInterval( s ):
     
 
 def cellIntervalToSlice(cellInterval, collapseExtentOne=True):
+    if not hasattr(collapseExtentOne, '__len__'):
+        collapseExtentOne = (collapseExtentOne, collapseExtentOne, collapseExtentOne)
+
     slices = []
-    for i in range(3):
-        if collapseExtentOne and cellInterval.min[i] == cellInterval.max[i]:
+    for i, collapseInfo in enumerate(collapseExtentOne):
+        if collapseInfo and cellInterval.min[i] == cellInterval.max[i]:
             slices.append( cellInterval.min[i] )
         else:
             slices.append( slice(cellInterval.min[i], cellInterval.max[i]+1,None ) )
-    return slices
+    return tuple(slices)
 
 
 

python/waLBerla/cuda_extension.py

@@ -10,6 +10,9 @@ def toGpuArray(f, withGhostLayers=True):
     dtype = np.dtype(f.dtypeStr)
     strides = [dtype.itemsize*a for a in f.strides]
     res = GPUArray(f.sizeWithGhostLayers, dtype, gpudata=f.ptr, strides=strides)
+    if withGhostLayers is True:
+        return res
+
     ghostLayers = normalizeGhostlayerInfo(f, withGhostLayers)
     glCutoff = [ f.nrOfGhostLayers - gl for gl in ghostLayers ]
     res = res[ glCutoff[0]:-glCutoff[0] if glCutoff[0] > 0 else None,

src/blockforest/python/Exports.cpp

@@ -87,7 +87,7 @@ object python_createUniformBlockGrid(tuple args, dict kw)
            *it != "dx" &&
            *it != "oneBlockPerProcess"  )
       {
-         PyErr_SetString( PyExc_ValueError, (std::string("Unknown Parameter") + (*it) ).c_str() );
+         PyErr_SetString( PyExc_ValueError, (std::string("Unknown Parameter: ") + (*it) ).c_str() );
          throw boost::python::error_already_set();
       }
    }