Commit 749eac23 authored by Sebastian Aland's avatar Sebastian Aland
Browse files

CompositeFEM gets a consistent namespace

parent 142ba14f
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include "SubElInfo.h" #include "SubElInfo.h"
#include "SubPolytope.h" #include "SubPolytope.h"
namespace AMDiS { namespace compositeFEM {
double double
CFE_Integration::integrate_onNegLs(ElementFunction<double> *f, CFE_Integration::integrate_onNegLs(ElementFunction<double> *f,
......
...@@ -29,7 +29,10 @@ ...@@ -29,7 +29,10 @@
#include "Quadrature.h" #include "Quadrature.h"
#include "ElementLevelSet.h" #include "ElementLevelSet.h"
namespace AMDiS {
namespace compositeFEM {
using namespace AMDiS;
class CFE_Integration class CFE_Integration
{ {
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "Traverse.h" #include "Traverse.h"
#include "SubElInfo.h" #include "SubElInfo.h"
namespace AMDiS { namespace compositeFEM {
double CFE_NormAndErrorFcts::L2_err_abs = 0.0; double CFE_NormAndErrorFcts::L2_err_abs = 0.0;
double CFE_NormAndErrorFcts::L2_u_norm = 0.0; double CFE_NormAndErrorFcts::L2_u_norm = 0.0;
......
...@@ -34,7 +34,10 @@ ...@@ -34,7 +34,10 @@
#include "ScalableQuadrature.h" #include "ScalableQuadrature.h"
#include "SubPolytope.h" #include "SubPolytope.h"
namespace AMDiS {
namespace compositeFEM {
using namespace AMDiS;
class ElementNorm class ElementNorm
{ {
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
/** \file ElementLevelSet.h */ /** \file ElementLevelSet.h */
#ifndef AMDIS_ELEMENTLEVELSET_H #ifndef AMDIS_CFEM_ELEMENTLEVELSET_H
#define AMDIS_ELEMENTLEVELSET_H #define AMDIS_CFEM_ELEMENTLEVELSET_H
#include "ElementFunction.h" #include "ElementFunction.h"
#include "FixVec.h" #include "FixVec.h"
...@@ -471,6 +471,6 @@ protected: ...@@ -471,6 +471,6 @@ protected:
} }
using compositeFEM::ElementLevelSet; // using compositeFEM::ElementLevelSet;
#endif // AMDIS_ELEMENTLEVELSET_H #endif // AMDIS_ELEMENTLEVELSET_H
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "ScalableQuadrature.h" #include "ScalableQuadrature.h"
#include "SubPolytope.h" #include "SubPolytope.h"
namespace AMDiS { namespace compositeFEM {
SubElementAssembler::SubElementAssembler(Operator *op, SubElementAssembler::SubElementAssembler(Operator *op,
const FiniteElemSpace *rowFeSpace_, const FiniteElemSpace *rowFeSpace_,
......
...@@ -29,7 +29,10 @@ ...@@ -29,7 +29,10 @@
#include "SubElInfo.h" #include "SubElInfo.h"
#include "ScalableQuadrature.h" #include "ScalableQuadrature.h"
namespace AMDiS {
namespace compositeFEM {
using namespace AMDiS;
class SubPolytope; class SubPolytope;
......
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
#include "SubElInfo.h" #include "SubElInfo.h"
#include "SubPolytope.h" #include "SubPolytope.h"
namespace AMDiS {
namespace compositeFEM {
bool SubPolytope::checkIntPoints() bool SubPolytope::checkIntPoints()
{ {
......
...@@ -31,7 +31,10 @@ ...@@ -31,7 +31,10 @@
#include "FixVec.h" #include "FixVec.h"
#include "SubElInfo.h" #include "SubElInfo.h"
namespace AMDiS {
namespace compositeFEM {
using namespace AMDiS;
// =========================================================================== // ===========================================================================
// === class SubPolytope ===================================================== // === class SubPolytope =====================================================
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment