[cig-commits] r14008 - in short/3D/PyLith/branches/pylith-swig: modulesrc/bc modulesrc/feassemble pylith/bc pylith/feassemble unittests/pytests/bc

[brad at geodynamics.org]

Author: brad
Date: 2009-02-02 14:00:57 -0800 (Mon, 02 Feb 2009)
New Revision: 14008

Modified:
   short/3D/PyLith/branches/pylith-swig/modulesrc/bc/DirichletBoundary.i
   short/3D/PyLith/branches/pylith-swig/modulesrc/bc/Makefile.am
   short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/Constraint.i
   short/3D/PyLith/branches/pylith-swig/pylith/bc/DirichletBoundary.py
   short/3D/PyLith/branches/pylith-swig/pylith/feassemble/Constraint.py
   short/3D/PyLith/branches/pylith-swig/unittests/pytests/bc/TestDirichletBC.py
Log:
Work on topology/bc objects and interfaces.

Modified: short/3D/PyLith/branches/pylith-swig/modulesrc/bc/DirichletBoundary.i
===================================================================
--- short/3D/PyLith/branches/pylith-swig/modulesrc/bc/DirichletBoundary.i	2009-02-02 21:50:07 UTC (rev 14007)
+++ short/3D/PyLith/branches/pylith-swig/modulesrc/bc/DirichletBoundary.i	2009-02-02 22:00:57 UTC (rev 14008)
@@ -46,7 +46,6 @@
       
       /** Get vertex field with BC information.
        *
-       * @param fieldType Type of field.
        * @param name Name of field.
        * @param fields Solution fields.
        *

Modified: short/3D/PyLith/branches/pylith-swig/modulesrc/bc/Makefile.am
===================================================================
--- short/3D/PyLith/branches/pylith-swig/modulesrc/bc/Makefile.am	2009-02-02 21:50:07 UTC (rev 14007)
+++ short/3D/PyLith/branches/pylith-swig/modulesrc/bc/Makefile.am	2009-02-02 22:00:57 UTC (rev 14008)
@@ -21,7 +21,8 @@
 	bc.i \
 	BoundaryCondition.i \
 	DirichletBC.i \
-	DirichletBoundary.i
+	DirichletBoundary.i \
+	../feassemble/Constraint.i
 
 swig_generated = \
 	bc_wrap.cxx \

Modified: short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/Constraint.i
===================================================================
--- short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/Constraint.i	2009-02-02 21:50:07 UTC (rev 14007)
+++ short/3D/PyLith/branches/pylith-swig/modulesrc/feassemble/Constraint.i	2009-02-02 22:00:57 UTC (rev 14008)
@@ -41,20 +41,16 @@
        * points in field.
        *
        * @param field Solution field
-       * @param mesh Finite-element mesh.
        */
       virtual
-      void setConstraintSizes(const pylith::topology::Field& field,
-			      const pylith::topology::Mesh& mesh) = 0;
+      void setConstraintSizes(const pylith::topology::Field& field) = 0;
 
       /** Set which degrees of freedom are constrained at points in field.
        *
        * @param field Solution field
-       * @param mesh Finite-element mesh.
        */
       virtual
-      void setConstraints(const pylith::topology::Field& field,
-			  const pylith::topology::Mesh& mesh) = 0;
+      void setConstraints(const pylith::topology::Field& field) = 0;
 
       /** Set flag for setting constraints for total field solution or
        *  incremental field solution.
@@ -68,12 +64,10 @@
        *
        * @param t Current time
        * @param field Solution field
-       * @param mesh Finite-element mesh.
        */
       virtual
       void setField(const double t,
-		    const pylith::topology::Field& field,
-		    const pylith::topology::Mesh& mesh) = 0;
+		    const pylith::topology::Field& field) = 0;
       
     }; // class Constraint
 

Modified: short/3D/PyLith/branches/pylith-swig/pylith/bc/DirichletBoundary.py
===================================================================
--- short/3D/PyLith/branches/pylith-swig/pylith/bc/DirichletBoundary.py	2009-02-02 21:50:07 UTC (rev 14007)
+++ short/3D/PyLith/branches/pylith-swig/pylith/bc/DirichletBoundary.py	2009-02-02 22:00:57 UTC (rev 14008)
@@ -125,9 +125,9 @@
     Get vertex field.
     """
     if None == fields:
-      field = self.vertexField(name, self.mesh)
+      field = self.vertexField(name)
     else:
-      field = self.vertexField(name, self.mesh, fields)
+      field = self.vertexField(name, fields)
     return field
 
 

Modified: short/3D/PyLith/branches/pylith-swig/pylith/feassemble/Constraint.py
===================================================================
--- short/3D/PyLith/branches/pylith-swig/pylith/feassemble/Constraint.py	2009-02-02 21:50:07 UTC (rev 14007)
+++ short/3D/PyLith/branches/pylith-swig/pylith/feassemble/Constraint.py	2009-02-02 22:00:57 UTC (rev 14008)
@@ -62,6 +62,13 @@
     return
 
 
+  def finalize(self):
+    """
+    Cleanup.
+    """
+    return
+
+
   # PRIVATE METHODS ////////////////////////////////////////////////////
 
   def _setupLogging(self):

Modified: short/3D/PyLith/branches/pylith-swig/unittests/pytests/bc/TestDirichletBC.py
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/pytests/bc/TestDirichletBC.py	2009-02-02 21:50:07 UTC (rev 14007)
+++ short/3D/PyLith/branches/pylith-swig/unittests/pytests/bc/TestDirichletBC.py	2009-02-02 22:00:57 UTC (rev 14008)
@@ -179,6 +179,7 @@
     from pylith.topology.Field import Field
     field = Field(mesh)
     field.newSection(Field.VERTICES_FIELD, cs.spaceDim())
+    field.allocate()
 
     field.zero()