diff --git a/library/StdRegions/StdPrismExp.cpp b/library/StdRegions/StdPrismExp.cpp index 732e2deebe73e4501148912ca1af40d15ed5b702..99034d5aa5b08646ec2f7d1ffbf2b239fad3fa2b 100644 --- a/library/StdRegions/StdPrismExp.cpp +++ b/library/StdRegions/StdPrismExp.cpp @@ -1924,15 +1924,6 @@ namespace Nektar // GLL quadrature points. switch(m_base[2]->GetPointsType()) { - // Legendre inner product. - case LibUtilities::eGaussLobattoLegendre: - for(i = 0; i < nquad2; ++i) - { - Blas::Dscal(nquad0*nquad1,0.25*(1-z2[i])*w2[i], - &outarray[0]+i*nquad0*nquad1,1); - } - break; - // (1,0) Jacobi inner product. case LibUtilities::eGaussRadauMAlpha1Beta0: for(i = 0; i < nquad2; ++i) @@ -1943,7 +1934,11 @@ namespace Nektar break; default: - ASSERTL0(false, "Quadrature point type not supported for this element."); + for(i = 0; i < nquad2; ++i) + { + Blas::Dscal(nquad0*nquad1,0.25*(1-z2[i])*w2[i], + &outarray[0]+i*nquad0*nquad1,1); + } break; } diff --git a/library/StdRegions/StdPyrExp.cpp b/library/StdRegions/StdPyrExp.cpp index 214392887f032883307ac2374103e72cbdb8f2eb..0a32d84caaa9881b7527442dd4cadf493ec14d1a 100644 --- a/library/StdRegions/StdPyrExp.cpp +++ b/library/StdRegions/StdPyrExp.cpp @@ -1250,15 +1250,6 @@ namespace Nektar // using GLL quadrature points. switch(m_base[2]->GetPointsType()) { - // Legendre inner product. - case LibUtilities::eGaussLobattoLegendre: - for(i = 0; i < nquad2; ++i) - { - Blas::Dscal(nquad0*nquad1,0.125*(1-z2[i])*(1-z2[i])*w2[i], - &outarray[0]+i*nquad0*nquad1,1); - } - break; - // (2,0) Jacobi inner product. case LibUtilities::eGaussRadauMAlpha2Beta0: for(i = 0; i < nquad2; ++i) @@ -1269,7 +1260,11 @@ namespace Nektar break; default: - ASSERTL0(false, "Quadrature point type not supported for this element."); + for(i = 0; i < nquad2; ++i) + { + Blas::Dscal(nquad0*nquad1,0.125*(1-z2[i])*(1-z2[i])*w2[i], + &outarray[0]+i*nquad0*nquad1,1); + } break; } } diff --git a/library/StdRegions/StdTetExp.cpp b/library/StdRegions/StdTetExp.cpp index d9aa9dc8efef3310efff4a07a42b472989070fda..cd7a6dd35ebc362e2e64345767e88f95ce294e28 100644 --- a/library/StdRegions/StdTetExp.cpp +++ b/library/StdRegions/StdTetExp.cpp @@ -2043,48 +2043,34 @@ namespace Nektar switch(m_base[1]->GetPointsType()) { - // Legendre inner product. - case LibUtilities::eGaussLobattoLegendre: - + // (1,0) Jacobi Inner product. + case LibUtilities::eGaussRadauMAlpha1Beta0: for(j = 0; j < nquad2; ++j) { for(i = 0; i < nquad1; ++i) { - Blas::Dscal(nquad0, - 0.5*(1-z1[i])*w1[i], - &outarray[0]+i*nquad0 + j*nquad0*nquad1, - 1 ); + Blas::Dscal(nquad0,0.5*w1[i], &outarray[0]+i*nquad0+ + j*nquad0*nquad1,1); } } break; - // (1,0) Jacobi Inner product. - case LibUtilities::eGaussRadauMAlpha1Beta0: + default: for(j = 0; j < nquad2; ++j) { for(i = 0; i < nquad1; ++i) { - Blas::Dscal(nquad0,0.5*w1[i], &outarray[0]+i*nquad0+ - j*nquad0*nquad1,1); + Blas::Dscal(nquad0, + 0.5*(1-z1[i])*w1[i], + &outarray[0]+i*nquad0 + j*nquad0*nquad1, + 1 ); } } break; - - default: - ASSERTL0(false, "Unsupported quadrature points type."); - break; } switch(m_base[2]->GetPointsType()) { - // Legendre inner product. - case LibUtilities::eGaussLobattoLegendre: - for(i = 0; i < nquad2; ++i) - { - Blas::Dscal(nquad0*nquad1,0.25*(1-z2[i])*(1-z2[i])*w2[i], - &outarray[0]+i*nquad0*nquad1,1); - } - break; // (2,0) Jacobi inner product. case LibUtilities::eGaussRadauMAlpha2Beta0: for(i = 0; i < nquad2; ++i) @@ -2095,7 +2081,11 @@ namespace Nektar break; default: - ASSERTL0(false, "Unsupported quadrature points type."); + for(i = 0; i < nquad2; ++i) + { + Blas::Dscal(nquad0*nquad1,0.25*(1-z2[i])*(1-z2[i])*w2[i], + &outarray[0]+i*nquad0*nquad1,1); + } break; } }