Diffusive Mixing (1D <--> CFD)

src/simulation/MixingModels.h

@@ -34,6 +34,9 @@ class Simulation;
 template<typename T>
 class Specie;
 
+template<typename T>
+class lbmSimulator;
+
 // Structure to define the mixture inflow into a node
 template<typename T>
 struct MixtureInFlow {
@@ -59,6 +62,12 @@ struct FlowSection {
     T width;
 };
 
+template<typename T> // TODO this is redundant -> remove
+struct HybridFlowSection : public FlowSection<T> {
+    T hybridResolution;
+    std::vector<T> concentrations; // Alternatively we could see this as one flow section that contains all concnetrations across the connection (maybe as a vector)
+};
+
 template<typename T>
 struct FlowSectionInput {
     T startWidth;
@@ -258,10 +267,20 @@ class DiffusionMixingModel : public MixingModel<T> {
     std::unordered_map<int, int> filledEdges;                                   ///< Which edges are currently filled and what mixture is at the front <EdgeID, MixtureID>
     void generateInflows();
 
+    lbmSimulator<T>* simulator; // Pointer to the lbmSimulator
+    // std::shared_ptr<lbmSimulator<T>> simulator; 
+
 public:
 
     DiffusionMixingModel();
 
+    // DiffusionMixingModel(lbmSimulator<T>* simulator);
+
+    // /**
+    //  * @brief Set the simulator for the hybrid mixing simulation.
+    // */
+    // void setSimulator(lbmSimulator<T>* simulator_);
+
     /**
      * @brief Create and/or propagate mixtures into channels downstream.
      * @param[in] timeStep the current timestep size.
@@ -290,13 +309,19 @@ class DiffusionMixingModel : public MixingModel<T> {
 
     void printTopology();
 
-    std::tuple<std::function<T(T)>,std::vector<T>, T> getAnalyticalSolutionConstant(T channelLength, T channelWidth, int resolution, T pecletNr, const std::vector<FlowSectionInput<T>>& parameters);
+    std::tuple<std::function<T(T)>,std::vector<T>, T> getAnalyticalFunction(T channelLength, T channelWidth, int resolution, T pecletNr, const std::vector<FlowSectionInput<T>>& parameters);
 
-    std::tuple<std::function<T(T)>,std::vector<T>, T> getAnalyticalSolutionFunction(T channelLength, T channelWidth, int resolution, T pecletNr, const std::vector<FlowSectionInput<T>>& parameters, std::function<T(T)> fConstant);
+    std::tuple<std::function<T(T)>,std::vector<T>, T> getAnalyticalFunction(T channelLength, T channelWidth, int resolution, T pecletNr, const std::vector<FlowSectionInput<T>>& parameters, std::function<T(T)> fConstant);
 
-    std::tuple<std::function<T(T)>,std::vector<T>, T> getAnalyticalSolutionTotal(T channelLength, T currChannelFlowRate, T channelWidth, int resolution, int speciesId, T pecletNr, 
+    std::tuple<std::function<T(T)>,std::vector<T>, T> getAnalyticalSolution(T channelLength, T currChannelFlowRate, T channelWidth, int resolution, int speciesId, T pecletNr, 
         const std::vector<FlowSection<T>>& flowSections, std::unordered_map<int, std::unique_ptr<Mixture<T>>>& diffusiveMixtures);
 
+    std::tuple<std::function<T(T)>,std::vector<T>,T> getAnalyticalSolutionHybrid(T channelLength, T currChannelFlowRate, T channelWidth, int resolution, T pecletNr, std::vector<T> concentrationField, T dx);
+
+    std::vector<T> defineConcentrationNodeFieldForCfdInput(int resolutionIntoCfd, int specieId, int channelId, std::unordered_map<int, std::unique_ptr<Mixture<T>>>& Mixtures, int resolution);
+
+    std::tuple<std::function<T(T)>, std::vector<T>, T> getAnalyticalSolutionHybridInput(T channelLength, T channelWidth, int resolution, T pecletNr, const std::vector<FlowSectionInput<T>>& parameters);
+
     void clean(arch::Network<T>* network);
 
     void printMixturesInNetwork();