Puts filesystem::Project into utils

OpenSEMBA · Jun 28, 2023 · 94999b2 · 94999b2
1 parent 84d9a5f
commit 94999b2
Show file tree

Hide file tree

Showing 24 changed files with 163 additions and 189 deletions.
diff --git a/cmakePackage/opensembaPackageInstall.cmake b/cmakePackage/opensembaPackageInstall.cmake
@@ -27,7 +27,6 @@ configure_file(
 install(
    TARGETS opensemba 
     opensemba_core 
-        opensemba_core_filesystem 
         opensemba_core_geometry 
         opensemba_core_math 
         opensemba_core_outputrequest

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -8,7 +8,6 @@ add_subdirectory(model/ model/)
 add_subdirectory(math/ math/)
 add_subdirectory(geometry/ geometry/)
 add_subdirectory(outputRequest/ outputRequest/)
-add_subdirectory(filesystem/ filesystem/)
 add_subdirectory(physicalModel/ physicalModel/)
 add_subdirectory(source/ source/)
 
@@ -19,7 +18,6 @@ add_library(opensemba_core STATIC
 )
 
 target_link_libraries(opensemba_core
-    opensemba_core_filesystem
     opensemba_core_geometry
     opensemba_core_math
     opensemba_core_physicalmodel

diff --git a/src/core/ProblemDescription.h b/src/core/ProblemDescription.h
@@ -7,14 +7,14 @@
 #include "core/source/Group.h"
 #include "core/outputRequest/Group.h"
 #include "core/model/Model.h"
-#include "core/filesystem/Project.h"
+#include "core/util/Project.h"
 
 namespace SEMBA {
 
 template<typename M = UnstructuredModel>
 class ProblemDescriptionBase {
 public:
-	FileSystem::Project project;
+	util::Project project;
 	Geometry::Grid3 grids;
 	SourceGroup sources;
 	nlohmann::json analysis;

diff --git a/src/core/filesystem/CMakeLists.txt b/src/core/filesystem/CMakeLists.txt
diff --git a/src/core/filesystem/Project.h b/src/core/filesystem/Project.h
diff --git a/src/core/physicalModel/CMakeLists.txt b/src/core/physicalModel/CMakeLists.txt
@@ -22,5 +22,4 @@ add_library(opensemba_core_physicalmodel STATIC
     "wire/Extremes.cpp"
     "wire/Wire.cpp"
 )
-target_link_libraries(opensemba_core_physicalmodel opensemba_core_math
-                                                   opensemba_core_filesystem)
+target_link_libraries(opensemba_core_physicalmodel opensemba_core_math)
diff --git a/src/core/physicalModel/physicalModels.h b/src/core/physicalModel/physicalModels.h
@@ -1,15 +1,16 @@
 #pragma once
 
 #include "Bound.h"
+#include "Gap.h"
+#include "Predefined.h"
+#include "wire/Wire.h"
 #include "multiport/Dispersive.h"
+#include "multiport/Predefined.h"
 #include "multiport/RLC.h"
-#include "Predefined.h"
 #include "surface/Multilayer.h"
 #include "surface/SIBC.h"
 #include "surface/SIBCFile.h"
+#include "volume/Anisotropic.h"
 #include "volume/Classic.h"
-#include "volume/Dispersive.h"
 #include "volume/PML.h"
-#include "volume/Anisotropic.h"
-#include "wire/Wire.h"
-#include "wire/Extremes.h"
+#include "volume/Dispersive.h"
diff --git a/src/core/physicalModel/surface/SIBC.h b/src/core/physicalModel/surface/SIBC.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "core/math/matrix/Static.h"
-#include "core/filesystem/Project.h"
+#include "core/util/Project.h"
 
 #include "Surface.h"
 

diff --git a/src/core/physicalModel/surface/SIBCFile.cpp b/src/core/physicalModel/surface/SIBCFile.cpp
@@ -8,7 +8,7 @@ namespace Surface {
 
 SIBCFile::SIBCFile(const Id id,
                          const std::string& name,
-                         const FileSystem::Project& file)
+                         const util::Project& file)
 :   Identifiable<Id>(id),
     PhysicalModel(name),
     file_(file) {
@@ -18,7 +18,7 @@ SIBCFile::SIBCFile(const Id id,
     }
 }
 
-const FileSystem::Project SIBCFile::getFile() const {
+const util::Project SIBCFile::getFile() const {
     return file_;
 }
 

diff --git a/src/core/physicalModel/surface/SIBCFile.h b/src/core/physicalModel/surface/SIBCFile.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "core/math/matrix/Static.h"
-#include "core/filesystem/Project.h"
+#include "core/util/Project.h"
 
 #include "Surface.h"
 
@@ -14,16 +14,16 @@ class SIBCFile : public virtual Surface {
     SIBCFile();
     SIBCFile(const Id id,
              const std::string& name,
-             const FileSystem::Project& file);
+             const util::Project& file);
 
     virtual std::unique_ptr<PhysicalModel> clone() const override {
         return std::make_unique<SIBCFile>(*this);
     }
 
-    const FileSystem::Project getFile() const;
+    const util::Project getFile() const;
 
 protected:
-    FileSystem::Project file_;
+    util::Project file_;
 };
 
 } /* namespace Surface */

diff --git a/src/core/physicalModel/volume/Dispersive.cpp b/src/core/physicalModel/volume/Dispersive.cpp
@@ -33,7 +33,7 @@ Dispersive::Dispersive(const Id id,
 
 Dispersive::Dispersive(const Id id,
                        const std::string& name,
-                       const FileSystem::Project& file)
+                       const util::Project& file)
 :   Identifiable<Id>(id),
     PhysicalModel(name) {
 	rEpsInfty_ = 1.0;
@@ -110,7 +110,7 @@ void Dispersive::addPole(
     return;
 }
 
-const FileSystem::Project Dispersive::getFile() const {
+const util::Project Dispersive::getFile() const {
     return file_;
 }
 

diff --git a/src/core/physicalModel/volume/Dispersive.h b/src/core/physicalModel/volume/Dispersive.h
@@ -4,7 +4,7 @@
 #include <exception>
 #include <utility>
 
-#include "core/filesystem/Project.h"
+#include "core/util/Project.h"
 #include "Volume.h"
 
 namespace SEMBA {
@@ -26,7 +26,7 @@ class Dispersive : public virtual Volume {
                         std::vector<PoleResidue>());
     Dispersive(const Id id,
                      const std::string& name,
-                     const FileSystem::Project& file);
+                     const util::Project& file);
     Dispersive(const Dispersive& rhs);
     virtual ~Dispersive();
 
@@ -43,12 +43,12 @@ class Dispersive : public virtual Volume {
     bool isSimplyConductive() const;
     bool isDispersive() const;
 
-    const FileSystem::Project getFile() const;
+    const util::Project getFile() const;
 
 protected:
     math::Real rEpsInfty_, rMuInfty_; // @ InftyFreq.
     std::vector<PoleResidue> poleResidue_; // Residues for dispers model. c_p.
-    FileSystem::Project file_;
+    util::Project file_;
     void addPole(const std::complex<math::Real>& pole_,
                  const std::complex<math::Real>& res_);
 };

diff --git a/src/core/source/CMakeLists.txt b/src/core/source/CMakeLists.txt
@@ -20,5 +20,4 @@ add_library(opensemba_core_source
     "magnitude/Magnitude.cpp"
     "magnitude/Numerical.cpp"
 )
-target_link_libraries(opensemba_core_source opensemba_core_geometry
-                                            opensemba_core_filesystem)
+target_link_libraries(opensemba_core_source opensemba_core_geometry)
diff --git a/src/core/source/Source.cpp b/src/core/source/Source.cpp
@@ -33,7 +33,7 @@ Source& Source::operator=(const Source& rhs)
 
 
 void Source::convertToNumerical(
-    const FileSystem::Project& file,
+    const util::Project& file,
     const math::Real step,
     const math::Real finalTime) 
 {
@@ -44,7 +44,7 @@ void Source::convertToNumerical(
     magnitude_ = std::move(newMagnitude);
 }
 
-Magnitude::Numerical Source::exportToFile(const FileSystem::Project& file,
+Magnitude::Numerical Source::exportToFile(const util::Project& file,
                                          const math::Real step,
                                          const math::Real finalTime) const {
     if(magnitude_->is<Magnitude::Numerical>()) {

diff --git a/src/core/source/Source.h b/src/core/source/Source.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "core/geometry/element/Group.h"
-#include "core/filesystem/Project.h"
+#include "core/util/Project.h"
 #include "core/util/Class.h"
 #include "core/util/Identifiable.h"
 #include "core/util/Identification.h"
@@ -29,11 +29,11 @@ class Source : public virtual util::Identifiable<Id>,
 
     virtual std::string getName() const = 0;
 
-    void convertToNumerical(const FileSystem::Project& file,
+    void convertToNumerical(const util::Project& file,
                             const math::Real step,
                             const math::Real finalTime);
 
-    Magnitude::Numerical exportToFile(const FileSystem::Project& file,
+    Magnitude::Numerical exportToFile(const util::Project& file,
                                        const math::Real step,
                                        const math::Real finalTime) const;
     const Magnitude::Magnitude* getMagnitude() const { return magnitude_.get(); }

diff --git a/src/core/source/magnitude/Numerical.cpp b/src/core/source/magnitude/Numerical.cpp
@@ -9,12 +9,12 @@ namespace SEMBA {
 namespace Source {
 namespace Magnitude {
 
-Numerical::Numerical(const FileSystem::Project& fileIn) :   
+Numerical::Numerical(const util::Project& fileIn) :   
     Magnitude(new math::function::LinearInterpolation<math::Real, math::Real>(fileIn)),
     file(fileIn)
 {}
 
-Numerical::Numerical(const FileSystem::Project& fileIn,
+Numerical::Numerical(const util::Project& fileIn,
                      const Magnitude& mag,
                      const math::Real timeStep,
                      const math::Real finalTime) 

diff --git a/src/core/source/magnitude/Numerical.h b/src/core/source/magnitude/Numerical.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Magnitude.h"
-#include "core/filesystem/Project.h"
+#include "core/util/Project.h"
 
 namespace SEMBA {
 namespace Source {
@@ -11,8 +11,8 @@ class Numerical : public virtual Magnitude {
 public:
     Numerical() = default;
     Numerical(const Numerical&) = default;
-    Numerical(const FileSystem::Project& filename);
-    Numerical(const FileSystem::Project& filename,
+    Numerical(const util::Project& filename);
+    Numerical(const util::Project& filename,
               const Magnitude& mag,
               const math::Real timeStep,
               const math::Real finalTime);
@@ -24,11 +24,11 @@ class Numerical : public virtual Magnitude {
     bool operator==(const Numerical&) const;
     math::Real evaluate(const math::Real time) const;
 
-    FileSystem::Project getFile() const { return file; };
+    util::Project getFile() const { return file; };
 
 private:
     static const std::size_t defaultNumberOfSteps = 1000;
-    FileSystem::Project file;
+    util::Project file;
 
 };