Modify reporting of displacement and distance

This commit is contained in:
graham
2009-01-08 18:41:25 +00:00
parent e53479ef18
commit 3ae7624f63
9 changed files with 25122 additions and 25070 deletions

View File

@ -1,11 +1,11 @@
EXE_DEBUG = -DFULLDEBUG -g -O0 //EXE_DEBUG = -DFULLDEBUG -g -O0
//EXE_DEBUG = EXE_NDEBUG = -DNDEBUG
include $(GENERAL_RULES)/CGAL include $(GENERAL_RULES)/CGAL
FFLAGS = -DCGAL_FILES='"${CGAL_PATH}/CGAL/files"' FFLAGS = -DCGAL_FILES='"${CGAL_PATH}/CGAL/files"'
EXE_INC = \ EXE_INC = \
${EXE_DEBUG} \ ${EXE_NDEBUG} \
${CGAL_INC} \ ${CGAL_INC} \
-I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude -I$(LIB_SRC)/triSurface/lnInclude

View File

@ -592,9 +592,9 @@ void Foam::CV3D::relaxPoints(const scalar relaxation)
scalar faceArea = dualFace.mag(dualVertices); scalar faceArea = dualFace.mag(dualVertices);
scalar directStiffness = 2.0*relaxation; scalar directStiffness = 2.0;
scalar transverseStiffness = 0.0001*relaxation; scalar transverseStiffness = 0.0001;
scalar r0 = 0.9*controls_.minCellSize; scalar r0 = 0.9*controls_.minCellSize;
@ -606,11 +606,11 @@ void Foam::CV3D::relaxPoints(const scalar relaxation)
if (vA->internalPoint()) if (vA->internalPoint())
{ {
displacementAccumulator[vA->index()] += dA + dT; displacementAccumulator[vA->index()] += (dA + dT);
} }
if (vB->internalPoint()) if (vB->internalPoint())
{ {
displacementAccumulator[vB->index()] += -dA + dT; displacementAccumulator[vB->index()] += (-dA + dT);
} }
} }
} }
@ -621,6 +621,8 @@ void Foam::CV3D::relaxPoints(const scalar relaxation)
Info<< "Total displacement = " << totalDisp Info<< "Total displacement = " << totalDisp
<< " total distance = " << totalDist << endl; << " total distance = " << totalDist << endl;
displacementAccumulator *= relaxation;
for for
( (
Triangulation::Finite_vertices_iterator vit = finite_vertices_begin(); Triangulation::Finite_vertices_iterator vit = finite_vertices_begin();