Compile and pass tests NaiveScheme

cda-tum · Aug 29, 2024 · 576fe69 · 576fe69
1 parent 9de100f
commit 576fe69
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 16 deletions.
diff --git a/examples/Hybrid/Network1a.py b/examples/Hybrid/Network1a.py
@@ -51,9 +51,11 @@ def hybridContinuous():
     simulation.setContinuousPhase(f0)
     simulation.setPoiseuilleResistanceModel()
 
-    simulation.addLbmSimulator("1a", "../STL/cross.stl", m0, [n5, n7, n8, n9], \
-                               [[1.0, 0.0], [0.0, -1.0], [0.0, 1.0], [-1.0, 0.0]], [1e-4, 1e-4, 1e-4, 1e-4], \
-                                1e-4, 1e-1, 0.1, 20, 1e-1, 0.55)
+    s1 = simulation.addLbmSimulator("1a", "../STL/cross.stl", m0, [n5, n7, n8, n9], \
+                                    [[1.0, 0.0], [0.0, -1.0], [0.0, 1.0], [-1.0, 0.0]], [1e-4, 1e-4, 1e-4, 1e-4], \
+                                    1e-4, 1e-1, 20, 1e-1, 0.55)
+
+    s1.setNaiveScheme(0.1, 0.5, 10)
 
     network.sort()
 

diff --git a/python/mmft/simulator/bindings.cpp b/python/mmft/simulator/bindings.cpp
@@ -89,7 +89,6 @@ PYBIND11_MODULE(pysimulator, m) {
 									std::vector<T> widths,
 									T charPhysLength,
 									T charPhysVelocity,
-									T alpha,
 									T resolution,
 									T epsilon,
 									T tau) {
@@ -111,7 +110,7 @@ PYBIND11_MODULE(pysimulator, m) {
 			}
 
 			return simulation.addLbmSimulator(	name, stlFile, simulation.getNetwork()->getModule(moduleId), openings, charPhysLength,
-												charPhysVelocity, alpha, resolution, epsilon, tau)->getId();
+												charPhysVelocity, resolution, epsilon, tau)->getId();
 
 			}, "Add a LBM simulator to the simulation.")
 		.def("injectDroplet", [](sim::Simulation<T> &simulation, int dropletId, T injectionTime, int channelId, T injectionPosition) {
@@ -126,6 +125,9 @@ PYBIND11_MODULE(pysimulator, m) {
 				sim::ResistanceModelPoiseuille<T>* resistanceModel = new sim::ResistanceModelPoiseuille<T>(simulation.getContinuousPhase()->getViscosity());
 				simulation.setResistanceModel(resistanceModel);
 			})
+		.def("setNaiveScheme", [](sim::Simulation<T> & simulation, T alpha, T beta, int theta) {
+				simulation.setNaiveHybridScheme(alpha, beta, theta);
+			})
 		.def("simulate", &sim::Simulation<T>::simulate)
 		.def("print", &sim::Simulation<T>::printResults)
 		.def("loadSimulation", [](sim::Simulation<T> &simulation, arch::Network<T> &network, std::string file) { 

diff --git a/src/porting/jsonPorter.hh b/src/porting/jsonPorter.hh
@@ -111,25 +111,25 @@ void simulationFromJSON(json jsonString, arch::Network<T>* network_, sim::Simula
         readResistanceModel<T>(jsonString, simulation);
 
         if (platform == sim::Platform::Continuous) {
-            readUpdateScheme(jsonString, simulation);
             readSimulators<T>(jsonString, simulation, network_);
+            readUpdateScheme(jsonString, simulation);
             network_->sortGroups();
         } else if (platform == sim::Platform::Mixing) {
             readMixingModel<T>(jsonString, simulation);
             readSpecies<T>(jsonString, simulation);
             readMixtures<T>(jsonString, simulation);
             readMixtureInjections<T>(jsonString, simulation, activeFixture);
-            readUpdateScheme(jsonString, simulation);
             readSimulators<T>(jsonString, simulation, network_);
+            readUpdateScheme(jsonString, simulation);
             network_->sortGroups();
         } else if (platform == sim::Platform::Ooc) {
             readMixingModel<T>(jsonString, simulation);
             readSpecies<T>(jsonString, simulation);
             readMixtures<T>(jsonString, simulation);
             readMixtureInjections<T>(jsonString, simulation, activeFixture);
             readTissues<T>(jsonString, simulation);
-            readUpdateScheme(jsonString, simulation);
             readSimulators<T>(jsonString, simulation, network_);
+            readUpdateScheme(jsonString, simulation);
             network_->sortGroups();
         } else if (platform == sim::Platform::BigDroplet) {
             throw std::invalid_argument("Droplet simulations are currently only supported for Abstract simulations.");

diff --git a/src/simulation/Simulation.hh b/src/simulation/Simulation.hh
@@ -202,25 +202,25 @@ namespace sim {
     std::shared_ptr<mmft::NaiveScheme<T>> Simulation<T>::setNaiveHybridScheme(T alpha, T beta, int theta) {
         auto naiveScheme = std::make_shared<mmft::NaiveScheme<T>>(network->getModules(), alpha, beta, theta);
         for (auto& [key, simulator] : cfdSimulators) {
-            simulator->setUpdateScheme(naiveScheme);
             updateSchemes.try_emplace(simulator->getId(), naiveScheme);
+            simulator->setUpdateScheme(updateSchemes.at(simulator->getId()));
         }
         return naiveScheme;
     }
 
     template<typename T>
     std::shared_ptr<mmft::NaiveScheme<T>> Simulation<T>::setNaiveHybridScheme(int moduleId, T alpha, T beta, int theta) {
         auto naiveScheme = std::make_shared<mmft::NaiveScheme<T>>(network->getModule(moduleId), alpha, beta, theta);
-        cfdSimulators.at(moduleId)->setUpdateScheme(naiveScheme);
         updateSchemes.try_emplace(moduleId, naiveScheme);
+        cfdSimulators.at(moduleId)->setUpdateScheme(updateSchemes.at(moduleId));
         return naiveScheme;
     }
 
     template<typename T>
     std::shared_ptr<mmft::NaiveScheme<T>> Simulation<T>::setNaiveHybridScheme(int moduleId, std::unordered_map<int, T> alpha, std::unordered_map<int, T> beta, int theta) {
         auto naiveScheme = std::make_shared<mmft::NaiveScheme<T>>(network->getModule(moduleId), alpha, beta, theta);
-        cfdSimulators.at(moduleId)->setUpdateScheme(naiveScheme);
         updateSchemes.try_emplace(moduleId, naiveScheme);
+        cfdSimulators.at(moduleId)->setUpdateScheme(updateSchemes.at(moduleId));
         return naiveScheme;
     }
 

diff --git a/src/simulation/simulators/cfdSimulator.h b/src/simulation/simulators/cfdSimulator.h
@@ -136,7 +136,7 @@ class CFDSimulator {
     /**
      * @brief Set the update scheme for Abstract-CFD coupling for this simulator.
      */
-    void setUpdateScheme(std::shared_ptr<mmft::Scheme<T>> updateScheme);
+    void setUpdateScheme(const std::shared_ptr<mmft::Scheme<T>>& updateScheme);
 
     /**
      * @brief Set the path, where vtk output from the simulator should be stored.

diff --git a/src/simulation/simulators/cfdSimulator.hh b/src/simulation/simulators/cfdSimulator.hh
@@ -57,7 +57,7 @@ void CFDSimulator<T>::setInitialized(bool initialization_) {
 }
 
 template <typename T>
-void CFDSimulator<T>::setUpdateScheme(std::shared_ptr<mmft::Scheme<T>> updateScheme_) {
+void CFDSimulator<T>::setUpdateScheme(const std::shared_ptr<mmft::Scheme<T>>& updateScheme_) {
     this->updateScheme = updateScheme_;
 }
 

diff --git a/tests/hybrid/Hybrid.test.cpp b/tests/hybrid/Hybrid.test.cpp
@@ -14,6 +14,7 @@ TEST(Hybrid, Case1a) {
 
     // define network
     arch::Network<T> network;
+    testSimulation.setNetwork(&network);
 
     // nodes
     auto node0 = network.addNode(0.0, 0.0, true);
@@ -68,7 +69,6 @@ TEST(Hybrid, Case1a) {
     std::string stlFile = "../examples/STL/cross.stl";
     T charPhysLength = 1e-4;
     T charPhysVelocity = 1e-1;
-    T alpha = 0.1;
     T resolution = 20;
     T epsilon = 1e-1;
     T tau = 0.55;
@@ -78,7 +78,8 @@ TEST(Hybrid, Case1a) {
     Openings.try_emplace(8, arch::Opening<T>(network.getNode(8), std::vector<T>({0.0, 1.0}), 1e-4));
     Openings.try_emplace(9, arch::Opening<T>(network.getNode(9), std::vector<T>({-1.0, 0.0}), 1e-4));
 
-    testSimulation.addLbmSimulator(name, stlFile, network.getModule(m0->getId()), Openings, charPhysLength, charPhysVelocity, alpha, resolution, epsilon, tau);
+    testSimulation.addLbmSimulator(name, stlFile, network.getModule(m0->getId()), Openings, charPhysLength, charPhysVelocity, resolution, epsilon, tau);
+    testSimulation.setNaiveHybridScheme(0.1, 0.5, 10);
     network.sortGroups();
 
     // pressure pump
@@ -90,7 +91,6 @@ TEST(Hybrid, Case1a) {
     network.isNetworkValid();
 
     // Simulate
-    testSimulation.setNetwork(&network);
     testSimulation.simulate();
 
     EXPECT_NEAR(network.getNodes().at(0)->getPressure(), 0, 1e-2);