Changeset 23716 for issm/trunk-jpl/src/m/contrib/morlighem/bamg/YamsCall.py

Timestamp:

02/12/19 06:10:51 (6 years ago)

Author:

bdef

Message:

CHG: shifting to py3 version of python interface (py2 compatible)

File:

• issm/trunk-jpl/src/m/contrib/morlighem/bamg/YamsCall.py (modified) (5 diffs)

issm/trunk-jpl/src/m/contrib/morlighem/bamg/YamsCall.py

@@ -29 +29 @@
         #Compute Hessian
         t1=time.time()
-        print "%s" % '      computing Hessian...'
+        print(("%s" % '      computing Hessian...'))
         hessian=ComputeHessian(md.mesh.elements,md.mesh.x,md.mesh.y,field,'node')
         t2=time.time()
-        print "%s%d%s\n" % (' done (',t2-t1,' seconds)')
+        print(("%s%d%s\n" % (' done (',t2-t1,' seconds)')))
 
         #Compute metric
         t1=time.time()
-        print "%s" % '      computing metric...'
+        print(("%s" % '      computing metric...'))
         metric=ComputeMetric(hessian,scale,epsilon,hmin,hmax,np.empty(0,int))
         t2=time.time()
-        print "%s%d%s\n" % (' done (',t2-t1,' seconds)')
+        print(("%s%d%s\n" % (' done (',t2-t1,' seconds)')))
 
         #write files
         t1=time.time()
-        print "%s" % '      writing initial mesh files...'
+        print(("%s" % '      writing initial mesh files...'))
         np.savetxt('carre0.met',metric)
 
@@ -56 +56 @@
         #Vertices
         f.write("\n%s\n%i\n\n" % ('Vertices',md.mesh.numberofvertices))
-        for i in xrange(0,md.mesh.numberofvertices):
+        for i in range(0,md.mesh.numberofvertices):
                 f.write("%8g %8g %i\n" % (md.mesh.x[i],md.mesh.y[i],0))
 
         #Triangles
         f.write("\n\n%s\n%i\n\n" % ('Triangles',md.mesh.numberofelements))
-        for i in xrange(0,md.mesh.numberofelements):
+        for i in range(0,md.mesh.numberofelements):
                 f.write("%i %i %i %i\n" % (md.mesh.elements[i,0],md.mesh.elements[i,1],md.mesh.elements[i,2],0))
         numberofelements1=md.mesh.numberofelements
@@ -80 +80 @@
         f.close()
         t2=time.time()
-        print "%s%d%s\n" % (' done (',t2-t1,' seconds)')
+        print(("%s%d%s\n" % (' done (',t2-t1,' seconds)')))
 
         #call yams
-        print "%s\n" % '      call Yams...'
+        print(("%s\n" % '      call Yams...'))
         if   m.ispc():
                 #windows
@@ -96 +96 @@
         #plug new mesh
         t1=time.time()
-        print "\n%s" % '      reading final mesh files...'
+        print(("\n%s" % '      reading final mesh files...'))
         Tria=np.loadtxt('carre1.tria',int)
         Coor=np.loadtxt('carre1.coor',float)
@@ -107 +107 @@
         numberofelements2=md.mesh.numberofelements
         t2=time.time()
-        print "%s%d%s\n\n" % (' done (',t2-t1,' seconds)')
+        print(("%s%d%s\n\n" % (' done (',t2-t1,' seconds)')))
 
         #display number of elements
-        print "\n%s %i" % ('      inital number of elements:',numberofelements1)
-        print "\n%s %i\n\n" % ('      new    number of elements:',numberofelements2)
+        print(("\n%s %i" % ('      inital number of elements:',numberofelements1)))
+        print(("\n%s %i\n\n" % ('      new    number of elements:',numberofelements2)))
 
         #clean up: