asset(error, msg) does not work in cray if msg has + operator. Modifi…

…ed this to make it work.
dftfeDevelopers · Sep 10, 2024 · 6bf7925 · 6bf7925
1 parent 67201d1
commit 6bf7925
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/src/atoms/AtomSphericalData.cpp b/src/atoms/AtomSphericalData.cpp
@@ -624,8 +624,9 @@ namespace dftefe
     {
       auto it = d_sphericalData.find(fieldName);
       DFTEFE_AssertWithMsg(it != d_sphericalData.end(),
-                           "FieldName " + fieldName +
-                             " not while parsing the XML file:" + d_fileName);
+                           ("FieldName " + fieldName +
+                            " not while parsing the XML file:" + d_fileName)
+                             .c_str());
       return it->second;
     }
 
@@ -636,12 +637,14 @@ namespace dftefe
     {
       auto it = d_sphericalData.find(fieldName);
       DFTEFE_AssertWithMsg(it != d_sphericalData.end(),
-                           "Unable to find the field " + fieldName +
-                             " while parsing the XML file " + d_fileName);
+                           ("Unable to find the field " + fieldName +
+                            " while parsing the XML file " + d_fileName)
+                             .c_str());
       auto iter = d_qNumbersToIdMap.find(fieldName);
       DFTEFE_AssertWithMsg(iter != d_qNumbersToIdMap.end(),
-                           "Unable to find the field " + fieldName +
-                             " while parsing the XML file " + d_fileName);
+                           ("Unable to find the field " + fieldName +
+                            " while parsing the XML file " + d_fileName)
+                             .c_str());
       auto iterQNumberToId = (iter->second).find(qNumbers);
       if (iterQNumberToId != (iter->second).end())
         return *((it->second).begin() + iterQNumberToId->second);
@@ -652,9 +655,10 @@ namespace dftefe
             s += std::to_string(qNumbers[i]) + " ";
 
           DFTEFE_AssertWithMsg(false,
-                               "Unable to find the qNumbers " + s + " for " +
-                                 " the field " + fieldName +
-                                 " while parsing the XML file " + d_fileName);
+                               ("Unable to find the qNumbers " + s + " for " +
+                                " the field " + fieldName +
+                                " while parsing the XML file " + d_fileName)
+                                 .c_str());
           return *((it->second).begin() + iterQNumberToId->second);
         }
     }

diff --git a/src/atoms/AtomSphericalData.h b/src/atoms/AtomSphericalData.h
@@ -30,6 +30,7 @@
 #include <atoms/SphericalData.h>
 #include <atoms/SphericalDataNumerical.h>
 #include <memory>
+#include <unordered_map>
 #include <map>
 #include <vector>
 #include <string>

diff --git a/src/atoms/AtomSphericalDataContainer.h b/src/atoms/AtomSphericalDataContainer.h
@@ -27,6 +27,7 @@
 #define dftefeAtomSphericalDataContainer_h
 
 #include <utils/TypeConfig.h>
+#include <unordered_map>
 #include <map>
 #include <string>
 #include <atoms/AtomSphericalData.h>