From a346e828b7bf516295184b39267e3ad911911092 Mon Sep 17 00:00:00 2001 From: Timo Koch Date: Wed, 11 Mar 2020 19:19:43 +0100 Subject: [PATCH] [cleanup] Remove old unused simulation steering functions in problem --- test/freeflow/navierstokes/channel/1d/problem.hh | 5 ----- .../freeflow/navierstokes/closedsystem/problem.hh | 6 ------ test/freeflow/navierstokes/donea/problem.hh | 5 ----- test/freeflow/navierstokes/kovasznay/problem.hh | 5 ----- test/freeflow/navierstokesnc/channel/problem.hh | 5 ----- .../navierstokesnc/densitydrivenflow/problem.hh | 5 ----- test/freeflow/rans/problem.hh | 5 ----- test/freeflow/ransnc/problem.hh | 6 ------ .../diffusionlawcomparison/problem_darcy.hh | 14 -------------- .../diffusionlawcomparison/problem_stokes.hh | 3 --- .../stokesdarcy/1p2c_2p2c/problem_darcy.hh | 14 -------------- .../stokesdarcy/1p3c_1p3c/problem_darcy.hh | 14 -------------- .../stokesdarcy/1p3c_1p3c/problem_stokes.hh | 10 ---------- .../boundary/stokesdarcy/1p_2p/problem_darcy.hh | 15 --------------- .../boundary/stokesdarcy/1p_2p/problem_stokes.hh | 3 --- .../mpnc/implicit/obstacle/problem.hh | 8 -------- 16 files changed, 123 deletions(-) diff --git a/test/freeflow/navierstokes/channel/1d/problem.hh b/test/freeflow/navierstokes/channel/1d/problem.hh index 7211d4a990..1ce84007d7 100644 --- a/test/freeflow/navierstokes/channel/1d/problem.hh +++ b/test/freeflow/navierstokes/channel/1d/problem.hh @@ -119,11 +119,6 @@ public: */ // \{ - bool shouldWriteRestartFile() const - { - return false; - } - void printL2Error(const SolutionVector& curSol) const { if(printL2Error_) diff --git a/test/freeflow/navierstokes/closedsystem/problem.hh b/test/freeflow/navierstokes/closedsystem/problem.hh index 1d8af19ef7..5baadd27fa 100644 --- a/test/freeflow/navierstokes/closedsystem/problem.hh +++ b/test/freeflow/navierstokes/closedsystem/problem.hh @@ -108,12 +108,6 @@ public: */ // \{ - - bool shouldWriteRestartFile() const - { - return false; - } - /*! * \brief Returns the temperature within the domain in [K]. * diff --git a/test/freeflow/navierstokes/donea/problem.hh b/test/freeflow/navierstokes/donea/problem.hh index c66f49b129..5f3e2507e9 100644 --- a/test/freeflow/navierstokes/donea/problem.hh +++ b/test/freeflow/navierstokes/donea/problem.hh @@ -117,11 +117,6 @@ public: */ // \{ - bool shouldWriteRestartFile() const - { - return false; - } - void printL2Error(const SolutionVector& curSol) const { if(printL2Error_) diff --git a/test/freeflow/navierstokes/kovasznay/problem.hh b/test/freeflow/navierstokes/kovasznay/problem.hh index a24810faa7..fb2cd37ef6 100644 --- a/test/freeflow/navierstokes/kovasznay/problem.hh +++ b/test/freeflow/navierstokes/kovasznay/problem.hh @@ -127,11 +127,6 @@ public: */ // \{ - bool shouldWriteRestartFile() const - { - return false; - } - void printL2Error(const SolutionVector& curSol) const { if(printL2Error_) diff --git a/test/freeflow/navierstokesnc/channel/problem.hh b/test/freeflow/navierstokesnc/channel/problem.hh index 24d7ad2860..fd6fd5b644 100644 --- a/test/freeflow/navierstokesnc/channel/problem.hh +++ b/test/freeflow/navierstokesnc/channel/problem.hh @@ -140,11 +140,6 @@ public: */ // \{ - bool shouldWriteRestartFile() const - { - return false; - } - /*! * \brief Returns the temperature within the domain in [K]. * diff --git a/test/freeflow/navierstokesnc/densitydrivenflow/problem.hh b/test/freeflow/navierstokesnc/densitydrivenflow/problem.hh index 13465cc26c..45b20a7706 100644 --- a/test/freeflow/navierstokesnc/densitydrivenflow/problem.hh +++ b/test/freeflow/navierstokesnc/densitydrivenflow/problem.hh @@ -128,11 +128,6 @@ public: */ // \{ - bool shouldWriteRestartFile() const - { - return false; - } - /*! * \brief Returns the temperature within the domain in [K]. * diff --git a/test/freeflow/rans/problem.hh b/test/freeflow/rans/problem.hh index db7365642f..1c4246d16f 100644 --- a/test/freeflow/rans/problem.hh +++ b/test/freeflow/rans/problem.hh @@ -185,11 +185,6 @@ public: return sandGrainRoughness_; } - bool shouldWriteRestartFile() const - { - return false; - } - /*! * \brief Returns the temperature [K] within the domain for the isothermal model. */ diff --git a/test/freeflow/ransnc/problem.hh b/test/freeflow/ransnc/problem.hh index be507c1f86..77641e476d 100644 --- a/test/freeflow/ransnc/problem.hh +++ b/test/freeflow/ransnc/problem.hh @@ -181,12 +181,6 @@ public: return globalPos[1] < eps_; } - - bool shouldWriteRestartFile() const - { - return false; - } - /*! * \brief Returns the temperature within the domain in [K]. * diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh index 16415514d1..9f95be0e70 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_darcy.hh @@ -143,25 +143,11 @@ public: initialMoleFraction_ = getParamFromGroup(this->paramGroup(), "Problem.InitialMoleFraction"); } - /*! - * \name Simulation steering - */ - // \{ - - /*! - * \brief Returns true if a restart file should be written to disk. - */ - bool shouldWriteRestartFile() const - { return false; } - /*! * \name Problem parameters */ // \{ - bool shouldWriteOutput() const // define output - { return true; } - /*! * \brief Returns the temperature within the domain in [K]. * diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh index ee04223635..c549f9dbcf 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/problem_stokes.hh @@ -135,9 +135,6 @@ public: */ // \{ - bool shouldWriteRestartFile() const - { return false; } - /*! * \brief Returns the temperature within the domain in [K]. * diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh index 9b33da50be..532768463b 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh +++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/problem_darcy.hh @@ -146,11 +146,6 @@ public: return problemName_; } - /*! - * \name Simulation steering - */ - // \{ - template void printWaterMass(const SolutionVector& curSol, const GridVariables& gridVariables, @@ -183,20 +178,11 @@ public: std::cout << std::setprecision(15) << "mass of water is: " << massWater << std::endl; } - /*! - * \brief Returns true if a restart file should be written to disk. - */ - bool shouldWriteRestartFile() const - { return false; } - /*! * \name Problem parameters */ // \{ - bool shouldWriteOutput() const //define output - { return true; } - /*! * \brief Returns the temperature within the domain in [K]. */ diff --git a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh index 9fdb6227b7..d92060c217 100644 --- a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh +++ b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_darcy.hh @@ -135,25 +135,11 @@ public: initialMoleFractionCO2_ = getParamFromGroup(this->paramGroup(), "Problem.InitialMoleFractionCO2"); } - /*! - * \name Simulation steering - */ - // \{ - - /*! - * \brief Returns true if a restart file should be written to disk. - */ - bool shouldWriteRestartFile() const - { return false; } - /*! * \name Problem parameters */ // \{ - bool shouldWriteOutput() const // define output - { return true; } - /*! * \brief Returns the temperature within the domain in [K]. * diff --git a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh index 23ed8d8626..aaaa4553a7 100644 --- a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh +++ b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/problem_stokes.hh @@ -120,9 +120,6 @@ public: */ // \{ - bool shouldWriteRestartFile() const - { return false; } - /*! * \brief Returns the temperature within the domain in [K]. * @@ -131,13 +128,6 @@ public: Scalar temperature() const { return 273.15 + 10; } // 10°C - /*! - * \brief Returns the sources within the domain. - * - * \param globalPos The global position - */ - NumEqVector sourceAtPos(const GlobalPosition &globalPos) const - { return NumEqVector(0.0); } // \} /*! diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh index 1450aafa40..f32b5c92d6 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh +++ b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_darcy.hh @@ -128,26 +128,11 @@ public: return problemName_; } - /*! - * \name Simulation steering - */ - // \{ - - /*! - * \brief Returns true if a restart file should be written to disk. - */ - bool shouldWriteRestartFile() const - { return false; } - /*! * \name Problem parameters */ // \{ - bool shouldWriteOutput() const // define output - { return true; } - - /*! * \brief Returns the temperature within the domain in [K]. * diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh index ed5c35b2e3..dbcb19217a 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh +++ b/test/multidomain/boundary/stokesdarcy/1p_2p/problem_stokes.hh @@ -114,9 +114,6 @@ public: */ // \{ - bool shouldWriteRestartFile() const - { return false; } - /*! * \brief Returns the temperature within the domain in [K]. */ diff --git a/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh b/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh index 6f6ab94d2d..faa0e93d53 100644 --- a/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh +++ b/test/porousmediumflow/mpnc/implicit/obstacle/problem.hh @@ -198,14 +198,6 @@ public: Scalar temperature() const { return temperature_; } - /*! - * \brief Write a restart file? - */ - bool shouldWriteRestartFile() const - { - return ParentType::shouldWriteRestartFile(); - } - // \} /*! -- GitLab