Merge branch 'feature/no_initfile' into 'develop'

remove necessity to always have an initfile

See merge request spraetor/dune-amdis!46

src/amdis/AMDiS.cpp

@@ -9,15 +9,16 @@ namespace AMDiS
   Dune::MPIHelper& init(int& argc, char**& argv, std::string const& initFileName)
   {
     // Maybe initialize MPI
-    Dune::MPIHelper& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+    static Dune::MPIHelper& mpiHelper = Dune::MPIHelper::instance(argc, argv);
 
     Parameters::clearData();
 
-    if (initFileName == "") {
-      test_exit(argc > 1, "No init file specified!\n");
+    if (initFileName.empty() && argc > 1) {
       Parameters::init(argv[1]);
-    } else {
+    } else if (!initFileName.empty()) {
       Parameters::init(initFileName);
+    } else {
+      warning("No initfile specified. Using default values for all parameters.");
     }
 
     return mpiHelper;

src/amdis/ProblemStat.hpp

@@ -280,10 +280,7 @@ namespace AMDiS
 
     void createGrid()
     {
-      gridName_ = "";
       Parameters::get(name_ + "->mesh", gridName_);
-      test_exit(!gridName_.empty(), "No grid name specified for '{}->mesh'!", name_);
-
       grid_ = MeshCreator<Grid>::create(gridName_);
 
       msg("Create grid:");
@@ -367,7 +364,7 @@ namespace AMDiS
     int nGrids = 1;
 
     /// Name of the grid
-    std::string gridName_ = "none";
+    std::string gridName_ = "mesh";
 
     /// FE spaces of this problem.
     std::shared_ptr<GlobalBasis> globalBasis_;

test/CMakeLists.txt

@@ -12,8 +12,7 @@ dune_add_test(SOURCES DOFVectorTest.cpp
   LINK_LIBRARIES amdis)
 
 dune_add_test(SOURCES ExpressionsTest.cpp
-  LINK_LIBRARIES amdis
-  CMD_ARGS "${CMAKE_SOURCE_DIR}/examples/init/ellipt.dat.2d")
+  LINK_LIBRARIES amdis)
 
 dune_add_test(SOURCES FieldMatVecTest.cpp
   LINK_LIBRARIES amdis)
@@ -29,8 +28,7 @@ dune_add_test(SOURCES IntegrateTest.cpp
   CMD_ARGS "${CMAKE_SOURCE_DIR}/examples/init/ellipt.dat.2d")
 
 dune_add_test(SOURCES MarkerTest.cpp
-  LINK_LIBRARIES amdis
-  CMD_ARGS "${CMAKE_SOURCE_DIR}/examples/init/marker.dat.2d")
+  LINK_LIBRARIES amdis)
 
 dune_add_test(SOURCES MultiTypeVectorTest.cpp
   LINK_LIBRARIES amdis)