From ba52c4215e6bfd8fce610ce7eb52dd0a3e51a9a2 Mon Sep 17 00:00:00 2001
From: iasonmanolas <iasonmanolasece@gmail.com>
Date: Tue, 12 Jul 2022 13:11:14 +0300
Subject: [PATCH] Refactoring

---
 reducedmodeloptimizer_structs.hpp | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/reducedmodeloptimizer_structs.hpp b/reducedmodeloptimizer_structs.hpp
index d68d8a0..6fe937d 100644
--- a/reducedmodeloptimizer_structs.hpp
+++ b/reducedmodeloptimizer_structs.hpp
@@ -27,10 +27,11 @@ inline static std::vector<std::string> baseSimulationScenarioNames{"Axial",
 
 struct Colors
 {
-    inline static std::array<double, 3> fullInitial{0.094, 0.094, 0.094};
+    inline static std::array<double, 3> patternInitial{0.518, 0.518, 0.518};
     //    inline static std::array<double, 3> fullDeformed{0.583333, 0.890196, 0.109804};
-    inline static std::array<double, 3> fullDeformed{0.094, 0.094, 0.094};
-    inline static std::array<double, 3> reducedInitial{0.890196, 0.109804, 0.193138};
+    inline static std::array<double, 3> patternDeformed{0.094, 0.094, 0.094};
+    //    inline static std::array<double, 3> reducedInitial{0.890196, 0.109804, 0.193138};
+    inline static std::array<double, 3> reducedInitial{0.518, 0.518, 0.518};
     inline static std::array<double, 3> reducedDeformed{0.262, 0.627, 0.910};
 };
 
@@ -115,12 +116,15 @@ struct Settings
     //                                                                                  0.0127508,
     //                                                                                  1.18079,
     //                                                                                  0}; //final
-    std::array<double, NumberOfBaseSimulationScenarios> baseScenarioMaxMagnitudes{0.590241 / 3,
-                                                                                  0.588372 / 3,
-                                                                                  0.368304,
-                                                                                  0.1,
-                                                                                  1.18 / 2,
-                                                                                  0}; //final
+    std::array<double, NumberOfBaseSimulationScenarios> baseScenarioMaxMagnitudes{
+        0.590241 / 6, 0.588372 / 6, 0.368304 / 2, 0.05, 1.18 / 4, 0}; //final b,h= 0.001
+
+    //     std::array<double, NumberOfBaseSimulationScenarios> baseScenarioMaxMagnitudes{0.590241 / 3,
+    //                                                                                  0.588372 / 3,
+    //                                                                                  0.368304,
+    //                                                                                  0.1,
+    //                                                                                  1.18 / 2,
+    //                                                                                  0}; //final b,h= 0.002
     //    std::array<double, NumberOfBaseSimulationScenarios> baseScenarioMaxMagnitudes{0, 0, 0, 0.1, 0};
 
     //    std::array<double, NumberOfBaseSimulationScenarios>
@@ -995,7 +999,7 @@ struct Settings
           DRMSimulationModel drmSimulator;
           LinearSimulationModel linearSimulator;
           assert(fullPatternSimulationJobs.size() == reducedPatternSimulationJobs.size());
-          fullPatternSimulationJobs[0]->pMesh->registerForDrawing(Colors::fullInitial);
+          fullPatternSimulationJobs[0]->pMesh->registerForDrawing(Colors::patternInitial);
           reducedPatternSimulationJobs[0]->pMesh->registerForDrawing(Colors::reducedInitial, false);
 
           const int numberOfSimulationJobs = fullPatternSimulationJobs.size();
@@ -1018,7 +1022,7 @@ struct Settings
               DRMSimulationModel::Settings drmSettings;
               SimulationResults fullModelResults
                   = drmSimulator.executeSimulation(pFullPatternSimulationJob, drmSettings);
-              fullModelResults.registerForDrawing(Colors::fullDeformed, true);
+              fullModelResults.registerForDrawing(Colors::patternDeformed, true);
               //        SimulationResults fullModelLinearResults =
               //            linearSimulator.executeSimulation(pFullPatternSimulationJob);
               //        fullModelLinearResults.setLabelPrefix("linear");