From 7f45fdb1fc377d0c59acb923e69d0020c90ead22 Mon Sep 17 00:00:00 2001 From: Luca Heltai Date: Thu, 28 May 2009 05:34:43 +0000 Subject: [PATCH] Fixed output for interpolation_3 and added test for factorization of two dimensional log integrals. git-svn-id: https://svn.dealii.org/trunk@18882 0785d39b-7218-0410-832d-ea1e28bc413d --- tests/codim_one/integrate_log_2.cc | 16 ++- tests/codim_one/interpolation_3.cc | 3 +- tests/codim_one/interpolation_3/cmp/generic | 122 ++++++++++---------- 3 files changed, 75 insertions(+), 66 deletions(-) diff --git a/tests/codim_one/integrate_log_2.cc b/tests/codim_one/integrate_log_2.cc index 72958f551c..6300261ede 100644 --- a/tests/codim_one/integrate_log_2.cc +++ b/tests/codim_one/integrate_log_2.cc @@ -66,11 +66,12 @@ int main() vector alphas; alphas.push_back(1.); - alphas.push_back(1/3.); + alphas.push_back(1./3.); alphas.push_back(3./2.); double exact_integral; + double eps = 1e-10; for(unsigned int nos = 0; nos< origins.size(); ++nos) { for(unsigned int nas = 0; nas < alphas.size(); ++nas) { @@ -83,16 +84,23 @@ int main() << exact_integral << endl; for(unsigned int nq = 1; nq < 13; ++nq) { QGaussLogR<1> quad(nq, origins[nos], alphas[nas]); + QGaussLogR<1> factored_quad(nq, origins[nos], alphas[nas], true); double approx_integral = 0; + double approx_integral_factored = 0; for(unsigned int q=0; q void test(std::string filename) { diff --git a/tests/codim_one/interpolation_3/cmp/generic b/tests/codim_one/interpolation_3/cmp/generic index 5aba0aee41..1d7b694e0f 100644 --- a/tests/codim_one/interpolation_3/cmp/generic +++ b/tests/codim_one/interpolation_3/cmp/generic @@ -1,7 +1,7 @@ -JobId unknown Mon Apr 27 19:02:34 2009 + DEAL::Test<1,2> # vtk DataFile Version 3.0 -#This file was generated by the deal.II library on 2009/4/27 at 19:2 :34 +#This file was generated ASCII DATASET UNSTRUCTURED_GRID @@ -113,7 +113,7 @@ LOOKUP_TABLE default 1.00000 0.959479 0.959479 0.844483 0.844483 0.673653 0.673653 0.474675 0.474675 0.279803 0.279803 0.120621 0.120621 0.0229304 0.0229304 0.00256534 0.00256534 0.0628267 0.0628267 0.193947 0.193947 0.374674 0.374674 0.575714 0.575714 0.764482 0.764482 0.910382 0.910382 0.989765 0.989765 0.989765 0.989765 0.910382 0.910382 0.764482 0.764482 0.575714 0.575714 0.374674 0.374674 0.193947 0.193947 0.0628267 0.0628267 0.00256534 0.00256534 0.0229304 0.0229304 0.120621 0.120621 0.279803 0.279803 0.474675 0.474675 0.673653 0.673653 0.844483 0.844483 0.959479 0.959479 1.00000 DEAL::Test<1,2> # vtk DataFile Version 3.0 -#This file was generated by the deal.II library on 2009/4/27 at 19:2 :34 +#This file was generated ASCII DATASET UNSTRUCTURED_GRID @@ -124,32 +124,32 @@ POINTS 1460 double 0.190136 0.195195 0.962158 0.00669937 0.000466175 0.999977 0.00461505 0.187078 0.982334 --0.182549 -0.000741852 0.983196 +-0.182549 0.000741852 0.983196 -0.182495 0.180430 0.966509 0.0100420 -0.185333 0.982625 0.00669937 0.000466175 0.999977 -0.181661 -0.183137 0.966157 --0.182549 -0.000741852 0.983196 +-0.182549 0.000741852 0.983196 0.0100420 -0.185333 0.982625 0.203852 -0.178404 0.962609 0.00669937 0.000466175 0.999977 0.199497 0.0116327 0.979829 -0.200262 -0.00155888 -0.979741 +0.200262 0.00155888 -0.979741 0.197856 -0.189980 -0.961645 -0.00414817 -0.00247690 -0.999988 +0.00414817 0.00247690 -0.999988 0.00806077 -0.188674 -0.982007 --0.186660 -0.00386397 -0.982417 -0.00414817 -0.00247690 -0.999988 +-0.186660 0.00386397 -0.982417 +0.00414817 0.00247690 -0.999988 -0.183004 -0.183737 -0.965790 0.00806077 -0.188674 -0.982007 --0.186660 -0.00386397 -0.982417 +-0.186660 0.00386397 -0.982417 -0.192625 0.178938 -0.964820 -0.00414817 -0.00247690 -0.999988 --0.00190117 0.187027 -0.982353 -0.200262 -0.00155888 -0.979741 -0.00414817 -0.00247690 -0.999988 +0.00414817 0.00247690 -0.999988 +0.00190117 0.187027 -0.982353 +0.200262 0.00155888 -0.979741 +0.00414817 0.00247690 -0.999988 0.193629 0.191921 -0.962120 --0.00190117 0.187027 -0.982353 +0.00190117 0.187027 -0.982353 0.0100420 -0.185333 0.982625 0.0148899 -0.361927 0.932087 0.203852 -0.178404 0.962609 @@ -163,10 +163,10 @@ POINTS 1460 double -0.171060 -0.362037 0.916334 -0.357202 -0.345442 0.867800 -0.181661 -0.183137 0.966157 --0.182549 -0.000741852 0.983196 +-0.182549 0.000741852 0.983196 -0.357552 -0.163253 0.919514 -0.340668 0.00333181 0.940178 --0.182549 -0.000741852 0.983196 +-0.182549 0.000741852 0.983196 -0.182495 0.180430 0.966509 -0.340668 0.00333181 0.940178 -0.349565 0.168579 0.921621 @@ -208,23 +208,23 @@ POINTS 1460 double 0.185093 -0.520900 0.833309 0.177120 0.369762 -0.912088 0.193629 0.191921 -0.962120 --0.00818778 0.364085 -0.931330 --0.00190117 0.187027 -0.982353 +0.00818778 0.364085 -0.931330 +0.00190117 0.187027 -0.982353 -0.191325 0.355670 -0.914819 --0.00818778 0.364085 -0.931330 +0.00818778 0.364085 -0.931330 -0.192625 0.178938 -0.964820 --0.00190117 0.187027 -0.982353 +0.00190117 0.187027 -0.982353 -0.191325 0.355670 -0.914819 -0.192625 0.178938 -0.964820 -0.374134 0.335899 -0.864405 -0.368281 0.158404 -0.916121 --0.186660 -0.00386397 -0.982417 --0.346835 -0.00571185 -0.937909 +-0.186660 0.00386397 -0.982417 +-0.346835 0.00571185 -0.937909 -0.192625 0.178938 -0.964820 -0.368281 0.158404 -0.916121 --0.186660 -0.00386397 -0.982417 +-0.186660 0.00386397 -0.982417 -0.183004 -0.183737 -0.965790 --0.346835 -0.00571185 -0.937909 +-0.346835 0.00571185 -0.937909 -0.357142 -0.169641 -0.918516 -0.183004 -0.183737 -0.965790 -0.172270 -0.356191 -0.918396 @@ -242,13 +242,13 @@ POINTS 1460 double 0.375860 -0.190880 -0.906805 0.195200 -0.356446 -0.913698 0.346872 -0.335557 -0.875832 -0.200262 -0.00155888 -0.979741 -0.388731 -0.00702144 -0.921324 +0.200262 0.00155888 -0.979741 +0.388731 0.00702144 -0.921324 0.197856 -0.189980 -0.961645 0.375860 -0.190880 -0.906805 -0.200262 -0.00155888 -0.979741 +0.200262 0.00155888 -0.979741 0.193629 0.191921 -0.962120 -0.388731 -0.00702144 -0.921324 +0.388731 0.00702144 -0.921324 0.380242 0.184526 -0.906293 0.177120 0.369762 -0.912088 0.356171 0.365963 -0.859775 @@ -261,7 +261,7 @@ POINTS 1460 double 0.148785 0.528158 -0.836010 0.177120 0.369762 -0.912088 -0.0141954 0.514050 -0.857643 --0.00818778 0.364085 -0.931330 +0.00818778 0.364085 -0.931330 0.0148899 -0.361927 0.932087 -0.171060 -0.362037 0.916334 0.0185949 -0.516363 0.856168 @@ -337,7 +337,7 @@ POINTS 1460 double -0.177259 0.515350 -0.838447 -0.0141954 0.514050 -0.857643 -0.191325 0.355670 -0.914819 --0.00818778 0.364085 -0.931330 +0.00818778 0.364085 -0.931330 -0.177259 0.515350 -0.838447 -0.191325 0.355670 -0.914819 -0.354645 0.504149 -0.787439 @@ -350,12 +350,12 @@ POINTS 1460 double -0.374134 0.335899 -0.864405 -0.519459 0.115001 -0.846721 -0.368281 0.158404 -0.916121 --0.465763 -0.00842279 -0.884870 +-0.465763 0.00842279 -0.884870 -0.519459 0.115001 -0.846721 --0.346835 -0.00571185 -0.937909 +-0.346835 0.00571185 -0.937909 -0.368281 0.158404 -0.916121 --0.465763 -0.00842279 -0.884870 --0.346835 -0.00571185 -0.937909 +-0.465763 0.00842279 -0.884870 +-0.346835 0.00571185 -0.937909 -0.509310 -0.135050 -0.849920 -0.357142 -0.169641 -0.918516 -0.509310 -0.135050 -0.849920 @@ -378,11 +378,11 @@ POINTS 1460 double 0.537669 -0.223636 -0.812957 0.346872 -0.335557 -0.875832 0.442254 -0.443253 -0.779704 -0.388731 -0.00702144 -0.921324 +0.388731 0.00702144 -0.921324 0.563849 -0.0174432 -0.825694 0.375860 -0.190880 -0.906805 0.537669 -0.223636 -0.812957 -0.388731 -0.00702144 -0.921324 +0.388731 0.00702144 -0.921324 0.380242 0.184526 -0.906293 0.563849 -0.0174432 -0.825694 0.550387 0.177131 -0.815904 @@ -454,11 +454,11 @@ POINTS 1460 double -0.245340 0.650976 0.718358 -0.147823 0.501329 0.852536 -0.308662 0.508706 0.803708 --0.00423022 0.648465 0.761233 +0.00423022 0.648465 0.761233 -0.133662 0.605681 0.784401 0.0154969 0.512293 0.858671 -0.147823 0.501329 0.852536 --0.00423022 0.648465 0.761233 +0.00423022 0.648465 0.761233 0.0154969 0.512293 0.858671 0.180122 0.656676 0.732347 0.202731 0.506664 0.837969 @@ -486,7 +486,7 @@ POINTS 1460 double -0.519459 0.115001 -0.846721 -0.698034 0.229271 -0.678368 -0.664513 -0.0142802 -0.747140 --0.465763 -0.00842279 -0.884870 +-0.465763 0.00842279 -0.884870 -0.509310 -0.135050 -0.849920 -0.519459 0.115001 -0.846721 -0.664513 -0.0142802 -0.747140 @@ -622,11 +622,11 @@ POINTS 1460 double -0.405250 0.660612 0.631952 -0.0989533 0.774002 0.625403 -0.245340 0.650976 0.718358 --0.00423022 0.648465 0.761233 +0.00423022 0.648465 0.761233 -0.0989533 0.774002 0.625403 -0.133662 0.605681 0.784401 -0.245340 0.650976 0.718358 --0.00423022 0.648465 0.761233 +0.00423022 0.648465 0.761233 0.180122 0.656676 0.732347 -0.0989533 0.774002 0.625403 0.135136 0.785214 0.604299 @@ -655,12 +655,12 @@ POINTS 1460 double 0.442254 -0.443253 -0.779704 0.648371 -0.422876 -0.633080 0.563849 -0.0174432 -0.825694 -0.721031 -0.00398178 -0.692891 +0.721031 0.00398178 -0.692891 0.537669 -0.223636 -0.812957 0.708667 -0.214314 -0.672206 0.563849 -0.0174432 -0.825694 0.550387 0.177131 -0.815904 -0.721031 -0.00398178 -0.692891 +0.721031 0.00398178 -0.692891 0.693866 0.186818 -0.695449 0.518968 0.354143 -0.777981 0.654562 0.341847 -0.674306 @@ -906,11 +906,11 @@ POINTS 1460 double 0.845603 -0.184532 -0.500902 0.648371 -0.422876 -0.633080 0.794706 -0.390023 -0.465106 -0.721031 -0.00398178 -0.692891 +0.721031 0.00398178 -0.692891 0.852837 0.0357928 -0.520950 0.708667 -0.214314 -0.672206 0.845603 -0.184532 -0.500902 -0.721031 -0.00398178 -0.692891 +0.721031 0.00398178 -0.692891 0.693866 0.186818 -0.695449 0.852837 0.0357928 -0.520950 0.802232 0.221238 -0.554506 @@ -1277,11 +1277,11 @@ POINTS 1460 double -0.762932 0.638505 -0.101221 -0.850268 0.492563 -0.185545 -0.820634 0.569603 0.0459706 --0.903095 0.429356 -0.00854739 +-0.903095 0.429356 0.00854739 -0.911350 0.315158 -0.264797 -0.975094 0.217450 -0.0436662 -0.850268 0.492563 -0.185545 --0.903095 0.429356 -0.00854739 +-0.903095 0.429356 0.00854739 -0.911350 0.315158 -0.264797 -0.926248 0.130915 -0.353450 -0.975094 0.217450 -0.0436662 @@ -1365,11 +1365,11 @@ POINTS 1460 double 0.104793 -0.974428 0.198765 -0.0960703 -0.977990 0.185220 0.101956 -0.994685 -0.0143580 --0.0833540 -0.996488 -0.00792410 +-0.0833540 -0.996488 0.00792410 -0.272765 -0.950318 0.149981 --0.242814 -0.970028 -0.00937444 +-0.242814 -0.970028 0.00937444 -0.0960703 -0.977990 0.185220 --0.0833540 -0.996488 -0.00792410 +-0.0833540 -0.996488 0.00792410 0.856776 -0.511278 -0.0673024 0.860569 -0.502041 0.0858767 0.773721 -0.632956 -0.0268631 @@ -1384,18 +1384,18 @@ POINTS 1460 double 0.913819 0.359120 0.189654 -0.266396 -0.949232 -0.167307 -0.0917829 -0.975406 -0.200399 --0.242814 -0.970028 -0.00937444 --0.0833540 -0.996488 -0.00792410 +-0.242814 -0.970028 0.00937444 +-0.0833540 -0.996488 0.00792410 0.0901999 -0.973909 -0.208243 0.101956 -0.994685 -0.0143580 -0.0917829 -0.975406 -0.200399 --0.0833540 -0.996488 -0.00792410 +-0.0833540 -0.996488 0.00792410 0.316742 0.933556 -0.167774 0.265611 0.963378 0.0367788 0.492632 0.860781 -0.127945 0.455745 0.889599 0.0301602 -0.820634 0.569603 0.0459706 --0.903095 0.429356 -0.00854739 +-0.903095 0.429356 0.00854739 -0.844457 0.512661 0.155148 -0.901670 0.400423 0.163259 -0.844457 0.512661 0.155148 @@ -1461,15 +1461,15 @@ POINTS 1460 double -0.515490 -0.856830 -0.0105762 -0.408566 -0.905560 -0.114173 -0.413198 -0.905712 0.0946222 --0.357619 -0.933819 -0.00949872 +-0.357619 -0.933819 0.00949872 -0.266396 -0.949232 -0.167307 --0.242814 -0.970028 -0.00937444 +-0.242814 -0.970028 0.00937444 -0.408566 -0.905560 -0.114173 --0.357619 -0.933819 -0.00949872 +-0.357619 -0.933819 0.00949872 -0.272765 -0.950318 0.149981 -0.413198 -0.905712 0.0946222 --0.242814 -0.970028 -0.00937444 --0.357619 -0.933819 -0.00949872 +-0.242814 -0.970028 0.00937444 +-0.357619 -0.933819 0.00949872 0.740417 0.441189 -0.507085 0.849417 0.341618 -0.402229 0.738599 0.337590 -0.583527 @@ -1508,7 +1508,7 @@ POINTS 1460 double -0.974178 0.0557530 0.218788 -0.975094 0.217450 -0.0436662 -0.955247 0.234028 0.180927 --0.903095 0.429356 -0.00854739 +-0.903095 0.429356 0.00854739 -0.901670 0.400423 0.163259 0.492632 0.860781 -0.127945 0.455745 0.889599 0.0301602 -- 2.39.5