From 7fb942a74e775177d216327ebb66d8c48ea9eae0 Mon Sep 17 00:00:00 2001 From: guido Date: Sun, 5 Mar 2000 03:46:02 +0000 Subject: [PATCH] pillows ok git-svn-id: https://svn.dealii.org/trunk@2550 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/base/source/function_lib.cc | 52 ++++++++++++++++++----------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/deal.II/base/source/function_lib.cc b/deal.II/base/source/function_lib.cc index d5df1d87ca..e2c1518abe 100644 --- a/deal.II/base/source/function_lib.cc +++ b/deal.II/base/source/function_lib.cc @@ -17,8 +17,6 @@ #include -//TODO: Derivatives in 3d wrong (GK!) - template double PillowFunction::value (const Point &p, @@ -75,11 +73,11 @@ PillowFunction::laplacian (const Point &p, switch(dim) { case 1: - return 2.; + return -2.; case 2: - return 2.*((1.-p(0)*p(0))+(1.-p(1)*p(1))); + return -2.*((1.-p(0)*p(0))+(1.-p(1)*p(1))); case 3: - return 2.*((1.-p(0)*p(0))*(1.-p(1)*p(1)) + return -2.*((1.-p(0)*p(0))*(1.-p(1)*p(1)) +(1.-p(1)*p(1))*(1.-p(2)*p(2)) +(1.-p(2)*p(2))*(1.-p(0)*p(0))); default: @@ -103,13 +101,15 @@ PillowFunction::laplacian_list (const vector > &points, switch(dim) { case 1: - values[i] = 2.; + values[i] = -2.; break; case 2: - values[i] = 2.*((1.-p(0)*p(0))+(1.-p(1)*p(1))); + values[i] = -2.*((1.-p(0)*p(0))+(1.-p(1)*p(1))); break; case 3: - values[i] = 2.*((1.-p(0)*p(0))+(1.-p(1)*p(1))+(1.-p(2)*p(2))); + values[i] = -2.*((1.-p(0)*p(0))*(1.-p(1)*p(1)) + +(1.-p(1)*p(1))*(1.-p(2)*p(2)) + +(1.-p(2)*p(2))*(1.-p(0)*p(0))); break; default: Assert(false, ExcNotImplemented()); @@ -126,16 +126,16 @@ PillowFunction::gradient (const Point &p, switch(dim) { case 1: - result[0] = 2.*p(0); + result[0] = -2.*p(0); break; case 2: - result[0] = 2.*p(0)*(1.-p(1)*p(1)); - result[1] = 2.*p(1)*(1.-p(0)*p(0)); + result[0] = -2.*p(0)*(1.-p(1)*p(1)); + result[1] = -2.*p(1)*(1.-p(0)*p(0)); break; case 3: - result[0] = 2.*p(0)*(1.-p(1)*p(1))*(1.-p(2)*p(2)); - result[1] = 2.*p(1)*(1.-p(0)*p(0))*(1.-p(2)*p(2)); - result[2] = 2.*p(2)*(1.-p(0)*p(0))*(1.-p(1)*p(1)); + result[0] = -2.*p(0)*(1.-p(1)*p(1))*(1.-p(2)*p(2)); + result[1] = -2.*p(1)*(1.-p(0)*p(0))*(1.-p(2)*p(2)); + result[2] = -2.*p(2)*(1.-p(0)*p(0))*(1.-p(1)*p(1)); break; default: Assert(false, ExcNotImplemented()); @@ -158,16 +158,16 @@ PillowFunction::gradient_list (const vector > &points, switch(dim) { case 1: - gradients[i][0] = 2.*p(0); + gradients[i][0] = -2.*p(0); break; case 2: - gradients[i][0] = 2.*p(0)*(1.-p(1)*p(1)); - gradients[i][1] = 2.*p(1)*(1.-p(0)*p(0)); + gradients[i][0] = -2.*p(0)*(1.-p(1)*p(1)); + gradients[i][1] = -2.*p(1)*(1.-p(0)*p(0)); return; case 3: - gradients[i][0] = 2.*p(0)*(1.-p(1)*p(1))*(1.-p(2)*p(2)); - gradients[i][1] = 2.*p(1)*(1.-p(0)*p(0))*(1.-p(2)*p(2)); - gradients[i][2] = 2.*p(2)*(1.-p(0)*p(0))*(1.-p(1)*p(1)); + gradients[i][0] = -2.*p(0)*(1.-p(1)*p(1))*(1.-p(2)*p(2)); + gradients[i][1] = -2.*p(1)*(1.-p(0)*p(0))*(1.-p(2)*p(2)); + gradients[i][2] = -2.*p(2)*(1.-p(0)*p(0))*(1.-p(1)*p(1)); break; default: Assert(false, ExcNotImplemented()); @@ -405,6 +405,18 @@ LSingularityFunction::gradient (const Point<2> &/*p*/, const unsigned int) const { Assert(false, ExcNotImplemented()); + double x = p(0); + double y = p(1); + + if ((x>=0) && (y>=0)) + { + static double infty[2] = {1./0., 1./0.}; + return Tensor<1,2>(infty); + } + + double phi = atan2(y,-x)+M_PI; + double r2 = x*x+y*y; + return Tensor<1,2>(); } -- 2.39.5