Merge pull request OpenSEMBA#11 from OpenSEMBA/luis

SMA does not work. Needs reviewing.
EMinsight · Sep 1, 2022 · 0bc5938 · 0bc5938
2 parents e5ed921 + b644ac4
commit 0bc5938
Show file tree

Hide file tree

Showing 15 changed files with 435 additions and 713 deletions.
diff --git a/src/maxwell/CMakeLists.txt b/src/maxwell/CMakeLists.txt
@@ -8,7 +8,6 @@ include_directories(${MFEM_INCLUDE_DIRS})
 add_library(maxwell STATIC 
 	"SolverOptions.h" 		
 	"Solver.h" "Solver.cpp" 
-	"FiniteElementEvolution.h" "FiniteElementEvolution.cpp" 
 	"mfemExtension/BilinearIntegrators.h" "mfemExtension/BilinearIntegrators.cpp"
 	"Types.h" 
 	"Material.h" "Material.cpp"
@@ -18,6 +17,8 @@ add_library(maxwell STATIC
     "ProbesManager.h" "ProbesManager.cpp" 
 	"SourcesManager.h" "SourcesManager.cpp" 
 	"Fields.h" "Fields.cpp" 
+	"MaxwellEvolution.h" "MaxwellEvolution.cpp"
+
 )
 
 target_link_libraries(maxwell mfem)
diff --git a/src/maxwell/Fields.cpp b/src/maxwell/Fields.cpp
@@ -1,15 +1,15 @@
 #include "Fields.h"
 
-#include "FiniteElementEvolution.h"
+#include "MaxwellEvolution.h"
 
 namespace maxwell {
 
 using namespace mfem;
 
 Fields::Fields(mfem::FiniteElementSpace& fes) :
     allDOFs{ 
-        FiniteElementEvolution::numberOfFieldComponents *
-        FiniteElementEvolution::numberOfMaxDimensions *
+        MaxwellEvolution::numberOfFieldComponents *
+        MaxwellEvolution::numberOfMaxDimensions *
         fes.GetNDofs() 
     }
 {

diff --git a/src/maxwell/Fields.h b/src/maxwell/Fields.h
@@ -13,5 +13,7 @@ class Fields {
 
     std::array<mfem::GridFunction, 3> E, H;
     mfem::Vector allDOFs;
+
+    double getNorml2() const { return allDOFs.Norml2(); }
 };
 }