From 5a521ad4282cf87a59047bfb880dc98940f671e5 Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Fri, 10 Feb 2012 13:45:59 +0000
Subject: [PATCH] also deprecate Dumux::startWithParameters()
as decided in FS#122. In a nutshell, Dumux::startWithParameters() has
been renamed to Dumux::start().
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7710 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/common/start.hh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/dumux/common/start.hh b/dumux/common/start.hh
index 230d4ecb65..1bba7e7e87 100644
--- a/dumux/common/start.hh
+++ b/dumux/common/start.hh
@@ -378,13 +378,14 @@ std::string usageTextBlock()
* \param usage Callback function for printing the usage message
*/
template <class TypeTag>
-int startWithParameters_(int argc,
- char **argv,
- void (*usage)(const char *, const std::string &))
+int start_(int argc,
+ char **argv,
+ void (*usage)(const char *, const std::string &))
{
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
- typedef typename GET_PROP_TYPE(TypeTag, GridCreator) GridCreator; // Set by default (dumux/common/basicproperties.hh) to DgfGridCreator (dumux/common/dgfgridcreator.hh)
+ // Set by default (dumux/common/basicproperties.hh) to DgfGridCreator (dumux/common/dgfgridcreator.hh)
+ typedef typename GET_PROP_TYPE(TypeTag, GridCreator) GridCreator;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
@@ -535,7 +536,6 @@ bool inDebugger()
return ptrace(PTRACE_TRACEME, 0, NULL, 0) == -1;
}
-
/*!
* \ingroup Start
*
@@ -558,7 +558,7 @@ int start(int argc,
{
if (!inDebugger()) {
try {
- return startWithParameters_<TypeTag>(argc, argv, usage);
+ return start_<TypeTag>(argc, argv, usage);
}
catch (Dumux::ParameterException &e) {
std::cerr << e << ". Abort!\n";
@@ -574,10 +574,9 @@ int start(int argc,
}
}
else
- return startWithParameters_<TypeTag>(argc, argv, usage);
+ return start_<TypeTag>(argc, argv, usage);
}
-
/*!
* \ingroup Start
*
@@ -594,6 +593,7 @@ int start(int argc,
* \param usage Callback function for printing the usage message
*/
template <class TypeTag>
+DUMUX_DEPRECATED_MSG("Please use Dumux::start() instead")
int startWithParameters(int argc,
char **argv,
void (*usage)(const char *, const std::string &))
--
GitLab