From 121408ca2ebf58f1e682c8474aaf0b3294991235 Mon Sep 17 00:00:00 2001
From: Emilie Marchandise <emilie.marchandise@uclouvain.be>
Date: Tue, 6 Dec 2011 12:19:14 +0000
Subject: [PATCH] dgFunctionIntegrator : simpleFunction
---
Geo/GFaceCompound.h | 2 +-
Mesh/BackgroundMesh.h | 2 +-
Mesh/meshMetric.h | 2 +-
Plugin/Distance.cpp | 3 ++-
Solver/FuncGradDisc.h | 4 ++--
Solver/elasticitySolver.h | 2 +-
Solver/filters.h | 2 +-
7 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Geo/GFaceCompound.h b/Geo/GFaceCompound.h
index 74aef07aad..1e99312cfd 100644
--- a/Geo/GFaceCompound.h
+++ b/Geo/GFaceCompound.h
@@ -11,7 +11,7 @@
#include "GmshConfig.h"
#include "GmshMessage.h"
#include "GFace.h"
-#include "simpleFunction.h"
+template <class scalar> class simpleFunction;
#if defined(HAVE_SOLVER)
diff --git a/Mesh/BackgroundMesh.h b/Mesh/BackgroundMesh.h
index aab9c7f521..a8981b80b8 100644
--- a/Mesh/BackgroundMesh.h
+++ b/Mesh/BackgroundMesh.h
@@ -7,9 +7,9 @@
#define _BACKGROUND_MESH_H_
#include "STensor3.h"
-#include "simpleFunction.h"
#include <vector>
#include <list>
+#include "simpleFunction.h"
class MElementOctree;
class GFace;
diff --git a/Mesh/meshMetric.h b/Mesh/meshMetric.h
index fa228ab551..240ad8d983 100644
--- a/Mesh/meshMetric.h
+++ b/Mesh/meshMetric.h
@@ -4,7 +4,7 @@
#include "STensor3.h"
#include "Field.h"
#include "meshGFaceOptimize.h"
-#include "simpleFunction.h"
+template <class scalar> class simpleFunction;
class MVertex;
class gLevelset;
diff --git a/Plugin/Distance.cpp b/Plugin/Distance.cpp
index 265c914776..48761bc744 100644
--- a/Plugin/Distance.cpp
+++ b/Plugin/Distance.cpp
@@ -8,7 +8,6 @@
#include "GmshConfig.h"
#include "GModel.h"
#include "Distance.h"
-#include "simpleFunction.h"
#include "distanceTerm.h"
#include "Context.h"
#include "Numeric.h"
@@ -20,6 +19,8 @@
#include "laplaceTerm.h"
#include "crossConfTerm.h"
+template <class scalar> class simpleFunction;
+
StringXNumber DistanceOptions_Number[] = {
{GMSH_FULLRC, "PhysPoint", NULL, 0.},
{GMSH_FULLRC, "PhysLine", NULL, 0.},
diff --git a/Solver/FuncGradDisc.h b/Solver/FuncGradDisc.h
index 2b5b8c7e09..0dc7006ce9 100644
--- a/Solver/FuncGradDisc.h
+++ b/Solver/FuncGradDisc.h
@@ -11,11 +11,11 @@
#ifndef _FUNCGRADDISC_H_
#define _FUNCGRADDISC_H_
-#include "simpleFunction.h"
#include "gmshLevelset.h"
#include "MVertex.h"
#include "GModel.h"
-//#include "gLevelSetMesh.cpp"
+
+template <class scalar> class simpleFunction;
class FuncGradDisc : public simpleFunctionOnElement<double> {
diff --git a/Solver/elasticitySolver.h b/Solver/elasticitySolver.h
index f555f6be78..0731c4d2f9 100644
--- a/Solver/elasticitySolver.h
+++ b/Solver/elasticitySolver.h
@@ -10,9 +10,9 @@
#include <string>
#include "SVector3.h"
#include "dofManager.h"
-#include "simpleFunction.h"
#include "functionSpace.h"
+template <class scalar> class simpleFunction;
class GModel;
class PView;
class groupOfElements;
diff --git a/Solver/filters.h b/Solver/filters.h
index 038aaeae7a..37ca454f47 100644
--- a/Solver/filters.h
+++ b/Solver/filters.h
@@ -11,11 +11,11 @@
#ifndef _FILTERS_H_
#define _FILTERS_H_
-#include "simpleFunction.h"
#include "dofManager.h"
#include "GModel.h"
#include "groupOfElements.h"
#include "gmshLevelset.h"
+template <class scalar> class simpleFunction;
class FilterNodeEnriched
{
--
GitLab