From 111fb62d9ad1dd87e577c29e37546b2f4394a55a Mon Sep 17 00:00:00 2001
From: Stefan Girke <stefan.girke@wwu.de>
Date: Fri, 12 Feb 2016 09:05:43 +0100
Subject: [PATCH] ProblemCreator is now called AlgorithmCreator
---
dune/fem-dg/examples/advdiff/CMakeLists.txt | 2 +-
...{problemcreator.hh => algorithmcreator.hh} | 10 +++++-----
dune/fem-dg/examples/advdiff/main.cc | 6 +++---
dune/fem-dg/examples/dataio/CMakeLists.txt | 2 +-
...{problemcreator.hh => algorithmcreator.hh} | 8 ++++----
dune/fem-dg/examples/dataio/dataconvert.cc | 2 +-
dune/fem-dg/examples/dataio/main.cc | 6 +++---
dune/fem-dg/examples/euler/CMakeLists.txt | 2 +-
...{problemcreator.hh => algorithmcreator.hh} | 10 +++++-----
dune/fem-dg/examples/euler/main.cc | 6 +++---
.../incompnavierstokes/CMakeLists.txt | 2 +-
...{problemcreator.hh => algorithmcreator.hh} | 20 +++++++++----------
.../examples/incompnavierstokes/main.cc | 6 +++---
.../examples/navierstokes/CMakeLists.txt | 2 +-
...{problemcreator.hh => algorithmcreator.hh} | 8 ++++----
dune/fem-dg/examples/navierstokes/main.cc | 6 +++---
dune/fem-dg/examples/poisson/CMakeLists.txt | 2 +-
...{problemcreator.hh => algorithmcreator.hh} | 8 ++++----
dune/fem-dg/examples/poisson/main.cc | 6 +++---
dune/fem-dg/examples/stokes/CMakeLists.txt | 2 +-
...{problemcreator.hh => algorithmcreator.hh} | 14 ++++++-------
dune/fem-dg/examples/stokes/main.cc | 6 +++---
dune/fem-dg/misc/configurator.hh | 2 +-
23 files changed, 69 insertions(+), 69 deletions(-)
rename dune/fem-dg/examples/advdiff/{problemcreator.hh => algorithmcreator.hh} (95%)
rename dune/fem-dg/examples/dataio/{problemcreator.hh => algorithmcreator.hh} (96%)
rename dune/fem-dg/examples/euler/{problemcreator.hh => algorithmcreator.hh} (96%)
rename dune/fem-dg/examples/incompnavierstokes/{problemcreator.hh => algorithmcreator.hh} (95%)
rename dune/fem-dg/examples/navierstokes/{problemcreator.hh => algorithmcreator.hh} (97%)
rename dune/fem-dg/examples/poisson/{problemcreator.hh => algorithmcreator.hh} (97%)
rename dune/fem-dg/examples/stokes/{problemcreator.hh => algorithmcreator.hh} (96%)
diff --git a/dune/fem-dg/examples/advdiff/CMakeLists.txt b/dune/fem-dg/examples/advdiff/CMakeLists.txt
index d247b303..d059849d 100644
--- a/dune/fem-dg/examples/advdiff/CMakeLists.txt
+++ b/dune/fem-dg/examples/advdiff/CMakeLists.txt
@@ -1,4 +1,4 @@
-dune_install( main.cc models.hh problemcreator.hh problems.hh)
+dune_install( main.cc models.hh algorithmcreator.hh problems.hh)
dune_add_subdirs( test )
diff --git a/dune/fem-dg/examples/advdiff/problemcreator.hh b/dune/fem-dg/examples/advdiff/algorithmcreator.hh
similarity index 95%
rename from dune/fem-dg/examples/advdiff/problemcreator.hh
rename to dune/fem-dg/examples/advdiff/algorithmcreator.hh
index f4c83a66..0584f7ee 100644
--- a/dune/fem-dg/examples/advdiff/problemcreator.hh
+++ b/dune/fem-dg/examples/advdiff/algorithmcreator.hh
@@ -47,10 +47,10 @@ namespace Fem
* \brief problem creator for an advection diffusion problem
*/
template< class GridImp >
- struct AdvectionDiffusionProblemCreator
+ struct AdvectionDiffusionAlgorithmCreator
{
- struct SubAdvectionDiffusionProblemCreator
+ struct SubAdvectionDiffusionAlgorithmCreator
{
typedef AlgorithmConfigurator< GridImp,
Galerkin::Enum::dg,
@@ -91,7 +91,7 @@ namespace Fem
static ProblemInterfaceType* problem()
{
- return AnalyticalAdvDiffProblemCreator<FunctionSpaceType,GridType>::apply();
+ return AnalyticalAdvDiffAlgorithmCreator<FunctionSpaceType,GridType>::apply();
}
@@ -136,12 +136,12 @@ namespace Fem
};
template< int polOrd >
- using Algorithm = SubAdvectionDiffusionAlgorithm< GridType, SubAdvectionDiffusionProblemCreator, polOrd >;
+ using Algorithm = SubAdvectionDiffusionAlgorithm< GridType, SubAdvectionDiffusionAlgorithmCreator, polOrd >;
};
template< int polOrd >
- using Algorithm = EvolutionAlgorithm< polOrd, UncoupledSubAlgorithms, SubAdvectionDiffusionProblemCreator >;
+ using Algorithm = EvolutionAlgorithm< polOrd, UncoupledSubAlgorithms, SubAdvectionDiffusionAlgorithmCreator >;
typedef GridImp GridType;
diff --git a/dune/fem-dg/examples/advdiff/main.cc b/dune/fem-dg/examples/advdiff/main.cc
index a06bc6af..67766910 100644
--- a/dune/fem-dg/examples/advdiff/main.cc
+++ b/dune/fem-dg/examples/advdiff/main.cc
@@ -2,7 +2,7 @@
#include <config.h>
#include <dune/fem-dg/misc/simulator.hh>
-#include "problemcreator.hh"
+#include "algorithmcreator.hh"
int main(int argc, char ** argv)
@@ -21,10 +21,10 @@ int main(int argc, char ** argv)
Dune::Fem::Parameter::write("parameter.log");
typedef Dune::GridSelector :: GridType GridType;
- Dune::Fem::AdvectionDiffusionProblemCreator< GridType > problem;
+ Dune::Fem::AdvectionDiffusionAlgorithmCreator< GridType > algorithmCreator;
// run simulation
- Dune::Fem::Simulator::run( problem );
+ Dune::Fem::Simulator::run( algorithmCreator );
}
catch (const Dune::Exception &e)
{
diff --git a/dune/fem-dg/examples/dataio/CMakeLists.txt b/dune/fem-dg/examples/dataio/CMakeLists.txt
index 2604cc02..927d6ab4 100644
--- a/dune/fem-dg/examples/dataio/CMakeLists.txt
+++ b/dune/fem-dg/examples/dataio/CMakeLists.txt
@@ -1,3 +1,3 @@
-dune_install( checkedcheckpointhandler.hh checkpointing.hh models.hh problemcreator.hh problem.hh )
+dune_install( checkedcheckpointhandler.hh checkpointing.hh models.hh algorithmcreator.hh problem.hh )
dune_add_subdirs( test )
diff --git a/dune/fem-dg/examples/dataio/problemcreator.hh b/dune/fem-dg/examples/dataio/algorithmcreator.hh
similarity index 96%
rename from dune/fem-dg/examples/dataio/problemcreator.hh
rename to dune/fem-dg/examples/dataio/algorithmcreator.hh
index 735f6683..7a4b71d7 100644
--- a/dune/fem-dg/examples/dataio/problemcreator.hh
+++ b/dune/fem-dg/examples/dataio/algorithmcreator.hh
@@ -90,10 +90,10 @@ namespace Fem
* \brief problem creator for an advection diffusion problem
*/
template< class GridImp >
- struct CheckPointingProblemCreator
+ struct CheckPointingAlgorithmCreator
{
- struct SubCheckPointingProblemCreator
+ struct SubCheckPointingAlgorithmCreator
{
typedef GridImp GridType;
@@ -144,12 +144,12 @@ namespace Fem
};
template <int polOrd>
- using Algorithm = Dune::Fem::SubCheckPointingAlgorithm< GridType, SubCheckPointingProblemCreator, polOrd >;
+ using Algorithm = Dune::Fem::SubCheckPointingAlgorithm< GridType, SubCheckPointingAlgorithmCreator, polOrd >;
};
template <int polOrd>
- using Algorithm = Dune::Fem::EvolutionAlgorithmBase< CheckPointEvolutionAlgorithmTraits< polOrd, SubCheckPointingProblemCreator >, UncoupledSubAlgorithms >;
+ using Algorithm = Dune::Fem::EvolutionAlgorithmBase< CheckPointEvolutionAlgorithmTraits< polOrd, SubCheckPointingAlgorithmCreator >, UncoupledSubAlgorithms >;
typedef GridImp GridType;
diff --git a/dune/fem-dg/examples/dataio/dataconvert.cc b/dune/fem-dg/examples/dataio/dataconvert.cc
index 2c18ed94..c362bcdb 100644
--- a/dune/fem-dg/examples/dataio/dataconvert.cc
+++ b/dune/fem-dg/examples/dataio/dataconvert.cc
@@ -39,7 +39,7 @@ void appendUserParameter()
#define PARAMETER_APPEND_FUNCTION appendUserParameter
typedef Dune::GridSelector :: GridType GridType;
-typedef ProblemCreator< GridType > ProblemTraits;
+typedef AlgorithmCreator< GridType > ProblemTraits;
typedef CheckPointingAlgorithm<GridType,
ProblemTraits,
diff --git a/dune/fem-dg/examples/dataio/main.cc b/dune/fem-dg/examples/dataio/main.cc
index 21810505..affed4eb 100644
--- a/dune/fem-dg/examples/dataio/main.cc
+++ b/dune/fem-dg/examples/dataio/main.cc
@@ -2,7 +2,7 @@
#include <config.h>
#include <dune/fem-dg/misc/simulator.hh>
-#include "problemcreator.hh"
+#include "algorithmcreator.hh"
int main(int argc, char ** argv)
@@ -21,10 +21,10 @@ int main(int argc, char ** argv)
Dune::Fem::Parameter::write("parameter.log");
typedef Dune::GridSelector :: GridType GridType;
- Dune::Fem::CheckPointingProblemCreator< GridType > problem;
+ Dune::Fem::CheckPointingAlgorithmCreator< GridType > algorithmCreator;
// run simulation
- Dune::Fem::Simulator::run( problem );
+ Dune::Fem::Simulator::run( algorithmCreator );
}
catch (const Dune::Exception &e)
{
diff --git a/dune/fem-dg/examples/euler/CMakeLists.txt b/dune/fem-dg/examples/euler/CMakeLists.txt
index 0108bc21..a01072f0 100644
--- a/dune/fem-dg/examples/euler/CMakeLists.txt
+++ b/dune/fem-dg/examples/euler/CMakeLists.txt
@@ -1,3 +1,3 @@
-dune_install( main.cc models.hh problemcreator.hh problems.hh )
+dune_install( main.cc models.hh algorithmcreator.hh problems.hh )
dune_add_subdirs( test )
diff --git a/dune/fem-dg/examples/euler/problemcreator.hh b/dune/fem-dg/examples/euler/algorithmcreator.hh
similarity index 96%
rename from dune/fem-dg/examples/euler/problemcreator.hh
rename to dune/fem-dg/examples/euler/algorithmcreator.hh
index 213088b7..ea0a5eaa 100644
--- a/dune/fem-dg/examples/euler/problemcreator.hh
+++ b/dune/fem-dg/examples/euler/algorithmcreator.hh
@@ -47,10 +47,10 @@ namespace Fem
{
template< class GridImp >
- struct EulerProblemCreator
+ struct EulerAlgorithmCreator
{
- struct SubEulerProblemCreator
+ struct SubEulerAlgorithmCreator
{
typedef AlgorithmConfigurator< GridImp,
Galerkin::Enum::dg,
@@ -94,7 +94,7 @@ namespace Fem
static ProblemInterfaceType* problem()
{
- return AnalyticalEulerProblemCreator<GridType>::apply();
+ return AnalyticalEulerAlgorithmCreator<GridType>::apply();
}
template< int polOrd >
@@ -139,11 +139,11 @@ namespace Fem
};
template <int polOrd>
- using Algorithm = SubAdvectionAlgorithm< GridType, SubEulerProblemCreator, polOrd >;
+ using Algorithm = SubAdvectionAlgorithm< GridType, SubEulerAlgorithmCreator, polOrd >;
};
template <int polOrd>
- using Algorithm = EvolutionAlgorithm< polOrd, UncoupledSubAlgorithms, SubEulerProblemCreator >;
+ using Algorithm = EvolutionAlgorithm< polOrd, UncoupledSubAlgorithms, SubEulerAlgorithmCreator >;
typedef GridImp GridType;
diff --git a/dune/fem-dg/examples/euler/main.cc b/dune/fem-dg/examples/euler/main.cc
index eb691a02..f77fc1e5 100644
--- a/dune/fem-dg/examples/euler/main.cc
+++ b/dune/fem-dg/examples/euler/main.cc
@@ -2,7 +2,7 @@
#include <config.h>
#include <dune/fem-dg/misc/simulator.hh>
-#include "problemcreator.hh"
+#include "algorithmcreator.hh"
int main(int argc, char ** argv)
@@ -21,10 +21,10 @@ int main(int argc, char ** argv)
Dune::Fem::Parameter::write("parameter.log");
typedef Dune::GridSelector :: GridType GridType;
- Dune::Fem::EulerProblemCreator< GridType > problem;
+ Dune::Fem::EulerAlgorithmCreator< GridType > algorithmCreator;
// run simulation
- Dune::Fem::Simulator::run( problem );
+ Dune::Fem::Simulator::run( algorithmCreator );
}
catch (const Dune::Exception &e)
{
diff --git a/dune/fem-dg/examples/incompnavierstokes/CMakeLists.txt b/dune/fem-dg/examples/incompnavierstokes/CMakeLists.txt
index 80e9539e..04c68182 100644
--- a/dune/fem-dg/examples/incompnavierstokes/CMakeLists.txt
+++ b/dune/fem-dg/examples/incompnavierstokes/CMakeLists.txt
@@ -1,3 +1,3 @@
-dune_install( main.cc incompnavierstokesalgorithm.hh models.hh problemcreator.hh problems.hh stokesmodel.hh )
+dune_install( main.cc incompnavierstokesalgorithm.hh models.hh algorithmcreator.hh problems.hh stokesmodel.hh )
dune_add_subdirs( test )
diff --git a/dune/fem-dg/examples/incompnavierstokes/problemcreator.hh b/dune/fem-dg/examples/incompnavierstokes/algorithmcreator.hh
similarity index 95%
rename from dune/fem-dg/examples/incompnavierstokes/problemcreator.hh
rename to dune/fem-dg/examples/incompnavierstokes/algorithmcreator.hh
index dbd43930..ca0fe6ce 100644
--- a/dune/fem-dg/examples/incompnavierstokes/problemcreator.hh
+++ b/dune/fem-dg/examples/incompnavierstokes/algorithmcreator.hh
@@ -55,14 +55,14 @@ namespace Fem
{
template< class GridImp >
- struct IncompressibleNavierStokesProblemCreator
+ struct IncompressibleNavierStokesAlgorithmCreator
{
//=======================================
// STOKES PROBLEM CREATOR
//=======================================
- struct SubStokesProblemCreator
+ struct SubStokesAlgorithmCreator
{
typedef AlgorithmConfigurator< GridImp,
Galerkin::Enum::dg,
@@ -75,7 +75,7 @@ namespace Fem
PrimalDiffusionFlux::Enum::general > AC;
- struct SubPoissonProblemCreator
+ struct SubPoissonAlgorithmCreator
{
typedef typename AC::GridType GridType;
@@ -142,7 +142,7 @@ namespace Fem
};
template <int polOrd>
- using Algorithm = SubEllipticAlgorithm< GridType, SubPoissonProblemCreator, polOrd >;
+ using Algorithm = SubEllipticAlgorithm< GridType, SubPoissonAlgorithmCreator, polOrd >;
};
typedef typename AC::GridType GridType;
@@ -176,9 +176,9 @@ namespace Fem
struct DiscreteTraits
{
private:
- typedef typename SubPoissonProblemCreator::template DiscreteTraits< polOrd > PoissonDiscreteTraits;
+ typedef typename SubPoissonAlgorithmCreator::template DiscreteTraits< polOrd > PoissonDiscreteTraits;
typedef typename PoissonDiscreteTraits::DiscreteFunctionType VelDiscreteFunctionType;
- typedef typename SubPoissonProblemCreator::FunctionSpaceType VelFunctionSpaceType;
+ typedef typename SubPoissonAlgorithmCreator::FunctionSpaceType VelFunctionSpaceType;
typedef typename AC::template DiscreteFunctionSpaces< GridPartType, polOrd, FunctionSpaceType>
DFSpaceType;
typedef typename AC::template DiscreteFunctionSpaces< GridPartType, polOrd, VelFunctionSpaceType>
@@ -221,7 +221,7 @@ namespace Fem
};
template <int polOrd>
- using Algorithm = SubStokesAlgorithm< GridType, SubStokesProblemCreator, SubPoissonProblemCreator, polOrd >;
+ using Algorithm = SubStokesAlgorithm< GridType, SubStokesAlgorithmCreator, SubPoissonAlgorithmCreator, polOrd >;
};
@@ -229,7 +229,7 @@ namespace Fem
// NAVIER-STOKES PROBLEM CREATOR
//=======================================
- struct SubNavierStokesProblemCreator
+ struct SubNavierStokesAlgorithmCreator
{
typedef AlgorithmConfigurator< GridImp,
Galerkin::Enum::dg,
@@ -320,14 +320,14 @@ namespace Fem
};
template <int polOrd>
- using Algorithm = SubAdvectionDiffusionAlgorithm< GridType, SubNavierStokesProblemCreator, polOrd >;
+ using Algorithm = SubAdvectionDiffusionAlgorithm< GridType, SubNavierStokesAlgorithmCreator, polOrd >;
};
// \todo implement coupling and exchange "UncoupledSubAlgorithms"
template <int polOrd>
- using Algorithm = IncompNavierStokesAlgorithm< polOrd, UncoupledSubAlgorithms, SubStokesProblemCreator, SubNavierStokesProblemCreator, SubStokesProblemCreator >;
+ using Algorithm = IncompNavierStokesAlgorithm< polOrd, UncoupledSubAlgorithms, SubStokesAlgorithmCreator, SubNavierStokesAlgorithmCreator, SubStokesAlgorithmCreator >;
typedef GridImp GridType;
diff --git a/dune/fem-dg/examples/incompnavierstokes/main.cc b/dune/fem-dg/examples/incompnavierstokes/main.cc
index 6d7e9bf0..6fca8213 100644
--- a/dune/fem-dg/examples/incompnavierstokes/main.cc
+++ b/dune/fem-dg/examples/incompnavierstokes/main.cc
@@ -2,7 +2,7 @@
#include <config.h>
#include <dune/fem-dg/misc/simulator.hh>
-#include "problemcreator.hh"
+#include "algorithmcreator.hh"
int main(int argc, char ** argv)
@@ -21,10 +21,10 @@ int main(int argc, char ** argv)
Dune::Fem::Parameter::write("parameter.log");
typedef Dune::GridSelector :: GridType GridType;
- Dune::Fem::IncompressibleNavierStokesProblemCreator< GridType > problem;
+ Dune::Fem::IncompressibleNavierStokesAlgorithmCreator< GridType > algorithmCreator;
// run simulation
- Dune::Fem::Simulator::run( problem );
+ Dune::Fem::Simulator::run( algorithmCreator );
}
catch (const Dune::Exception &e)
{
diff --git a/dune/fem-dg/examples/navierstokes/CMakeLists.txt b/dune/fem-dg/examples/navierstokes/CMakeLists.txt
index 751cfc66..6cf6cf5f 100644
--- a/dune/fem-dg/examples/navierstokes/CMakeLists.txt
+++ b/dune/fem-dg/examples/navierstokes/CMakeLists.txt
@@ -1,3 +1,3 @@
-dune_install( main.cc ns_model.hh problemcreator.hh ns_model_spec.hh thermodynamics.hh passtraits.hh)
+dune_install( main.cc ns_model.hh algorithmcreator.hh ns_model_spec.hh thermodynamics.hh passtraits.hh)
dune_add_subdirs( test )
diff --git a/dune/fem-dg/examples/navierstokes/problemcreator.hh b/dune/fem-dg/examples/navierstokes/algorithmcreator.hh
similarity index 97%
rename from dune/fem-dg/examples/navierstokes/problemcreator.hh
rename to dune/fem-dg/examples/navierstokes/algorithmcreator.hh
index d186d13e..835567e5 100644
--- a/dune/fem-dg/examples/navierstokes/problemcreator.hh
+++ b/dune/fem-dg/examples/navierstokes/algorithmcreator.hh
@@ -49,11 +49,11 @@ namespace Fem
{
template< class GridImp >
- struct NavierStokesProblemCreator
+ struct NavierStokesAlgorithmCreator
{
- struct SubNavierStokesProblemCreator
+ struct SubNavierStokesAlgorithmCreator
{
typedef AlgorithmConfigurator< GridImp,
Galerkin::Enum::dg,
@@ -137,12 +137,12 @@ namespace Fem
};
template <int polOrd>
- using Algorithm = SubAdvectionDiffusionAlgorithm< GridType, SubNavierStokesProblemCreator, polOrd >;
+ using Algorithm = SubAdvectionDiffusionAlgorithm< GridType, SubNavierStokesAlgorithmCreator, polOrd >;
};
template <int polOrd>
- using Algorithm = EvolutionAlgorithm< polOrd, UncoupledSubAlgorithms, SubNavierStokesProblemCreator >;
+ using Algorithm = EvolutionAlgorithm< polOrd, UncoupledSubAlgorithms, SubNavierStokesAlgorithmCreator >;
typedef GridImp GridType;
diff --git a/dune/fem-dg/examples/navierstokes/main.cc b/dune/fem-dg/examples/navierstokes/main.cc
index f082e75d..70c37669 100644
--- a/dune/fem-dg/examples/navierstokes/main.cc
+++ b/dune/fem-dg/examples/navierstokes/main.cc
@@ -2,7 +2,7 @@
#include <config.h>
#include <dune/fem-dg/misc/simulator.hh>
-#include "problemcreator.hh"
+#include "algorithmcreator.hh"
int main(int argc, char ** argv)
@@ -21,10 +21,10 @@ int main(int argc, char ** argv)
Dune::Fem::Parameter::write("parameter.log");
typedef Dune::GridSelector :: GridType GridType;
- Dune::Fem::NavierStokesProblemCreator< GridType > problem;
+ Dune::Fem::NavierStokesAlgorithmCreator< GridType > algorithmCreator;
// run simulation
- Dune::Fem::Simulator::run( problem );
+ Dune::Fem::Simulator::run( algorithmCreator );
}
catch (const Dune::Exception &e)
{
diff --git a/dune/fem-dg/examples/poisson/CMakeLists.txt b/dune/fem-dg/examples/poisson/CMakeLists.txt
index d76bad1a..346cbb58 100644
--- a/dune/fem-dg/examples/poisson/CMakeLists.txt
+++ b/dune/fem-dg/examples/poisson/CMakeLists.txt
@@ -1,3 +1,3 @@
-dune_install( main.cc gridinitializer.hh models.hh problemcreator.hh problems.hh )
+dune_install( main.cc gridinitializer.hh models.hh algorithmcreator.hh problems.hh )
dune_add_subdirs( test )
diff --git a/dune/fem-dg/examples/poisson/problemcreator.hh b/dune/fem-dg/examples/poisson/algorithmcreator.hh
similarity index 97%
rename from dune/fem-dg/examples/poisson/problemcreator.hh
rename to dune/fem-dg/examples/poisson/algorithmcreator.hh
index 90e6373e..d47275b3 100644
--- a/dune/fem-dg/examples/poisson/problemcreator.hh
+++ b/dune/fem-dg/examples/poisson/algorithmcreator.hh
@@ -45,10 +45,10 @@ namespace Fem
{
template< class GridImp >
- struct PoissonProblemCreator
+ struct PoissonAlgorithmCreator
{
- struct SubPoissonProblemCreator
+ struct SubPoissonAlgorithmCreator
{
typedef AlgorithmConfigurator< GridImp,
Galerkin::Enum::dg,
@@ -125,12 +125,12 @@ namespace Fem
};
template <int polOrd>
- using Algorithm = SubEllipticAlgorithm< GridType, SubPoissonProblemCreator, polOrd >;
+ using Algorithm = SubEllipticAlgorithm< GridType, SubPoissonAlgorithmCreator, polOrd >;
};
template <int polOrd>
- using Algorithm = SteadyStateAlgorithm< polOrd, UncoupledSubAlgorithms, SubPoissonProblemCreator >;
+ using Algorithm = SteadyStateAlgorithm< polOrd, UncoupledSubAlgorithms, SubPoissonAlgorithmCreator >;
typedef GridImp GridType;
diff --git a/dune/fem-dg/examples/poisson/main.cc b/dune/fem-dg/examples/poisson/main.cc
index fc9acd2c..2ed108a5 100644
--- a/dune/fem-dg/examples/poisson/main.cc
+++ b/dune/fem-dg/examples/poisson/main.cc
@@ -2,7 +2,7 @@
#include <config.h>
#include <dune/fem-dg/misc/simulator.hh>
-#include "problemcreator.hh"
+#include "algorithmcreator.hh"
int main(int argc, char ** argv)
@@ -21,10 +21,10 @@ int main(int argc, char ** argv)
Dune::Fem::Parameter::write("parameter.log");
typedef Dune::GridSelector :: GridType GridType;
- Dune::Fem::PoissonProblemCreator< GridType > problem;
+ Dune::Fem::PoissonAlgorithmCreator< GridType > algorithmCreator;
// run simulation
- Dune::Fem::Simulator::run( problem );
+ Dune::Fem::Simulator::run( algorithmCreator );
}
catch (const Dune::Exception &e)
{
diff --git a/dune/fem-dg/examples/stokes/CMakeLists.txt b/dune/fem-dg/examples/stokes/CMakeLists.txt
index c33b516a..92fcad43 100644
--- a/dune/fem-dg/examples/stokes/CMakeLists.txt
+++ b/dune/fem-dg/examples/stokes/CMakeLists.txt
@@ -1,3 +1,3 @@
-dune_install( main.cc models.hh problemcreator.hh problems.hh stokesalgorithm.hh stokesassembler.hh tensorhelper.hh )
+dune_install( main.cc models.hh algorithmcreator.hh problems.hh stokesalgorithm.hh stokesassembler.hh tensorhelper.hh )
dune_add_subdirs( test )
diff --git a/dune/fem-dg/examples/stokes/problemcreator.hh b/dune/fem-dg/examples/stokes/algorithmcreator.hh
similarity index 96%
rename from dune/fem-dg/examples/stokes/problemcreator.hh
rename to dune/fem-dg/examples/stokes/algorithmcreator.hh
index abeb1657..01a39d09 100644
--- a/dune/fem-dg/examples/stokes/problemcreator.hh
+++ b/dune/fem-dg/examples/stokes/algorithmcreator.hh
@@ -66,15 +66,15 @@ namespace Fem
static const AvailableSolvers< solverEnum > checkSolverInstalled;
template< class GridImp >
- struct StokesProblemCreator
+ struct StokesAlgorithmCreator
{
- struct SubStokesProblemCreator
+ struct SubStokesAlgorithmCreator
{
typedef AlgorithmConfigurator< GridImp, galerkinEnum, adaptivityEnum, dfSpaceEnum, solverEnum, advLimiterEnum,
matrixEnum, advFluxEnum, diffFluxEnum > AC;
- struct SubPoissonProblemCreator
+ struct SubPoissonAlgorithmCreator
{
typedef typename AC::GridType GridType;
@@ -149,7 +149,7 @@ namespace Fem
};
template <int polOrd>
- using Algorithm = SubEllipticAlgorithm< GridType, SubPoissonProblemCreator, polOrd >;
+ using Algorithm = SubEllipticAlgorithm< GridType, SubPoissonAlgorithmCreator, polOrd >;
};
typedef typename AC::GridType GridType;
@@ -193,7 +193,7 @@ namespace Fem
struct DiscreteTraits
{
private:
- typedef typename SubPoissonProblemCreator::template DiscreteTraits< polOrd > PoissonDiscreteTraits;
+ typedef typename SubPoissonAlgorithmCreator::template DiscreteTraits< polOrd > PoissonDiscreteTraits;
typedef typename PoissonDiscreteTraits::DiscreteFunctionType VelDiscreteFunctionType;
typedef typename AC::template DiscreteFunctionSpaces< GridPartType, polOrd, FunctionSpaceType>
DFSpaceType;
@@ -228,12 +228,12 @@ namespace Fem
};
template <int polOrd>
- using Algorithm = SubStokesAlgorithm< GridType, SubStokesProblemCreator, SubPoissonProblemCreator, polOrd >;
+ using Algorithm = SubStokesAlgorithm< GridType, SubStokesAlgorithmCreator, SubPoissonAlgorithmCreator, polOrd >;
};
template <int polOrd>
- using Algorithm = SteadyStateAlgorithm< polOrd, UncoupledSubAlgorithms, SubStokesProblemCreator >;
+ using Algorithm = SteadyStateAlgorithm< polOrd, UncoupledSubAlgorithms, SubStokesAlgorithmCreator >;
typedef GridImp GridType;
diff --git a/dune/fem-dg/examples/stokes/main.cc b/dune/fem-dg/examples/stokes/main.cc
index 15af6677..2b46803b 100644
--- a/dune/fem-dg/examples/stokes/main.cc
+++ b/dune/fem-dg/examples/stokes/main.cc
@@ -2,7 +2,7 @@
#include <config.h>
#include <dune/fem-dg/misc/simulator.hh>
-#include "problemcreator.hh"
+#include "algorithmcreator.hh"
int main(int argc, char ** argv)
@@ -21,10 +21,10 @@ int main(int argc, char ** argv)
Dune::Fem::Parameter::write("parameter.log");
typedef Dune::GridSelector :: GridType GridType;
- Dune::Fem::StokesProblemCreator< GridType > problem;
+ Dune::Fem::StokesAlgorithmCreator< GridType > algorithmCreator;
// run simulation
- Dune::Fem::Simulator::run( problem );
+ Dune::Fem::Simulator::run( algorithmCreator );
}
catch (const Dune::Exception &e)
{
diff --git a/dune/fem-dg/misc/configurator.hh b/dune/fem-dg/misc/configurator.hh
index ec2d39cf..2d2e0932 100644
--- a/dune/fem-dg/misc/configurator.hh
+++ b/dune/fem-dg/misc/configurator.hh
@@ -10,7 +10,7 @@ namespace Fem
/**
- * \brief Convenience class for ProblemCreator classes.
+ * \brief Convenience class for AlgorithmCreator classes.
*
* The module dune-fem-dg needs a lot of templates and typedefs which might confuse some users.
* Furthermore, redundancy of templates expressions which are not updated correctly
--
GitLab