Wed Nov 5 15:41:42 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 70cf4b4dc873491035c0af1663fe74ce8b7a23a5
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Sun Jun 22 10:30:54 2014 -0700

    Cleanup of APREPRO lines.


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

70cf4b4dc873491035c0af1663fe74ce8b7a23a5
 examples/2d/subduction/geometry.jou  | 24 ++++++++++++------------
 examples/2d/subduction/mesh_tri3.jou |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/examples/2d/subduction/geometry.jou b/examples/2d/subduction/geometry.jou
index 89d5e50..b86d74b 100644
--- a/examples/2d/subduction/geometry.jou
+++ b/examples/2d/subduction/geometry.jou
@@ -40,7 +40,7 @@
 # ----------------------------------------------------------------------
 # Set units to SI.
 # ----------------------------------------------------------------------
-# {Units('si')}
+${Units('si')}
 #
 # ----------------------------------------------------------------------
 # Reset geometry.
@@ -62,7 +62,7 @@ undo off
 # to select multiple vertices.
 #
 create vertex x { -600.0*km} y {-2000.0*m}
-#{idPtTopoW=Id("vertex")}
+${idPtTopoW=Id("vertex")}
 create vertex x { -439.1*km} y { -300.0*m}
 create vertex x { -351.2*km} y { -800.0*m}
 create vertex x { -263.4*km} y {    0.0*m}
@@ -71,12 +71,12 @@ create vertex x {  -87.7*km} y {    0.0*m}
 create vertex x {    0.0*km} y { -400.0*m}
 create vertex x {   87.7*km} y {-3000.0*m}
 create vertex x {  165.6*km} y {-6000.0*m}
-#{idPtTrench=Id("vertex")}
+${idPtTrench=Id("vertex")}
 create vertex x {  263.4*km} y {-5400.0*m}
 create vertex x {  351.2*km} y {-5400.0*m}
 create vertex x {  439.1*km} y {-5400.0*m}
 create vertex x {  600.0*km} y {-5700.0*m}
-#{idPtTopoE=Id("vertex")}
+${idPtTopoE=Id("vertex")}
 
 create curve spline vertex {idPtTopoW} to {idPtTopoE}
 curve {Id("curve")} name "topobathy"
@@ -85,7 +85,7 @@ curve {Id("curve")} name "topobathy"
 # Hayes and Wald, 2009
 # http://earthquake.usgs.gov/research/data/slab
 create vertex x { -600.0*km} y {-340.00*km}
-#{idPtSlabBot=Id("vertex")}
+${idPtSlabBot=Id("vertex")}
 create vertex x { -422.4*km} y {-240.00*km}
 create vertex x { -331.0*km} y {-180.00*km}
 create vertex x { -261.6*km} y {-140.00*km}
@@ -93,12 +93,12 @@ create vertex x { -223.9*km} y {-120.00*km}
 create vertex x { -182.6*km} y {-100.00*km}
 create vertex x { -134.3*km} y {-80.00*km}
 create vertex x {  -74.6*km} y {-60.00*km}
-#{idPtSlabMoho=Id("vertex")}
+${idPtSlabMoho=Id("vertex")}
 create vertex x {   -7.9*km} y {-40.00*km}
-#{idPtSlabTopMoho=Id("vertex")}
+${idPtSlabTopMoho=Id("vertex")}
 create vertex x {   71.1*km} y {-20.00*km}
 create vertex x {  160.5*km} y {-7.50*km}
-#{idPtSlabTop=Id("vertex")}
+${idPtSlabTop=Id("vertex")}
 
 create curve spline vertex {idPtSlabBot} to {idPtSlabTop} {idPtTrench}
 curve {Id("curve")} name "slabtop"
@@ -108,24 +108,24 @@ curve {Id("curve")} name "slabtop"
 # Better approach would be to move points normal to slab to preserve
 # uniform thickness.
 vertex {idPtSlabBot} to {idPtSlabMoho} copy move X {120.0*km}
-#{idPtSlabBotW=idPtSlabTop+1}
+${idPtSlabBotW=idPtSlabTop+1}
 create vertex x {  175.6*km} y {-40.0*km}
 create vertex x {  600.0*km} y {-40.0*km}
-#{idPtMohoE=Id("vertex")}
+${idPtMohoE=Id("vertex")}
 
 create curve spline vertex {idPtSlabBotW} to {idPtMohoE}
 curve {Id("curve")} name "slabbot"
 
 # Top of mantle (uniform depth of 40 km)
 create vertex x { -600.0*km} y {-40.00*km}
-#{idPtMohoW=Id("vertex")}
+${idPtMohoW=Id("vertex")}
 
 create curve spline vertex {idPtMohoW} {idPtSlabTopMoho}
 curve {Id("curve")} name "conmoho"
 
 # Lateral edges and bottom boundary
 create vertex x { 600.0*km} y {-340.00*km}
-#{idPtBotE=Id("vertex")}
+${idPtBotE=Id("vertex")}
 
 create curve spline vertex {idPtTopoW} {idPtMohoW} {idPtSlabBot}
 curve {Id("curve")} name "edgewest"
diff --git a/examples/2d/subduction/mesh_tri3.jou b/examples/2d/subduction/mesh_tri3.jou
index 424ddde..eacf9e7 100644
--- a/examples/2d/subduction/mesh_tri3.jou
+++ b/examples/2d/subduction/mesh_tri3.jou
@@ -30,10 +30,10 @@ curve all scheme default
 surface all sizing function none
 
 # Discretization size on fault (finest resolution)
-#{dx=8.0*km}
+${dx=8.0*km}
 # Bias factor corresponding to geometric rate at which discretization size will
 # increase away from fault.
-#{bias_factor=1.2}
+${bias_factor=1.2}
 
 # Set size on faults (and bottom of slab corresponding to fault section)
 curve slabtop at A slabtop at D size {dx}

