From 19f2899f75988cc8ddaef002924569e696008d08 Mon Sep 17 00:00:00 2001
From: Lisa Julia Nebel <lisa_julia.nebel@tu-dresden.de>
Date: Wed, 5 May 2021 17:36:50 +0200
Subject: [PATCH] Change the keywords for switching between the solvers to
trustRegion and proximalNewton also in film-on-substrate
---
problems/film-on-substrate.parset | 2 +-
src/film-on-substrate.cc | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/problems/film-on-substrate.parset b/problems/film-on-substrate.parset
index 55b999fc..8ccce0d1 100644
--- a/problems/film-on-substrate.parset
+++ b/problems/film-on-substrate.parset
@@ -59,7 +59,7 @@ initialDeformation = "x"
#############################################
# Inner solver, cholmod or multigrid
-solvertype = multigrid
+solvertype = trustRegion
# Number of homotopy steps for the Dirichlet boundary conditions
numHomotopySteps = 1
diff --git a/src/film-on-substrate.cc b/src/film-on-substrate.cc
index 5f5134fe..e5220155 100644
--- a/src/film-on-substrate.cc
+++ b/src/film-on-substrate.cc
@@ -554,7 +554,7 @@ int main (int argc, char *argv[]) try
// Create the chosen solver and solve!
///////////////////////////////////////////////////
- if (parameterSet.get<std::string>("solvertype") == "multigrid") {
+ if (parameterSet.get<std::string>("solvertype", "trustRegion") == "trustRegion") {
#if MIXED_SPACE
MixedRiemannianTrustRegionSolver<GridType, CompositeBasis, DeformationFEBasis, RealTuple<double,dim>, OrientationFEBasis, Rotation<double,dim>> solver;
solver.setup(*grid,
@@ -603,7 +603,7 @@ int main (int argc, char *argv[]) try
x[_1][i] = xRBM[i].q;
}
#endif
- } else { //parameterSet.get<std::string>("solvertype") == "cholmod"
+ } else { //parameterSet.get<std::string>("solvertype") == "proximalNewton"
#if MIXED_SPACE
DUNE_THROW(Exception, "Error: There is no MixedRiemannianProximalNewtonSolver!");
--
GitLab