Commit c55ea0e4 authored by Melanie Darcis's avatar Melanie Darcis
Browse files

Adjusted usage messages to property name changes.

Reverted Yasp Grid change since it only seems to cause an error for gcc 4.5.2 and works for all other tested compilers (see bernds mail).
Reviewed by Markus

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8819 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 8698b922
......@@ -45,16 +45,16 @@ void usage(const char *progName, const std::string &errorMsg)
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-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";
"\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";
std::cout << errorMessageOut
<< "\n";
......
......@@ -46,9 +46,9 @@ void usage(const char *progName, const std::string &errorMsg)
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-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";
std::cout << errorMessageOut
......
......@@ -64,7 +64,7 @@ NEW_TYPE_TAG(LensProblem, INHERITS_FROM(BoxTwoP, LensSpatialParams));
#if HAVE_UG
SET_TYPE_PROP(LensProblem, Grid, Dune::UGGrid<2>);
#else
SET_TYPE_PROP(LensProblem, Grid, Dune::SGrid<2,2>);
SET_TYPE_PROP(LensProblem, Grid, Dune::YaspGrid<2>);
#endif
// Set the problem property
......
......@@ -46,14 +46,14 @@ void usage(const char *progName, const std::string &errorMsg)
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-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.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"
"\n";
std::cout << errorMessageOut
......
......@@ -44,19 +44,19 @@ void usage(const char *progName, const std::string &errorMsg)
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-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-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"
"\t-FluidSystem.pressureHigh High end for tabularization of fluid properties [Pa] \n"
"\t-FluidSystem.temperatureLow Low end for tabularization of fluid properties [Pa] \n"
"\t-FluidSystem.temperatureHigh High end for tabularization of fluid properties [Pa] \n"
"\t-SimulationControl.name The name of the output files [-] \n"
"\t-InitialConditions.temperature Initial temperature in the reservoir [K] \n"
"\t-InitialConditions.depthBOR Depth below ground surface [m] \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"
"\t-FluidSystem.PressureHigh High end for tabularization of fluid properties [Pa] \n"
"\t-FluidSystem.TemperatureLow Low end for tabularization of fluid properties [Pa] \n"
"\t-FluidSystem.TemperatureHigh High end for tabularization of fluid properties [Pa] \n"
"\t-SimulationControl.Name The name of the output files [-] \n"
"\t-InitialConditions.Temperature Initial temperature in the reservoir [K] \n"
"\t-InitialConditions.DepthBOR Depth below ground surface [m] \n";
std::cout << errorMessageOut
<< "\n";
......
......@@ -47,9 +47,9 @@ void usage(const char *progName, const std::string &errorMsg)
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-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";
std::cout << errorMessageOut
......
......@@ -54,7 +54,7 @@ NEW_TYPE_TAG(WaterAirProblem, INHERITS_FROM(BoxTwoPTwoCNI, WaterAirSpatialParams
// Set the grid type
SET_PROP(WaterAirProblem, Grid)
{
typedef Dune::SGrid<2,2> type;
typedef Dune::YaspGrid<2> type;
};
// Set the problem property
......
......@@ -78,7 +78,7 @@ SET_PROP(InjectionProblem2PNI, Grid)
#if HAVE_UG
typedef Dune::UGGrid<2> type;
#else
typedef Dune::SGrid<2,2> type;
typedef Dune::YaspGrid<2> type;
#endif
};
......
......@@ -47,12 +47,12 @@ void usage(const char *progName, const std::string &errorMsg)
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";
"\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";
std::cout << errorMessageOut
<< "\n";
......
......@@ -49,7 +49,7 @@ namespace Properties
NEW_TYPE_TAG(InfiltrationProblem, INHERITS_FROM(BoxThreePThreeC, InfiltrationSpatialParams));
// Set the grid type
SET_TYPE_PROP(InfiltrationProblem, Grid, Dune::SGrid<2,2>);
SET_TYPE_PROP(InfiltrationProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
SET_TYPE_PROP(InfiltrationProblem, Problem, Dumux::InfiltrationProblem<TypeTag>);
......
......@@ -48,9 +48,9 @@ void usage(const char *progName, const std::string &errorMsg)
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-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";
std::cout << errorMessageOut
......
......@@ -54,7 +54,7 @@ NEW_TYPE_TAG(ColumnProblem, INHERITS_FROM(BoxThreePThreeCNI, ColumnSpatialParams
// Set the grid type
SET_PROP(ColumnProblem, Grid)
{
typedef Dune::SGrid<2,2> type;
typedef Dune::YaspGrid<2> type;
};
// Set the problem property
......
......@@ -54,7 +54,7 @@ NEW_TYPE_TAG(KuevetteProblem, INHERITS_FROM(BoxThreePThreeCNI, KuevetteSpatialPa
// Set the grid type
SET_PROP(KuevetteProblem, Grid)
{
typedef Dune::SGrid<2,2> type;
typedef Dune::YaspGrid<2> type;
};
......
......@@ -50,9 +50,9 @@ void usage(const char *progName, const std::string &errorMsg)
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-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";
std::cout << errorMessageOut
......
......@@ -57,7 +57,7 @@ namespace Properties
NEW_TYPE_TAG(ObstacleProblem, INHERITS_FROM(BoxMPNC, ObstacleSpatialParams));
// Set the grid type
SET_TYPE_PROP(ObstacleProblem, Grid, Dune::SGrid<2,2>);
SET_TYPE_PROP(ObstacleProblem, Grid, Dune::YaspGrid<2>);
// Set the problem property
SET_TYPE_PROP(ObstacleProblem,
......
......@@ -45,9 +45,9 @@ void usage(const char *progName, const std::string &errorMsg)
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-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";
std::cout << errorMessageOut
......
......@@ -52,7 +52,7 @@ namespace Properties
NEW_TYPE_TAG(RichardsLensProblem, INHERITS_FROM(BoxRichards, RichardsLensSpatialParams));
// Use 2d YaspGrid
SET_TYPE_PROP(RichardsLensProblem, Grid, Dune::SGrid<2,2>);
SET_TYPE_PROP(RichardsLensProblem, Grid, Dune::YaspGrid<2>);
// Set the physical problem to be solved
SET_PROP(RichardsLensProblem, Problem)
......
......@@ -45,9 +45,9 @@ void usage(const char *progName, const std::string &errorMsg)
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-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";
std::cout << errorMessageOut
......
......@@ -45,9 +45,9 @@ void usage(const char *progName, const std::string &errorMsg)
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-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";
std::cout << errorMessageOut
......
......@@ -44,9 +44,9 @@ void usage(const char *progName, const std::string &errorMsg)
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-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";
std::cout << errorMessageOut
......
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