manolas
/
MySources
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactoring

This commit is contained in:
iasonmanolas 2022-07-12 13:11:14 +03:00
parent 0d07f1c831
commit ba52c4215e
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
reducedmodeloptimizer_structs.hpp
View File

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