From 1b31b307375df821a396485bc5b8e24b2e3b864e Mon Sep 17 00:00:00 2001 From: hartmann Date: Tue, 5 Jul 2005 17:56:23 +0000 Subject: [PATCH] Remove NegativeMeasure assertions from measure function. Rather check for positive volumes in the Triangulation::create_triangulation function. git-svn-id: https://svn.dealii.org/trunk@11059 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/source/grid/tria_accessor.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/deal.II/deal.II/source/grid/tria_accessor.cc b/deal.II/deal.II/source/grid/tria_accessor.cc index 3c3d23ad16..531fd171a6 100644 --- a/deal.II/deal.II/source/grid/tria_accessor.cc +++ b/deal.II/deal.II/source/grid/tria_accessor.cc @@ -570,9 +570,8 @@ double TriaObjectAccessor<2, 2>::measure () const vertex(2)(1), vertex(3)(1) }; - const double measure=-x[0]*y[3]/2.0-x[1]*y[0]/2.0+x[2]*y[3]/2.0+x[3]*y[0]/2.0+x[0]*y[1]/2.0-x[3]*y[2]/2.0+x[1]*y[2]/2.0-x[2]*y[1]/2.0; - Assert(measure>=0, ExcNegativeMeasure()); - return measure; + return (-x[0]*y[3]/2.0-x[1]*y[0]/2.0+x[2]*y[3]/2.0+x[3]*y[0]/2.0+ + x[0]*y[1]/2.0-x[3]*y[2]/2.0+x[1]*y[2]/2.0-x[2]*y[1]/2.0); } @@ -1629,13 +1628,11 @@ double TriaObjectAccessor<3, 3>::measure () const // the other one). the measure is // thus negative. Thus take the // negative value of the result - const double measure= -(s3+x[5]*y[4]*z[1]/12.0-x[5]*y[4]*z[6]/12.0-x[3]*y[7]*z[4]/12.0+x[6]* + return -(s3+x[5]*y[4]*z[1]/12.0-x[5]*y[4]*z[6]/12.0-x[3]*y[7]*z[4]/12.0+x[6]* y[3]*z[7]/12.0-y[1]*x[6]*z[5]/12.0-z[5]*x[1]*y[4]/12.0+z[5]*x[6]*y[4]/12.0+z[5] *x[4]*y[1]/12.0-z[5]*x[4]*y[6]/12.0-x[6]*y[7]*z[3]/12.0-x[4]*y[3]*z[7]/12.0+x [4]*y[7]*z[3]/12.0-x[1]*y[5]*z[6]/12.0-y[6]*x[7]*z[4]/12.0-y[1]*x[2]*z[6]/12.0- y[2]*x[3]*z[6]/12.0+s2+s1+x[2]*y[0]*z[3]/12.0); - Assert(measure>=0, ExcNegativeMeasure()); - return measure; } #endif -- 2.39.5