From af9b97f912d127c04c59d9eea2d704920131bbb8 Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Fri, 22 Feb 2019 08:06:03 +0100
Subject: [PATCH] [rans][iofields] Clean-up
* remove deprecated functions
* remove debug output
---
dumux/freeflow/rans/iofields.hh | 8 --------
dumux/freeflow/rans/oneeq/iofields.hh | 7 -------
dumux/freeflow/rans/twoeq/kepsilon/iofields.hh | 9 ---------
dumux/freeflow/rans/twoeq/komega/iofields.hh | 8 --------
dumux/freeflow/rans/twoeq/lowrekepsilon/iofields.hh | 8 --------
5 files changed, 40 deletions(-)
diff --git a/dumux/freeflow/rans/iofields.hh b/dumux/freeflow/rans/iofields.hh
index 14c0293874..ce7d6a77ce 100644
--- a/dumux/freeflow/rans/iofields.hh
+++ b/dumux/freeflow/rans/iofields.hh
@@ -25,7 +25,6 @@
#define DUMUX_RANS_IO_FIELDS_HH
#include <dumux/freeflow/navierstokes/iofields.hh>
-#include <dune/common/deprecated.hh>
namespace Dumux {
@@ -35,13 +34,6 @@ namespace Dumux {
*/
struct RANSIOFields
{
- template <class OutputModule>
- DUNE_DEPRECATED_MSG("use initOutputModule instead")
- static void init(OutputModule& out)
- {
- initOutputModule(out);
- }
-
//! Initialize the RANS specific output fields.
template <class OutputModule>
static void initOutputModule(OutputModule& out)
diff --git a/dumux/freeflow/rans/oneeq/iofields.hh b/dumux/freeflow/rans/oneeq/iofields.hh
index 97bdd4a651..f0bcc48d4c 100644
--- a/dumux/freeflow/rans/oneeq/iofields.hh
+++ b/dumux/freeflow/rans/oneeq/iofields.hh
@@ -34,13 +34,6 @@ namespace Dumux {
*/
struct OneEqIOFields
{
- template <class OutputModule>
- DUNE_DEPRECATED_MSG("use initOutputModule instead")
- static void init(OutputModule& out)
- {
- initOutputModule(out);
- }
-
//! Initialize the OneEq specific output fields.
template <class OutputModule>
static void initOutputModule(OutputModule& out)
diff --git a/dumux/freeflow/rans/twoeq/kepsilon/iofields.hh b/dumux/freeflow/rans/twoeq/kepsilon/iofields.hh
index b323360402..e8c1e087c9 100644
--- a/dumux/freeflow/rans/twoeq/kepsilon/iofields.hh
+++ b/dumux/freeflow/rans/twoeq/kepsilon/iofields.hh
@@ -25,7 +25,6 @@
#define DUMUX_KEPSILON_IO_FIELDS_HH
#include <dumux/freeflow/rans/iofields.hh>
-#include <dune/common/deprecated.hh>
namespace Dumux {
@@ -35,13 +34,6 @@ namespace Dumux {
*/
struct KEpsilonIOFields
{
- template <class OutputModule>
- DUNE_DEPRECATED_MSG("use initOutputModule instead")
- static void init(OutputModule& out)
- {
- initOutputModule(out);
- }
-
//! Initialize the KEpsilon specific output fields.
template <class OutputModule>
static void initOutputModule(OutputModule& out)
@@ -60,7 +52,6 @@ struct KEpsilonIOFields
template <class ModelTraits, class FluidSystem>
static std::string primaryVariableName(int pvIdx = 0, int state = 0)
{
- std::cout << "kepsi called with " << pvIdx << std::endl;
if (pvIdx < ModelTraits::dim() + ModelTraits::numFluidComponents())
return RANSIOFields::template primaryVariableName<ModelTraits, FluidSystem>(pvIdx, state);
else if (pvIdx == ModelTraits::dim() + ModelTraits::numFluidComponents())
diff --git a/dumux/freeflow/rans/twoeq/komega/iofields.hh b/dumux/freeflow/rans/twoeq/komega/iofields.hh
index 876782f87f..cd832cfdab 100644
--- a/dumux/freeflow/rans/twoeq/komega/iofields.hh
+++ b/dumux/freeflow/rans/twoeq/komega/iofields.hh
@@ -25,7 +25,6 @@
#define DUMUX_KOMEGA_IO_FIELDS_HH
#include <dumux/freeflow/rans/iofields.hh>
-#include <dune/common/deprecated.hh>
namespace Dumux {
@@ -35,13 +34,6 @@ namespace Dumux {
*/
struct KOmegaIOFields
{
- template <class OutputModule>
- DUNE_DEPRECATED_MSG("use initOutputModule instead")
- static void init(OutputModule& out)
- {
- initOutputModule(out);
- }
-
//! Initialize the KOmegaModel specific output fields.
template <class OutputModule>
static void initOutputModule(OutputModule& out)
diff --git a/dumux/freeflow/rans/twoeq/lowrekepsilon/iofields.hh b/dumux/freeflow/rans/twoeq/lowrekepsilon/iofields.hh
index 9c83dec87b..7193c3e2f9 100644
--- a/dumux/freeflow/rans/twoeq/lowrekepsilon/iofields.hh
+++ b/dumux/freeflow/rans/twoeq/lowrekepsilon/iofields.hh
@@ -25,7 +25,6 @@
#define DUMUX_LOWREKEPSILON_IO_FIELDS_HH
#include <dumux/freeflow/rans/iofields.hh>
-#include <dune/common/deprecated.hh>
namespace Dumux {
@@ -35,13 +34,6 @@ namespace Dumux {
*/
struct LowReKEpsilonIOFields
{
- template <class OutputModule>
- DUNE_DEPRECATED_MSG("use initOutputModule instead")
- static void init(OutputModule& out)
- {
- initOutputModule(out);
- }
-
//! Initialize the LowReKEpsilon specific output fields.
template <class OutputModule>
static void initOutputModule(OutputModule& out)
--
GitLab