[cig-commits] r16179 - in short/3D/PyLith/trunk: libsrc libsrc/friction unittests/libtests/friction

[surendra at geodynamics.org]

Author: surendra
Date: 2010-01-25 17:58:38 -0800 (Mon, 25 Jan 2010)
New Revision: 16179

Modified:
   short/3D/PyLith/trunk/libsrc/Makefile.am
   short/3D/PyLith/trunk/libsrc/friction/Makefile.am
   short/3D/PyLith/trunk/libsrc/friction/frictionfwd.hh
   short/3D/PyLith/trunk/unittests/libtests/friction/Makefile.am
Log:
Implemented SlipWeakening ( not compiling - 1 error)

Modified: short/3D/PyLith/trunk/libsrc/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/libsrc/Makefile.am	2010-01-26 01:50:25 UTC (rev 16178)
+++ short/3D/PyLith/trunk/libsrc/Makefile.am	2010-01-26 01:58:38 UTC (rev 16179)
@@ -79,6 +79,7 @@
 	feassemble/ElasticityExplicitLgDeform.cc \
 	friction/FrictionModel.cc \
 	friction/StaticFriction.cc \
+	friction/SlipWeakening.cc \
 	materials/Metadata.cc \
 	materials/Material.cc \
 	materials/ElasticMaterial.cc \

Modified: short/3D/PyLith/trunk/libsrc/friction/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/libsrc/friction/Makefile.am	2010-01-26 01:50:25 UTC (rev 16178)
+++ short/3D/PyLith/trunk/libsrc/friction/Makefile.am	2010-01-26 01:58:38 UTC (rev 16179)
@@ -17,6 +17,7 @@
 	FrictionModel.hh \
 	FrictionModel.icc \
 	StaticFriction.hh \
+	SlipWeakening.hh \
 	frictionfwd.hh
 
 

Modified: short/3D/PyLith/trunk/libsrc/friction/frictionfwd.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/friction/frictionfwd.hh	2010-01-26 01:50:25 UTC (rev 16178)
+++ short/3D/PyLith/trunk/libsrc/friction/frictionfwd.hh	2010-01-26 01:58:38 UTC (rev 16179)
@@ -28,6 +28,8 @@
 
     class StaticFriction;
 
+    class SlipWeakening;
+
   } // friction
 } // pylith
 

Modified: short/3D/PyLith/trunk/unittests/libtests/friction/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/friction/Makefile.am	2010-01-26 01:50:25 UTC (rev 16178)
+++ short/3D/PyLith/trunk/unittests/libtests/friction/Makefile.am	2010-01-26 01:58:38 UTC (rev 16179)
@@ -23,22 +23,26 @@
 testfriction_SOURCES = \
 	test_friction.cc \
 	TestFrictionModel.cc \
-	TestStaticFriction.cc
+	TestStaticFriction.cc \
+	TestSlipWeakening.cc
 
 
 noinst_HEADERS = 
 	TestFrictionModel.hh \
-	TestStaticFriction.hh
+	TestStaticFriction.hh \
+	TestSlipWeakening.hh
 
 # Source files associated with testing data
 testfriction_SOURCES += \
 	data/FrictionModelData.cc \
-	data/StaticFrictionData.cc
+	data/StaticFrictionData.cc \
+	data/SlipWeakeningData.cc
 
 
 noinst_HEADERS += \
 	data/FrictionModelData.hh \
-	data/StaticFrictionData.hh
+	data/StaticFrictionData.hh \
+	data/SlipWeakeningData.hh
 
 AM_CPPFLAGS = \
 	$(PYTHON_EGG_CPPFLAGS) -I$(PYTHON_INCDIR) \