Wed Nov 5 15:42:46 PST 2014

Repository : https://github.com/geodynamics/pylith

On branches: baagaard/add-release-2.0.3,baagaard/add-release-2.1.0,baagaard/dynrup-new-lagrange,baagaard/feature-output-station-names,baagaard/feature-progress-monitor,baagaard/fix-custom-faultpc,baagaard/fix-error-messages,baagaard/fix-faults-intersect,baagaard/fix-friction-initial-state,baagaard/fix-meshing-examples-trelis,baagaard/update-autoconf,knepley/feature-petsc-fe,knepley/upgrade-petsc-3.5,knepley/upgrade-petsc-master,maint,master,next,willic3/fix-plasticity
Link       : https://github.com/geodynamics/pylith/compare/f33c75b19fd60eedb2a3405db76a1fee333bb1d7...5b6d812b1612809fea3bd331c4e5af98c25a536a

>---------------------------------------------------------------

commit d58a6b5e14ef107f5888dc19fe109023c443c898
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Tue Jun 24 14:55:51 2014 -0700

    Updated spline creation for compatibility with Trelis.


>---------------------------------------------------------------

d58a6b5e14ef107f5888dc19fe109023c443c898
 examples/meshing/surface_nurbs/dem/dem2lines.py | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/examples/meshing/surface_nurbs/dem/dem2lines.py b/examples/meshing/surface_nurbs/dem/dem2lines.py
index 60171aa..13f62c8 100644
--- a/examples/meshing/surface_nurbs/dem/dem2lines.py
+++ b/examples/meshing/surface_nurbs/dem/dem2lines.py
@@ -367,9 +367,14 @@ class Dem2Lines(Application):
       masterString = masterPref + outputFileName + "'" + newLine
       um.write(masterString)
       u = open(outputFileName, 'w')
-      u.write('create curve spline')
       for column in range(self.numXOut):
-        u.write(fmt % (self.xOut[column], y, self.zOut[row, column]))
+        point = (self.xOut[column], y, self.zOut[row, column])
+        u.write("create vertex x %10.5e y %10.5e z %10.5e\n" % \
+                    (point[0], point[1], point[2]))
+        if 0 == column:
+            u.write("${idBeg=Id('vertex')}\n")
+      u.write("${idEnd=Id('vertex')}\n")
+      u.write("create curve spline vertex {idBeg} to {idEnd} delete\n")
 
       u.close()
 
@@ -385,10 +390,14 @@ class Dem2Lines(Application):
       masterString = masterPref + outputFileName + "'" + newLine
       vm.write(masterString)
       v = open(outputFileName, 'w')
-      v.write('create curve spline')
       for row in range(self.numYOut):
-        v.write(fmt % (x, self.yOut[row], self.zOut[row, column]))
-
+        point = (x, self.yOut[row], self.zOut[row, column])
+        v.write("create vertex x %10.5e y %10.5e z %10.5e\n" % \
+                    (point[0], point[1], point[2]))
+        if 0 == row:
+            v.write("${idBeg=Id('vertex')}\n")
+      v.write("${idEnd=Id('vertex')}\n")
+      v.write("create curve spline vertex {idBeg} to {idEnd} delete\n")
       v.close()
 
     vm.close()

