Skip to content
Snippets Groups Projects
Commit ee37f7c4 authored by Elias Pipping's avatar Elias Pipping Committed by Elias Pipping
Browse files

Cleanup

parent fed4c2ae
Branches
No related tags found
No related merge requests found
...@@ -204,7 +204,6 @@ int main(int argc, char *argv[]) { ...@@ -204,7 +204,6 @@ int main(int argc, char *argv[]) {
*s4_new = s4_old; *s4_new = s4_old;
SingletonVectorType vonMisesStress; SingletonVectorType vonMisesStress;
VectorType b4; VectorType b4;
auto const nodalIntegrals = auto const nodalIntegrals =
...@@ -219,18 +218,21 @@ int main(int argc, char *argv[]) { ...@@ -219,18 +218,21 @@ int main(int argc, char *argv[]) {
std::fstream octave_writer("data", std::fstream::out); std::fstream octave_writer("data", std::fstream::out);
std::fstream coefficient_writer("coefficient", std::fstream::out); std::fstream coefficient_writer("coefficient", std::fstream::out);
timer.reset(); timer.reset();
auto const timesteps = parset.get<size_t>("timesteps");
octave_writer << "# name: A" << std::endl << "# type: matrix" << std::endl
<< "# rows: " << timesteps << std::endl << "# columns: 3"
<< std::endl;
double const h = 1.0 / timesteps;
auto const &neumannFunction = functions.get("neumannCondition");
auto const &dirichletFunction = functions.get("dirichletCondition");
auto const L = parset.get<double>("boundary.friction.ruina.L"); auto const L = parset.get<double>("boundary.friction.ruina.L");
auto const a = parset.get<double>("boundary.friction.ruina.a"); auto const a = parset.get<double>("boundary.friction.ruina.a");
auto const b = parset.get<double>("boundary.friction.ruina.b"); auto const b = parset.get<double>("boundary.friction.ruina.b");
auto const eta = parset.get<double>("boundary.friction.eta"); auto const eta = parset.get<double>("boundary.friction.eta");
auto const mu = parset.get<double>("boundary.friction.mu"); auto const mu = parset.get<double>("boundary.friction.mu");
auto const timesteps = parset.get<size_t>("timesteps");
double const h = 1.0 / timesteps;
octave_writer << "# name: A" << std::endl << "# type: matrix" << std::endl
<< "# rows: " << timesteps << std::endl << "# columns: 3"
<< std::endl;
auto const &dirichletFunction = functions.get("dirichletCondition");
auto const &neumannFunction = functions.get("neumannCondition");
for (size_t run = 1; run <= timesteps; ++run) { for (size_t run = 1; run <= timesteps; ++run) {
if (parset.get<bool>("printProgress")) { if (parset.get<bool>("printProgress")) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment