From 732923b726a3d1f8774b61f08dd0ca2a5fbae95d Mon Sep 17 00:00:00 2001 From: Bernd Flemisch <bernd@iws.uni-stuttgart.de> Date: Mon, 13 Aug 2012 12:16:43 +0000 Subject: [PATCH] Tests: adapt output messages to naming conventions and unify. git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8843 2fb0f335-1f38-0410-981e-8018bf24f1b0 --- test/boxmodels/1p/test_1p.cc | 22 +++++++++---------- test/boxmodels/1p2c/test_1p2c.cc | 11 +++++----- test/boxmodels/2p/test_2p.cc | 16 +++++++------- test/boxmodels/2p2c/test_2p2c.cc | 10 ++++----- test/boxmodels/2p2cni/test_2p2cni.cc | 10 ++++----- test/boxmodels/2pni/test_2pni.cc | 14 ++++++------ test/boxmodels/3p3c/test_3p3c.cc | 10 ++++----- test/boxmodels/3p3cni/test_3p3cni.cc | 10 ++++----- test/boxmodels/mpnc/test_mpnc.cc | 10 ++++----- test/boxmodels/richards/test_richards.cc | 10 ++++----- test/decoupled/1p/test_1p.cc | 13 ++++++----- test/decoupled/1p/test_1pproblem.hh | 2 +- test/decoupled/2p/test_impes.cc | 14 ++++++------ test/decoupled/2p/test_transport.cc | 10 ++++----- test/decoupled/2p2c/test_dec2p2c.cc | 20 +++++++++-------- .../2padaptive/test_impesadaptive.cc | 14 ++++++------ 16 files changed, 99 insertions(+), 97 deletions(-) diff --git a/test/boxmodels/1p/test_1p.cc b/test/boxmodels/1p/test_1p.cc index 73f90370d2..f5148079f9 100644 --- a/test/boxmodels/1p/test_1p.cc +++ b/test/boxmodels/1p/test_1p.cc @@ -44,17 +44,17 @@ void usage(const char *progName, const std::string &errorMsg) errorMessageOut += progName; errorMessageOut += " [options]\n"; errorMessageOut += errorMsg; - errorMessageOut += "\n\nThe List of Mandatory arguments for this program is:\n" - "\t-TimeManager.TEnd The end of the simulation. [s] \n" - "\t-TimeManager.DtInitial The initial timestep size. [s] \n" - "\t-Grid.File The file name of the file containing the grid \n" - "\t definition in DGF format\n" - "\t-SpatialParameters.LensLowerLeftX Dimension of the lens [m] \n" - "\t-SpatialParameters.LensLowerLeftY Dimension of the lens [m] \n" - "\t-SpatialParameters.LensUpperRightX Dimension of the lens [m] \n" - "\t-SpatialParameters.LensUpperRighty Dimension of the lens [m] \n" - "\t-SpatialParameters.Permeability Permeability of the domain [mm^2] \n" - "\t-SpatialParameters.PermeabilityLens Permeability of the lens [mm^2] \n"; + 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"; diff --git a/test/boxmodels/1p2c/test_1p2c.cc b/test/boxmodels/1p2c/test_1p2c.cc index 95cb2bb8c8..dd33925cdc 100644 --- a/test/boxmodels/1p2c/test_1p2c.cc +++ b/test/boxmodels/1p2c/test_1p2c.cc @@ -45,12 +45,11 @@ void usage(const char *progName, const std::string &errorMsg) errorMessageOut += progName; errorMessageOut += " [options]\n"; errorMessageOut += errorMsg; - errorMessageOut += "\n\nThe List of Mandatory arguments for this program is:\n" - "\t-TimeManager.TEnd The end of the simulation. [s] \n" - "\t-TimeManager.DtInitial The initial timestep size. [s] \n" - "\t-Grid.File The file name of the file containing the grid \n" - "\t definition in DGF format\n"; - + errorMessageOut += "\n\nThe list of mandatory options 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"; std::cout << errorMessageOut << "\n"; } diff --git a/test/boxmodels/2p/test_2p.cc b/test/boxmodels/2p/test_2p.cc index de2b290148..b570612b33 100644 --- a/test/boxmodels/2p/test_2p.cc +++ b/test/boxmodels/2p/test_2p.cc @@ -46,14 +46,14 @@ void usage(const char *progName, const std::string &errorMsg) errorMessageOut += " [options]\n"; errorMessageOut += errorMsg; errorMessageOut += "\n\nThe list of mandatory options 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 Dimension of the lens [m] \n" - "\t-SpatialParams.LensLowerLeftY Dimension of the lens [m] \n" - "\t-SpatialParams.LensUpperRightX Dimension of the lens [m] \n" - "\t-SpatialParams.LensUpperRighty Dimension of the lens [m] \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" "\n"; std::cout << errorMessageOut diff --git a/test/boxmodels/2p2c/test_2p2c.cc b/test/boxmodels/2p2c/test_2p2c.cc index 63fcc0e57f..7483f22cc7 100644 --- a/test/boxmodels/2p2c/test_2p2c.cc +++ b/test/boxmodels/2p2c/test_2p2c.cc @@ -43,11 +43,11 @@ void usage(const char *progName, const std::string &errorMsg) errorMessageOut += progName; errorMessageOut += " [options]\n"; errorMessageOut += errorMsg; - errorMessageOut += "\n\nThe List of Mandatory arguments for this program is:\n" - "\t-TimeManager.TEnd The end of the simulation. [s] \n" - "\t-TimeManager.DtInitial The initial timestep size. [s] \n" - "\t-Grid.File The file name of the file containing the grid \n" - "\t definition in DGF format\n" + errorMessageOut += "\n\nThe list of mandatory options 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-FluidSystem.NTemperature Number of tabularization entries [-] \n" "\t-FluidSystem.NPressure Number of tabularization entries [-] \n" "\t-FluidSystem.PressureLow Low end for tabularization of fluid properties [Pa] \n" diff --git a/test/boxmodels/2p2cni/test_2p2cni.cc b/test/boxmodels/2p2cni/test_2p2cni.cc index 51f376cef7..9607b4105f 100644 --- a/test/boxmodels/2p2cni/test_2p2cni.cc +++ b/test/boxmodels/2p2cni/test_2p2cni.cc @@ -46,11 +46,11 @@ void usage(const char *progName, const std::string &errorMsg) errorMessageOut += progName; errorMessageOut += " [options]\n"; errorMessageOut += errorMsg; - errorMessageOut += "\n\nThe List of Mandatory arguments for this program is:\n" - "\t-TimeManager.TEnd The end of the simulation. [s] \n" - "\t-TimeManager.DtInitial The initial timestep size. [s] \n" - "\t-Grid.File The file name of the file containing the grid \n" - "\t definition in DGF format\n"; + errorMessageOut += "\n\nThe list of mandatory options 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"; std::cout << errorMessageOut << "\n"; diff --git a/test/boxmodels/2pni/test_2pni.cc b/test/boxmodels/2pni/test_2pni.cc index 7f0baa4c7c..29b6bcd954 100644 --- a/test/boxmodels/2pni/test_2pni.cc +++ b/test/boxmodels/2pni/test_2pni.cc @@ -46,13 +46,13 @@ void usage(const char *progName, const std::string &errorMsg) errorMessageOut += progName; errorMessageOut += " [options]\n"; errorMessageOut += errorMsg; - errorMessageOut += "\n\nThe List of Mandatory arguments for this program is:\n" - "\t-TimeManager.TEnd The end of the simulation. [s] \n" - "\t-TimeManager.DtInitial The initial timestep size. [s] \n" - "\t-Grid.NumberOfCellsX Resolution in x-direction [-]\n" - "\t-Grid.NumberOfCellsY Resolution in y-direction [-]\n" - "\t-Grid.UpperRightX Dimension of the grid [m]\n" - "\t-Grid.UpperRightY Dimension of the grid [m]\n"; + errorMessageOut += "\n\nThe list of mandatory options for this program is:\n" + "\t-TimeManager.TEnd End of the simulation [s] \n" + "\t-TimeManager.DtInitial Initial timestep size [s] \n" + "\t-Grid.NumberOfCellsX Resolution in x-direction [-]\n" + "\t-Grid.NumberOfCellsY Resolution in y-direction [-]\n" + "\t-Grid.UpperRightX Length of the domain [m]\n" + "\t-Grid.UpperRightY Height of the domain [m]\n"; std::cout << errorMessageOut << "\n"; diff --git a/test/boxmodels/3p3c/test_3p3c.cc b/test/boxmodels/3p3c/test_3p3c.cc index efc3fabf95..4efc94dd79 100644 --- a/test/boxmodels/3p3c/test_3p3c.cc +++ b/test/boxmodels/3p3c/test_3p3c.cc @@ -47,11 +47,11 @@ void usage(const char *progName, const std::string &errorMsg) errorMessageOut += progName; errorMessageOut += " [options]\n"; errorMessageOut += errorMsg; - errorMessageOut += "\n\nThe List of Mandatory arguments for this program is:\n" - "\t-TimeManager.TEnd The end of the simulation. [s] \n" - "\t-TimeManager.DtInitial The initial timestep size. [s] \n" - "\t-Grid.File The file name of the file containing the grid \n" - "\t definition in DGF format\n"; + errorMessageOut += "\n\nThe list of mandatory options 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"; std::cout << errorMessageOut << "\n"; diff --git a/test/boxmodels/3p3cni/test_3p3cni.cc b/test/boxmodels/3p3cni/test_3p3cni.cc index 2c1f88afee..1bc6d7bc37 100644 --- a/test/boxmodels/3p3cni/test_3p3cni.cc +++ b/test/boxmodels/3p3cni/test_3p3cni.cc @@ -49,11 +49,11 @@ void usage(const char *progName, const std::string &errorMsg) errorMessageOut += progName; errorMessageOut += " [options]\n"; errorMessageOut += errorMsg; - errorMessageOut += "\n\nThe List of Mandatory arguments for this program is:\n" - "\t-TimeManager.TEnd The end of the simulation. [s] \n" - "\t-TimeManager.DtInitial The initial timestep size. [s] \n" - "\t-Grid.File The file name of the file containing the grid \n" - "\t definition in DGF format\n"; + errorMessageOut += "\n\nThe list of mandatory options 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"; std::cout << errorMessageOut << "\n"; diff --git a/test/boxmodels/mpnc/test_mpnc.cc b/test/boxmodels/mpnc/test_mpnc.cc index 3bec22808e..7eb63f5260 100644 --- a/test/boxmodels/mpnc/test_mpnc.cc +++ b/test/boxmodels/mpnc/test_mpnc.cc @@ -44,11 +44,11 @@ void usage(const char *progName, const std::string &errorMsg) errorMessageOut += progName; errorMessageOut += " [options]\n"; errorMessageOut += errorMsg; - errorMessageOut += "\n\nThe List of Mandatory arguments for this program is:\n" - "\t-TimeManager.TEnd The end of the simulation. [s] \n" - "\t-TimeManager.DtInitial The initial timestep size. [s] \n" - "\t-Grid.File The file name of the file containing the grid \n" - "\t definition in DGF format\n"; + errorMessageOut += "\n\nThe list of mandatory options 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"; std::cout << errorMessageOut << "\n"; diff --git a/test/boxmodels/richards/test_richards.cc b/test/boxmodels/richards/test_richards.cc index 2874ede525..ba94e5bd6a 100644 --- a/test/boxmodels/richards/test_richards.cc +++ b/test/boxmodels/richards/test_richards.cc @@ -44,11 +44,11 @@ void usage(const char *progName, const std::string &errorMsg) errorMessageOut += progName; errorMessageOut += " [options]\n"; errorMessageOut += errorMsg; - errorMessageOut += "\n\nThe List of Mandatory arguments for this program is:\n" - "\t-TimeManager.TEnd The end of the simulation. [s] \n" - "\t-TimeManager.DtInitial The initial timestep size. [s] \n" - "\t-Grid.File The file name of the file containing the grid \n" - "\t definition in DGF format\n"; + errorMessageOut += "\n\nThe list of mandatory options 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"; std::cout << errorMessageOut << "\n"; diff --git a/test/decoupled/1p/test_1p.cc b/test/decoupled/1p/test_1p.cc index d51c6394c9..6379cdc75a 100644 --- a/test/decoupled/1p/test_1p.cc +++ b/test/decoupled/1p/test_1p.cc @@ -48,12 +48,13 @@ void usage(const char *progName, const std::string &errorMsg) errorMessageOut += progName; errorMessageOut += " [options]\n"; errorMessageOut += errorMsg; - errorMessageOut += "\n\nThe List of Mandatory arguments for this program is:\n" - "\t-refine The refinement level of the grid. [-] \n" - "\t-tEnd The end of the simulation. [s] \n" - "\t-dtInitial The initial timestep size. [s] \n"; - errorMessageOut += "\n\nAdditionaly the following arguments can be specified:\n" - "\t-delta ??? (has to be commented in in the parameter file) \n"; + 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.NumRefine The refinement level of the grid. [-] \n" + errorMessageOut += "\nAdditionally the following arguments can be specified:\n" + "\t-Problem.Delta Anisotropy of permeability tensor. Value out + "\t of (0, 1], with 1 being isotrop. Default: 1e-3.\n"; std::cout << errorMessageOut << "\n"; diff --git a/test/decoupled/1p/test_1pproblem.hh b/test/decoupled/1p/test_1pproblem.hh index 483b97b2ce..70973d8a6b 100644 --- a/test/decoupled/1p/test_1pproblem.hh +++ b/test/decoupled/1p/test_1pproblem.hh @@ -131,7 +131,7 @@ public: try { if (ParameterTree::tree().hasKey("delta")) - delta_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Problem, Delta_); + delta_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Problem, Delta); int numRefine; numRefine = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Grid, NumRefine); GridCreator::grid().globalRefine(numRefine); diff --git a/test/decoupled/2p/test_impes.cc b/test/decoupled/2p/test_impes.cc index 6a436acb96..e6b824b845 100644 --- a/test/decoupled/2p/test_impes.cc +++ b/test/decoupled/2p/test_impes.cc @@ -47,13 +47,13 @@ void usage(const char *progName, const std::string &errorMsg) errorMessageOut += progName; errorMessageOut += " [options]\n"; errorMessageOut += errorMsg; - errorMessageOut += "\n\nThe List of Mandatory arguments for this program is:\n" - "\t-tEnd The end of the simulation. [s] \n" - "\t-dtInitial The initial timestep size. [s] \n" - "\t-Grid.numberOfCellsX Resolution in x-direction [-]\n" - "\t-Grid.numberOfCellsY Resolution in y-direction [-]\n" - "\t-Grid.upperRightX Dimension of the grid [m]\n" - "\t-Grid.upperRightY Dimension of the grid [m]\n"; + 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.NumberOfCellsX Resolution in x-direction [-]\n" + "\t-Grid.NumberOfCellsY Resolution in y-direction [-]\n" + "\t-Grid.UpperRightX Length of the domain [m]\n" + "\t-Grid.UpperRightY Height of the domain [m]\n"; std::cout << errorMessageOut << "\n"; diff --git a/test/decoupled/2p/test_transport.cc b/test/decoupled/2p/test_transport.cc index 05401f98c4..4b6eed2b1d 100644 --- a/test/decoupled/2p/test_transport.cc +++ b/test/decoupled/2p/test_transport.cc @@ -54,11 +54,11 @@ void usage(const char *progName, const std::string &errorMsg) errorMessageOut += progName; errorMessageOut += " [options]\n"; errorMessageOut += errorMsg; - errorMessageOut += "\n\nThe List of Mandatory arguments for this program is:\n" - "\t-tEnd The end of the simulation. [s] \n" - "\t-dtInitial The initial timestep size. [s] \n" - "\t-gridFile The file name of the file containing the grid \n" - "\t definition in DGF format\n"; + errorMessageOut += "\n\nThe list of mandatory options 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"; std::cout << errorMessageOut << "\n"; diff --git a/test/decoupled/2p2c/test_dec2p2c.cc b/test/decoupled/2p2c/test_dec2p2c.cc index 32a0e051f6..ae4019d84c 100644 --- a/test/decoupled/2p2c/test_dec2p2c.cc +++ b/test/decoupled/2p2c/test_dec2p2c.cc @@ -46,15 +46,17 @@ void usage(const char *progName, const std::string &errorMsg) errorMessageOut += progName; errorMessageOut += " [options]\n"; errorMessageOut += errorMsg; - errorMessageOut += "\n\nThe List of Mandatory arguments for this program is:\n" - "\t-tEnd The end of the simulation. [s] \n" - "\t-dtInitial The initial timestep size. [s] \n" - "\t-Grid.numberOfCellsX Resolution in x-direction [-]\n" - "\t-Grid.numberOfCellsY Resolution in y-direction [-]\n" - "\t-Grid.numberOfCellsZ Resolution in z-direction [-]\n" - "\t-Grid.upperRightX Dimension of the grid [m]\n" - "\t-Grid.upperRightY Dimension of the grid [m]\n" - "\t-Grid.upperRightZ Dimension of the grid [m]\n"; + errorMessageOut += "\n\nThe list of mandatory options 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-Grid.NumberOfCellsX Resolution in x-direction [-]\n" + "\t-Grid.NumberOfCellsY Resolution in y-direction [-]\n" + "\t-Grid.NumberOfCellsZ Resolution in z-direction [-]\n" + "\t-Grid.UpperRightX Length of the domain [m]\n" + "\t-Grid.UpperRightY Width of the domain [m]\n" + "\t-Grid.UpperRightZ Height of the domain [m]\n"; std::cout << errorMessageOut << "\n"; } diff --git a/test/decoupled/2padaptive/test_impesadaptive.cc b/test/decoupled/2padaptive/test_impesadaptive.cc index 1d6ed8162e..21fb3856c9 100644 --- a/test/decoupled/2padaptive/test_impesadaptive.cc +++ b/test/decoupled/2padaptive/test_impesadaptive.cc @@ -54,13 +54,13 @@ void usage(const char *progName, const std::string &errorMsg) errorMessageOut += progName; errorMessageOut += " [options]\n"; errorMessageOut += errorMsg; - errorMessageOut += "\n\nThe List of Mandatory arguments for this program is:\n" - "\t-tEnd The end of the simulation. [s] \n" - "\t-dtInitial The initial timestep size. [s] \n" - "\t-Grid.numberOfCellsX Resolution in x-direction [-]\n" - "\t-Grid.numberOfCellsY Resolution in y-direction [-]\n" - "\t-Grid.upperRightX Dimension of the grid [m]\n" - "\t-Grid.upperRightY Dimension of the grid [m]\n"; + errorMessageOut += "\n\nThe list of mandatory options for this program is:\n" + "\t-TimeManager.TEnd End of the simulation [s] \n" + "\t-TimeManager.DtInitial Initial timestep size [s] \n" + "\t-Grid.NumberOfCellsX Resolution in x-direction [-]\n" + "\t-Grid.NumberOfCellsY Resolution in y-direction [-]\n" + "\t-Grid.UpperRightX Length of the domain [m]\n" + "\t-Grid.UpperRightY Height of the domain [m]\n"; std::cout << errorMessageOut << "\n"; } -- GitLab