Patch for when both xrootd and derived variables are activated (ornla…

…dios#4200) Co-authored-by: Greg Eisenhauer <eisen@cc.gatech.edu>
guj · Jun 18, 2024 · 8371475 · 8371475
1 parent a134f53
commit 8371475
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/source/adios2/toolkit/derived/Function.cpp b/source/adios2/toolkit/derived/Function.cpp
@@ -12,6 +12,10 @@ namespace adios2
 {
 namespace derived
 {
+std::map<adios2::detail::ExpressionOperator, OperatorFunctions> OpFunctions = {
+    {adios2::detail::ExpressionOperator::OP_ADD, {AddFunc, SameDimsFunc}},
+    {adios2::detail::ExpressionOperator::OP_CURL, {Curl3DFunc, CurlDimsFunc}},
+    {adios2::detail::ExpressionOperator::OP_MAGN, {MagnitudeFunc, SameDimsFunc}}};
 
 DerivedData AddFunc(std::vector<DerivedData> inputData, DataType type)
 {

diff --git a/source/adios2/toolkit/derived/Function.h b/source/adios2/toolkit/derived/Function.h
@@ -31,10 +31,7 @@ DerivedData Curl3DFunc(std::vector<DerivedData> input, DataType type);
 Dims SameDimsFunc(std::vector<Dims> input);
 Dims CurlDimsFunc(std::vector<Dims> input);
 
-const std::map<adios2::detail::ExpressionOperator, OperatorFunctions> OpFunctions = {
-    {adios2::detail::ExpressionOperator::OP_ADD, {AddFunc, SameDimsFunc}},
-    {adios2::detail::ExpressionOperator::OP_CURL, {Curl3DFunc, CurlDimsFunc}},
-    {adios2::detail::ExpressionOperator::OP_MAGN, {MagnitudeFunc, SameDimsFunc}}};
+extern std::map<adios2::detail::ExpressionOperator, OperatorFunctions> OpFunctions;
 
 template <class T>
 T *ApplyOneToOne(std::vector<DerivedData> inputData, size_t dataSize,