Merged master
This commit is contained in:
commit
570046132b
|
|
@ -50,7 +50,6 @@ download_project(PROJ vcglib_devel
|
||||||
PREFIX ${EXTERNAL_DEPS_DIR}
|
PREFIX ${EXTERNAL_DEPS_DIR}
|
||||||
${UPDATE_DISCONNECTED_IF_AVAILABLE}
|
${UPDATE_DISCONNECTED_IF_AVAILABLE}
|
||||||
)
|
)
|
||||||
add_subdirectory(${vcglib_devel_SOURCE_DIR} ${vcglib_devel_BINARY_DIR})
|
|
||||||
|
|
||||||
##matplot++ lib
|
##matplot++ lib
|
||||||
download_project(PROJ MATPLOTPLUSPLUS
|
download_project(PROJ MATPLOTPLUSPLUS
|
||||||
|
|
|
||||||
|
|
@ -1323,7 +1323,6 @@ void DRMSimulationModel::updateNodalAccelerations()
|
||||||
Node &node = pMesh->nodes[v];
|
Node &node = pMesh->nodes[v];
|
||||||
const VertexIndex vi = pMesh->getIndex(v);
|
const VertexIndex vi = pMesh->getIndex(v);
|
||||||
node.acceleration = node.force.residual / node.mass_6d;
|
node.acceleration = node.force.residual / node.mass_6d;
|
||||||
const bool shouldTrigger = mCurrentSimulationStep > 3500;
|
|
||||||
#ifdef POLYSCOPE_DEFINED
|
#ifdef POLYSCOPE_DEFINED
|
||||||
if (std::isnan(node.acceleration.norm())) {
|
if (std::isnan(node.acceleration.norm())) {
|
||||||
std::cout << "acceleration " << vi << ":" << node.acceleration.toString() << std::endl;
|
std::cout << "acceleration " << vi << ":" << node.acceleration.toString() << std::endl;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue