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

Added beamWidth and beamHeight static variables

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

22
reducedmodeloptimizer.cpp
View File

@ -371,15 +371,16 @@ void ReducedModelOptimizer::createSimulationMeshes(
std::cerr << "Error: A rectangular cross section is expected." << std::endl; std::cerr << "Error: A rectangular cross section is expected." << std::endl;
std::terminate(); std::terminate();
} }
// Full pattern // Full pattern
pFullPatternSimulationMesh = std::make_shared<SimulationMesh>(fullModel); pFullPatternSimulationMesh = std::make_shared<SimulationMesh>(fullModel);
pFullPatternSimulationMesh->setBeamCrossSection(CrossSectionType{0.002, 0.002}); pFullPatternSimulationMesh->setBeamCrossSection(CrossSectionType{beamWidth, beamHeight});
pFullPatternSimulationMesh->setBeamMaterial(0.3, youngsModulus); pFullPatternSimulationMesh->setBeamMaterial(0.3, youngsModulus);
pFullPatternSimulationMesh->reset(); pFullPatternSimulationMesh->reset();
// Reduced pattern // Reduced pattern
pReducedPatternSimulationMesh = std::make_shared<SimulationMesh>(reducedModel); pReducedPatternSimulationMesh = std::make_shared<SimulationMesh>(reducedModel);
pReducedPatternSimulationMesh->setBeamCrossSection(CrossSectionType{0.002, 0.002}); pReducedPatternSimulationMesh->setBeamCrossSection(CrossSectionType{beamWidth, beamHeight});
pReducedPatternSimulationMesh->setBeamMaterial(0.3, youngsModulus); pReducedPatternSimulationMesh->setBeamMaterial(0.3, youngsModulus);
pReducedPatternSimulationMesh->reset(); pReducedPatternSimulationMesh->reset();
} }
@ -972,12 +973,12 @@ void ReducedModelOptimizer::getResults(const FunctionEvaluation &optimalObjectiv
<< std::endl; << std::endl;
std::cout << std::endl; std::cout << std::endl;
reducedModelResults.registerForDrawing(Colors::reducedDeformed); // reducedModelResults.registerForDrawing(Colors::reducedDeformed);
optimizationState.fullPatternResults[simulationScenarioIndex].registerForDrawing( // optimizationState.fullPatternResults[simulationScenarioIndex].registerForDrawing(
Colors::patternDeformed); // Colors::patternDeformed);
polyscope::show(); // polyscope::show();
reducedModelResults.unregister(); // reducedModelResults.unregister();
optimizationState.fullPatternResults[simulationScenarioIndex].unregister(); // optimizationState.fullPatternResults[simulationScenarioIndex].unregister();
#endif #endif
} }
@ -1886,8 +1887,6 @@ std::vector<std::shared_ptr<SimulationJob>> ReducedModelOptimizer::createFullPat
job.nodalExternalForces.clear(); job.nodalExternalForces.clear();
job.constrainedVertices.clear(); job.constrainedVertices.clear();
job.nodalForcedDisplacements.clear(); job.nodalForcedDisplacements.clear();
job.label = baseSimulationScenarioNames[baseScenario] + "_"
+ std::to_string(simulationScenarioIndex);
const double forceMagnitude = (forceMagnitudeStep * simulationScenarioIndex const double forceMagnitude = (forceMagnitudeStep * simulationScenarioIndex
+ minForceMagnitude); + minForceMagnitude);
@ -1895,6 +1894,9 @@ std::vector<std::shared_ptr<SimulationJob>> ReducedModelOptimizer::createFullPat
m_fullPatternOppositeInterfaceViPairs, m_fullPatternOppositeInterfaceViPairs,
job); job);
job.label = baseSimulationScenarioNames[baseScenario] + "_"
+ std::to_string(simulationScenarioIndex);
scenarios[scenarioIndex] = std::make_shared<SimulationJob>(job); scenarios[scenarioIndex] = std::make_shared<SimulationJob>(job);
} }
} }