From 5a4222a539a250586ac3472499b1e7b6697c2af1 Mon Sep 17 00:00:00 2001 From: Kilian Weishaupt Date: Thu, 22 Nov 2018 08:20:52 +0100 Subject: [PATCH 1/5] [test][navierstokes] Clean-up main files * clean-up includes * remove faulty usage message * init gridVars with one argument --- test/freeflow/navierstokes/angeli/main.cc | 77 ++++------------ test/freeflow/navierstokes/channel/1d/main.cc | 43 ++------- test/freeflow/navierstokes/channel/2d/main.cc | 80 ++++------------- test/freeflow/navierstokes/channel/3d/main.cc | 88 ++++++------------- .../navierstokes/closedsystem/main.cc | 76 ++++------------ test/freeflow/navierstokes/donea/main.cc | 78 ++++------------ test/freeflow/navierstokes/kovasznay/main.cc | 76 ++++------------ 7 files changed, 124 insertions(+), 394 deletions(-) diff --git a/test/freeflow/navierstokes/angeli/main.cc b/test/freeflow/navierstokes/angeli/main.cc index 963ffa6080..d2676cfab7 100644 --- a/test/freeflow/navierstokes/angeli/main.cc +++ b/test/freeflow/navierstokes/angeli/main.cc @@ -21,68 +21,29 @@ * * \brief Test for the instationary staggered grid Navier-Stokes model with analytical solution (Angeli et al., 2017) */ - #include +#include - #include - #include +#include +#include - #include - #include - #include - #include - #include +#include +#include +#include +#include +#include - -#include "problem.hh" - -#include +#include +#include +#include #include +#include #include -#include -#include - +#include +#include #include #include -#include -#include - -#include - -#include -#include - -/*! - * \brief Provides an interface for customizing error messages associated with - * reading in parameters. - * - * \param progName The name of the program, that was tried to be started. - * \param errorMsg The error message that was issued by the start function. - * Comprises the thing that went wrong and a general help message. - */ -void usage(const char *progName, const std::string &errorMsg) -{ - if (errorMsg.size() > 0) { - std::string errorMessageOut = "\nUsage: "; - errorMessageOut += progName; - errorMessageOut += " [options]\n"; - errorMessageOut += errorMsg; - errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n" - "\t-TimeManager.TEnd End of the simulation [s] \n" - "\t-TimeManager.DtInitial Initial timestep size [s] \n" - "\t-Grid.File Name of the file containing the grid \n" - "\t definition in DGF format\n" - "\t-SpatialParams.LensLowerLeftX x-coordinate of the lower left corner of the lens [m] \n" - "\t-SpatialParams.LensLowerLeftY y-coordinate of the lower left corner of the lens [m] \n" - "\t-SpatialParams.LensUpperRightX x-coordinate of the upper right corner of the lens [m] \n" - "\t-SpatialParams.LensUpperRightY y-coordinate of the upper right corner of the lens [m] \n" - "\t-SpatialParams.Permeability Permeability of the domain [m^2] \n" - "\t-SpatialParams.PermeabilityLens Permeability of the lens [m^2] \n"; - - std::cout << errorMessageOut - << "\n"; - } -} +#include "problem.hh" int main(int argc, char** argv) try { @@ -99,7 +60,7 @@ int main(int argc, char** argv) try DumuxMessage::print(/*firstCall=*/true); // parse command line arguments and input file - Parameters::init(argc, argv, usage); + Parameters::init(argc, argv); // try to create a grid (from the given grid file or the input file) GridManager> gridManager; @@ -134,11 +95,9 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; - const auto numDofsCellCenter = leafGridView.size(0); - const auto numDofsFace = leafGridView.size(1); SolutionVector x; - x[FVGridGeometry::cellCenterIdx()].resize(numDofsCellCenter); - x[FVGridGeometry::faceIdx()].resize(numDofsFace); + x[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + x[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); problem->applyInitialSolution(x); auto xOld = x; diff --git a/test/freeflow/navierstokes/channel/1d/main.cc b/test/freeflow/navierstokes/channel/1d/main.cc index 8bdcf02e6e..3eeb99923d 100644 --- a/test/freeflow/navierstokes/channel/1d/main.cc +++ b/test/freeflow/navierstokes/channel/1d/main.cc @@ -21,7 +21,6 @@ * * \brief Test for a 1-D staggered grid Navier-Stokes model */ - #include #include @@ -33,45 +32,19 @@ #include #include -#include +#include +#include #include -#include #include +#include #include - -#include -#include -#include -#include #include +#include #include #include #include "problem.hh" -/*! - * \brief Provides an interface for customizing error messages associated with - * reading in parameters. - * - * \param progName The name of the program, that was tried to be started. - * \param errorMsg The error message that was issued by the start function. - * Comprises the thing that went wrong and a general help message. - */ -void usage(const char *progName, const std::string &errorMsg) -{ - if (errorMsg.size() > 0) { - std::string errorMessageOut = "\nUsage: "; - errorMessageOut += progName; - errorMessageOut += " [options]\n"; - errorMessageOut += errorMsg; - errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n" - "\t-TimeManager.TEnd End of the simulation [s] \n" - "\t-TimeManager.DtInitial Initial timestep size [s] \n"; - std::cout << errorMessageOut - << "\n"; - } -} - int main(int argc, char** argv) try { using namespace Dumux; @@ -87,7 +60,7 @@ int main(int argc, char** argv) try DumuxMessage::print(/*firstCall=*/true); // parse command line arguments and input file - Parameters::init(argc, argv, usage); + Parameters::init(argc, argv); // try to create a grid (from the given grid file or the input file) GridManager> gridManager; @@ -111,11 +84,9 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; - const auto numDofsCellCenter = leafGridView.size(0); - const auto numDofsFace = leafGridView.size(1); SolutionVector x; - x[FVGridGeometry::cellCenterIdx()].resize(numDofsCellCenter); - x[FVGridGeometry::faceIdx()].resize(numDofsFace); + x[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + x[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); // the grid variables using GridVariables = GetPropType; diff --git a/test/freeflow/navierstokes/channel/2d/main.cc b/test/freeflow/navierstokes/channel/2d/main.cc index cb3fba4112..c8dc1ed287 100644 --- a/test/freeflow/navierstokes/channel/2d/main.cc +++ b/test/freeflow/navierstokes/channel/2d/main.cc @@ -21,70 +21,30 @@ * * \brief Channel flow test for the staggered grid (Navier-)Stokes model */ - #include +#include - #include - #include +#include +#include - #include - #include - #include - #include - #include +#include +#include +#include +#include +#include -#include "problem.hh" - -#include +#include +#include +#include #include +#include #include -#include -#include - +#include +#include +#include #include #include -#include -#include - -#include - -#include -#include -#include - -#include - -/*! - * \brief Provides an interface for customizing error messages associated with - * reading in parameters. - * - * \param progName The name of the program, that was tried to be started. - * \param errorMsg The error message that was issued by the start function. - * Comprises the thing that went wrong and a general help message. - */ -void usage(const char *progName, const std::string &errorMsg) -{ - if (errorMsg.size() > 0) { - std::string errorMessageOut = "\nUsage: "; - errorMessageOut += progName; - errorMessageOut += " [options]\n"; - errorMessageOut += errorMsg; - errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n" - "\t-TimeManager.TEnd End of the simulation [s] \n" - "\t-TimeManager.DtInitial Initial timestep size [s] \n" - "\t-Grid.File Name of the file containing the grid \n" - "\t definition in DGF format\n" - "\t-SpatialParams.LensLowerLeftX x-coordinate of the lower left corner of the lens [m] \n" - "\t-SpatialParams.LensLowerLeftY y-coordinate of the lower left corner of the lens [m] \n" - "\t-SpatialParams.LensUpperRightX x-coordinate of the upper right corner of the lens [m] \n" - "\t-SpatialParams.LensUpperRightY y-coordinate of the upper right corner of the lens [m] \n" - "\t-SpatialParams.Permeability Permeability of the domain [m^2] \n" - "\t-SpatialParams.PermeabilityLens Permeability of the lens [m^2] \n"; - - std::cout << errorMessageOut - << "\n"; - } -} +#include "problem.hh" int main(int argc, char** argv) try { @@ -101,7 +61,7 @@ int main(int argc, char** argv) try DumuxMessage::print(/*firstCall=*/true); // parse command line arguments and input file - Parameters::init(argc, argv, usage); + Parameters::init(argc, argv); // try to create a grid (from the given grid file or the input file) GridManager> gridManager; @@ -134,11 +94,9 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; - const auto numDofsCellCenter = leafGridView.size(0); - const auto numDofsFace = leafGridView.size(1); SolutionVector x; - x[FVGridGeometry::cellCenterIdx()].resize(numDofsCellCenter); - x[FVGridGeometry::faceIdx()].resize(numDofsFace); + x[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + x[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); problem->applyInitialSolution(x); auto xOld = x; diff --git a/test/freeflow/navierstokes/channel/3d/main.cc b/test/freeflow/navierstokes/channel/3d/main.cc index fadc9cdd2c..0d456df2d8 100644 --- a/test/freeflow/navierstokes/channel/3d/main.cc +++ b/test/freeflow/navierstokes/channel/3d/main.cc @@ -16,67 +16,35 @@ * You should have received a copy of the GNU General Public License * * along with this program. If not, see . * *****************************************************************************/ - #include + /*! + * \file + * + * \brief 3D Channel flow test for the staggered grid (Navier-)Stokes model + */ +#include + +#include +#include + +#include +#include +#include +#include +#include - #include - #include - - #include - #include - #include - #include - #include - - -#include "problem.hh" - -#include +#include +#include +#include #include +#include #include -#include -#include - +#include +#include +#include #include #include -#include -#include - -#include -#include -#include - -/*! - * \brief Provides an interface for customizing error messages associated with - * reading in parameters. - * - * \param progName The name of the program, that was tried to be started. - * \param errorMsg The error message that was issued by the start function. - * Comprises the thing that went wrong and a general help message. - */ -void usage(const char *progName, const std::string &errorMsg) -{ - if (errorMsg.size() > 0) { - std::string errorMessageOut = "\nUsage: "; - errorMessageOut += progName; - errorMessageOut += " [options]\n"; - errorMessageOut += errorMsg; - errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n" - "\t-TimeManager.TEnd End of the simulation [s] \n" - "\t-TimeManager.DtInitial Initial timestep size [s] \n" - "\t-Grid.File Name of the file containing the grid \n" - "\t definition in DGF format\n" - "\t-SpatialParams.LensLowerLeftX x-coordinate of the lower left corner of the lens [m] \n" - "\t-SpatialParams.LensLowerLeftY y-coordinate of the lower left corner of the lens [m] \n" - "\t-SpatialParams.LensUpperRightX x-coordinate of the upper right corner of the lens [m] \n" - "\t-SpatialParams.LensUpperRightY y-coordinate of the upper right corner of the lens [m] \n" - "\t-SpatialParams.Permeability Permeability of the domain [m^2] \n" - "\t-SpatialParams.PermeabilityLens Permeability of the lens [m^2] \n"; - - std::cout << errorMessageOut - << "\n"; - } -} +#include "problem.hh" int main(int argc, char** argv) try { @@ -93,7 +61,7 @@ int main(int argc, char** argv) try DumuxMessage::print(/*firstCall=*/true); // parse command line arguments and input file - Parameters::init(argc, argv, usage); + Parameters::init(argc, argv); // try to create a grid (from the given grid file or the input file) GridManager> gridManager; @@ -117,13 +85,9 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; - static constexpr auto cellCenterIdx = FVGridGeometry::cellCenterIdx(); - static constexpr auto faceIdx = FVGridGeometry::faceIdx(); - const auto numDofsCellCenter = leafGridView.size(0); - const auto numDofsFace = leafGridView.size(1); SolutionVector x; - x[cellCenterIdx].resize(numDofsCellCenter); - x[faceIdx].resize(numDofsFace); + x[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + x[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); // the grid variables using GridVariables = GetPropType; diff --git a/test/freeflow/navierstokes/closedsystem/main.cc b/test/freeflow/navierstokes/closedsystem/main.cc index 7a64cb1841..11c7ca554f 100644 --- a/test/freeflow/navierstokes/closedsystem/main.cc +++ b/test/freeflow/navierstokes/closedsystem/main.cc @@ -21,67 +21,29 @@ * * \brief Test for the staggered grid Stokes model in a closed domain */ - #include +#include - #include - #include +#include +#include - #include - #include - #include - #include - #include +#include +#include +#include +#include +#include -#include "problem.hh" - -#include +#include +#include +#include #include +#include #include -#include -#include - +#include +#include #include #include -#include -#include - -#include - -#include -#include - -/*! - * \brief Provides an interface for customizing error messages associated with - * reading in parameters. - * - * \param progName The name of the program, that was tried to be started. - * \param errorMsg The error message that was issued by the start function. - * Comprises the thing that went wrong and a general help message. - */ -void usage(const char *progName, const std::string &errorMsg) -{ - if (errorMsg.size() > 0) { - std::string errorMessageOut = "\nUsage: "; - errorMessageOut += progName; - errorMessageOut += " [options]\n"; - errorMessageOut += errorMsg; - errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n" - "\t-TimeManager.TEnd End of the simulation [s] \n" - "\t-TimeManager.DtInitial Initial timestep size [s] \n" - "\t-Grid.File Name of the file containing the grid \n" - "\t definition in DGF format\n" - "\t-SpatialParams.LensLowerLeftX x-coordinate of the lower left corner of the lens [m] \n" - "\t-SpatialParams.LensLowerLeftY y-coordinate of the lower left corner of the lens [m] \n" - "\t-SpatialParams.LensUpperRightX x-coordinate of the upper right corner of the lens [m] \n" - "\t-SpatialParams.LensUpperRightY y-coordinate of the upper right corner of the lens [m] \n" - "\t-SpatialParams.Permeability Permeability of the domain [m^2] \n" - "\t-SpatialParams.PermeabilityLens Permeability of the lens [m^2] \n"; - - std::cout << errorMessageOut - << "\n"; - } -} +#include "problem.hh" int main(int argc, char** argv) try { @@ -98,7 +60,7 @@ int main(int argc, char** argv) try DumuxMessage::print(/*firstCall=*/true); // parse command line arguments and input file - Parameters::init(argc, argv, usage); + Parameters::init(argc, argv); // try to create a grid (from the given grid file or the input file) GridManager> gridManager; @@ -122,11 +84,9 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; - const auto numDofsCellCenter = leafGridView.size(0); - const auto numDofsFace = leafGridView.size(1); SolutionVector x; - x[FVGridGeometry::cellCenterIdx()].resize(numDofsCellCenter); - x[FVGridGeometry::faceIdx()].resize(numDofsFace); + x[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + x[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); problem->applyInitialSolution(x); auto xOld = x; diff --git a/test/freeflow/navierstokes/donea/main.cc b/test/freeflow/navierstokes/donea/main.cc index bb7bc985e0..9056ba53c2 100644 --- a/test/freeflow/navierstokes/donea/main.cc +++ b/test/freeflow/navierstokes/donea/main.cc @@ -21,69 +21,29 @@ * * \brief Test for the staggered grid Navier-Stokes model (Kovasznay 1947) */ +#include - #include +#include +#include - #include - #include +#include +#include +#include +#include +#include - #include - #include - #include - #include - #include - - -#include "problem.hh" - -#include +#include +#include +#include #include +#include #include -#include -#include - +#include +#include #include #include -#include -#include - -#include -#include - -#include - -/*! - * \brief Provides an interface for customizing error messages associated with - * reading in parameters. - * - * \param progName The name of the program, that was tried to be started. - * \param errorMsg The error message that was issued by the start function. - * Comprises the thing that went wrong and a general help message. - */ -void usage(const char *progName, const std::string &errorMsg) -{ - if (errorMsg.size() > 0) { - std::string errorMessageOut = "\nUsage: "; - errorMessageOut += progName; - errorMessageOut += " [options]\n"; - errorMessageOut += errorMsg; - errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n" - "\t-TimeManager.TEnd End of the simulation [s] \n" - "\t-TimeManager.DtInitial Initial timestep size [s] \n" - "\t-Grid.File Name of the file containing the grid \n" - "\t definition in DGF format\n" - "\t-SpatialParams.LensLowerLeftX x-coordinate of the lower left corner of the lens [m] \n" - "\t-SpatialParams.LensLowerLeftY y-coordinate of the lower left corner of the lens [m] \n" - "\t-SpatialParams.LensUpperRightX x-coordinate of the upper right corner of the lens [m] \n" - "\t-SpatialParams.LensUpperRightY y-coordinate of the upper right corner of the lens [m] \n" - "\t-SpatialParams.Permeability Permeability of the domain [m^2] \n" - "\t-SpatialParams.PermeabilityLens Permeability of the lens [m^2] \n"; - - std::cout << errorMessageOut - << "\n"; - } -} +#include "problem.hh" int main(int argc, char** argv) try { @@ -100,7 +60,7 @@ int main(int argc, char** argv) try DumuxMessage::print(/*firstCall=*/true); // parse command line arguments and input file - Parameters::init(argc, argv, usage); + Parameters::init(argc, argv); // try to create a grid (from the given grid file or the input file) using GridManager = Dumux::GridManager>; @@ -125,11 +85,9 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; - const auto numDofsCellCenter = leafGridView.size(0); - const auto numDofsFace = leafGridView.size(1); SolutionVector x; - x[FVGridGeometry::cellCenterIdx()].resize(numDofsCellCenter); - x[FVGridGeometry::faceIdx()].resize(numDofsFace); + x[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + x[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); // the grid variables using GridVariables = GetPropType; diff --git a/test/freeflow/navierstokes/kovasznay/main.cc b/test/freeflow/navierstokes/kovasznay/main.cc index 2eba37c031..b5bb572e89 100644 --- a/test/freeflow/navierstokes/kovasznay/main.cc +++ b/test/freeflow/navierstokes/kovasznay/main.cc @@ -21,67 +21,29 @@ * * \brief Stationary test for the staggered grid Navier-Stokes model (Kovasznay 1947) */ - #include +#include - #include - #include +#include +#include - #include - #include - #include - #include - #include +#include +#include +#include +#include +#include - -#include "problem.hh" - -#include +#include +#include +#include #include +#include #include -#include -#include - +#include +#include #include #include -#include -#include - - -#include -#include - -/*! - * \brief Provides an interface for customizing error messages associated with - * reading in parameters. - * - * \param progName The name of the program, that was tried to be started. - * \param errorMsg The error message that was issued by the start function. - * Comprises the thing that went wrong and a general help message. - */ -void usage(const char *progName, const std::string &errorMsg) -{ - if (errorMsg.size() > 0) { - std::string errorMessageOut = "\nUsage: "; - errorMessageOut += progName; - errorMessageOut += " [options]\n"; - errorMessageOut += errorMsg; - errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n" - "\t-TimeManager.TEnd End of the simulation [s] \n" - "\t-TimeManager.DtInitial Initial timestep size [s] \n" - "\t-Grid.File Name of the file containing the grid \n" - "\t definition in DGF format\n" - "\t-SpatialParams.LensLowerLeftX x-coordinate of the lower left corner of the lens [m] \n" - "\t-SpatialParams.LensLowerLeftY y-coordinate of the lower left corner of the lens [m] \n" - "\t-SpatialParams.LensUpperRightX x-coordinate of the upper right corner of the lens [m] \n" - "\t-SpatialParams.LensUpperRightY y-coordinate of the upper right corner of the lens [m] \n" - "\t-SpatialParams.Permeability Permeability of the domain [m^2] \n" - "\t-SpatialParams.PermeabilityLens Permeability of the lens [m^2] \n"; - - std::cout << errorMessageOut - << "\n"; - } -} +#include "problem.hh" int main(int argc, char** argv) try { @@ -98,7 +60,7 @@ int main(int argc, char** argv) try DumuxMessage::print(/*firstCall=*/true); // parse command line arguments and input file - Parameters::init(argc, argv, usage); + Parameters::init(argc, argv); // try to create a grid (from the given grid file or the input file) GridManager> gridManager; @@ -122,11 +84,9 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; - const auto numDofsCellCenter = leafGridView.size(0); - const auto numDofsFace = leafGridView.size(1); SolutionVector x; - x[FVGridGeometry::cellCenterIdx()].resize(numDofsCellCenter); - x[FVGridGeometry::faceIdx()].resize(numDofsFace); + x[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + x[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); // the grid variables using GridVariables = GetPropType; -- GitLab From 66a4640dc0f3ad67bff7c688298e4920bddfbf05 Mon Sep 17 00:00:00 2001 From: Kilian Weishaupt Date: Thu, 22 Nov 2018 08:21:12 +0100 Subject: [PATCH 2/5] [test][navierstokesnc] Clean-up main files * clean-up includes * remove faulty usage message * init gridVars with one argument --- test/freeflow/navierstokesnc/channel/main.cc | 76 +++++-------------- .../navierstokesnc/densitydrivenflow/main.cc | 76 +++++-------------- .../navierstokesnc/maxwellstefan/main.cc | 76 +++++-------------- 3 files changed, 54 insertions(+), 174 deletions(-) diff --git a/test/freeflow/navierstokesnc/channel/main.cc b/test/freeflow/navierstokesnc/channel/main.cc index 89eba79ac2..eca54a7574 100644 --- a/test/freeflow/navierstokesnc/channel/main.cc +++ b/test/freeflow/navierstokesnc/channel/main.cc @@ -21,67 +21,29 @@ * * \brief Test for the staggered grid multi-component (Navier-)Stokes model */ - #include +#include - #include - #include +#include +#include - #include - #include - #include - #include - #include +#include +#include +#include +#include +#include -#include "problem.hh" - -#include +#include +#include +#include #include +#include #include -#include -#include - +#include +#include #include #include -#include -#include - -#include - -#include -#include - -/*! - * \brief Provides an interface for customizing error messages associated with - * reading in parameters. - * - * \param progName The name of the program, that was tried to be started. - * \param errorMsg The error message that was issued by the start function. - * Comprises the thing that went wrong and a general help message. - */ -void usage(const char *progName, const std::string &errorMsg) -{ - if (errorMsg.size() > 0) { - std::string errorMessageOut = "\nUsage: "; - errorMessageOut += progName; - errorMessageOut += " [options]\n"; - errorMessageOut += errorMsg; - errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n" - "\t-TimeManager.TEnd End of the simulation [s] \n" - "\t-TimeManager.DtInitial Initial timestep size [s] \n" - "\t-Grid.File Name of the file containing the grid \n" - "\t definition in DGF format\n" - "\t-SpatialParams.LensLowerLeftX x-coordinate of the lower left corner of the lens [m] \n" - "\t-SpatialParams.LensLowerLeftY y-coordinate of the lower left corner of the lens [m] \n" - "\t-SpatialParams.LensUpperRightX x-coordinate of the upper right corner of the lens [m] \n" - "\t-SpatialParams.LensUpperRightY y-coordinate of the upper right corner of the lens [m] \n" - "\t-SpatialParams.Permeability Permeability of the domain [m^2] \n" - "\t-SpatialParams.PermeabilityLens Permeability of the lens [m^2] \n"; - - std::cout << errorMessageOut - << "\n"; - } -} +#include "problem.hh" int main(int argc, char** argv) try { @@ -98,7 +60,7 @@ int main(int argc, char** argv) try DumuxMessage::print(/*firstCall=*/true); // parse command line arguments and input file - Parameters::init(argc, argv, usage); + Parameters::init(argc, argv); // try to create a grid (from the given grid file or the input file) GridManager> gridManager; @@ -133,11 +95,9 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; - const auto numDofsCellCenter = leafGridView.size(0); - const auto numDofsFace = leafGridView.size(1); SolutionVector x; - x[FVGridGeometry::cellCenterIdx()].resize(numDofsCellCenter); - x[FVGridGeometry::faceIdx()].resize(numDofsFace); + x[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + x[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); problem->applyInitialSolution(x); auto xOld = x; diff --git a/test/freeflow/navierstokesnc/densitydrivenflow/main.cc b/test/freeflow/navierstokesnc/densitydrivenflow/main.cc index d6fe30094e..9791e64f19 100644 --- a/test/freeflow/navierstokesnc/densitydrivenflow/main.cc +++ b/test/freeflow/navierstokesnc/densitydrivenflow/main.cc @@ -21,67 +21,29 @@ * * \brief Test for the staggered grid multi-component (Navier-)Stokes model */ - #include +#include - #include - #include +#include +#include - #include - #include - #include - #include - #include +#include +#include +#include +#include +#include -#include "problem.hh" - -#include +#include +#include +#include #include +#include #include -#include -#include - +#include +#include #include #include -#include -#include - -#include - -#include -#include - -/*! - * \brief Provides an interface for customizing error messages associated with - * reading in parameters. - * - * \param progName The name of the program, that was tried to be started. - * \param errorMsg The error message that was issued by the start function. - * Comprises the thing that went wrong and a general help message. - */ -void usage(const char *progName, const std::string &errorMsg) -{ - if (errorMsg.size() > 0) { - std::string errorMessageOut = "\nUsage: "; - errorMessageOut += progName; - errorMessageOut += " [options]\n"; - errorMessageOut += errorMsg; - errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n" - "\t-TimeManager.TEnd End of the simulation [s] \n" - "\t-TimeManager.DtInitial Initial timestep size [s] \n" - "\t-Grid.File Name of the file containing the grid \n" - "\t definition in DGF format\n" - "\t-SpatialParams.LensLowerLeftX x-coordinate of the lower left corner of the lens [m] \n" - "\t-SpatialParams.LensLowerLeftY y-coordinate of the lower left corner of the lens [m] \n" - "\t-SpatialParams.LensUpperRightX x-coordinate of the upper right corner of the lens [m] \n" - "\t-SpatialParams.LensUpperRightY y-coordinate of the upper right corner of the lens [m] \n" - "\t-SpatialParams.Permeability Permeability of the domain [m^2] \n" - "\t-SpatialParams.PermeabilityLens Permeability of the lens [m^2] \n"; - - std::cout << errorMessageOut - << "\n"; - } -} +#include "problem.hh" int main(int argc, char** argv) try { @@ -98,7 +60,7 @@ int main(int argc, char** argv) try DumuxMessage::print(/*firstCall=*/true); // parse command line arguments and input file - Parameters::init(argc, argv, usage); + Parameters::init(argc, argv); // try to create a grid (from the given grid file or the input file) GridManager> gridManager; @@ -132,11 +94,9 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; - const auto numDofsCellCenter = leafGridView.size(0); - const auto numDofsFace = leafGridView.size(1); SolutionVector x; - x[FVGridGeometry::cellCenterIdx()].resize(numDofsCellCenter); - x[FVGridGeometry::faceIdx()].resize(numDofsFace); + x[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + x[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); problem->applyInitialSolution(x); auto xOld = x; diff --git a/test/freeflow/navierstokesnc/maxwellstefan/main.cc b/test/freeflow/navierstokesnc/maxwellstefan/main.cc index c72b94fa4d..468d6317a8 100644 --- a/test/freeflow/navierstokesnc/maxwellstefan/main.cc +++ b/test/freeflow/navierstokesnc/maxwellstefan/main.cc @@ -21,67 +21,29 @@ * * \brief Test for the staggered grid multi-component (Navier-)Stokes model */ - #include +#include - #include - #include +#include +#include - #include - #include - #include - #include - #include +#include +#include +#include +#include +#include -#include "problem.hh" - -#include +#include +#include +#include #include +#include #include -#include -#include - +#include +#include #include #include -#include -#include - -#include - -#include -#include - -/*! - * \brief Provides an interface for customizing error messages associated with - * reading in parameters. - * - * \param progName The name of the program, that was tried to be started. - * \param errorMsg The error message that was issued by the start function. - * Comprises the thing that went wrong and a general help message. - */ -void usage(const char *progName, const std::string &errorMsg) -{ - if (errorMsg.size() > 0) { - std::string errorMessageOut = "\nUsage: "; - errorMessageOut += progName; - errorMessageOut += " [options]\n"; - errorMessageOut += errorMsg; - errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n" - "\t-TimeManager.TEnd End of the simulation [s] \n" - "\t-TimeManager.DtInitial Initial timestep size [s] \n" - "\t-Grid.File Name of the file containing the grid \n" - "\t definition in DGF format\n" - "\t-SpatialParams.LensLowerLeftX x-coordinate of the lower left corner of the lens [m] \n" - "\t-SpatialParams.LensLowerLeftY y-coordinate of the lower left corner of the lens [m] \n" - "\t-SpatialParams.LensUpperRightX x-coordinate of the upper right corner of the lens [m] \n" - "\t-SpatialParams.LensUpperRightY y-coordinate of the upper right corner of the lens [m] \n" - "\t-SpatialParams.Permeability Permeability of the domain [m^2] \n" - "\t-SpatialParams.PermeabilityLens Permeability of the lens [m^2] \n"; - - std::cout << errorMessageOut - << "\n"; - } -} +#include "problem.hh" int main(int argc, char** argv) try { @@ -98,7 +60,7 @@ int main(int argc, char** argv) try DumuxMessage::print(/*firstCall=*/true); // parse command line arguments and input file - Parameters::init(argc, argv, usage); + Parameters::init(argc, argv); // try to create a grid (from the given grid file or the input file) GridManager> gridManager; @@ -132,11 +94,9 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; - const auto numDofsCellCenter = leafGridView.size(0); - const auto numDofsFace = leafGridView.size(1); SolutionVector x; - x[FVGridGeometry::cellCenterIdx()].resize(numDofsCellCenter); - x[FVGridGeometry::faceIdx()].resize(numDofsFace); + x[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + x[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); problem->applyInitialSolution(x); auto xOld = x; -- GitLab From 94ec7faecfc9dc8a37a8cca16deeaf14dac77c47 Mon Sep 17 00:00:00 2001 From: Kilian Weishaupt Date: Thu, 22 Nov 2018 11:14:44 +0100 Subject: [PATCH 3/5] [test][rans] Clean-up main files --- test/freeflow/rans/main.cc | 28 ++++++++++------------------ test/freeflow/ransnc/main.cc | 26 +++++++++----------------- 2 files changed, 19 insertions(+), 35 deletions(-) diff --git a/test/freeflow/rans/main.cc b/test/freeflow/rans/main.cc index a2bb77a056..3fddb555d6 100644 --- a/test/freeflow/rans/main.cc +++ b/test/freeflow/rans/main.cc @@ -35,25 +35,19 @@ #include #include -#include "problem.hh" - -#include +#include +#include +#include #include +#include #include -#include -#include - +#include +#include +#include #include #include -#include -#include - -#include - -#include -#include -#include +#include "problem.hh" /*! * \brief Provides an interface for customizing error messages associated with @@ -126,11 +120,9 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; - const auto numDofsCellCenter = leafGridView.size(0); - const auto numDofsFace = leafGridView.size(1); SolutionVector x; - x[FVGridGeometry::cellCenterIdx()].resize(numDofsCellCenter); - x[FVGridGeometry::faceIdx()].resize(numDofsFace); + x[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + x[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); problem->applyInitialSolution(x); problem->updateStaticWallProperties(); problem->updateDynamicWallProperties(x); diff --git a/test/freeflow/ransnc/main.cc b/test/freeflow/ransnc/main.cc index 3bf3ca410b..598d29d614 100644 --- a/test/freeflow/ransnc/main.cc +++ b/test/freeflow/ransnc/main.cc @@ -32,24 +32,18 @@ #include #include -#include "problem.hh" - -#include +#include +#include +#include #include +#include #include -#include -#include - +#include +#include #include #include -#include -#include - -#include - -#include -#include +#include "problem.hh" /*! * \brief Provides an interface for customizing error messages associated with @@ -122,11 +116,9 @@ int main(int argc, char** argv) try // the solution vector using SolutionVector = GetPropType; - const auto numDofsCellCenter = leafGridView.size(0); - const auto numDofsFace = leafGridView.size(1); SolutionVector x; - x[FVGridGeometry::cellCenterIdx()].resize(numDofsCellCenter); - x[FVGridGeometry::faceIdx()].resize(numDofsFace); + x[FVGridGeometry::cellCenterIdx()].resize(fvGridGeometry->numCellCenterDofs()); + x[FVGridGeometry::faceIdx()].resize(fvGridGeometry->numFaceDofs()); problem->applyInitialSolution(x); problem->updateStaticWallProperties(); problem->updateDynamicWallProperties(x); -- GitLab From 57bfc0b3b5fc190baae0117b7ab64fce2118c06e Mon Sep 17 00:00:00 2001 From: Kilian Weishaupt Date: Thu, 22 Nov 2018 07:53:59 +0100 Subject: [PATCH 4/5] [test][stokesDarcy] Remove unused includes --- .../boundary/stokesdarcy/1p2c_1p2c/horizontalflow/main.cc | 2 -- .../boundary/stokesdarcy/1p2c_1p2c/verticalflow/main.cc | 2 -- test/multidomain/boundary/stokesdarcy/1p2c_2p2c/main.cc | 2 -- .../boundary/stokesdarcy/1p_1p/horizontalflow/main.cc | 2 -- .../multidomain/boundary/stokesdarcy/1p_1p/verticalflow/main.cc | 2 -- test/multidomain/boundary/stokesdarcy/1p_2p/main.cc | 2 -- 6 files changed, 12 deletions(-) diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/main.cc b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/main.cc index e6cb12ca8f..156c1b88c1 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/main.cc +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/main.cc @@ -25,7 +25,6 @@ #include #include -#include #include #include @@ -34,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/main.cc b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/main.cc index 716bbdc7e8..3b913a3ebb 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/main.cc +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/main.cc @@ -25,7 +25,6 @@ #include #include -#include #include #include @@ -34,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/main.cc b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/main.cc index 52674aa3c3..c4b80552e9 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/main.cc +++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/main.cc @@ -25,7 +25,6 @@ #include #include -#include #include #include @@ -34,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/main.cc b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/main.cc index b117364694..f85c72ca83 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/main.cc +++ b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/main.cc @@ -25,7 +25,6 @@ #include #include -#include #include #include @@ -34,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/main.cc b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/main.cc index ef884a4254..f1bc479ced 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/main.cc +++ b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/main.cc @@ -25,7 +25,6 @@ #include #include -#include #include #include @@ -34,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/main.cc b/test/multidomain/boundary/stokesdarcy/1p_2p/main.cc index 2d2698039c..776b53804c 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_2p/main.cc +++ b/test/multidomain/boundary/stokesdarcy/1p_2p/main.cc @@ -25,7 +25,6 @@ #include #include -#include #include #include @@ -34,7 +33,6 @@ #include #include #include -#include #include #include #include -- GitLab From 8909ac84741a72cd78780feeb5d7fea973e6d416 Mon Sep 17 00:00:00 2001 From: Timo Koch Date: Mon, 26 Nov 2018 09:48:42 +0100 Subject: [PATCH 5/5] [test] Add freeflow label to multidomain freeflow tests --- .../1p2c_1p2c/diffusionlawcomparison/CMakeLists.txt | 4 ++-- .../stokesdarcy/1p2c_1p2c/horizontalflow/CMakeLists.txt | 2 +- .../stokesdarcy/1p2c_1p2c/verticalflow/CMakeLists.txt | 4 ++-- .../multidomain/boundary/stokesdarcy/1p2c_2p2c/CMakeLists.txt | 4 ++-- .../multidomain/boundary/stokesdarcy/1p3c_1p3c/CMakeLists.txt | 2 +- .../boundary/stokesdarcy/1p_1p/horizontalflow/CMakeLists.txt | 2 +- .../boundary/stokesdarcy/1p_1p/verticalflow/CMakeLists.txt | 2 +- test/multidomain/boundary/stokesdarcy/1p_2p/CMakeLists.txt | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/CMakeLists.txt index 5c27a37406..ee8d570d6d 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/CMakeLists.txt +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links() dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_maxwellstefan - LABELS multidomain + LABELS multidomain freeflow SOURCES main.cc CMAKE_GUARD HAVE_UMFPACK COMPILE_DEFINITIONS DIFFUSIONTYPE=MaxwellStefansLaw @@ -15,7 +15,7 @@ dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_maxwellstefan --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_maxwellstefan params.input") dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_fickslaw - LABELS multidomain + LABELS multidomain freeflow SOURCES main.cc CMAKE_GUARD HAVE_UMFPACK COMPILE_DEFINITIONS DIFFUSIONTYPE=FicksLaw diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/CMakeLists.txt index 7f2a65be92..ef763e257c 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/CMakeLists.txt +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links() dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_horizontal - LABELS multidomain + LABELS multidomain freeflow SOURCES main.cc CMAKE_GUARD HAVE_UMFPACK COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/CMakeLists.txt index d25a242d95..1988ed7f9d 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/CMakeLists.txt +++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/CMakeLists.txt @@ -3,7 +3,7 @@ add_input_file_links() add_executable(test_md_boundary_darcy1p2c_stokes1p2c_vertical EXCLUDE_FROM_ALL main.cc) dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion - LABELS multidomain + LABELS multidomain freeflow TARGET test_md_boundary_darcy1p2c_stokes1p2c_vertical CMAKE_GUARD HAVE_UMFPACK COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -17,7 +17,7 @@ dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion -Vtk.OutputName test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion") dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_vertical_advection - LABELS multidomain + LABELS multidomain freeflow TARGET test_md_boundary_darcy1p2c_stokes1p2c_vertical CMAKE_GUARD HAVE_UMFPACK COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/CMakeLists.txt index 0d0494e9e4..0f308e877d 100644 --- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/CMakeLists.txt +++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links() dune_add_test(NAME test_md_boundary_darcy2p2c_stokes1p2c_horizontal - LABELS multidomain + LABELS multidomain freeflow SOURCES main.cc CMAKE_GUARD HAVE_UMFPACK COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py @@ -15,7 +15,7 @@ dune_add_test(NAME test_md_boundary_darcy2p2c_stokes1p2c_horizontal -Vtk.OutputName test_md_boundary_darcy2p2c_stokes1p2c_horizontal") dune_add_test(NAME test_md_boundary_darcy2p2cni_stokes1p2cni_horizontal - LABELS multidomain + LABELS multidomain freeflow SOURCES main.cc COMPILE_DEFINITIONS NONISOTHERMAL=1 CMAKE_GUARD HAVE_UMFPACK diff --git a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/CMakeLists.txt index 20d9ed243e..4afa37814f 100644 --- a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/CMakeLists.txt +++ b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links() dune_add_test(NAME test_md_boundary_darcy1p3c_stokes1p3c_horizontal - LABELS multidomain + LABELS multidomain freeflow SOURCES main.cc CMAKE_GUARD HAVE_UMFPACK COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/CMakeLists.txt index c87e39cdcc..48bfbeca35 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/CMakeLists.txt +++ b/test/multidomain/boundary/stokesdarcy/1p_1p/horizontalflow/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links() dune_add_test(NAME test_md_boundary_darcy1p_stokes1p_horizontal - LABELS multidomain + LABELS multidomain freeflow SOURCES main.cc CMAKE_GUARD HAVE_UMFPACK COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/CMakeLists.txt index 9aed1f2c74..3ad02d9bb5 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/CMakeLists.txt +++ b/test/multidomain/boundary/stokesdarcy/1p_1p/verticalflow/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links() dune_add_test(NAME test_md_boundary_darcy1p_stokes1p_vertical - LABELS multidomain + LABELS multidomain freeflow SOURCES main.cc CMAKE_GUARD HAVE_UMFPACK COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p_2p/CMakeLists.txt index 5955dec9cb..5dc4a86091 100644 --- a/test/multidomain/boundary/stokesdarcy/1p_2p/CMakeLists.txt +++ b/test/multidomain/boundary/stokesdarcy/1p_2p/CMakeLists.txt @@ -1,7 +1,7 @@ add_input_file_links() dune_add_test(NAME test_md_boundary_darcy2p_stokes1p_vertical - LABELS multidomain + LABELS multidomain freeflow SOURCES main.cc CMAKE_GUARD HAVE_UMFPACK COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py -- GitLab