From 1e1f33e9d913fd7234aca2e88ad217752b543314 Mon Sep 17 00:00:00 2001
From: Oliver Sander <sander@igpm.rwth-aachen.de>
Date: Mon, 13 Jun 2011 16:21:20 +0000
Subject: [PATCH] Construct the Cosserat energy object with the correct
parameters
[[Imported from SVN: r7425]]
---
cosserat-continuum.cc | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/cosserat-continuum.cc b/cosserat-continuum.cc
index ad27cd31..392d6f9f 100644
--- a/cosserat-continuum.cc
+++ b/cosserat-continuum.cc
@@ -2,8 +2,6 @@
#include <fenv.h>
-//#define HARMONIC_ENERGY_FD_GRADIENT
-
#define RIGIDBODYMOTION3
#include <dune/common/bitsetvector.hh>
@@ -178,13 +176,14 @@ int main (int argc, char *argv[]) try
SolutionType initialIterate = x;
// ////////////////////////////////////////////////////////////
- // Create an assembler for the Harmonic Energy Functional
+ // Create an assembler for the energy functional
// ////////////////////////////////////////////////////////////
- CosseratEnergyLocalStiffness<GridType::LeafGridView,3> harmonicEnergyLocalStiffness;
+ const ParameterTree& materialParameters = parameterSet.sub("materialParameters");
+ CosseratEnergyLocalStiffness<GridType::LeafGridView,3> cosseratEnergyLocalStiffness(materialParameters);
GeodesicFEAssembler<GridType::LeafGridView,TargetSpace> assembler(grid.leafView(),
- &harmonicEnergyLocalStiffness);
+ &cosseratEnergyLocalStiffness);
// /////////////////////////////////////////////////
// Create a Riemannian trust-region solver
--
GitLab