[cig-commits] r15154 - in short/3D/PyLith/trunk: . examples/3d/tet4 examples/greensfns/hex8 examples/twocells/twohex8 examples/twocells/twoquad4 examples/twocells/twotet4 examples/twocells/twotet4-geoproj examples/twocells/twotri3 libsrc/bc libsrc/topology modulesrc/bc pylith/meshio unittests/libtests/bc unittests/libtests/topology
brad at geodynamics.org
brad at geodynamics.org
Tue Jun 9 09:31:25 PDT 2009
Author: brad
Date: 2009-06-09 09:31:22 -0700 (Tue, 09 Jun 2009)
New Revision: 15154
Modified:
short/3D/PyLith/trunk/README
short/3D/PyLith/trunk/examples/3d/tet4/dislocation.cfg
short/3D/PyLith/trunk/examples/3d/tet4/fixeddisp_shear.spatialdb
short/3D/PyLith/trunk/examples/3d/tet4/shearxy.cfg
short/3D/PyLith/trunk/examples/greensfns/hex8/gftest.cfg
short/3D/PyLith/trunk/examples/greensfns/hex8/pylithapp.cfg
short/3D/PyLith/trunk/examples/twocells/twohex8/axialdisp.cfg
short/3D/PyLith/trunk/examples/twocells/twohex8/axialdisp.spatialdb
short/3D/PyLith/trunk/examples/twocells/twohex8/dislocation.cfg
short/3D/PyLith/trunk/examples/twocells/twohex8/sheardisp.cfg
short/3D/PyLith/trunk/examples/twocells/twohex8/sheardisp.spatialdb
short/3D/PyLith/trunk/examples/twocells/twoquad4/axialdisp.cfg
short/3D/PyLith/trunk/examples/twocells/twoquad4/axialdisp.spatialdb
short/3D/PyLith/trunk/examples/twocells/twoquad4/dislocation.cfg
short/3D/PyLith/trunk/examples/twocells/twoquad4/sheardisp.cfg
short/3D/PyLith/trunk/examples/twocells/twoquad4/sheardisp.spatialdb
short/3D/PyLith/trunk/examples/twocells/twotet4-geoproj/dislocation.cfg
short/3D/PyLith/trunk/examples/twocells/twotet4/axialdisp.cfg
short/3D/PyLith/trunk/examples/twocells/twotet4/axialdisp.spatialdb
short/3D/PyLith/trunk/examples/twocells/twotet4/dislocation.cfg
short/3D/PyLith/trunk/examples/twocells/twotri3/axialdisp.cfg
short/3D/PyLith/trunk/examples/twocells/twotri3/axialdisp.spatialdb
short/3D/PyLith/trunk/examples/twocells/twotri3/dislocation.cfg
short/3D/PyLith/trunk/examples/twocells/twotri3/sheardisp.cfg
short/3D/PyLith/trunk/examples/twocells/twotri3/shearxy.spatialdb
short/3D/PyLith/trunk/libsrc/bc/DirichletBC.cc
short/3D/PyLith/trunk/libsrc/bc/Neumann.cc
short/3D/PyLith/trunk/libsrc/bc/Neumann.hh
short/3D/PyLith/trunk/libsrc/topology/Field.cc
short/3D/PyLith/trunk/modulesrc/bc/Neumann.i
short/3D/PyLith/trunk/pylith/meshio/OutputManagerSubMesh.py
short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBC.cc
short/3D/PyLith/trunk/unittests/libtests/topology/TestFieldMesh.cc
Log:
Updated settings for examples (DirichletBC). Fixed some bugs with traction info output.
Modified: short/3D/PyLith/trunk/README
===================================================================
--- short/3D/PyLith/trunk/README 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/README 2009-06-09 16:31:22 UTC (rev 15154)
@@ -71,6 +71,9 @@
general time dependence. The names of the facilities and the names of
the values in the spatial databses are, in most cases, different.
+(9) The FixedDOFDB has been renamed to ZeroDispDB in order to better
+reflect the boundary condition.
+
======================================================================
MIGRATING FROM VERSION 1.2 TO 1.3
======================================================================
Modified: short/3D/PyLith/trunk/examples/3d/tet4/dislocation.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/3d/tet4/dislocation.cfg 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/examples/3d/tet4/dislocation.cfg 2009-06-09 16:31:22 UTC (rev 15154)
@@ -48,12 +48,12 @@
[pylithapp.timedependent.bc.x_pos]
fixed_dof = [0, 1, 2]
label = boundary_xp
-db.label = Dirichlet BC on +x
+db_initial.label = Dirichlet BC on +x
[pylithapp.timedependent.bc.x_neg]
fixed_dof = [0, 1, 2]
label = boundary_xm
-db.label = Dirichlet BC on -x
+db_initial.label = Dirichlet BC on -x
# ----------------------------------------------------------------------
# faults
Modified: short/3D/PyLith/trunk/examples/3d/tet4/fixeddisp_shear.spatialdb
===================================================================
--- short/3D/PyLith/trunk/examples/3d/tet4/fixeddisp_shear.spatialdb 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/examples/3d/tet4/fixeddisp_shear.spatialdb 2009-06-09 16:31:22 UTC (rev 15154)
@@ -11,7 +11,7 @@
#SPATIAL.ascii 1
SimpleDB {
num-values = 3
- value-names = dof-0 dof-1 dof-2
+ value-names = displacement-x displacement-y displacement-z
value-units = m m m
num-locs = 2
data-dim = 1 // locations form a line
Modified: short/3D/PyLith/trunk/examples/3d/tet4/shearxy.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/3d/tet4/shearxy.cfg 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/examples/3d/tet4/shearxy.cfg 2009-06-09 16:31:22 UTC (rev 15154)
@@ -27,7 +27,7 @@
# ----------------------------------------------------------------------
# boundary conditions
# ----------------------------------------------------------------------
-# We change spatial database for initial value from FixedDOFDB (which has
+# We change spatial database for initial value from ZeroDispDB (which has
# a uniform spatial distribution) to SimpleDB (which uses a data file
# to specify a spatial variation).
@@ -43,23 +43,23 @@
[pylithapp.timedependent.bc.x_pos]
fixed_dof = [0, 1]
label = boundary_xp
-db = spatialdata.spatialdb.SimpleDB
-db.label = Dirichlet BC on +x
-db.iohandler.filename = fixeddisp_shear.spatialdb
+db_initial = spatialdata.spatialdb.SimpleDB
+db_initial.label = Dirichlet BC on +x
+db_initial.iohandler.filename = fixeddisp_shear.spatialdb
[pylithapp.timedependent.bc.x_neg]
fixed_dof = [0, 1]
label = boundary_xm
-db = spatialdata.spatialdb.SimpleDB
-db.label = Dirichlet BC on -x
-db.iohandler.filename = fixeddisp_shear.spatialdb
+db_initial = spatialdata.spatialdb.SimpleDB
+db_initial.label = Dirichlet BC on -x
+db_initial.iohandler.filename = fixeddisp_shear.spatialdb
[pylithapp.timedependent.bc.z_neg]
fixed_dof = [2]
label = boundary_zm
-db = spatialdata.spatialdb.SimpleDB
-db.label = Dirichlet BC on -z
-db.iohandler.filename = fixeddisp_shear.spatialdb
+db_initial = spatialdata.spatialdb.SimpleDB
+db_initial.label = Dirichlet BC on -z
+db_initial.iohandler.filename = fixeddisp_shear.spatialdb
# ----------------------------------------------------------------------
# output
Modified: short/3D/PyLith/trunk/examples/greensfns/hex8/gftest.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/greensfns/hex8/gftest.cfg 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/examples/greensfns/hex8/gftest.cfg 2009-06-09 16:31:22 UTC (rev 15154)
@@ -37,7 +37,7 @@
# boundary conditions
# ----------------------------------------------------------------------
-# We change spatial database for the rate of change from FixedDOFDB
+# We change spatial database for the rate of change from ZeroDispDB
# (which has zero velocity) to UniformDB (which allows nonzero
# velocities).
@@ -48,17 +48,17 @@
[pylithapp.timedependent.bc.x_pos]
fixed_dof = [0, 1]
label = 11
-db.label = Dirichlet BC on +x
+db_initial.label = Dirichlet BC on +x
[pylithapp.timedependent.bc.x_neg]
fixed_dof = [0, 1]
label = 12
-db.label = Dirichlet BC on -x
+db_initial.label = Dirichlet BC on -x
[pylithapp.timedependent.bc.z_neg]
fixed_dof = [2]
label = 15
-db.label = Dirichlet BC on -z
+db_initial.label = Dirichlet BC on -z
# ----------------------------------------------------------------------
# faults
@@ -69,7 +69,6 @@
[pylithapp.timedependent.interfaces.fault]
label = 10
-quadrature = pylith.feassemble.quadrature.Quadrature2Din3D
quadrature.cell = pylith.feassemble.FIATLagrange
quadrature.cell.dimension = 2
@@ -179,14 +178,14 @@
# Give basename for VTK output of state variables.
[pylithapp.timedependent.materials.elastic_upper.output]
skip = 9
-cell_filter = pylith.meshio.CellFilterAvg
-writer.filename = gftest-statevars-elastic_upper.vtk
+cell_filter = pylith.meshio.CellFilterAvgMesh
+writer.filename = gftest-elastic_upper.vtk
writer.time_format = %04.0f
writer.time_constant = 1.0*year
[pylithapp.timedependent.materials.elastic_lower.output]
skip = 9
-cell_filter = pylith.meshio.CellFilterAvg
-writer.filename = gftest-statevars-elastic_lower.vtk
+cell_filter = pylith.meshio.CellFilterAvgMesh
+writer.filename = gftest-elastic_lower.vtk
writer.time_format = %04.0f
writer.time_constant = 1.0*year
Modified: short/3D/PyLith/trunk/examples/greensfns/hex8/pylithapp.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/greensfns/hex8/pylithapp.cfg 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/examples/greensfns/hex8/pylithapp.cfg 2009-06-09 16:31:22 UTC (rev 15154)
@@ -28,9 +28,9 @@
#debug = 1 ; uncomment to get very verbose mesh information
# Change the default mesh importer to the CUBIT importer.
-importer = pylith.meshio.MeshIOCubit
+reader = pylith.meshio.MeshIOCubit
-[pylithapp.mesh_generator.importer]
+[pylithapp.mesh_generator.reader]
# Set filename of mesh to import.
filename = box_hex8_1000m.exo
@@ -56,16 +56,14 @@
[pylithapp.timedependent.materials.elastic_upper]
label = Upper elastic material
id = 1
-db.iohandler.filename = mat_elastic.spatialdb
-quadrature = pylith.feassemble.quadrature.Quadrature3D
+properties_db.iohandler.filename = mat_elastic.spatialdb
quadrature.cell = pylith.feassemble.FIATLagrange
quadrature.cell.dimension = 3
[pylithapp.timedependent.materials.elastic_lower]
label = Lower elastic material
id = 2
-db.iohandler.filename = mat_elastic.spatialdb
-quadrature = pylith.feassemble.quadrature.Quadrature3D
+properties_db.iohandler.filename = mat_elastic.spatialdb
quadrature.cell = pylith.feassemble.FIATLagrange
quadrature.cell.dimension = 3
Modified: short/3D/PyLith/trunk/examples/twocells/twohex8/axialdisp.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/twocells/twohex8/axialdisp.cfg 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/examples/twocells/twohex8/axialdisp.cfg 2009-06-09 16:31:22 UTC (rev 15154)
@@ -39,17 +39,17 @@
# 'x_neg' in the mesh file.
label = x_neg
-# Change spatial database for initial value from FixedDOFDB (which has
+# Change spatial database for initial value from ZeroDispDB (which has
# a uniform spatial distribution) to SimpleDB (which uses a data file
# to specify a spatial variation).
-db = spatialdata.spatialdb.SimpleDB
+db_initial = spatialdata.spatialdb.SimpleDB
# We are assigning the label 'Dirichlet BC -x face' to the database.
-db.label = Dirichlet BC -x face
+db_initial.label = Dirichlet BC -x face
# The name of the file containing the spatial database for the BC
# specification.
-db.iohandler.filename = axialdisp.spatialdb
+db_initial.iohandler.filename = axialdisp.spatialdb
# Boundary conditions to be applied to the positive x-side of the mesh.
@@ -62,17 +62,17 @@
# 'x_pos' in the mesh file.
label = x_pos
-# Change spatial database for initial value from FixedDOFDB (which has
+# Change spatial database for initial value from ZeroDispDB (which has
# a uniform spatial distribution) to SimpleDB (which uses a data file
# to specify a spatial variation).
-db = spatialdata.spatialdb.SimpleDB
+db_initial = spatialdata.spatialdb.SimpleDB
# We are assigning the label 'Dirichlet BC +x face' to the database.
-db.label = Dirichlet BC +x face
+db_initial.label = Dirichlet BC +x face
# The name of the file containing the spatial database for the BC
# specification.
-db.iohandler.filename = axialdisp.spatialdb
+db_initial.iohandler.filename = axialdisp.spatialdb
# ----------------------------------------------------------------------
# output
Modified: short/3D/PyLith/trunk/examples/twocells/twohex8/axialdisp.spatialdb
===================================================================
--- short/3D/PyLith/trunk/examples/twocells/twohex8/axialdisp.spatialdb 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/examples/twocells/twohex8/axialdisp.spatialdb 2009-06-09 16:31:22 UTC (rev 15154)
@@ -9,7 +9,7 @@
// There are 3 values specified in the database, corresponding to the
// constraint values for the x, y, and z degrees of freedom.
num-values = 3
- value-names = dof-0 dof-1 dof-2
+ value-names = displacement-x displacement-y displacement-z
// The constraint values (displacements) have units of meters.
value-units = m m m
@@ -39,6 +39,6 @@
// As described in axialdisp.cfg, this database will be used to specify
// data along edges.
// The entries are:
-// X-coord, Y-coord, Z-coord, dof-0, dof-1, dof-2.
+// X-coord, Y-coord, Z-coord, disp-x disp-y disp-z
-1.0 0.0 0.0 -0.01 0.0 0.0
1.0 0.0 0.0 0.01 0.0 0.0
Modified: short/3D/PyLith/trunk/examples/twocells/twohex8/dislocation.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/twocells/twohex8/dislocation.cfg 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/examples/twocells/twohex8/dislocation.cfg 2009-06-09 16:31:22 UTC (rev 15154)
@@ -53,7 +53,7 @@
label = x_neg
# We are assigning the label 'Dirichlet BC -x face' to the database.
-db.label = Dirichlet BC -x face
+db_initial.label = Dirichlet BC -x face
# Boundary conditions to be applied to the positive x-side of the mesh.
@@ -67,7 +67,7 @@
label = x_pos
# We are assigning the label 'Dirichlet BC +x face' to the database.
-db.label = Dirichlet BC +x face
+db_initial.label = Dirichlet BC +x face
# ----------------------------------------------------------------------
# faults
Modified: short/3D/PyLith/trunk/examples/twocells/twohex8/sheardisp.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/twocells/twohex8/sheardisp.cfg 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/examples/twocells/twohex8/sheardisp.cfg 2009-06-09 16:31:22 UTC (rev 15154)
@@ -39,17 +39,17 @@
# 'x_neg' in the mesh file.
label = x_neg
-# Change spatial database for initial value from FixedDOFDB (which has
+# Change spatial database for initial value from ZeroDispDB (which has
# a uniform spatial distribution) to SimpleDB (which uses a data file
# to specify a spatial variation).
-db = spatialdata.spatialdb.SimpleDB
+db_initial = spatialdata.spatialdb.SimpleDB
# We are assigning the label 'Dirichlet BC -x face' to the database.
-db.label = Dirichlet BC -x face
+db_initial.label = Dirichlet BC -x face
# The name of the file containing the spatial database for the BC
# specification.
-db.iohandler.filename = sheardisp.spatialdb
+db_initial.iohandler.filename = sheardisp.spatialdb
# Boundary conditions to be applied to the positive x-side of the mesh.
@@ -62,17 +62,17 @@
# 'x_pos' in the mesh file.
label = x_pos
-# Change spatial database for initial value from FixedDOFDB (which has
+# Change spatial database for initial value from ZeroDispDB (which has
# a uniform spatial distribution) to SimpleDB (which uses a data file
# to specify a spatial variation).
-db = spatialdata.spatialdb.SimpleDB
+db_initial = spatialdata.spatialdb.SimpleDB
# We are assigning the label 'Dirichlet BC +x face' to the database.
-db.label = Dirichlet BC +x face
+db_initial.label = Dirichlet BC +x face
# The name of the file containing the spatial database for the BC
# specification.
-db.iohandler.filename = sheardisp.spatialdb
+db_initial.iohandler.filename = sheardisp.spatialdb
# ----------------------------------------------------------------------
# output
Modified: short/3D/PyLith/trunk/examples/twocells/twohex8/sheardisp.spatialdb
===================================================================
--- short/3D/PyLith/trunk/examples/twocells/twohex8/sheardisp.spatialdb 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/examples/twocells/twohex8/sheardisp.spatialdb 2009-06-09 16:31:22 UTC (rev 15154)
@@ -9,7 +9,7 @@
// There are 3 values specified in the database, corresponding to the
// constraint values for the x, y, and z degrees of freedom.
num-values = 3
- value-names = dof-0 dof-1 dof-2
+ value-names = displacement-x displacement-y displacement-z
// The constraint values (displacements) have units of meters.
value-units = m m m
@@ -39,6 +39,6 @@
// As described in axialdisp.cfg, this database will be used to specify
// data along edges (pylith.bc.BCSixSides).
// The entries are:
-// X-coord, Y-coord, Z-coord, dof-0, dof-1, dof-2.
+// X-coord, Y-coord, Z-coord, disp-x, disp-y, disp-z.
-1.0 0.0 0.0 0.0 -0.01 0.0
1.0 0.0 0.0 0.0 0.01 0.0
Modified: short/3D/PyLith/trunk/examples/twocells/twoquad4/axialdisp.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/twocells/twoquad4/axialdisp.cfg 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/examples/twocells/twoquad4/axialdisp.cfg 2009-06-09 16:31:22 UTC (rev 15154)
@@ -47,17 +47,17 @@
label = x_neg
# Change the spatial database for the Dirichlet BC initial values from
-# FixedDOFDB (which has a uniform spatial distribution) to SimpleDB
+# ZeroDispDB (which has a uniform spatial distribution) to SimpleDB
# (which uses a data file to specify a spatial variation).
-db = spatialdata.spatialdb.SimpleDB
+db_initial = spatialdata.spatialdb.SimpleDB
# Assign the label 'Dirichlet BC -x edge' to the database.
-db.label = Dirichlet BC -x edge
+db_initial.label = Dirichlet BC -x edge
# The name of the file containing the spatial database for the BC
# specification.
-db.iohandler.filename = axialdisp.spatialdb
-db.query_type = linear
+db_initial.iohandler.filename = axialdisp.spatialdb
+db_initial.query_type = linear
# Boundary conditions to be applied to the positive x-side of the mesh.
@@ -71,17 +71,17 @@
label = x_pos
# Change the spatial database for the Dirichlet BC initial values from
-# FixedDOFDB (which has a uniform spatial distribution) to SimpleDB
+# ZeroDispDB (which has a uniform spatial distribution) to SimpleDB
# (which uses a data file to specify a spatial variation).
-db = spatialdata.spatialdb.SimpleDB
+db_initial = spatialdata.spatialdb.SimpleDB
# Assign the label 'Dirichlet BC +x edge' to the database.
-db.label = Dirichlet BC +x edge
+db_initial.label = Dirichlet BC +x edge
# The name of the file containing the spatial database for the BC
# specification.
-db.iohandler.filename = axialdisp.spatialdb
-db.query_type = linear
+db_initial.iohandler.filename = axialdisp.spatialdb
+db_initial.query_type = linear
# Boundary conditions to be applied to the bottom boundary of the mesh.
@@ -94,18 +94,18 @@
# condition have the name 'y_neg'.
label = y_neg
-# Change spatial database for initial value from FixedDOFDB (which has
+# Change spatial database for initial value from ZeroDispDB (which has
# a uniform spatial distribution) to SimpleDB (which uses a data file
# to specify a spatial variation).
-db = spatialdata.spatialdb.SimpleDB
+db_initial = spatialdata.spatialdb.SimpleDB
# Assign the label 'Dirichlet BC -y corners' to the database.
-db.label = Dirichlet BC -y edge
+db_initial.label = Dirichlet BC -y edge
# The name of the file containing the spatial database for the BC
# specification.
-db.iohandler.filename = axialdisp.spatialdb
-db.query_type = linear
+db_initial.iohandler.filename = axialdisp.spatialdb
+db_initial.query_type = linear
# ----------------------------------------------------------------------
# output
Modified: short/3D/PyLith/trunk/examples/twocells/twoquad4/axialdisp.spatialdb
===================================================================
--- short/3D/PyLith/trunk/examples/twocells/twoquad4/axialdisp.spatialdb 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/examples/twocells/twoquad4/axialdisp.spatialdb 2009-06-09 16:31:22 UTC (rev 15154)
@@ -4,9 +4,9 @@
SimpleDB {
// There are two values specified in the database, corresponding to the
- // constraint values for the x (dof-0) and y (dof-1) degrees of freedom.
+ // constraint values for the x and y degrees of freedom.
num-values = 2
- value-names = dof-0 dof-1
+ value-names = displacement-x displacement-y
// The constraint values (displacements) have units of meters.
value-units = m m
@@ -36,6 +36,6 @@
// As described in axialdisp.cfg, this database will be used to specify
// data along edges (pylith.bc.BCFourSides).
// The entries are:
-// X-coord, Y-coord, dof-0 (x constraint), dof-1 (y constraint).
+// X-coord, Y-coord, displ-x, disp-y
-2.0 0.0 -0.01 0.0
2.0 0.0 0.01 0.0
Modified: short/3D/PyLith/trunk/examples/twocells/twoquad4/dislocation.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/twocells/twoquad4/dislocation.cfg 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/examples/twocells/twoquad4/dislocation.cfg 2009-06-09 16:31:22 UTC (rev 15154)
@@ -55,7 +55,7 @@
label = x_neg
# We are assigning the label 'Dirichlet BC' to the database.
-db.label = Dirichlet BC -x edge
+db_initial.label = Dirichlet BC -x edge
# Boundary conditions to be applied to the positive x-side of the mesh.
[pylithapp.timedependent.bc.x_pos]
@@ -68,7 +68,7 @@
label = x_pos
# We are assigning the label 'Dirichlet BC' to the database.
-db.label = Dirichlet BC +x edge
+db_initial.label = Dirichlet BC +x edge
# ----------------------------------------------------------------------
# faults
Modified: short/3D/PyLith/trunk/examples/twocells/twoquad4/sheardisp.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/twocells/twoquad4/sheardisp.cfg 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/examples/twocells/twoquad4/sheardisp.cfg 2009-06-09 16:31:22 UTC (rev 15154)
@@ -39,17 +39,17 @@
# 'x_neg' in the mesh file.
label = x_neg
-# Change spatial database for initial value from FixedDOFDB (which has
+# Change spatial database for initial value from ZeroDispDB (which has
# a uniform spatial distribution) to SimpleDB (which uses a data file
# to specify a spatial variation).
-db = spatialdata.spatialdb.SimpleDB
+db_initial = spatialdata.spatialdb.SimpleDB
# We are assigning the label 'Dirichlet BC -x edge' to the database.
-db.label = Dirichlet BC -x edge
+db_initial.label = Dirichlet BC -x edge
# The name of the file containing the spatial database for the BC
# specification.
-db.iohandler.filename = sheardisp.spatialdb
+db_initial.iohandler.filename = sheardisp.spatialdb
# Boundary conditions to be applied to the positive x-side of the mesh.
@@ -62,17 +62,17 @@
# 'x_pos' in the mesh file.
label = x_pos
-# Change spatial database for initial value from FixedDOFDB (which has
+# Change spatial database for initial value from ZeroDispDB (which has
# a uniform spatial distribution) to SimpleDB (which uses a data file
# to specify a spatial variation).
-db = spatialdata.spatialdb.SimpleDB
+db_initial = spatialdata.spatialdb.SimpleDB
# We are assigning the label 'Dirichlet BC +x edge' to the database.
-db.label = Dirichlet BC +x edge
+db_initial.label = Dirichlet BC +x edge
# The name of the file containing the spatial database for the BC
# specification.
-db.iohandler.filename = sheardisp.spatialdb
+db_initial.iohandler.filename = sheardisp.spatialdb
# ----------------------------------------------------------------------
# PETSc
Modified: short/3D/PyLith/trunk/examples/twocells/twoquad4/sheardisp.spatialdb
===================================================================
--- short/3D/PyLith/trunk/examples/twocells/twoquad4/sheardisp.spatialdb 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/examples/twocells/twoquad4/sheardisp.spatialdb 2009-06-09 16:31:22 UTC (rev 15154)
@@ -7,9 +7,9 @@
SimpleDB {
// There are two values specified in the database, corresponding to the
- // constraint values for the x (dof-0) and y (dof-1) degrees of freedom.
+ // constraint values for the x and y degrees of freedom.
num-values = 2
- value-names = dof-0 dof-1
+ value-names = displacement-x displacement-y
// The constraint values (displacements) have units of meters.
value-units = m m
@@ -39,6 +39,6 @@
// As described in sheardisp.cfg, this database will be used to specify
// data along an edge (pylith.bc.BCFourSides).
// The entries are:
-// X-coord, Y-coord, dof-0 (x constraint), dof-1 (y constraint).
+// X-coord, Y-coord, disp-x disp-y
-2.0 0.0 0.0 -0.01
+2.0 0.0 0.0 +0.01
Modified: short/3D/PyLith/trunk/examples/twocells/twotet4/axialdisp.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/twocells/twotet4/axialdisp.cfg 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/examples/twocells/twotet4/axialdisp.cfg 2009-06-09 16:31:22 UTC (rev 15154)
@@ -40,17 +40,17 @@
# 'end points' in the mesh file.
label = end points
-# Change spatial database for initial value from FixedDOFDB (which has
+# Change spatial database for initial value from ZeroDispDB (which has
# a uniform spatial distribution) to SimpleDB (which uses a data file
# to specify a spatial variation).
-db = spatialdata.spatialdb.SimpleDB
+db_initial = spatialdata.spatialdb.SimpleDB
# We are assigning the label 'Dirichlet BC' to the database.
-db.label = Dirichlet BC
+db_initial.label = Dirichlet BC
# The name of the file containing the spatial database for the BC
# specification.
-db.iohandler.filename = axialdisp.spatialdb
+db_initial.iohandler.filename = axialdisp.spatialdb
# ----------------------------------------------------------------------
# output
Modified: short/3D/PyLith/trunk/examples/twocells/twotet4/axialdisp.spatialdb
===================================================================
--- short/3D/PyLith/trunk/examples/twocells/twotet4/axialdisp.spatialdb 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/examples/twocells/twotet4/axialdisp.spatialdb 2009-06-09 16:31:22 UTC (rev 15154)
@@ -7,10 +7,9 @@
SimpleDB {
// There are 3 values specified in the database, corresponding to the
- // constraint values for the x (dof-0), y (dof-1) and z (dof-2) degrees of
- // freedom.
+ // constraint values for the x, y, and z degrees of freedom.
num-values = 3
- value-names = dof-0 dof-1 dof-2
+ value-names = displacement-x displacement-y displacement-z
// The constraint values (displacements) have units of meters.
value-units = m m m
@@ -40,6 +39,6 @@
// As described in axialdisp.cfg, this database will be used to specify
// data at a point (pylith.bc.BCSingle).
// The entries are:
-// X-coord, Y-coord, Z-coord, dof-0, dof-1, dof-2.
+// X-coord, Y-coord, Z-coord, disp-x, disp-y, disp-z.
-1.0 0.0 0.0 -0.01 0.0 0.0
1.0 0.0 0.0 0.01 0.0 0.0
Modified: short/3D/PyLith/trunk/examples/twocells/twotet4/dislocation.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/twocells/twotet4/dislocation.cfg 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/examples/twocells/twotet4/dislocation.cfg 2009-06-09 16:31:22 UTC (rev 15154)
@@ -53,7 +53,7 @@
label = end points
# We are assigning the label 'Dirichlet BC' to the database.
-db.label = Dirichlet BC
+db_initial.label = Dirichlet BC
# ----------------------------------------------------------------------
# faults
Modified: short/3D/PyLith/trunk/examples/twocells/twotet4-geoproj/dislocation.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/twocells/twotet4-geoproj/dislocation.cfg 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/examples/twocells/twotet4-geoproj/dislocation.cfg 2009-06-09 16:31:22 UTC (rev 15154)
@@ -53,7 +53,7 @@
label = end points
# We are assigning the label 'Dirichlet BC' to the database.
-db.label = Dirichlet BC
+db_initial.label = Dirichlet BC
# ----------------------------------------------------------------------
# faults
Modified: short/3D/PyLith/trunk/examples/twocells/twotri3/axialdisp.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/twocells/twotri3/axialdisp.cfg 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/examples/twocells/twotri3/axialdisp.cfg 2009-06-09 16:31:22 UTC (rev 15154)
@@ -47,16 +47,16 @@
label = end points
# Change the spatial database for the Dirichlet BC initial values from
-# FixedDOFDB (which has a uniform spatial distribution) to SimpleDB
+# ZeroDispDB (which has a uniform spatial distribution) to SimpleDB
# (which uses a data file to specify a spatial variation).
-db = spatialdata.spatialdb.SimpleDB
+db_initial = spatialdata.spatialdb.SimpleDB
# We are assigning the label 'Dirichlet BC' to the database.
-db.label = Dirichlet BC
+db_initial.label = Dirichlet BC
# The name of the file containing the spatial database for the BC
# specification.
-db.iohandler.filename = axialdisp.spatialdb
+db_initial.iohandler.filename = axialdisp.spatialdb
# ----------------------------------------------------------------------
# output
Modified: short/3D/PyLith/trunk/examples/twocells/twotri3/axialdisp.spatialdb
===================================================================
--- short/3D/PyLith/trunk/examples/twocells/twotri3/axialdisp.spatialdb 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/examples/twocells/twotri3/axialdisp.spatialdb 2009-06-09 16:31:22 UTC (rev 15154)
@@ -4,9 +4,9 @@
SimpleDB {
// There are two values specified in the database, corresponding to the
- // constraint values for the x (dof-0) and y (dof-1) degrees of freedom.
+ // constraint values for the x and y degrees of freedom.
num-values = 2
- value-names = dof-0 dof-1
+ value-names = displacement-x displacement-y
// The constraint values (displacements) have units of meters.
value-units = m m
@@ -34,8 +34,7 @@
// This is where the data is specified.
// As described in axialdisp.cfg, this database will be used to specify
-// data at a point (pylith.bc.BCSingle).
-// The entries are:
-// X-coord, Y-coord, dof-0 (x constraint), dof-1 (y constraint).
+// data at a point. The entries are:
+// X-coord, Y-coord, disp-x disp-y
-0.5 -0.5 -0.01 -0.01
0.5 0.5 0.01 0.01
Modified: short/3D/PyLith/trunk/examples/twocells/twotri3/dislocation.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/twocells/twotri3/dislocation.cfg 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/examples/twocells/twotri3/dislocation.cfg 2009-06-09 16:31:22 UTC (rev 15154)
@@ -58,7 +58,7 @@
label = end points
# We are assigning the label 'Dirichlet BC' to the database.
-db.label = Dirichlet BC
+db_initial.label = Dirichlet BC
# ----------------------------------------------------------------------
# faults
Modified: short/3D/PyLith/trunk/examples/twocells/twotri3/sheardisp.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/twocells/twotri3/sheardisp.cfg 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/examples/twocells/twotri3/sheardisp.cfg 2009-06-09 16:31:22 UTC (rev 15154)
@@ -52,17 +52,17 @@
# condition have the name 'x_neg'.
label = x_neg
-# Change spatial database for initial value from FixedDOFDB (which has
+# Change spatial database for initial value from ZeroDispDB (which has
# a uniform spatial distribution) to SimpleDB (which uses a data file
# to specify a spatial variation).
-db = spatialdata.spatialdb.SimpleDB
+db_initial = spatialdata.spatialdb.SimpleDB
# We are assigning the label 'Dirichlet BC -x edge' to the database.
-db.label = Dirichlet BC -x edge
+db_initial.label = Dirichlet BC -x edge
# The name of the file containing the spatial database for the BC
# specification.
-db.iohandler.filename = shearxy.spatialdb
+db_initial.iohandler.filename = shearxy.spatialdb
# Boundary conditions to be applied to the positive x-side of the mesh.
@@ -75,17 +75,17 @@
# condition have the name 'x_pos'.
label = x_pos
-# Change spatial database for initial value from FixedDOFDB (which has
+# Change spatial database for initial value from ZeroDispDB (which has
# a uniform spatial distribution) to SimpleDB (which uses a data file
# to specify a spatial variation).
-db = spatialdata.spatialdb.SimpleDB
+db_initial = spatialdata.spatialdb.SimpleDB
# We are assigning the label 'Dirichlet BC +x edge' to the database.
-db.label = Dirichlet BC +x edge
+db_initial.label = Dirichlet BC +x edge
# The name of the file containing the spatial database for the BC
# specification.
-db.iohandler.filename = shearxy.spatialdb
+db_initial.iohandler.filename = shearxy.spatialdb
# ----------------------------------------------------------------------
# PETSc
Modified: short/3D/PyLith/trunk/examples/twocells/twotri3/shearxy.spatialdb
===================================================================
--- short/3D/PyLith/trunk/examples/twocells/twotri3/shearxy.spatialdb 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/examples/twocells/twotri3/shearxy.spatialdb 2009-06-09 16:31:22 UTC (rev 15154)
@@ -7,9 +7,9 @@
SimpleDB {
// There are two values specified in the database, corresponding to the
- // constraint values for the x (dof-0) and y (dof-1) degrees of freedom.
+ // constraint values for the x and y degrees of freedom.
num-values = 2
- value-names = dof-0 dof-1
+ value-names = displacement-x displacement-y
// The constraint values (displacements) have units of meters.
value-units = m m
@@ -39,6 +39,6 @@
// As described in sheardisp.cfg, this database will be used to specify
// data along an edge (pylith.bc.BCFourSides).
// The entries are:
-// X-coord, Y-coord, dof-0 (x constraint), dof-1 (y constraint).
+// X-coord, Y-coord, disp-x, disp-y
-0.5 0.0 0.0 -0.01
+0.5 0.0 0.0 +0.01
Modified: short/3D/PyLith/trunk/libsrc/bc/DirichletBC.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/bc/DirichletBC.cc 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/libsrc/bc/DirichletBC.cc 2009-06-09 16:31:22 UTC (rev 15154)
@@ -25,8 +25,6 @@
#include <stdexcept> // USES std::runtime_error
#include <sstream> // USES std::ostringstream
-//#define FIELD_SPLIT
-
// ----------------------------------------------------------------------
typedef pylith::topology::Mesh::SieveMesh SieveMesh;
typedef pylith::topology::Mesh::RealSection RealSection;
@@ -92,14 +90,12 @@
} // if
_offsetLocal[iPoint] = curNumConstraints;
section->addConstraintDimension(_points[iPoint], numFixedDOF);
-#if defined(FIELD_SPLIT)
if (fibration >= 0) {
assert(fiberDim == section->getFiberDimension(_points[iPoint],
fibration));
section->addConstraintDimension(_points[iPoint], numFixedDOF,
fibration);
} // if
-#endif
} // for
} // setConstraintSizes
@@ -164,10 +160,8 @@
// Update list of constrained DOF
section->setConstraintDof(point, &allFixedDOF[0]);
-#if defined(FIELD_SPLIT)
if (fibration >= 0)
section->setConstraintDof(point, &allFixedDOF[0], fibration);
-#endif
} // for
} // setConstraints
Modified: short/3D/PyLith/trunk/libsrc/bc/Neumann.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/bc/Neumann.cc 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/libsrc/bc/Neumann.cc 2009-06-09 16:31:22 UTC (rev 15154)
@@ -81,6 +81,10 @@
} // if
const int numCorners = _quadrature->numBasis();
+ assert(0 != _normalizer);
+ const double lengthScale = _normalizer->lengthScale();
+ const double pressureScale = _normalizer->pressureScale();
+
// Get 'surface' cells (1 dimension lower than top-level cells)
const ALE::Obj<SieveSubMesh>& subSieveMesh = _boundaryMesh->sieveMesh();
assert(!subSieveMesh.isNull());
@@ -123,6 +127,8 @@
topology::Field<topology::SubMesh>& traction = _parameters->get("traction");
traction.newSection(cells, fiberDim);
traction.allocate();
+ traction.scale(pressureScale);
+ traction.vectorFieldType(topology::FieldBase::VECTOR);
// Containers for orientation information
const int orientationSize = spaceDim * spaceDim;
@@ -185,10 +191,6 @@
const spatialdata::geocoords::CoordSys* cs = _boundaryMesh->coordsys();
- assert(0 != _normalizer);
- const double lengthScale = _normalizer->lengthScale();
- const double pressureScale = _normalizer->pressureScale();
-
// Compute quadrature information
_quadrature->initializeGeometry();
#if defined(PRECOMPUTE_GEOMETRY)
Modified: short/3D/PyLith/trunk/libsrc/bc/Neumann.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/bc/Neumann.hh 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/libsrc/bc/Neumann.hh 2009-06-09 16:31:22 UTC (rev 15154)
@@ -96,7 +96,7 @@
*/
const topology::Field<topology::SubMesh>&
cellField(const char* name,
- topology::SolutionFields* const fields);
+ topology::SolutionFields* const fields =0);
// NOT IMPLEMENTED ////////////////////////////////////////////////////
private :
Modified: short/3D/PyLith/trunk/libsrc/topology/Field.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/topology/Field.cc 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/libsrc/topology/Field.cc 2009-06-09 16:31:22 UTC (rev 15154)
@@ -509,13 +509,14 @@
for (typename chart_type::const_iterator c_iter = chart.begin();
c_iter != chartEnd;
- ++c_iter) {
- assert(fiberDim == _section->getFiberDimension(*c_iter));
+ ++c_iter)
+ if (0 != _section->getFiberDimension(*c_iter)) {
+ assert(fiberDim == _section->getFiberDimension(*c_iter));
- _section->restrictPoint(*c_iter, &values[0], values.size());
- normalizer.dimensionalize(&values[0], values.size(), _scale);
- _section->updatePointAll(*c_iter, &values[0]);
- } // for
+ _section->restrictPoint(*c_iter, &values[0], values.size());
+ normalizer.dimensionalize(&values[0], values.size(), _scale);
+ _section->updatePointAll(*c_iter, &values[0]);
+ } // if
} // if
} // dimensionalize
@@ -696,18 +697,17 @@
_section->addSpace(); // displacements
_section->addSpace(); // Lagrange multipliers
- // Assume fiber dimension is uniform
const chart_type& chart = _section->getChart();
- const int fiberDim = (chart.size() > 0) ?
- _section->getFiberDimension(*chart.begin()) : 0;
const int fibration = 0;
const typename chart_type::const_iterator chartBegin = chart.begin();
const typename chart_type::const_iterator chartEnd = chart.end();
for (typename chart_type::const_iterator c_iter = chart.begin();
c_iter != chartEnd;
- ++c_iter)
+ ++c_iter) {
+ const int fiberDim = _section->getFiberDimension(*c_iter);
_section->setFiberDimension(*c_iter, fiberDim, fibration);
+ } // for
} // splitDefault
// End of file
Modified: short/3D/PyLith/trunk/modulesrc/bc/Neumann.i
===================================================================
--- short/3D/PyLith/trunk/modulesrc/bc/Neumann.i 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/modulesrc/bc/Neumann.i 2009-06-09 16:31:22 UTC (rev 15154)
@@ -85,7 +85,7 @@
*/
const pylith::topology::Field<pylith::topology::SubMesh>&
cellField(const char* name,
- pylith::topology::SolutionFields* const fields);
+ pylith::topology::SolutionFields* const fields =0);
}; // class Neumann
Modified: short/3D/PyLith/trunk/pylith/meshio/OutputManagerSubMesh.py
===================================================================
--- short/3D/PyLith/trunk/pylith/meshio/OutputManagerSubMesh.py 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/pylith/meshio/OutputManagerSubMesh.py 2009-06-09 16:31:22 UTC (rev 15154)
@@ -110,7 +110,7 @@
return
- def _appendCellField(self, t, field):
+ def _appendCellField(self, t, field, label, labelId):
"""
Call C++ appendCellField();
"""
Modified: short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBC.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBC.cc 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBC.cc 2009-06-09 16:31:22 UTC (rev 15154)
@@ -156,27 +156,23 @@
fieldSection->getFiberDimension(*v_iter));
CPPUNIT_ASSERT_EQUAL(0,
fieldSection->getConstraintDimension(*v_iter));
-#if 0 // TODO FIELD SPLIT
CPPUNIT_ASSERT_EQUAL(_data->numDOF,
fieldSection->getFiberDimension(*v_iter,
fibration));
CPPUNIT_ASSERT_EQUAL(0,
fieldSection->getConstraintDimension(*v_iter,
fibration));
-#endif
} else {
CPPUNIT_ASSERT_EQUAL(_data->numDOF,
fieldSection->getFiberDimension(*v_iter));
CPPUNIT_ASSERT_EQUAL(_data->numFixedDOF,
fieldSection->getConstraintDimension(*v_iter));
-#if 0 // TODO FIELD SPLIT
CPPUNIT_ASSERT_EQUAL(_data->numDOF,
fieldSection->getFiberDimension(*v_iter,
fibration));
CPPUNIT_ASSERT_EQUAL(_data->numFixedDOF,
fieldSection->getConstraintDimension(*v_iter,
fibration));
-#endif
++iConstraint;
} // if/else
} // for
@@ -229,7 +225,6 @@
} // if/else
} // for
-#if 0 // TODO FIELD SPLIT
// Check fibration 0
const int fibration = 0;
iConstraint = 0;
@@ -252,7 +247,6 @@
++iConstraint;
} // if/else
} // for
-#endif
} // testSetConstraints
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/trunk/unittests/libtests/topology/TestFieldMesh.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/topology/TestFieldMesh.cc 2009-06-09 08:55:26 UTC (rev 15153)
+++ short/3D/PyLith/trunk/unittests/libtests/topology/TestFieldMesh.cc 2009-06-09 16:31:22 UTC (rev 15154)
@@ -21,8 +21,6 @@
#include "spatialdata/geocoords/CSCart.hh" // USES CSCart
-#define FIELD_SPLIT
-
// ----------------------------------------------------------------------
CPPUNIT_TEST_SUITE_REGISTRATION( pylith::topology::TestFieldMesh );
@@ -986,9 +984,7 @@
v_iter != vertices->end();
++v_iter, ++iV) {
section->addConstraintDimension(*v_iter, nconstraints[iV]);
-#if defined(FIELD_SPLIT)
section->addConstraintDimension(*v_iter, nconstraints[iV], fibration);
-#endif
} // for
fieldSrc.allocate();
@@ -998,20 +994,15 @@
v_iter != vertices->end();
++v_iter, index += nconstraints[i++]) {
section->setConstraintDof(*v_iter, &constraints[index]);
-#if defined(FIELD_SPLIT)
section->setConstraintDof(*v_iter, &constraints[index], fibration);
-#endif
} // for
} // Setup source field
-#if defined(FIELD_SPLIT)
const ALE::Obj<Mesh::RealSection>& section = fieldSrc.section();
CPPUNIT_ASSERT(!section.isNull());
CPPUNIT_ASSERT_EQUAL(numFibrations, section->getNumSpaces());
const ALE::Obj<Mesh::RealSection>& sectionSplit = section->getFibration(0);
CPPUNIT_ASSERT(!sectionSplit.isNull());
- section->view("FULL FIELD"); // TEMPORARY
- sectionSplit->view("FIBRATION 0"); // TEMPORARY
CPPUNIT_ASSERT(!vertices.isNull());
int iV = 0;
@@ -1022,7 +1013,6 @@
CPPUNIT_ASSERT_EQUAL(nconstraints[iV++],
section->getConstraintDimension(*v_iter, fibration));
} // for
-#endif
} // testSplitDefault
// ----------------------------------------------------------------------
@@ -1062,9 +1052,7 @@
v_iter != vertices->end();
++v_iter, ++iV) {
section->addConstraintDimension(*v_iter, nconstraints[iV]);
-#if defined(FIELD_SPLIT)
section->addConstraintDimension(*v_iter, nconstraints[iV], fibration);
-#endif
} // for
fieldSrc.allocate();
@@ -1074,13 +1062,10 @@
v_iter != vertices->end();
++v_iter, index += nconstraints[i++]) {
section->setConstraintDof(*v_iter, &constraints[index]);
-#if defined(FIELD_SPLIT)
section->setConstraintDof(*v_iter, &constraints[index], fibration);
-#endif
} // for
} // Setup source field
-#if defined(FIELD_SPLIT)
Field<Mesh> field(mesh);
field.cloneSection(fieldSrc);
const ALE::Obj<Mesh::RealSection>& section = field.section();
@@ -1100,7 +1085,6 @@
CPPUNIT_ASSERT_EQUAL(nconstraints[iV++],
section->getConstraintDimension(*v_iter, fibration));
} // for
-#endif
} // testCloneSectionSplit
// ----------------------------------------------------------------------
More information about the CIG-COMMITS
mailing list