Commit 732923b7 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

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
parent a78158f7
......@@ -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";
......
......@@ -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";
}
......
......@@ -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
......
......@@ -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"
......
......@@ -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";
......
......@@ -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";
......
......@@ -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";
......
......@@ -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";
......
......@@ -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";
......
......@@ -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";
......
......@@ -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";
......
......@@ -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);
......
......@@ -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";
......
......@@ -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";
......
......@@ -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";
}
......
......@@ -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";
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment