[cig-commits] r16200 - in short/3D/PyLith/trunk: pylith/tests tests/1d/line2 tests/1d/line3 tests/2d/quad4 tests/2d/tri3
brad at geodynamics.org
brad at geodynamics.org
Sat Jan 30 12:48:35 PST 2010
Author: brad
Date: 2010-01-30 12:48:34 -0800 (Sat, 30 Jan 2010)
New Revision: 16200
Modified:
short/3D/PyLith/trunk/pylith/tests/Solution.py
short/3D/PyLith/trunk/tests/1d/line2/dislocation.cfg
short/3D/PyLith/trunk/tests/1d/line3/dislocation.cfg
short/3D/PyLith/trunk/tests/2d/quad4/axialdisp_gendb.py
short/3D/PyLith/trunk/tests/2d/quad4/rigidbody_gendb.py
short/3D/PyLith/trunk/tests/2d/quad4/sheardisp_gendb.py
short/3D/PyLith/trunk/tests/2d/tri3/axialdisp_gendb.py
short/3D/PyLith/trunk/tests/2d/tri3/sheardisp_gendb.py
Log:
Fixed preconditioner setting for 1-D dislocation full scale tests. Updated spatial database creation settings.
Modified: short/3D/PyLith/trunk/pylith/tests/Solution.py
===================================================================
--- short/3D/PyLith/trunk/pylith/tests/Solution.py 2010-01-30 19:07:15 UTC (rev 16199)
+++ short/3D/PyLith/trunk/pylith/tests/Solution.py 2010-01-30 20:48:34 UTC (rev 16200)
@@ -34,34 +34,34 @@
disp = data['vertex_fields']['displacement']
# Check x displacements
- mask = numpy.abs(dispE[:,0] > tolerance)
+ mask = numpy.abs(dispE[:,0]) > tolerance
diff = numpy.abs(disp[:,0] - dispE[:,0])
diffR = numpy.abs(1.0 - disp[:,0] / dispE[:,0])
okay = ~mask * (diff < tolerance) + mask * (diffR < tolerance)
if numpy.sum(okay) != nvertices:
- "Error in x-component of displacement field."
+ print "Error in x-component of displacement field."
print "Expected values: ",dispE
print "Output values: ",disp
testcase.assertEqual(nvertices, numpy.sum(okay))
# Check y displacements
- mask = numpy.abs(dispE[:,1] > tolerance)
- diff = numpy.abs(disp[:,1] - dispE[:,0])
+ mask = numpy.abs(dispE[:,1]) > tolerance
+ diff = numpy.abs(disp[:,1] - dispE[:,1])
diffR = numpy.abs(1.0 - disp[:,1] / dispE[:,1])
okay = ~mask * (diff < tolerance) + mask * (diffR < tolerance)
if numpy.sum(okay) != nvertices:
- "Error in y-component of displacement field."
+ print "Error in y-component of displacement field."
print "Expected values: ",dispE
print "Output values: ",disp
testcase.assertEqual(nvertices, numpy.sum(okay))
# Check z displacements
- mask = numpy.abs(dispE[:,2] > tolerance)
+ mask = numpy.abs(dispE[:,2]) > tolerance
diff = numpy.abs(disp[:,2] - dispE[:,2])
diffR = numpy.abs(1.0 - disp[:,2] / dispE[:,2])
okay = ~mask * (diff < tolerance) + mask * (diffR < tolerance)
if numpy.sum(okay) != nvertices:
- "Error in z-component of displacement field."
+ print "Error in z-component of displacement field."
print "Expected values: ",dispE
print "Output values: ",disp
testcase.assertEqual(nvertices, numpy.sum(okay))
Modified: short/3D/PyLith/trunk/tests/1d/line2/dislocation.cfg
===================================================================
--- short/3D/PyLith/trunk/tests/1d/line2/dislocation.cfg 2010-01-30 19:07:15 UTC (rev 16199)
+++ short/3D/PyLith/trunk/tests/1d/line2/dislocation.cfg 2010-01-30 20:48:34 UTC (rev 16200)
@@ -83,31 +83,30 @@
# PETSc
# ----------------------------------------------------------------------
[dislocation.petsc]
-ksp_rtol = 1.0e-8
-pc_type = asm
-# Change the preconditioner settings (must turn off
-# shift_positive_definite and turn on shift_nonzero).
-sub_pc_factor_shift_positive_definite = 0
-sub_pc_factor_shift_nonzero =
+ksp_rtol = 1.0e-10
+pc_type = jacobi
ksp_max_it = 100
ksp_gmres_restart = 50
#ksp_monitor = true
#ksp_view = true
-#log_summary = true
-#start_in_debugger = true
#snes_monitor = true
#snes_view = true
+#log_summary = true
+#start_in_debugger = true
# ----------------------------------------------------------------------
# output
# ----------------------------------------------------------------------
[dislocation.problem.formulation.output.output.writer]
filename = dislocation.vtk
+float_precision = 8
[dislocation.timedependent.materials.elastic.output]
cell_filter = pylith.meshio.CellFilterAvgMesh
writer.filename = dislocation-elastic.vtk
+writer.float_precision = 8
[dislocation.timedependent.interfaces.fault.output.writer]
filename = dislocation-fault.vtk
+float_precision = 8
Modified: short/3D/PyLith/trunk/tests/1d/line3/dislocation.cfg
===================================================================
--- short/3D/PyLith/trunk/tests/1d/line3/dislocation.cfg 2010-01-30 19:07:15 UTC (rev 16199)
+++ short/3D/PyLith/trunk/tests/1d/line3/dislocation.cfg 2010-01-30 20:48:34 UTC (rev 16200)
@@ -82,11 +82,7 @@
# ----------------------------------------------------------------------
[dislocation.petsc]
ksp_rtol = 1.0e-8
-pc_type = asm
-# Change the preconditioner settings (must turn off
-# shift_positive_definite and turn on shift_nonzero).
-sub_pc_factor_shift_positive_definite = 0
-sub_pc_factor_shift_nonzero =
+pc_type = jacobi
ksp_max_it = 100
ksp_gmres_restart = 50
Modified: short/3D/PyLith/trunk/tests/2d/quad4/axialdisp_gendb.py
===================================================================
--- short/3D/PyLith/trunk/tests/2d/quad4/axialdisp_gendb.py 2010-01-30 19:07:15 UTC (rev 16199)
+++ short/3D/PyLith/trunk/tests/2d/quad4/axialdisp_gendb.py 2010-01-30 20:48:34 UTC (rev 16200)
@@ -53,7 +53,7 @@
cs = CSCart()
cs.inventory.spaceDim = 2
cs._configure()
- data = {'locs': xy,
+ data = {'points': xy,
'coordsys': cs,
'data_dim': 2,
'values': [{'name': "displacement-x",
Modified: short/3D/PyLith/trunk/tests/2d/quad4/rigidbody_gendb.py
===================================================================
--- short/3D/PyLith/trunk/tests/2d/quad4/rigidbody_gendb.py 2010-01-30 19:07:15 UTC (rev 16199)
+++ short/3D/PyLith/trunk/tests/2d/quad4/rigidbody_gendb.py 2010-01-30 20:48:34 UTC (rev 16200)
@@ -53,7 +53,7 @@
cs = CSCart()
cs.inventory.spaceDim = 2
cs._configure()
- data = {'locs': xy,
+ data = {'points': xy,
'coordsys': cs,
'data_dim': 2,
'values': [{'name': "displacement-x",
Modified: short/3D/PyLith/trunk/tests/2d/quad4/sheardisp_gendb.py
===================================================================
--- short/3D/PyLith/trunk/tests/2d/quad4/sheardisp_gendb.py 2010-01-30 19:07:15 UTC (rev 16199)
+++ short/3D/PyLith/trunk/tests/2d/quad4/sheardisp_gendb.py 2010-01-30 20:48:34 UTC (rev 16200)
@@ -53,7 +53,7 @@
cs = CSCart()
cs.inventory.spaceDim = 2
cs._configure()
- data = {'locs': xy,
+ data = {'points': xy,
'coordsys': cs,
'data_dim': 2,
'values': [{'name': "displacement-x",
Modified: short/3D/PyLith/trunk/tests/2d/tri3/axialdisp_gendb.py
===================================================================
--- short/3D/PyLith/trunk/tests/2d/tri3/axialdisp_gendb.py 2010-01-30 19:07:15 UTC (rev 16199)
+++ short/3D/PyLith/trunk/tests/2d/tri3/axialdisp_gendb.py 2010-01-30 20:48:34 UTC (rev 16200)
@@ -53,7 +53,7 @@
cs = CSCart()
cs.inventory.spaceDim = 2
cs._configure()
- data = {'locs': xy,
+ data = {'points': xy,
'coordsys': cs,
'data_dim': 2,
'values': [{'name': "displacement-x",
Modified: short/3D/PyLith/trunk/tests/2d/tri3/sheardisp_gendb.py
===================================================================
--- short/3D/PyLith/trunk/tests/2d/tri3/sheardisp_gendb.py 2010-01-30 19:07:15 UTC (rev 16199)
+++ short/3D/PyLith/trunk/tests/2d/tri3/sheardisp_gendb.py 2010-01-30 20:48:34 UTC (rev 16200)
@@ -53,7 +53,7 @@
cs = CSCart()
cs.inventory.spaceDim = 2
cs._configure()
- data = {'locs': xy,
+ data = {'points': xy,
'coordsys': cs,
'data_dim': 2,
'values': [{'name': "displacement-x",
More information about the CIG-COMMITS
mailing list