Commit 111d2439 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

remove necessity to always have an initfile

parent c27b2e73
...@@ -9,15 +9,16 @@ namespace AMDiS ...@@ -9,15 +9,16 @@ namespace AMDiS
Dune::MPIHelper& init(int& argc, char**& argv, std::string const& initFileName) Dune::MPIHelper& init(int& argc, char**& argv, std::string const& initFileName)
{ {
// Maybe initialize MPI // Maybe initialize MPI
Dune::MPIHelper& mpiHelper = Dune::MPIHelper::instance(argc, argv); static Dune::MPIHelper& mpiHelper = Dune::MPIHelper::instance(argc, argv);
Parameters::clearData(); Parameters::clearData();
if (initFileName == "") { if (initFileName.empty() && argc > 1) {
test_exit(argc > 1, "No init file specified!\n");
Parameters::init(argv[1]); Parameters::init(argv[1]);
} else { } else if (!initFileName.empty()) {
Parameters::init(initFileName); Parameters::init(initFileName);
} else {
warning("No initfile specified. Using default values for all parameters.");
} }
return mpiHelper; return mpiHelper;
......
...@@ -280,10 +280,7 @@ namespace AMDiS ...@@ -280,10 +280,7 @@ namespace AMDiS
void createGrid() void createGrid()
{ {
gridName_ = "";
Parameters::get(name_ + "->mesh", gridName_); Parameters::get(name_ + "->mesh", gridName_);
test_exit(!gridName_.empty(), "No grid name specified for '{}->mesh'!", name_);
grid_ = MeshCreator<Grid>::create(gridName_); grid_ = MeshCreator<Grid>::create(gridName_);
msg("Create grid:"); msg("Create grid:");
...@@ -367,7 +364,7 @@ namespace AMDiS ...@@ -367,7 +364,7 @@ namespace AMDiS
int nGrids = 1; int nGrids = 1;
/// Name of the grid /// Name of the grid
std::string gridName_ = "none"; std::string gridName_ = "mesh";
/// FE spaces of this problem. /// FE spaces of this problem.
std::shared_ptr<GlobalBasis> globalBasis_; std::shared_ptr<GlobalBasis> globalBasis_;
......
...@@ -12,8 +12,7 @@ dune_add_test(SOURCES DOFVectorTest.cpp ...@@ -12,8 +12,7 @@ dune_add_test(SOURCES DOFVectorTest.cpp
LINK_LIBRARIES amdis) LINK_LIBRARIES amdis)
dune_add_test(SOURCES ExpressionsTest.cpp dune_add_test(SOURCES ExpressionsTest.cpp
LINK_LIBRARIES amdis LINK_LIBRARIES amdis)
CMD_ARGS "${CMAKE_SOURCE_DIR}/examples/init/ellipt.dat.2d")
dune_add_test(SOURCES FieldMatVecTest.cpp dune_add_test(SOURCES FieldMatVecTest.cpp
LINK_LIBRARIES amdis) LINK_LIBRARIES amdis)
...@@ -25,8 +24,7 @@ dune_add_test(SOURCES FilesystemTest.cpp ...@@ -25,8 +24,7 @@ dune_add_test(SOURCES FilesystemTest.cpp
LINK_LIBRARIES amdis) LINK_LIBRARIES amdis)
dune_add_test(SOURCES MarkerTest.cpp dune_add_test(SOURCES MarkerTest.cpp
LINK_LIBRARIES amdis LINK_LIBRARIES amdis)
CMD_ARGS "${CMAKE_SOURCE_DIR}/examples/init/marker.dat.2d")
dune_add_test(SOURCES MultiTypeVectorTest.cpp dune_add_test(SOURCES MultiTypeVectorTest.cpp
LINK_LIBRARIES amdis) LINK_LIBRARIES amdis)
......
Markdown is supported
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