Add data name to message (precice#826)

* Add dataName to exchange cplscheme error message * Fix comment * Apply refactoring. Co-authored-by: BenjaminRueth <[email protected]>
jianzhou722 · Jul 20, 2020 · 5b566bd · 5b566bd
1 parent 743232d
commit 5b566bd
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/cplscheme/config/CouplingSchemeConfiguration.cpp b/src/cplscheme/config/CouplingSchemeConfiguration.cpp
@@ -733,6 +733,20 @@ mesh::PtrData CouplingSchemeConfiguration::getData(
                           << meshName << "\" is not configured.");
 }
 
+mesh::PtrData CouplingSchemeConfiguration::findDataByID(
+    int ID) const
+{
+  for (mesh::PtrMesh mesh : _meshConfig->meshes()) {
+    for (mesh::PtrData data : mesh->data()) {
+      if (data->getID() == ID) {
+        return data;
+      }
+    }
+  }
+  return nullptr;
+}
+
+
 PtrCouplingScheme CouplingSchemeConfiguration::createSerialExplicitCouplingScheme(
     const std::string &accessor) const
 {
@@ -1067,8 +1081,15 @@ void CouplingSchemeConfiguration::checkIfDataIsExchanged(
       hasFound = true;
     }
   }
+
+  std::string dataName = "";
+  auto dataptr = findDataByID(dataID);
+  if (dataptr) {
+    dataName = dataptr->getName();
+  }
+
   PRECICE_CHECK(hasFound, "You need to exchange every data that you use for convergence measures "
-                              << "and/or the iteration acceleration. Data \"" << dataID << "\" is " /// @todo better provide the dataName! Is there an easy way to access it?
+                              << "and/or the iteration acceleration. Data \"" << dataName << "\" is "
                               << "currently not exchanged, but used for convergence measures and/or iteration "
                               << "acceleration. Please check the <exchange ... /> and "
                               << "<...-convergence-measure ... /> tags in the "

diff --git a/src/cplscheme/config/CouplingSchemeConfiguration.hpp b/src/cplscheme/config/CouplingSchemeConfiguration.hpp
@@ -217,6 +217,9 @@ class CouplingSchemeConfiguration : public xml::XMLTag::Listener {
       const std::string &dataName,
       const std::string &meshName) const;
 
+  mesh::PtrData findDataByID(
+      int ID) const;
+
   PtrCouplingScheme createSerialExplicitCouplingScheme(
       const std::string &accessor) const;