diff --git a/examples/heatTransfer/write/IO_ph5_adios2.cpp b/examples/heatTransfer/write/IO_ph5_adios2.cpp
index 93612af5cf9ae0cab53bd49e7bc626dfcdfb7150..dfde353508fadd8c45046603e3eeb3dc8e325496 100644
--- a/examples/heatTransfer/write/IO_ph5_adios2.cpp
+++ b/examples/heatTransfer/write/IO_ph5_adios2.cpp
@@ -14,7 +14,6 @@
#include <adios2.h>
-static int rank_saved;
adios2::ADIOS *ad = nullptr;
adios2::Engine *h5writer;
adios2::Variable<double> *varT = nullptr;
@@ -22,7 +21,6 @@ adios2::Variable<unsigned int> *varGndx = nullptr;
IO::IO(const Settings &s, MPI_Comm comm)
{
- rank_saved = s.rank;
m_outputfilename = s.outputfile + ".h5";
ad = new adios2::ADIOS(comm, adios2::DebugOFF);
diff --git a/examples/hello/callback/helloCallback1.cpp b/examples/hello/callback/helloCallback1.cpp
index 38527e7db186f22cc1b523c032ac24bc24d9f78d..7f41b196201618a2e6a87ed36dfddc1351ee57be 100644
--- a/examples/hello/callback/helloCallback1.cpp
+++ b/examples/hello/callback/helloCallback1.cpp
@@ -49,7 +49,6 @@ int main(int argc, char *argv[])
std::vector<float> myFloats(100);
std::iota(myFloats.begin(), myFloats.end(), 0.f);
const std::size_t Nx = myFloats.size();
- const std::size_t inputBytes = Nx * sizeof(float);
try
{
diff --git a/examples/hello/callback/helloCallback2.cpp b/examples/hello/callback/helloCallback2.cpp
index b7b014a34a813c1afff4f3fb0324e432cb9c1c1e..d2ed0476caa0ec5b2efe44a5c4db2dd8b387669b 100644
--- a/examples/hello/callback/helloCallback2.cpp
+++ b/examples/hello/callback/helloCallback2.cpp
@@ -47,7 +47,6 @@ int main(int argc, char *argv[])
std::vector<float> myFloats(100);
std::iota(myFloats.begin(), myFloats.end(), 0.f);
const std::size_t Nx = myFloats.size();
- const std::size_t inputBytes = Nx * sizeof(float);
try
{
diff --git a/source/adios2/helper/adiosMPIFunctions.inl b/source/adios2/helper/adiosMPIFunctions.inl
index 96751a56ee5240565af58d1e35505425bb741458..dd57c854dfa106339851f2495d31e20ef01ea699 100644
--- a/source/adios2/helper/adiosMPIFunctions.inl
+++ b/source/adios2/helper/adiosMPIFunctions.inl
@@ -24,7 +24,6 @@ template <class T>
std::vector<T> GatherValues(const T source, MPI_Comm mpiComm,
const int rankDestination)
{
- constexpr size_t count = 1;
int rank, size;
MPI_Comm_rank(mpiComm, &rank);
MPI_Comm_size(mpiComm, &size);
diff --git a/source/adios2/operator/compress/CompressBZip2.cpp b/source/adios2/operator/compress/CompressBZip2.cpp
index 89e35146bb9ccfd81054f963fee2098e2ad0edd8..cf2c1fdbb1831dba745c126499e15fe7c5d02cd5 100644
--- a/source/adios2/operator/compress/CompressBZip2.cpp
+++ b/source/adios2/operator/compress/CompressBZip2.cpp
@@ -8,7 +8,8 @@
* Author: William F Godoy godoywf@ornl.gov
*/
-#include <adios2/operator/compress/CompressBZip2.h>
+#include "CompressBZip2.h"
+
#include <cmath> //std::ceil
#include <ios> //std::ios_base::failure
#include <stdexcept> //std::invalid_argument
diff --git a/source/adios2/operator/compress/CompressZfp.cpp b/source/adios2/operator/compress/CompressZfp.cpp
index 4dccaaad65a6bd19dfa175674260f0b50baaff3b..6e7c5bb5dbee76410d736f6b5557e9b203b884fa 100644
--- a/source/adios2/operator/compress/CompressZfp.cpp
+++ b/source/adios2/operator/compress/CompressZfp.cpp
@@ -8,8 +8,9 @@
* Author: William F Godoy godoywf@ornl.gov
*/
+#include "CompressZfp.h"
+
#include "adios2/helper/adiosFunctions.h"
-#include <adios2/operator/compress/CompressZfp.h>
namespace adios2
{
diff --git a/source/adios2/toolkit/format/bp3/BP3Base.tcc b/source/adios2/toolkit/format/bp3/BP3Base.tcc
index a05f232f9e175dad886837e3c7f71627c502e03b..b2e121c7e4d7f22a8cf5617c14f7f92065c73b7b 100644
--- a/source/adios2/toolkit/format/bp3/BP3Base.tcc
+++ b/source/adios2/toolkit/format/bp3/BP3Base.tcc
@@ -272,7 +272,6 @@ inline void BP3Base::ParseCharacteristics(
throw std::invalid_argument("ERROR: characteristic ID " +
std::to_string(id) +
" not supported\n");
- break;
}
} // end id switch
@@ -397,7 +396,6 @@ BP3Base::ParseCharacteristics(const std::vector<char> &buffer, size_t &position,
throw std::invalid_argument("ERROR: characteristic ID " +
std::to_string(id) +
" not supported\n");
- break;
}
} // end id switch
diff --git a/source/adios2/toolkit/format/bp3/BP3Serializer.cpp b/source/adios2/toolkit/format/bp3/BP3Serializer.cpp
index bd8368837a19e0450cd5739a9210bf8e2cef8a53..84127dda3650012f86436cbcf573e2a07757b268 100644
--- a/source/adios2/toolkit/format/bp3/BP3Serializer.cpp
+++ b/source/adios2/toolkit/format/bp3/BP3Serializer.cpp
@@ -1077,45 +1077,47 @@ void BP3Serializer::MergeSerializeIndices(
return;
}
// TODO need to debug this part, if threaded per variable
- const size_t elements = nameRankIndices.size();
- const size_t stride = elements / m_Threads; // elements per thread
- const size_t last = stride + elements % m_Threads; // remainder to last
-
- std::vector<std::thread> threads;
- threads.reserve(m_Threads);
-
- // copy names in order to use threads
- std::vector<std::string> names;
- names.reserve(nameRankIndices.size());
-
- for (const auto &nameRankIndexPair : nameRankIndices)
- {
- names.push_back(nameRankIndexPair.first);
- }
-
- for (unsigned int t = 0; t < m_Threads; ++t)
- {
- const size_t start = stride * t;
- size_t end;
-
- if (t == m_Threads - 1)
- {
- end = start + stride;
- }
- else
- {
- end = start + last;
- }
-
- threads.push_back(std::thread(lf_MergeRankRange,
- std::ref(nameRankIndices),
- std::ref(names), start, end));
- }
-
- for (auto &thread : threads)
- {
- thread.join();
- }
+ // const size_t elements = nameRankIndices.size();
+ // const size_t stride = elements / m_Threads; // elements per
+ // thread
+ // const size_t last = stride + elements % m_Threads; // remainder to
+ // last
+ //
+ // std::vector<std::thread> threads;
+ // threads.reserve(m_Threads);
+ //
+ // // copy names in order to use threads
+ // std::vector<std::string> names;
+ // names.reserve(nameRankIndices.size());
+ //
+ // for (const auto &nameRankIndexPair : nameRankIndices)
+ // {
+ // names.push_back(nameRankIndexPair.first);
+ // }
+ //
+ // for (unsigned int t = 0; t < m_Threads; ++t)
+ // {
+ // const size_t start = stride * t;
+ // size_t end;
+ //
+ // if (t == m_Threads - 1)
+ // {
+ // end = start + stride;
+ // }
+ // else
+ // {
+ // end = start + last;
+ // }
+ //
+ // threads.push_back(std::thread(lf_MergeRankRange,
+ // std::ref(nameRankIndices),
+ // std::ref(names), start, end));
+ // }
+ //
+ // for (auto &thread : threads)
+ // {
+ // thread.join();
+ // }
}
std::vector<char>
diff --git a/source/adios2/toolkit/format/bp3/BP3Serializer.tcc b/source/adios2/toolkit/format/bp3/BP3Serializer.tcc
index bea7681154e364dcf30cea308b551cb11ef16e1e..5aa926cedde8454f5d4c514115e9b6d16f3dfff3 100644
--- a/source/adios2/toolkit/format/bp3/BP3Serializer.tcc
+++ b/source/adios2/toolkit/format/bp3/BP3Serializer.tcc
@@ -90,8 +90,6 @@ void BP3Serializer::PutAttributeLengthInData(
auto &absolutePosition = m_Data.m_AbsolutePosition;
// back to attribute length
- const uint32_t attributeLength =
- static_cast<uint32_t>(position - attributeLengthPosition);
size_t backPosition = attributeLengthPosition;
CopyToBuffer(buffer, backPosition, &attributeLengthPosition);
diff --git a/testing/adios2/engine/hdf5/TestHDF5WriteRead.cpp b/testing/adios2/engine/hdf5/TestHDF5WriteRead.cpp
index df52f86f752f27f15cf6381d1d38e66b44656be7..d0e2cf49e8cd4fb7c6834fb785d321c829ad28d4 100644
--- a/testing/adios2/engine/hdf5/TestHDF5WriteRead.cpp
+++ b/testing/adios2/engine/hdf5/TestHDF5WriteRead.cpp
@@ -144,7 +144,8 @@ bool HDF5NativeReader::Advance()
return false;
}
- std::string tsName = "/TimeStep" + std::to_string(m_CurrentTimeStep + 1);
+ const std::string tsName =
+ "TimeStep" + std::to_string(m_CurrentTimeStep + 1);
m_GroupId = H5Gopen(m_FileId, tsName.c_str(), H5P_DEFAULT);
if (m_GroupId < 0)
{
diff --git a/testing/adios2/interface/TestADIOSDefineVariable.cpp b/testing/adios2/interface/TestADIOSDefineVariable.cpp
index 5bcab78ef2e37a0bb1caf71e41d71765889eac39..2772bd7f72156ebfd8fc222957ebf1d320a658a3 100644
--- a/testing/adios2/interface/TestADIOSDefineVariable.cpp
+++ b/testing/adios2/interface/TestADIOSDefineVariable.cpp
@@ -403,12 +403,10 @@ TEST_F(ADIOSDefineVariableTest, DefineJoinedArrayInvalidStart)
// Define ADIOS joined array
std::size_t n = 10;
std::size_t WrongValue = 1;
- adios2::Variable<int> *joinedarray;
// Start must be empty or full zero array
- EXPECT_THROW(
- joinedarray = &io.DefineVariable<int>(
- "joinedarray", {adios2::JoinedDim, 50}, {0, WrongValue}, {n, 50}),
- std::invalid_argument);
+ EXPECT_THROW(io.DefineVariable<int>("joinedarray", {adios2::JoinedDim, 50},
+ {0, WrongValue}, {n, 50}),
+ std::invalid_argument);
}
TEST_F(ADIOSDefineVariableTest, DefineString)