Reorganizes codes. Removes using namespace mfem from headers.

EMinsight · Aug 17, 2022 · 55e3b5b · 55e3b5b
1 parent 10f2619
commit 55e3b5b
Show file tree

Hide file tree

Showing 29 changed files with 227 additions and 216 deletions.
diff --git a/src/maxwell/CMakeLists.txt b/src/maxwell/CMakeLists.txt
@@ -7,13 +7,13 @@ include_directories(${MFEM_INCLUDE_DIRS})
 add_library(maxwell_solvers STATIC 
 	"Solver.h" "Solver.cpp" 
 	"FiniteElementEvolution.h" "FiniteElementEvolution.cpp" 
-	"BilinearIntegrators.h" "BilinearIntegrators.cpp"
+	"mfemExtension/BilinearIntegrators.h" "mfemExtension/BilinearIntegrators.cpp"
 	"Types.h" 
-
 	"Material.h" "Material.cpp"
 	"Model.h" "Model.cpp" 
 	"Probes.h" "Probes.cpp" 
-	"Sources.h" "Sources.cpp")
+	"Sources.h" "Sources.cpp"
+)
 
 target_link_libraries(maxwell_solvers mfem)
 
diff --git a/src/maxwell/FiniteElementEvolution.cpp b/src/maxwell/FiniteElementEvolution.cpp
@@ -2,6 +2,9 @@
 
 namespace maxwell {
 
+using namespace mfem;
+using namespace mfemExtension;
+
 FiniteElementEvolution::FiniteElementEvolution(FiniteElementSpace* fes, Options options, Model& model, Sources& sources) :
 	TimeDependentOperator(numberOfFieldComponents* numberOfMaxDimensions* fes->GetNDofs()),
 	opts_(options),

diff --git a/src/maxwell/FiniteElementEvolution.h b/src/maxwell/FiniteElementEvolution.h
@@ -1,19 +1,19 @@
 #pragma once
 
-#include "mfem.hpp"
-#include "BilinearIntegrators.h"
+#include "mfemExtension/BilinearIntegrators.h"
+
 #include "Types.h"
 #include "Model.h"
 #include "Sources.h"
 
-#include <array>
-
 namespace maxwell {
 
-class FiniteElementEvolution : public TimeDependentOperator {
+class FiniteElementEvolution : public mfem::TimeDependentOperator {
 public:
-
-	typedef std::unique_ptr<BilinearForm> FiniteElementOperator;
+	using Vector = mfem::Vector;
+	using FiniteElementSpace = mfem::FiniteElementSpace;
+	using BilinearForm = mfem::BilinearForm;
+	using FiniteElementOperator = std::unique_ptr<BilinearForm>;
 
 	struct Options {
 		FluxType fluxType = FluxType::Upwind;

diff --git a/src/maxwell/Material.h b/src/maxwell/Material.h
@@ -11,7 +11,7 @@ class Material {
 	double getPermittivity() const { return epsilon_; }
 	double getPermeability() const { return mu_; }
 	double getImpedance() const { return sqrt(mu_ / epsilon_); }
-	double getConductance() const { return sqrt(epsilon_ / mu_); }
+	double getAdmitance() const { return sqrt(epsilon_ / mu_); }
 
 private:
 	double epsilon_, mu_;

diff --git a/src/maxwell/Model.h b/src/maxwell/Model.h
@@ -1,11 +1,10 @@
 #pragma once
 
-#include "mfem.hpp"
-#include "Material.h"
-#include "Types.h"
+#include <mfem.hpp>
 #include <map>
 
-using namespace mfem;
+#include "Material.h"
+#include "Types.h"
 
 namespace maxwell {
 
@@ -16,6 +15,7 @@ using AttributeToBoundary = std::map<Attribute, BdrCond>;
 
 class Model {
 public:
+	using Mesh = mfem::Mesh;
 
 	Model(Mesh&, const AttributeToMaterial&, const AttributeToBoundary&);
 	Mesh& getMesh() { return mesh_; };
@@ -24,11 +24,9 @@ class Model {
 	const AttributeToBoundary& getAttToBdr() const { return attToBdrMap_; }
 
 private:
-
 	Mesh mesh_;
 	AttributeToMaterial attToMatMap_;
 	AttributeToBoundary attToBdrMap_;
-
 };
 
 }
diff --git a/src/maxwell/Probes.h b/src/maxwell/Probes.h
@@ -1,9 +1,8 @@
 #pragma once
 
-#include "mfem.hpp"
+#include <mfem.hpp>
 #include "Types.h"
 
-
 namespace maxwell {
 
 class Probe {
@@ -24,25 +23,23 @@ class ExporterProbe : public Probe {
 class PointsProbe : public Probe {
 
 public:
-
     PointsProbe(const FieldType&, const Direction&, std::vector<std::vector<double>>& integPoints);
     const FieldType& getFieldType() const { return fieldToExtract_; }
     const Direction& getDirection() const { return directionToExtract_; }
-    DenseMatrix& getIntegPointMat() { return integPointMat_; }
+    mfem::DenseMatrix& getIntegPointMat() { return integPointMat_; }
     FieldMovie& getFieldMovie() { return fieldMovie_; }
     const FieldMovie& getConstFieldMovie() const { return fieldMovie_; }
 
 private:
 
     FieldType fieldToExtract_;
     Direction directionToExtract_;
-    DenseMatrix integPointMat_;
+    mfem::DenseMatrix integPointMat_;
     FieldMovie fieldMovie_;
 
     const bool verifyEntryVectorsSameSize(std::vector<std::vector<double>>& points) const;
     const void verifyEntrySubvectorsNotEmpty(std::vector<std::vector<double>>& points) const;
     const void buildIntegPointMat(std::vector<std::vector<double>>& points);
-
 };
 
 class Probes {

diff --git a/src/maxwell/Solver.h b/src/maxwell/Solver.h
@@ -1,19 +1,20 @@
 #pragma once
 
-#include "mfem.hpp"
+#include <mfem.hpp>
 #include "Material.h"
 #include "FiniteElementEvolution.h"
-#include "Types.h"
-#include "Model.h"
 #include "Probes.h"
-#include "Sources.h"
-#include <array>
+#include "Types.h"
 
 namespace maxwell {
 
 class Solver {
 public:
-
+    using Vector = mfem::Vector;
+    using Position = Vector;
+    using GridFunction = mfem::GridFunction;
+    using IntegrationPoint = mfem::IntegrationPoint;
+    using ODESolver = mfem::ODESolver;
     using IntegrationPointsSet = std::vector<std::vector<IntegrationPoint>>;
 
     struct Options {
@@ -29,7 +30,6 @@ class Solver {
     const PointsProbe& getPointsProbe(const std::size_t probe) { return probes_.getPointsProbes().at(probe); }
 
     const mfem::Mesh& getMesh() const { return mesh_; }
-    const mfem::Mesh& getConstMesh() const { return mesh_; }
     const FiniteElementEvolution& getFEEvol() const { return *maxwellEvol_; }
 
     void run();
@@ -56,21 +56,23 @@ class Solver {
 
     std::array<GridFunction, 3> E_, H_;
 
-    std::vector<Array<int>> elemIds_;
+    std::vector<mfem::Array<int>> elemIds_;
     std::vector<IntegrationPointsSet> integPointSet_;
     double timeRecord_;
     std::vector<FieldFrame> fieldRecord_;
 
     std::unique_ptr<mfem::ParaViewDataCollection> pd_;
 
-    socketstream sout_;
+    mfem::socketstream sout_;
 
     void checkOptionsAreValid(const Options&);
 
     void Solver::initializeSources();
 
-    const std::pair<Array<int>, Array<IntegrationPoint>> buildElemAndIntegrationPointArrays(DenseMatrix& physPoints) const;
-    const IntegrationPointsSet buildIntegrationPointsSet(const Array<IntegrationPoint>& ipArray) const;
+    const std::pair<mfem::Array<int>, mfem::Array<IntegrationPoint>> 
+        buildElemAndIntegrationPointArrays(mfem::DenseMatrix& physPoints) const;
+    const IntegrationPointsSet 
+        buildIntegrationPointsSet(const mfem::Array<IntegrationPoint>& ipArray) const;
     const std::vector<FieldFrame> saveFieldAtPointsForAllProbes();
 
     void initializeParaviewData();

diff --git a/src/maxwell/Sources.cpp b/src/maxwell/Sources.cpp
@@ -1,10 +1,9 @@
 #include "Sources.h"
 #include <math.h>
 
-
 namespace maxwell {
 
-
+using namespace mfem;
 
 Source::Source(
 	Model& model,

diff --git a/src/maxwell/Sources.h b/src/maxwell/Sources.h
@@ -1,20 +1,29 @@
 #pragma once
 
 #include <functional>
+
 #include "Types.h"
 #include "Model.h"
 
 namespace maxwell {
 
-
 class Source {
 public:
-	Source(Model& model, const FieldType& ft, const Direction& d,  const double spread, const double coeff,
-		const Vector devFromCenter);
-
-	double evalGaussianFunction3D(const Position& pos) const;
-	double evalGaussianFunction2D(const Position& pos) const;
-	double evalGaussianFunction1D(const Position& pos) const;
+	using Vector = mfem::Vector;
+	using Position = mfem::Vector;
+
+	Source(
+		Model& model, 
+		const FieldType& ft, 
+		const Direction& d, 
+		const double spread, 
+		const double coeff,
+		const Vector devFromCenter
+	);
+
+	double evalGaussianFunction3D(const Position&) const;
+	double evalGaussianFunction2D(const Position&) const;
+	double evalGaussianFunction1D(const Position&) const;
 	FieldType getFieldType() const { return fieldType_; }
 	Direction getDirection() const { return direction_; }
 

diff --git a/src/maxwell/Types.h b/src/maxwell/Types.h
@@ -4,19 +4,13 @@
 #include <vector>
 #include <map>
 
-#include "mfem.hpp"
-
 namespace maxwell {
 
-using namespace mfem;
-
 using Time = double;
 using CVec3 = std::array<double, 3>;
 using FieldFrame = std::vector<CVec3>;
 using FieldMovie = std::map<Time, FieldFrame>;
 
-using Position = mfem::Vector;
-
 enum FieldType {
 	E,
 	H

diff --git a/src/maxwell/BilinearIntegrators.cpp → ...ell/mfemExtension/BilinearIntegrators.cpp b/src/maxwell/BilinearIntegrators.cpp → ...ell/mfemExtension/BilinearIntegrators.cpp
@@ -1,6 +1,7 @@
 #include "BilinearIntegrators.h"
 
 namespace maxwell {
+namespace mfemExtension {
 
 const IntegrationRule* MaxwellDGTraceJumpIntegrator::setIntegrationRule(
     const FiniteElement& el1,
@@ -363,5 +364,5 @@ void HesthavenDerivativeIntegrator::AssembleElementMatrix2(
 
 
 }
-
+}
 
diff --git a/src/maxwell/BilinearIntegrators.h → ...xwell/mfemExtension/BilinearIntegrators.h b/src/maxwell/BilinearIntegrators.h → ...xwell/mfemExtension/BilinearIntegrators.h
@@ -1,16 +1,18 @@
-#ifndef _HEADER_MAXWELLDGTRACEINTEGRATOR
-#define _HEADER_MAXWELLDGTRACEINTEGRATOR
+#pragma once
+
+#include <mfem.hpp>
 
-#include "mfem.hpp"
 #include "../../../general/forall.hpp"
-#include "Types.h"
+#include "../Types.h"
 
-namespace maxwell {
+namespace maxwell{
+namespace mfemExtension {
 
 using namespace mfem;
+using DisForm = maxwell::DisForm;
+using Direction = maxwell::Direction;
 
-class MaxwellDGTraceIntegrator : public BilinearFormIntegrator
-{
+class MaxwellDGTraceIntegrator : public mfem::BilinearFormIntegrator {
 
 public:
 	//When explicitly undeclared, rho = 1.0;
@@ -126,8 +128,6 @@ class HesthavenDerivativeIntegrator : public BilinearFormIntegrator
 		ElementTransformation& Trans,
 		DenseMatrix& elmat);
 };
-}
 
-
-
-#endif
+}
+}
diff --git a/test/MFEMHesthavenComparison/TestMfemHesthaven1D.cpp b/test/MFEMHesthavenComparison/TestMfemHesthaven1D.cpp
@@ -1,7 +1,9 @@
 #include <gtest/gtest.h>
 
 #include "TestMfemHesthavenFunctions.h"
-#include "TestGlobalFunctions.h"
+#include "GlobalFunctions.h"
+
+using namespace mfem;
 
 class MFEMHesthaven1D : public ::testing::Test {
 protected:

diff --git a/test/MFEMHesthavenComparison/TestMfemHesthaven3D.cpp b/test/MFEMHesthavenComparison/TestMfemHesthaven3D.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 
 #include "TestMfemHesthavenFunctions.h"
-#include "TestGlobalFunctions.h"
+#include "GlobalFunctions.h"
 
 using namespace mfem;
 

diff --git a/test/MFEMHesthavenComparison/TestMfemHesthavenFunctions.cpp b/test/MFEMHesthavenComparison/TestMfemHesthavenFunctions.cpp
@@ -1,10 +1,12 @@
 #include <gtest/gtest.h>
 
+#include "maxwell/mfemExtension/BilinearIntegrators.h"
+
 #include "TestMfemHesthavenFunctions.h"
-#include "TestGlobalFunctions.h"
-#include "mfem.hpp"
+#include "GlobalFunctions.h"
 
 using namespace mfem;
+using namespace maxwell::mfemExtension;
 
 Eigen::MatrixXd buildExpectedAverageDenseMatrix1D(
 	const int order,
@@ -75,7 +77,7 @@ Eigen::MatrixXd buildMaxwellDGTrace1DEigen(
 {
 	BilinearForm DGmat(&fes);
 	std::vector<VectorConstantCoefficient> n{ VectorConstantCoefficient(Vector({1.0})) };
-	DGmat.AddInteriorFaceIntegrator(new maxwell::MaxwellDGTraceJumpIntegrator(dir, beta));
+	DGmat.AddInteriorFaceIntegrator(new MaxwellDGTraceJumpIntegrator(dir, beta));
 	DGmat.Assemble();
 	DGmat.Finalize();
 

diff --git a/test/MFEMHesthavenComparison/TestMfemHesthavenFunctions.h b/test/MFEMHesthavenComparison/TestMfemHesthavenFunctions.h
@@ -1,14 +1,17 @@
 #pragma once
 
-#include "mfem.hpp"
+#include <mfem.hpp>
 #include "maxwell/Types.h"
-#include "maxwell/BilinearIntegrators.h"
 
 #include <Eigen/Dense>
 #include <maxwell/Model.h>
 
 Eigen::MatrixXd buildExpectedAverageDenseMatrix1D(const int order,const int elements);
 Eigen::MatrixXd buildExpectedJumpDenseMatrix1D(const int order, const int elements);
-Eigen::MatrixXd buildDGTrace1DEigen(FiniteElementSpace& fes, maxwell::FluxCoefficient ab);
-Eigen::MatrixXd buildMaxwellDGTrace1DEigen(FiniteElementSpace& fes, const std::vector<maxwell::Direction>& dir, const double beta);
+
+Eigen::MatrixXd buildDGTrace1DEigen(
+	mfem::FiniteElementSpace& fes, maxwell::FluxCoefficient ab);
+Eigen::MatrixXd buildMaxwellDGTrace1DEigen(
+	mfem::FiniteElementSpace& fes, const std::vector<maxwell::Direction>& dir, const double beta);
+
 Eigen::MatrixXd build3DOneElementDMatrix();