From ee367ad95a9c156f961c7707466c5d39a79ce8f3 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Sun, 21 Jul 2013 22:02:22 +0200
Subject: [PATCH] [Cleanup] Move anything FPI-related to v.fpi
---
src/one-body-sample.cc | 10 ++++------
src/one-body-sample.parset | 8 ++------
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index 284462da..0167752d 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -471,13 +471,11 @@ int main(int argc, char *argv[]) {
VectorType v = v_initial;
SingletonVectorType alpha = alpha_initial;
- auto const state_fpi_max =
- parset.get<size_t>("solver.tnnmg.fixed_point_iterations");
- auto const fixedPointTolerance =
- parset.get<double>("solver.tnnmg.fixed_point_tolerance");
- auto const relaxation = parset.get<double>("solver.relaxation");
+ auto const state_fpi_max = parset.get<size_t>("v.fpi.maximumIterations");
+ auto const fixedPointTolerance = parset.get<double>("v.fpi.tolerance");
+ auto const relaxation = parset.get<double>("v.fpi.relaxation");
auto const requiredReduction =
- parset.get<double>("solver.requiredReduction");
+ parset.get<double>("v.fpi.requiredReduction");
auto const printProgress = parset.get<bool>("io.printProgress");
auto const verbosity =
parset.get<Solver::VerbosityMode>("v.solver.verbosity");
diff --git a/src/one-body-sample.parset b/src/one-body-sample.parset
index 8ffaf115..2fc54839 100644
--- a/src/one-body-sample.parset
+++ b/src/one-body-sample.parset
@@ -46,16 +46,12 @@ tolerance = 1e-10
maximumIterations = 100000
verbosity = quiet
-[solver]
+[v.fpi]
tolerance = 1e-10
+maximumIterations = 10000
relaxation = 0.5
requiredReduction = 0.5
-[solver.tnnmg]
-maxiterations = 1000000
-fixed_point_iterations = 10000
-fixed_point_tolerance = 1e-10
-
[solver.tnnmg.linear]
maxiterations = 1000000
tolerance = 1e-10
--
GitLab