Skip to content
Snippets Groups Projects
Commit 53f39d49 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

don't template laplaceTerm

parent e4b61514
Branches
Tags
No related merge requests found
...@@ -757,7 +757,7 @@ void GFaceCompound::parametrize(iterationStep step) const ...@@ -757,7 +757,7 @@ void GFaceCompound::parametrize(iterationStep step) const
myAssembler.sizeOfR(), myAssembler.sizeOfF()); myAssembler.sizeOfR(), myAssembler.sizeOfF());
//convexCombinationTerm laplace(model(), 1, &ONE); //convexCombinationTerm laplace(model(), 1, &ONE);
laplaceTerm<double> laplace(model(), 1, &ONE); laplaceTerm laplace(model(), 1, &ONE);
it = _compound.begin(); it = _compound.begin();
for( ; it != _compound.end() ; ++it){ for( ; it != _compound.end() ; ++it){
for(unsigned int i = 0; i < (*it)->triangles.size(); ++i){ for(unsigned int i = 0; i < (*it)->triangles.size(); ++i){
...@@ -851,8 +851,8 @@ void GFaceCompound::parametrize_conformal() const ...@@ -851,8 +851,8 @@ void GFaceCompound::parametrize_conformal() const
simpleFunction<double> ONE(1.0); simpleFunction<double> ONE(1.0);
simpleFunction<double> MONE(-1.0 ); simpleFunction<double> MONE(-1.0 );
laplaceTerm<double> laplace1(model(), 1, &ONE); laplaceTerm laplace1(model(), 1, &ONE);
laplaceTerm<double> laplace2(model(), 2, &ONE); laplaceTerm laplace2(model(), 2, &ONE);
crossConfTerm cross12(model(), 1, 2, &ONE); crossConfTerm cross12(model(), 1, 2, &ONE);
crossConfTerm cross21(model(), 2, 1, &MONE); crossConfTerm cross21(model(), 2, 1, &MONE);
it = _compound.begin(); it = _compound.begin();
...@@ -1214,7 +1214,7 @@ void GFaceCompound::getTriangle(double u, double v, ...@@ -1214,7 +1214,7 @@ void GFaceCompound::getTriangle(double u, double v,
void GFaceCompound::buildOct() const void GFaceCompound::buildOct() const
{ {
printStuff(); //printStuff();
SBoundingBox3d bb; SBoundingBox3d bb;
int count = 0; int count = 0;
......
...@@ -9,11 +9,10 @@ ...@@ -9,11 +9,10 @@
#include "helmholtzTerm.h" #include "helmholtzTerm.h"
// \nabla \cdot k \nabla U // \nabla \cdot k \nabla U
template<class scalar> class laplaceTerm : public helmholtzTerm<double> {
class laplaceTerm : public helmholtzTerm<scalar> {
public: public:
laplaceTerm(GModel *gm, int iField, simpleFunction<scalar> *k) laplaceTerm(GModel *gm, int iField, simpleFunction<double> *k)
: helmholtzTerm<scalar>(gm, iField, iField, k, 0) {} : helmholtzTerm<double>(gm, iField, iField, k, 0) {}
}; };
#endif #endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment