Fix priority of JSON/envvar config for ADIOS2 schema

franzpoeschel · franzpoeschel · commit 6fa52c811f56 · 2022-07-22T17:31:45.000+02:00
diff --git a/src/IO/ADIOS/ADIOS2IOHandler.cpp b/src/IO/ADIOS/ADIOS2IOHandler.cpp
@@ -134,6 +134,10 @@ void ADIOS2IOHandlerImpl::init(json::TracingJSON cfg)
         m_engineType.end(),
         m_engineType.begin(),
         [](unsigned char c) { return std::tolower(c); });
+
+    // environment-variable based configuration
+    m_schema = auxiliary::getEnvNum("OPENPMD2_ADIOS2_SCHEMA", m_schema);
+
     if (cfg.json().contains("adios2"))
     {
         m_config = cfg["adios2"];
@@ -179,8 +183,6 @@ void ADIOS2IOHandlerImpl::init(json::TracingJSON cfg)
             defaultOperators = std::move(operators.value());
         }
     }
-    // environment-variable based configuration
-    m_schema = auxiliary::getEnvNum("OPENPMD2_ADIOS2_SCHEMA", m_schema);
 }
 
 std::optional<std::vector<ADIOS2IOHandlerImpl::ParameterizedOperator>>

Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,10 @@ void ADIOS2IOHandlerImpl::init(json::TracingJSON cfg)`
`134`	`134`	`m_engineType.end(),`
`135`	`135`	`m_engineType.begin(),`
`136`	`136`	`[](unsigned char c) { return std::tolower(c); });`
	`137`	`+`
	`138`	`+ // environment-variable based configuration`
	`139`	`+ m_schema = auxiliary::getEnvNum("OPENPMD2_ADIOS2_SCHEMA", m_schema);`
	`140`	`+`
`137`	`141`	`if (cfg.json().contains("adios2"))`
`138`	`142`	`{`
`139`	`143`	`m_config = cfg["adios2"];`
`@@ -179,8 +183,6 @@ void ADIOS2IOHandlerImpl::init(json::TracingJSON cfg)`
`179`	`183`	`defaultOperators = std::move(operators.value());`
`180`	`184`	`}`
`181`	`185`	`}`
`182`		`- // environment-variable based configuration`
`183`		`- m_schema = auxiliary::getEnvNum("OPENPMD2_ADIOS2_SCHEMA", m_schema);`
`184`	`186`	`}`
`185`	`187`
`186`	`188`	`std::optional<std::vector<ADIOS2IOHandlerImpl::ParameterizedOperator>>`