From 91316ce487181ec26881223906ce6642d515db2b Mon Sep 17 00:00:00 2001
From: podlesny <podlesny@mi.fu-berlin.de>
Date: Tue, 16 Jul 2019 17:54:17 +0200
Subject: [PATCH] .
---
src/multi-body-problem.cc | 2 +-
src/spatial-solving/tnnmg/tnnmgstep.hh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/multi-body-problem.cc b/src/multi-body-problem.cc
index 5e4c505e..f986549e 100644
--- a/src/multi-body-problem.cc
+++ b/src/multi-body-problem.cc
@@ -199,7 +199,7 @@ int main(int argc, char *argv[]) {
programState.setupInitialConditions(parset, contactNetwork);
- DUNE_THROW(Dune::Exception, "Just need to stop here!");
+ //DUNE_THROW(Dune::Exception, "Just need to stop here!");
auto& nBodyAssembler = contactNetwork.nBodyAssembler();
for (size_t i=0; i<bodyCount; i++) {
diff --git a/src/spatial-solving/tnnmg/tnnmgstep.hh b/src/spatial-solving/tnnmg/tnnmgstep.hh
index d09f3fd1..41780c07 100644
--- a/src/spatial-solving/tnnmg/tnnmgstep.hh
+++ b/src/spatial-solving/tnnmg/tnnmgstep.hh
@@ -151,7 +151,7 @@ class TNNMGStep :
//print(f.linearPart(), "f.linearPart():");
- //std::cout << "-- energy before smoothing: " << energy(x) << std::endl;
+ std::cout << "-- energy before smoothing: " << f(x) << std::endl;
// Nonlinear presmoothing
for (std::size_t i=0; i<preSmoothingSteps_; ++i)
@@ -160,7 +160,7 @@ class TNNMGStep :
std::cout << "- nonlinear presmoothing: success" << std::endl;
//print(x, "TNNMG iterate after smoothing:");
- std::cout << "-- energy after presmoothing: " << energy(x) << std::endl;
+ std::cout << "-- energy after presmoothing: " << f(x) << std::endl;
/*
// Compute constraint/truncated linearization
--
GitLab