Changeset 13455

Timestamp:

09/26/12 17:02:08 (12 years ago)

Author:

mikep

Message:

t cases 201, 3001..3010. Conversion of SquareShelf.par to .py. Creation of matlab script -> python script conversion tool {/scripts/mToPy.py}. Modification of modules/python/Makefile.am to support use of ContourToMesh[cpp]. Utilization of deep copy when marshaling flowequation data. Add support of ice-front-file specification [as param] to SetIceShelfBC.

Location:

issm/trunk-jpl

Files:

• scripts/mToPy.py (added)
• scripts/translateToPy.py (added)
• src/m/boundaryconditions/SetIceShelfBC.py (modified) (2 diffs)
• src/m/classes/flowequation.py (modified) (5 diffs)
• src/modules/python/Makefile.am (modified) (2 diffs)
• test/NightlyRun/test201.py (added)
• test/NightlyRun/test3001.py (added)
• test/NightlyRun/test3002.py (added)
• test/NightlyRun/test3003.py (added)
• test/NightlyRun/test3004.py (added)
• test/NightlyRun/test3005.py (added)
• test/NightlyRun/test3006.py (added)
• test/NightlyRun/test3007.py (added)
• test/NightlyRun/test3008.py (added)
• test/NightlyRun/test3009.py (added)
• test/NightlyRun/test3010.py (added)
• test/Par/SquareShelf.py (added)

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

@@ -1 +1 @@
 import os
 import numpy
+from ContourToMesh import ContourToMesh
 
 def SetIceShelfBC(md,icefrontfile=''):
@@ -24 +25 @@
                 if not os.path.exists(icefrontfile):
                         raise IOError("SetIceShelfBC error message: ice front file '%s' not found." % icefrontfile)
-                nodeinsideicefront=ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,icefrontfile,'node',2)
-                nodeonicefront=double(md.mesh.vertexonboundary and nodeinsideicefront)
+                nodeinsideicefront=ContourToMesh((md.mesh.elements).reshape(-1,1),(md.mesh.x).reshape(-1,1),(md.mesh.y).reshape(-1,1),icefrontfile,'node',2)
+                nodeonicefront= numpy.bitwise_and( map(int,md.mesh.vertexonboundary), map(int,nodeinsideicefront[0].ravel()) )
         else:
                 nodeonicefront=numpy.zeros(md.mesh.numberofvertices)

issm/trunk-jpl/src/m/classes/flowequation.py ¶

@@ -1 +1 @@
 #module imports
+import copy
 import numpy
 from fielddisplay import fielddisplay
@@ -81 +82 @@
 
         def marshall(self,fid):    # {{{
+                #print "marshalling flowequation-1"
+                #print self.vertex_equation
                 WriteData(fid,'object',self,'fieldname','ismacayealpattyn','format','Boolean')
                 WriteData(fid,'object',self,'fieldname','ishutter','format','Boolean')
@@ -89 +92 @@
                 WriteData(fid,'object',self,'fieldname','borderstokes','format','DoubleMat','mattype',1)
                 #convert approximations to enums
-                data=self.vertex_equation
+                ## data=list(self.vertex_equation)
+                data=copy.deepcopy(self.vertex_equation)
                 data[numpy.nonzero(data==0)]=NoneApproximationEnum()
                 data[numpy.nonzero(data==1)]=HutterApproximationEnum()
@@ -100 +104 @@
                 data[numpy.nonzero(data==8)]=L1L2ApproximationEnum()
                 WriteData(fid,'data',data,'enum',FlowequationVertexEquationEnum(),'format','DoubleMat','mattype',1)
-                data=self.element_equation
+                ########data=self.element_equation
+                data=copy.deepcopy(self.element_equation)
                 data[numpy.nonzero(data==0)]=NoneApproximationEnum()
                 data[numpy.nonzero(data==1)]=HutterApproximationEnum()
@@ -111 +116 @@
                 data[numpy.nonzero(data==8)]=L1L2ApproximationEnum()
                 WriteData(fid,'data',data,'enum',FlowequationElementEquationEnum(),'format','DoubleMat','mattype',2)
+                #print "marshalling flowequation-4"
+                #print self.vertex_equation
         # }}}
 

issm/trunk-jpl/src/modules/python/Makefile.am ¶

@@ -14 +14 @@
                                                 NodeConnectivity.la\
                                                 StringToEnum.la\
+                                                ContourToMesh.la\
                                                 TriMesh.la
 endif 
@@ -94 +95 @@
 StringToEnum_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
 
+ContourToMesh_la_SOURCES = ../ContourToMesh/ContourToMesh.cpp\
+                                                                  ../ContourToMesh/ContourToMesh.h
+ContourToMesh_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
+
 TriMesh_la_SOURCES = ../TriMesh/TriMesh.cpp\
                                                         ../TriMesh/TriMesh.h