From 53f39d4945504ae296f72129d71df21e536badc9 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sun, 20 Sep 2009 19:16:08 +0000
Subject: [PATCH] don't template laplaceTerm
---
Geo/GFaceCompound.cpp | 8 ++++----
Solver/laplaceTerm.h | 7 +++----
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/Geo/GFaceCompound.cpp b/Geo/GFaceCompound.cpp
index f2a0c8c85f..c704de7ead 100644
--- a/Geo/GFaceCompound.cpp
+++ b/Geo/GFaceCompound.cpp
@@ -757,7 +757,7 @@ void GFaceCompound::parametrize(iterationStep step) const
myAssembler.sizeOfR(), myAssembler.sizeOfF());
//convexCombinationTerm laplace(model(), 1, &ONE);
- laplaceTerm<double> laplace(model(), 1, &ONE);
+ laplaceTerm laplace(model(), 1, &ONE);
it = _compound.begin();
for( ; it != _compound.end() ; ++it){
for(unsigned int i = 0; i < (*it)->triangles.size(); ++i){
@@ -851,8 +851,8 @@ void GFaceCompound::parametrize_conformal() const
simpleFunction<double> ONE(1.0);
simpleFunction<double> MONE(-1.0 );
- laplaceTerm<double> laplace1(model(), 1, &ONE);
- laplaceTerm<double> laplace2(model(), 2, &ONE);
+ laplaceTerm laplace1(model(), 1, &ONE);
+ laplaceTerm laplace2(model(), 2, &ONE);
crossConfTerm cross12(model(), 1, 2, &ONE);
crossConfTerm cross21(model(), 2, 1, &MONE);
it = _compound.begin();
@@ -1214,7 +1214,7 @@ void GFaceCompound::getTriangle(double u, double v,
void GFaceCompound::buildOct() const
{
- printStuff();
+ //printStuff();
SBoundingBox3d bb;
int count = 0;
diff --git a/Solver/laplaceTerm.h b/Solver/laplaceTerm.h
index 6cb0135af1..d950d483c1 100644
--- a/Solver/laplaceTerm.h
+++ b/Solver/laplaceTerm.h
@@ -9,11 +9,10 @@
#include "helmholtzTerm.h"
// \nabla \cdot k \nabla U
-template<class scalar>
-class laplaceTerm : public helmholtzTerm<scalar> {
+class laplaceTerm : public helmholtzTerm<double> {
public:
- laplaceTerm(GModel *gm, int iField, simpleFunction<scalar> *k)
- : helmholtzTerm<scalar>(gm, iField, iField, k, 0) {}
+ laplaceTerm(GModel *gm, int iField, simpleFunction<double> *k)
+ : helmholtzTerm<double>(gm, iField, iField, k, 0) {}
};
#endif
--
GitLab