[cig-commits] [commit] master: call initialize for termination criteria (078e892)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Jun 4 12:46:51 PDT 2014
Repository : https://github.com/geodynamics/aspect
On branch : master
Link : https://github.com/geodynamics/aspect/compare/dea94ae3fdac1f434e32718c384fe5ce83109802...db7eea299d721e7afa2dc72d8f42352dc88a9e16
>---------------------------------------------------------------
commit 078e89250eab3239a3ade2b983ea5ff46f41b9cd
Author: Timo Heister <timo.heister at gmail.com>
Date: Sun Jun 1 12:11:10 2014 -0400
call initialize for termination criteria
>---------------------------------------------------------------
078e89250eab3239a3ade2b983ea5ff46f41b9cd
source/termination_criteria/interface.cc | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/source/termination_criteria/interface.cc b/source/termination_criteria/interface.cc
index 6d67c26..9b44be8 100644
--- a/source/termination_criteria/interface.cc
+++ b/source/termination_criteria/interface.cc
@@ -63,12 +63,16 @@ namespace aspect
void
Manager<dim>::initialize (const Simulator<dim> &simulator)
{
+ SimulatorAccess<dim>::initialize (simulator);
+
for (typename std::list<std_cxx1x::shared_ptr<Interface<dim> > >::iterator
p = termination_objects.begin();
p != termination_objects.end(); ++p)
- dynamic_cast<SimulatorAccess<dim>&>(**p).initialize (simulator);
+ {
+ dynamic_cast<SimulatorAccess<dim>&>(**p).initialize (simulator);
+ (*p)->initialize ();
+ }
- SimulatorAccess<dim>::initialize (simulator);
}
template <int dim>
More information about the CIG-COMMITS
mailing list