diff options
| author | over0219 <over0219@umn.edu> | 2020-06-10 02:23:28 +0300 |
|---|---|---|
| committer | over0219 <over0219@umn.edu> | 2020-06-10 02:23:28 +0300 |
| commit | a8066c5e18f54bdaf3d6f3f5b5112b6a5e17aa9b (patch) | |
| tree | e9a33e70d4aba54dcd9749c185ff30719aa2eedb | |
| parent | 9819c3576cdce6c5f9efca1a821997a856ad66d7 (diff) | |
stiffness settings
| -rw-r--r-- | extern/softbody/src/admmpd_energy.cpp | 3 | ||||
| -rw-r--r-- | extern/softbody/src/admmpd_solver.cpp | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extern/softbody/src/admmpd_energy.cpp b/extern/softbody/src/admmpd_energy.cpp index 3b90d506a2a..cbe60cb1511 100644 --- a/extern/softbody/src/admmpd_energy.cpp +++ b/extern/softbody/src/admmpd_energy.cpp @@ -9,7 +9,7 @@ using namespace Eigen; Lame::Lame() : m_model(0) { - set_from_youngs_poisson(10000000,0.399); + set_from_youngs_poisson(100000,0.299); } void Lame::set_from_youngs_poisson(double youngs, double poisson) @@ -94,6 +94,7 @@ int EnergyTerm::init_tet( if( volume < 0 ) throw std::runtime_error("**Solver::energy_init: Inverted initial tet"); double k = lame.m_bulk_mod; +std::cout << "IDX: " << index << " bulk mod: " << k << std::endl; weight = std::sqrt(k*volume); Matrix<double,4,3> S = Matrix<double,4,3>::Zero(); S(0,0) = -1; S(0,1) = -1; S(0,2) = -1; diff --git a/extern/softbody/src/admmpd_solver.cpp b/extern/softbody/src/admmpd_solver.cpp index 008db80720e..c5831077b0b 100644 --- a/extern/softbody/src/admmpd_solver.cpp +++ b/extern/softbody/src/admmpd_solver.cpp @@ -237,10 +237,9 @@ void Solver::compute_matrices( data->v.setZero(); } if (data->m.rows() != nx) - { // TODO get from BodyPoint + { // TODO get from input data->m.resize(nx); data->m.setOnes(); - data->m *= 0.01; } // Add per-element energies to data |