improved setup for simulation (ii) and (iii)

solid-cpp/ownSolver.cpp

@@ -7,6 +7,7 @@
 #include <cassert>
 #include <chrono>           // timing
 #include <cmath>
+#include <fstream>
 #include <iostream>
 #include <omp.h>
 
@@ -76,61 +77,26 @@ int main(int argc, char **argv )
     // ##########################################
 
 
-    // ################################## SIMULATION (i) ##################################
-
-    // Initialize temperature u_0
-    vector<double> uv(SK.Nrows(), 0.0);                                                               // temperature
-    mesh_c.Init_Solution_mult(uv, 0, [u0_mug](double x, double y) -> double { return u0_mug; });      // mug
-    mesh_c.Init_Solution_mult(uv, 1, [u0_fluid](double x, double y) -> double { return u0_fluid; });  // fluid
-    mesh_c.Init_Solution_mult(uv, 2, [u0_air](double x, double y) -> double { return u0_air; });      // air
-    
-    //mesh_c.Visualize(uv);
-
-    auto t3 = system_clock::now(); // start timer
-    double average_cup_temperature = u0_mug;
-    double percentage_temp_reached = 0.0;
-    double goal_temp = 67.0;
-    double goal_perc = 60.0;
-
-    double time_count = 0;
-    while (average_cup_temperature < goal_temp)
-    // while (percentage_temp_reached < goal_perc)
-    //for (int step = 0; step < steps; ++step)
-    {
-        vector<double> G(Mdt.Nrows(), 0.0);        
-        Mdt.Mult(G, uv);                                           // G = M/dt * u_{n}
-        
-        vector<double> H = fv;   
-        for (size_t i = 0; i < Mdt.Nrows(); ++i)
-        {
-            H[i] += G[i];                                         // H = F + G
-        }
-
-        JacobiSolve(SK, H, uv);          // solve: (M/dt + K + C) * u_{n+1}  =  F + M/dt * u_{n}
-                                         //        ----- SK -----               ------ H -------
-
-        average_cup_temperature = mesh_c.AverageVectorFunction_perSubdomain(uv, 0);
-        percentage_temp_reached = mesh_c.CheckTemp_mult(uv, 0, goal_temp);
-        cout << "Average cup temperature: " << average_cup_temperature << " after " << time_count << " seconds. " << endl;
-        cout << "% of elements reached temperature " << goal_temp << "ºC: " << percentage_temp_reached << endl;
-        time_count += dt;
-    }
-    auto t4 = system_clock::now();  // stop timer
-
-
-    auto duration = duration_cast<microseconds>(t4 - t3);        // duration in microseconds
-    double t_diff = static_cast<double>(duration.count()) / 1e6; // overall duration in seconds
-    cout << "\n\nJacobiSolve: timing in sec. : " << t_diff << endl;
-
-    mesh_c.Visualize(uv);
-
     // ################################## SIMULATION (iii) ##################################
+    // read vector from simulation (i)
+    vector<double> uv(SK.Nrows(), 0.0); 
+
+    ifstream input_file("uv_1.txt");
+    for (size_t i = 0; i < uv.size(); ++i)
+    {
+        input_file >> uv[i];
+    }
+
     double u0_coffee = 85.0;
     mesh_c.Init_Solution_mult(uv, 1, [u0_coffee](double x, double y) -> double { return u0_coffee; });  // fluid
 
-    t3 = system_clock::now(); // start timer
+    mesh_c.Visualize(uv);
+
+    auto t3 = system_clock::now(); // start timer
     double average_coffee_temperature = u0_coffee;
-    percentage_temp_reached = 0.0;
+    double goal_temp = 50.0;
+    double goal_perc = 60.0;
+    double percentage_temp_reached = mesh_c.CheckTemp_mult(uv, 1, goal_temp);
 
     // ------------------------ initialize preCICE ------------------------
     int commRank = 0;
@@ -172,9 +138,9 @@ int main(int argc, char **argv )
     goal_temp = 50.0;
     goal_perc = 60.0;
 
-    time_count = 0;
-    while (average_cup_temperature > goal_temp)
-    // while (percentage_temp_reached > goal_perc)
+    double time_count = 0;
+    //while (average_coffee_temperature > goal_temp)
+    while (percentage_temp_reached > goal_perc)
     {
         preciceDt = participantSolid.getMaxTimeStepSize();
         solverDt = 1.0;
@@ -201,9 +167,10 @@ int main(int argc, char **argv )
                                          //        ----- SK -----               ------ H -------
 
         average_coffee_temperature = mesh_c.AverageVectorFunction_perSubdomain(uv, 1);
-        percentage_temp_reached = mesh_c.CheckTemp_mult(uv, 0, goal_temp);
+        percentage_temp_reached = mesh_c.CheckTemp_mult(uv, 1, goal_temp);
         cout << "Average coffee temperature: " << average_coffee_temperature << " after " << time_count << " seconds. " << endl;
-        cout << "% of elements reached temperature " << goal_temp << "ºC: " << percentage_temp_reached << endl;
+        cout << "% of elements above temperature " << goal_temp << "ºC: " << percentage_temp_reached << endl;
+        time_count += dt;
 
         // ----- write the heat-flux, so openFOAM can read it
         {
@@ -218,9 +185,9 @@ int main(int argc, char **argv )
 
         time_count += dt;
     }
-    t4 = system_clock::now();  // stop timer
-    duration = duration_cast<microseconds>(t4 - t3);        // duration in microseconds
-    t_diff = static_cast<double>(duration.count()) / 1e6; // overall duration in seconds
+    auto t4 = system_clock::now();  // stop timer
+    auto duration = duration_cast<microseconds>(t4 - t3);        // duration in microseconds
+    double t_diff = static_cast<double>(duration.count()) / 1e6; // overall duration in seconds
     cout << "\n\nJacobiSolve: timing in sec. : " << t_diff << endl;