Skip to content
Snippets Groups Projects
Commit 05bb134f authored by Denis Louis's avatar Denis Louis
Browse files

preparing merge

parent 85c6bbab
No related branches found
No related tags found
1 merge request!8SECOND PROGRESS DEADLINE
......@@ -92,7 +92,7 @@ int main(int argc, char **argv)
i++;
}
relativeDisplacement = sqrt(relativeDisplacement/i);
std::cout << iteration << ", " << relativeDisplacement << ";\n";
//std::cout << iteration << ", " << relativeDisplacement << ";\n";
// std::cout << "Iteration: " << iteration << "\t-> Averaged relative displacement = " << relativeDisplacement << "\n";
if(relativeDisplacement < criticalNorm)
break;
......@@ -105,7 +105,7 @@ int main(int argc, char **argv)
solverFEMnonLinear(argc, argv, electrostaticPressure, boundaryDisplacementMap, nbViews, postProcessing, iteration, viewTagU, viewTagF);
/*--------get physical groups--------------*/
std::map<std::string, std::pair<int, int>> groups;
/*std::map<std::string, std::pair<int, int>> groups;
gmsh::vectorpair dimTags;
gmsh::model::getPhysicalGroups(dimTags);
for (std::size_t i = 0; i < dimTags.size(); ++i)
......@@ -140,7 +140,7 @@ int main(int argc, char **argv)
}
gmsh::model::mesh::optimize("UntangleMeshGeometry", false, 1, dimTagsBis);
std::map<int,std::pair<double,double>> boundaryDisplacementMap2;
solverBEM(argc, argv, electrostaticPressure, boundaryDisplacementMap2, nbViews, postProcessing, iteration);
solverBEM(argc, argv, electrostaticPressure, boundaryDisplacementMap2, nbViews, postProcessing, iteration);*/
}
else
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment