Wed Nov 5 15:41:46 PST 2014

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

On branches: baagaard/add-missing-files-dist,baagaard/add-release-2.0.2,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/fix-dm-composition,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 cc342c0456ea2a854f51376caac37ab2727d2ff6
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Sun Jun 22 10:38:01 2014 -0700

    Cleanup of APREPRO lines.


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

cc342c0456ea2a854f51376caac37ab2727d2ff6
 examples/meshing/surface_nurbs/subduction/geometry.jou | 18 +++++++-----------
 .../surface_nurbs/subduction/interface_netsurf.py      | 16 ++++++++--------
 examples/meshing/surface_nurbs/subduction/mesh.jou     |  2 +-
 .../meshing/surface_nurbs/subduction/splay_skinsurf.py |  8 ++++----
 .../surface_nurbs/subduction/topobath_netsurf.py       | 16 ++++++++--------
 5 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/examples/meshing/surface_nurbs/subduction/geometry.jou b/examples/meshing/surface_nurbs/subduction/geometry.jou
index 49ad15b..708f753 100644
--- a/examples/meshing/surface_nurbs/subduction/geometry.jou
+++ b/examples/meshing/surface_nurbs/subduction/geometry.jou
@@ -26,7 +26,7 @@
 # ----------------------------------------------------------------------
 # Set units to SI.
 # ----------------------------------------------------------------------
-# {Units('si')}
+${Units('si')}
 #
 # ----------------------------------------------------------------------
 # Reset geometry.
@@ -37,17 +37,17 @@ reset
 # Create block
 # ----------------------------------------------------------------------
 # Block is 250 km x 500 km x 62 km
-#{blockLength=250.0*km}
-#{blockWidth=500.0*km}
-#{blockHeight=80.0*km}
+${blockLength=250.0*km}
+${blockWidth=500.0*km}
+${blockHeight=80.0*km}
 
 brick x {blockLength} y {blockWidth} z {blockHeight}
-#{idVol=Id("volume")}
+${idVol=Id("volume")}
 
 # Translate block so top can be chopped with topography and so faults
 # intersect upper surface rather than side.
-#{moveX=50.0*km}
-#{moveY=0.0*km}
+${moveX=50.0*km}
+${moveY=0.0*km}
 
 volume {idVol} move x {moveX} y {moveY} z {-0.5*blockHeight+10.0*km}
 
@@ -84,7 +84,3 @@ imprint all with volume all
 merge all
 
 # End of file
-
-
-
-
diff --git a/examples/meshing/surface_nurbs/subduction/interface_netsurf.py b/examples/meshing/surface_nurbs/subduction/interface_netsurf.py
index ebde6c2..8250b44 100644
--- a/examples/meshing/surface_nurbs/subduction/interface_netsurf.py
+++ b/examples/meshing/surface_nurbs/subduction/interface_netsurf.py
@@ -47,12 +47,12 @@ for iContour in range(numContours):
         j.write("create vertex x %10.2e y %10.2e z %10.2e\n" % \
                     (point[0], point[1], point[2]))
         if 0 == iPoint:
-            j.write("#{idBeg=Id('vertex')}\n")
-    j.write("#{idEnd=Id('vertex')}\n")
+            j.write("${idBeg=Id('vertex')}\n")
+    j.write("${idEnd=Id('vertex')}\n")
     j.write("create curve spline vertex {idBeg} to {idEnd} delete\n")
     if 0 == iContour:
-        j.write("#{idCBeg=Id('curve')}\n")
-j.write("#{idCEnd=Id('curve')}\n\n")
+        j.write("${idCBeg=Id('curve')}\n")
+j.write("${idCEnd=Id('curve')}\n\n")
 
 # Loop over profiles (v-lines).
 for iProfile in range(pointsPerContour):
@@ -62,12 +62,12 @@ for iProfile in range(pointsPerContour):
         j.write("create vertex x %10.2e y %10.2e z %10.2e\n" % \
                     (point[0], point[1], point[2]))
         if 0 == iPoint:
-            j.write("#{idBeg=Id('vertex')}\n")
-    j.write("#{idEnd=Id('vertex')}\n")
+            j.write("${idBeg=Id('vertex')}\n")
+    j.write("${idEnd=Id('vertex')}\n")
     j.write("create curve spline vertex {idBeg} to {idEnd} delete\n")
     if 0 == iProfile:
-        j.write("#{idPBeg=Id('curve')}\n")
-j.write("#{idPEnd=Id('curve')}\n\n")
+        j.write("${idPBeg=Id('curve')}\n")
+j.write("${idPEnd=Id('curve')}\n\n")
 
 # Create net surface.
 j.write("create surface net u curve {idCBeg} to {idCEnd} v curve {idPBeg} to {idPEnd}\n")
diff --git a/examples/meshing/surface_nurbs/subduction/mesh.jou b/examples/meshing/surface_nurbs/subduction/mesh.jou
index 9979e01..f1a7e4f 100644
--- a/examples/meshing/surface_nurbs/subduction/mesh.jou
+++ b/examples/meshing/surface_nurbs/subduction/mesh.jou
@@ -26,7 +26,7 @@ playback 'geometry.jou'
 # Create tet4 mesh at 6.0 km resolution.
 # ----------------------------------------------------------------------
 
-#{dx=6.0*km}
+${dx=6.0*km}
 volume all size {dx}
 volume all scheme tetmesh
 
diff --git a/examples/meshing/surface_nurbs/subduction/splay_skinsurf.py b/examples/meshing/surface_nurbs/subduction/splay_skinsurf.py
index 06055d2..40ba81f 100644
--- a/examples/meshing/surface_nurbs/subduction/splay_skinsurf.py
+++ b/examples/meshing/surface_nurbs/subduction/splay_skinsurf.py
@@ -47,12 +47,12 @@ for iProfile in range(numProfiles):
         j.write("create vertex x %10.2e y %10.2e z %10.2e\n" % \
                     (point[0], point[1], point[2]))
         if 0 == iPoint:
-            j.write("#{idBeg=Id('vertex')}\n")
-    j.write("#{idEnd=Id('vertex')}\n")
+            j.write("${idBeg=Id('vertex')}\n")
+    j.write("${idEnd=Id('vertex')}\n")
     j.write("create curve spline vertex {idBeg} to {idEnd} delete\n")
     if 0 == iProfile:
-        j.write("#{idCBeg=Id('curve')}\n")
-j.write("#{idCEnd=Id('curve')}\n\n")
+        j.write("${idCBeg=Id('curve')}\n")
+j.write("${idCEnd=Id('curve')}\n\n")
 
 # Create skin surface.
 j.write("create surface skin curve {idCBeg} to {idCEnd}\n")
diff --git a/examples/meshing/surface_nurbs/subduction/topobath_netsurf.py b/examples/meshing/surface_nurbs/subduction/topobath_netsurf.py
index 2bebc10..af939e7 100644
--- a/examples/meshing/surface_nurbs/subduction/topobath_netsurf.py
+++ b/examples/meshing/surface_nurbs/subduction/topobath_netsurf.py
@@ -46,12 +46,12 @@ for iProfile in range(numProfiles):
         j.write("create vertex x %10.2e y %10.2e z %10.2e\n" % \
                     (point[0], point[1], point[2]))
         if 0 == iPoint:
-            j.write("#{idBeg=Id('vertex')}\n")
-    j.write("#{idEnd=Id('vertex')}\n")
+            j.write("${idBeg=Id('vertex')}\n")
+    j.write("${idEnd=Id('vertex')}\n")
     j.write("create curve spline vertex {idBeg} to {idEnd} delete\n")
     if 0 == iProfile:
-        j.write("#{idPBeg=Id('curve')}\n")
-j.write("#{idPEnd=Id('curve')}\n\n")
+        j.write("${idPBeg=Id('curve')}\n")
+j.write("${idPEnd=Id('curve')}\n\n")
 
 # Loop over contours (v-lines).
 for iContour in range(pointsPerProfile):
@@ -61,12 +61,12 @@ for iContour in range(pointsPerProfile):
         j.write("create vertex x %10.2e y %10.2e z %10.2e\n" % \
                     (point[0], point[1], point[2]))
         if 0 == iPoint:
-            j.write("#{idBeg=Id('vertex')}\n")
-    j.write("#{idEnd=Id('vertex')}\n")
+            j.write("${idBeg=Id('vertex')}\n")
+    j.write("${idEnd=Id('vertex')}\n")
     j.write("create curve spline vertex {idBeg} to {idEnd} delete\n")
     if 0 == iContour:
-        j.write("#{idCBeg=Id('curve')}\n")
-j.write("#{idCEnd=Id('curve')}\n\n")
+        j.write("${idCBeg=Id('curve')}\n")
+j.write("${idCEnd=Id('curve')}\n\n")
 
 # Create net surface.
 j.write("create surface net u curve {idCBeg} to {idCEnd} v curve {idPBeg} to {idPEnd}\n")

