Changeset 14098

Timestamp:

12/05/12 09:34:29 (12 years ago)

Author:

jschierm

Message:

NEW: Allow Python vectors to be input to modules directly rather than reshaping to Mx1 matrices.

Location:

issm/trunk-jpl/src

Files:

• m/boundaryconditions/SetIceShelfBC.py (modified) (1 diff)
• m/boundaryconditions/SetMarineIceSheetBC.py (modified) (1 diff)
• m/geometry/FlagElements.py (modified) (1 diff)
• m/mesh/ComputeMetric.m (modified) (1 diff)
• m/mesh/ComputeMetric.py (modified) (1 diff)
• m/mesh/bamg.py (modified) (2 diffs)
• m/mesh/rifts/meshprocessoutsiderifts.py (modified) (1 diff)
• m/mesh/rifts/meshprocessrifts.py (modified) (1 diff)
• wrappers/python/io/FetchPythonData.cpp (modified) (4 diffs)

issm/trunk-jpl/src/m/boundaryconditions/SetIceShelfBC.py

@@ -25 +25 @@
                 if not os.path.exists(icefrontfile):
                         raise IOError("SetIceShelfBC error message: ice front file '%s' not found." % icefrontfile)
-                [nodeinsideicefront,dum]=ContourToMesh(md.mesh.elements,md.mesh.x.reshape(-1,1),md.mesh.y.reshape(-1,1),icefrontfile,'node',2)
+                [nodeinsideicefront,dum]=ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,icefrontfile,'node',2)
                 nodeonicefront=numpy.logical_and(md.mesh.vertexonboundary,nodeinsideicefront.reshape(-1))
         else:

issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.py

@@ -27 +27 @@
                 if not os.path.exists(icefrontfile):
                         raise IOError("SetMarineIceSheetBC error message: ice front file '%s' not found." % icefrontfile)
-                [nodeinsideicefront,dum]=ContourToMesh(md.mesh.elements,md.mesh.x.reshape(-1,1),md.mesh.y.reshape(-1,1),icefrontfile,'node',2)
+                [nodeinsideicefront,dum]=ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,icefrontfile,'node',2)
                 vertexonicefront=numpy.logical_and(md.mesh.vertexonboundary,nodeinsideicefront.reshape(-1))
         else:

issm/trunk-jpl/src/m/geometry/FlagElements.py

@@ -47 +47 @@
                         else:
                                 #ok, flag elements
-                                [flag,dum]=ContourToMesh(md.mesh.elements[:,0:3].copy(),md.mesh.x.reshape(-1,1),md.mesh.y.reshape(-1,1),region,'element',1)
+                                [flag,dum]=ContourToMesh(md.mesh.elements[:,0:3].copy(),md.mesh.x,md.mesh.y,region,'element',1)
                                 flag=flag.astype(bool)
 

issm/trunk-jpl/src/m/mesh/ComputeMetric.m

@@ -13 +13 @@
 lambda1=0.5*((a+d)+sqrt(4.*b.^2+(a-d).^2));
 lambda2=0.5*((a+d)-sqrt(4.*b.^2+(a-d).^2));
-pos1=find(lambda1==0);
-pos2=find(lambda2==0);
-pos3=find(b==0 & lambda1==lambda2);
+pos1=find(lambda1==0.);
+pos2=find(lambda2==0.);
+pos3=find(b==0. & lambda1==lambda2);
 
 %Modify the eigen values to control the shape of the elements

issm/trunk-jpl/src/m/mesh/ComputeMetric.py

@@ -19 +19 @@
         lambda1=0.5*((a+d)+numpy.sqrt(4.*b**2+(a-d)**2))
         lambda2=0.5*((a+d)-numpy.sqrt(4.*b**2+(a-d)**2))
-        pos1=numpy.nonzero(lambda1==0)[0]
-        pos2=numpy.nonzero(lambda2==0)[0]
-        pos3=numpy.nonzero(numpy.logical_and(b==0,lambda1==lambda2))[0]
+        pos1=numpy.nonzero(lambda1==0.)[0]
+        pos2=numpy.nonzero(lambda2==0.)[0]
+        pos3=numpy.nonzero(numpy.logical_and(b==0.,lambda1==lambda2))[0]
 
         #Modify the eigen values to control the shape of the elements

issm/trunk-jpl/src/m/mesh/bamg.py

@@ -92 +92 @@
                         #Checks that all holes are INSIDE the principle domain outline
                         if i:
-                                flags=ContourToNodes(domaini['x'].reshape(-1,1),domaini['y'].reshape(-1,1),domainfile,0)
+                                flags=ContourToNodes(domaini['x'],domaini['y'],domainfile,0)
                                 if numpy.any(numpy.logical_not(flags)):
                                         raise RuntimeError("bamg error message: All holes should be strictly inside the principal domain")
@@ -118 +118 @@
 
                                 #detect whether all points of the rift are inside the domain
-                                flags=ContourToNodes(rifti['x'].reshape(-1,1),rifti['y'].reshape(-1,1),domain[0],0)
+                                flags=ContourToNodes(rifti['x'],rifti['y'],domain[0],0)
                                 if numpy.all(numpy.logical_not(flags)):
                                         raise RuntimeError("one rift has all its points outside of the domain outline")

issm/trunk-jpl/src/m/mesh/rifts/meshprocessoutsiderifts.py

@@ -16 +16 @@
         
                 #first, flag nodes that belong to the domain outline
-                flags=ContourToMesh(md.mesh.elements,md.mesh.x.reshape(-1,1),md.mesh.y.reshape(-1,1),domainoutline,'node',0)
+                flags=ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,domainoutline,'node',0)
 
                 tips=rift.tips

issm/trunk-jpl/src/m/mesh/rifts/meshprocessrifts.py

@@ -49 +49 @@
 
         #In case we have rifts that open up the domain outline, we need to open them: 
-        [flags,dum]=ContourToMesh(md.mesh.elements,md.mesh.x.reshape(-1,1),md.mesh.y.reshape(-1,1),domainoutline,'node',0)
+        [flags,dum]=ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,domainoutline,'node',0)
         found=0
         for rift in md.rifts.riftstruct:

issm/trunk-jpl/src/wrappers/python/io/FetchPythonData.cpp

@@ -108 +108 @@
                 /*retrieve dimensions: */
                 ndim=PyArray_NDIM((const PyArrayObject*)py_matrix);
-                if(ndim!=2)_error_("expecting an MxN matrix in input!");
-                dims=PyArray_DIMS((PyArrayObject*)py_matrix);
-                M=dims[0]; N=dims[1];
+                if      (ndim==2) {
+                        dims=PyArray_DIMS((PyArrayObject*)py_matrix);
+                        M=dims[0]; N=dims[1];
+                }
+                else if (ndim==1) {
+                        dims=PyArray_DIMS((PyArrayObject*)py_matrix);
+                        M=dims[0]; N=1;
+                }
+                else
+                        _error_("expecting an MxN matrix or M vector in input!");
 
                 if (M && N) {
@@ -141 +148 @@
 
                         else
-                                _error_("unrecognized pyarray type in input!");
+                                _error_("unrecognized float pyarray type in input!");
                 }
                 else
@@ -178 +185 @@
                 /*retrieve dimensions: */
                 ndim=PyArray_NDIM((const PyArrayObject*)py_matrix);
-                if(ndim!=2)_error_("expecting an MxN matrix in input!");
-                dims=PyArray_DIMS((PyArrayObject*)py_matrix);
-                M=dims[0]; N=dims[1];
+                if      (ndim==2) {
+                        dims=PyArray_DIMS((PyArrayObject*)py_matrix);
+                        M=dims[0]; N=dims[1];
+                }
+                else if (ndim==1) {
+                        dims=PyArray_DIMS((PyArrayObject*)py_matrix);
+                        M=dims[0]; N=1;
+                }
+                else
+                        _error_("expecting an MxN matrix or M vector in input!");
 
                 if (M && N) {
@@ -211 +225 @@
 
                         else
-                                _error_("unrecognized pyarray type in input!");
+                                _error_("unrecognized long pyarray type in input!");
                 }
                 else