Change the flag names to make them consistent with the BoundaryPatchFactory

The old flag names are still working but a dynamic deprecation warning is
printed to the user

dune/fufem/utilities/dirichletbcassembler.hh

@@ -117,7 +117,7 @@ void DirichletBCAssembler<GridType>::assembleDirichletBC(const GridType& grid,
         inflateBitField(*dummy.getVertices(),coarseDirichletNodes);
     else {
 
-        std::cout << "Warning: No *_dnFile found in the parameter set, unset all Dirichlet dofs!\n";
+        std::cout << "Warning: No *PatchFile found in the parameter set, unset all Dirichlet dofs!\n";
         leafDirichletNodes.resize(grid.size(dim),false);
         leafDirichletValues.resize(grid.size(dim));
         leafDirichletValues = 0;
@@ -125,16 +125,26 @@ void DirichletBCAssembler<GridType>::assembleDirichletBC(const GridType& grid,
     }
 
     // read values from amira file
-    if (config.hasKey("amira_dvFile")) {
+    if (config.hasKey("amiraValuesFile") or config.hasKey(("amira_dvFile"))) {
+        if (config.hasKey("amira_dvFile"))
+            Dune::dwarn << "Warning the flag 'amira_dvFile' has been deprecated in favour of 'amiraValuesFile'\n";
+
+        std::string fileName = (config.hasKey("amiraValuesFile")) ? "amiraValuesFile" : "amira_dvFile";
 #if HAVE_AMIRAMESH
-        Dune::AmiraMeshReader<GridType>::readFunction(coarseDirichletValues, path+config.get("amira_dvFile",""));
+        Dune::AmiraMeshReader<GridType>::readFunction(coarseDirichletValues, path + fileName);
+#else
+        DUNE_THROW(Dune::Exception, "You need libamiramesh if you want to read data in Amira format!");
 #endif
     }
-
     // construct constant field
-    else if (config.hasKey("constant_dv")) {
+    else if (config.hasKey("constantValues") or config.hasKey("constant_dv")) {
+        if (config.hasKey("constant_dv"))
+            Dune::dwarn << "Warning the flag 'constant_dv' has been deprecated in favour of 'constantValues'\n";
+
+        std::string flag = (config.hasKey("constantValues")) ? "constantValues" : "constant_dv";
         using BlockType = typename VectorType::block_type;
-        auto constant_dv = config.get<BlockType>("constant_dv");
+        auto constant_dv = config.get<BlockType>(flag);
+
         for (size_t i=0; i<coarseDirichletValues.size(); i++) {
             if (coarseDirichletNodes[i].any())
                 coarseDirichletValues[i] = constant_dv;