wip refactor timeintegration

exasim-project · Oct 8, 2024 · 7d24306 · 7d24306
1 parent 9c604a8
commit 7d24306
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/include/NeoFOAM/finiteVolume/cellCentred/timeIntegration/forwardEuler.hpp b/include/NeoFOAM/finiteVolume/cellCentred/timeIntegration/forwardEuler.hpp
@@ -1,20 +1,20 @@
 // SPDX-License-Identifier: MIT
+//
 // SPDX-FileCopyrightText: 2023 NeoFOAM authors
 
 #pragma once
 
+#include <functional>
+
 #include "NeoFOAM/fields/field.hpp"
 #include "NeoFOAM/core/executor/executor.hpp"
 #include "NeoFOAM/finiteVolume/cellCentred/timeIntegration/timeIntegration.hpp"
 #include "NeoFOAM/mesh/unstructured.hpp"
 
-#include <functional>
-
 
 namespace NeoFOAM::finiteVolume::cellCentred
 {
 
-
 class ForwardEuler : public TimeIntegrationFactory::Register<ForwardEuler>
 {
 
@@ -28,7 +28,6 @@ class ForwardEuler : public TimeIntegrationFactory::Register<ForwardEuler>
 
     static std::string schema() { return "none"; }
 
-
     void solve() override;
 
     std::unique_ptr<TimeIntegrationFactory> clone() const override;

diff --git a/include/NeoFOAM/finiteVolume/cellCentred/timeIntegration/timeIntegration.hpp b/include/NeoFOAM/finiteVolume/cellCentred/timeIntegration/timeIntegration.hpp
@@ -13,26 +13,24 @@
 
 #include <functional>
 
-namespace dsl = NeoFOAM::DSL;
-
-namespace NeoFOAM::finiteVolume::cellCentred
+namespace NeoFOAM
 {
 
 class TimeIntegrationFactory :
-    public NeoFOAM::RuntimeSelectionFactory<
+    public RuntimeSelectionFactory<
         TimeIntegrationFactory,
-        Parameters<const dsl::Equation&, const Dictionary&>>
+        Parameters<const DSL::Equation&, const Dictionary&>>
 {
 
 public:
 
     static std::string name() { return "timeIntegrationFactory"; }
 
-    TimeIntegrationFactory(const dsl::Equation& eqnSystem, const Dictionary& dict)
+    TimeIntegrationFactory(const DSL::Equation& eqnSystem, const Dictionary& dict)
         : eqnSystem_(eqnSystem), dict_(dict)
     {}
 
-    virtual ~TimeIntegrationFactory() {} // Virtual destructor
+    virtual ~TimeIntegrationFactory() {}
 
     virtual void solve() = 0; // Pure virtual function for solving
 
@@ -62,12 +60,10 @@ class TimeIntegration
             TimeIntegrationFactory::create(dict.get<std::string>("type"), eqnSystem, dict)
         ) {};
 
-
     void solve() { timeIntegrateStrategy_->solve(); }
 
 private:
 
-
     std::unique_ptr<TimeIntegrationFactory> timeIntegrateStrategy_;
 };
 

diff --git a/test/finiteVolume/cellCentred/timeIntegration/timeIntegration.cpp b/test/finiteVolume/cellCentred/timeIntegration/timeIntegration.cpp
@@ -3,10 +3,10 @@
 
 #define CATCH_CONFIG_RUNNER // Define this before including catch.hpp to create
                             // a custom main
-#include <catch2/catch_session.hpp>
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/generators/catch_generators_all.hpp>
 
+#include "common.hpp"
 #include "NeoFOAM/core/dictionary.hpp"
 #include "NeoFOAM/core/parallelAlgorithms.hpp"
 #include "NeoFOAM/finiteVolume/cellCentred/timeIntegration/timeIntegration.hpp"
@@ -71,7 +71,9 @@ class TimeOperator
     std::size_t nCells() const { return nCells_; }
 
     dsl::Operator::Type termType_;
+
     const NeoFOAM::Executor exec_;
+
     std::size_t nCells_;
 };