Merge pull request #1920 from chuckatkins/fix-windows-warnings

Fix windows warnings

examples/heatTransfer/read/ReadSettings.cpp

@@ -19,7 +19,7 @@
 static unsigned int convertToUint(std::string varName, char *arg)
 {
     char *end;
-    int retval = std::strtoll(arg, &end, 10);
+    long retval = std::strtol(arg, &end, 10);
     if (end[0] || errno == ERANGE)
     {
         throw std::invalid_argument("Invalid value given for " + varName +
@@ -30,7 +30,7 @@ static unsigned int convertToUint(std::string varName, char *arg)
         throw std::invalid_argument("Negative value given for " + varName +
                                     ": " + std::string(arg));
     }
-    return (unsigned int)retval;
+    return static_cast<unsigned int>(retval);
 }
 
 ReadSettings::ReadSettings(int argc, char *argv[], int rank, int nproc)

examples/heatTransfer/read/heatRead.cpp

@@ -145,8 +145,8 @@ int main(int argc, char *argv[])
                 // nor add new variables
                 reader.LockReaderSelections();
 
-                unsigned int gndx = vTin.Shape()[0];
-                unsigned int gndy = vTin.Shape()[1];
+                unsigned int gndx = static_cast<unsigned int>(vTin.Shape()[0]);
+                unsigned int gndy = static_cast<unsigned int>(vTin.Shape()[1]);
 
                 if (rank == 0)
                 {

examples/heatTransfer/read_fileonly/PrintData.h

@@ -18,7 +18,7 @@
 #include <string>
 
 template <class T>
-void printData(double *xy, T *size, T *offset, int rank, int steps)
+void printData(double *xy, T *size, T *offset, int rank, size_t steps)
 {
     std::ofstream myfile;
     std::string filename = "data." + std::to_string(rank);

examples/heatTransfer/write/Settings.cpp

@@ -19,7 +19,7 @@
 static unsigned int convertToUint(std::string varName, char *arg)
 {
     char *end;
-    int retval = std::strtoll(arg, &end, 10);
+    long retval = std::strtol(arg, &end, 10);
     if (end[0] || errno == ERANGE)
     {
         throw std::invalid_argument("Invalid value given for " + varName +
@@ -30,7 +30,7 @@ static unsigned int convertToUint(std::string varName, char *arg)
         throw std::invalid_argument("Negative value given for " + varName +
                                     ": " + std::string(arg));
     }
-    return (unsigned int)retval;
+    return static_cast<unsigned int>(retval);
 }
 
 Settings::Settings(int argc, char *argv[], int rank, int nproc) : rank{rank}

examples/hello/bpFWriteCRead/CppWriter.cpp

@@ -28,7 +28,7 @@ int main(int argc, char *argv[])
     {
         for (size_t j = 0; j < ny; ++j)
         {
-            data[i * ny + j] = rank * nx * ny + i * ny + j;
+            data[i * ny + j] = static_cast<float>(rank * nx * ny + i * ny + j);
         }
     }
 

examples/hello/bpFlushWriter/helloBPFlushWriter.cpp

@@ -56,7 +56,7 @@ int main(int argc, char *argv[])
         for (unsigned int t = 0; t < 100; ++t)
         {
             /** values to time step */
-            myFloats.assign(myFloats.size(), t);
+            myFloats.assign(myFloats.size(), static_cast<float>(t));
             /** Write variable for buffering */
             bpWriter.Put<float>(bpFloats, myFloats.data());
         }

examples/hello/bpReader/helloBPReaderHeatMap2D.cpp

@@ -47,11 +47,12 @@ int main(int argc, char *argv[])
     std::vector<unsigned int> temperatures(Nx * Ny);
     for (unsigned int i = 0; i < Nx; ++i)
     {
-        const unsigned int iGlobal = start[0] + i;
+        const unsigned int iGlobal = static_cast<unsigned int>(start[0] + i);
 
         for (unsigned int j = 0; j < Ny; ++j)
         {
-            const unsigned int value = iGlobal * shape[1] + j;
+            const unsigned int value =
+                static_cast<unsigned int>(iGlobal * shape[1] + j);
             temperatures[i * Ny + j] = value;
         }
     }

examples/hello/bpReader/helloBPReaderHeatMap3D.cpp

@@ -52,14 +52,14 @@ int main(int argc, char *argv[])
     std::vector<unsigned int> temperatures(Nx * Ny * Nz);
     for (unsigned int i = 0; i < count[0]; ++i)
     {
-        const unsigned int iGlobal = start[0] + i;
+        const unsigned int iGlobal = static_cast<unsigned int>(start[0] + i);
 
         for (unsigned int j = 0; j < count[1]; ++j)
         {
             for (unsigned int k = 0; k < count[2]; ++k)
             {
-                const unsigned int value =
-                    iGlobal * shape[1] * shape[2] + j * shape[2] + k;
+                const unsigned int value = static_cast<unsigned int>(
+                    iGlobal * shape[1] * shape[2] + j * shape[2] + k);
 
                 const std::size_t linearIndex =
                     i * count[1] * count[2] + j * count[2] + k;

examples/hello/insituMPI/HelloInsituArgs.cpp

@@ -37,7 +37,7 @@ static void printUsage(bool isWriter)
 static unsigned int convertToUint(std::string varName, char *arg)
 {
     char *end;
-    int retval = std::strtoll(arg, &end, 10);
+    long retval = std::strtol(arg, &end, 10);
     if (end[0] || errno == ERANGE)
     {
         throw std::invalid_argument("Invalid value given for " + varName +
@@ -48,7 +48,7 @@ static unsigned int convertToUint(std::string varName, char *arg)
         throw std::invalid_argument("Negative value given for " + varName +
                                     ": " + std::string(arg));
     }
-    return (unsigned int)retval;
+    return static_cast<unsigned int>(retval);
 }
 
 HelloInsituArgs::HelloInsituArgs(bool isWriter, int argc, char *argv[],

examples/hello/insituMPI/HelloInsituArgs.h

@@ -46,6 +46,10 @@ class HelloInsituArgs
     HelloInsituArgs(bool isWriter, int argc, char *argv[], int rank, int nproc);
 
     void DecomposeArray(int NX, int NY);
+    void DecomposeArray(size_t NX, size_t NY)
+    {
+        DecomposeArray(static_cast<int>(NX), static_cast<int>(NY));
+    }
 };
 
 #endif /* HELLOINSITUARGS_H_s */

source/adios2/engine/insitumpi/InSituMPIFunctions.cpp

@@ -122,7 +122,7 @@ std::vector<int> FindPeers(const MPI_Comm comm, const std::string &name,
 std::vector<int> AssignPeers(const int rank, const int nproc,
                              const std::vector<int> &allPeers)
 {
-    int nAllPeers = allPeers.size();
+    int nAllPeers = static_cast<int>(allPeers.size());
 
     std::vector<int> directPeers;
 
@@ -254,8 +254,8 @@ std::vector<MPI_Status> CompleteRequests(std::vector<MPI_Request> &requests,
 {
     std::vector<MPI_Status> statuses(requests.size());
 
-    const auto ierr =
-        MPI_Waitall(requests.size(), requests.data(), statuses.data());
+    const auto ierr = MPI_Waitall(static_cast<int>(requests.size()),
+                                  requests.data(), statuses.data());
 
     if (ierr == MPI_ERR_IN_STATUS)
     {

source/adios2/engine/insitumpi/InSituMPIReader.cpp

@@ -153,7 +153,7 @@ StepStatus InSituMPIReader::BeginStep(const StepMode mode,
         /* Have timeout: do a collective wait for a step within timeout.
            Make sure every writer comes to the same conclusion */
         int haveStepMsg = 0;
-        uint64_t nanoTO = timeoutSeconds * 1000000000.0;
+        uint64_t nanoTO = static_cast<uint64_t>(timeoutSeconds * 1e9);
         if (nanoTO < 1)
         {
             nanoTO = 1; // avoid 0
@@ -377,7 +377,8 @@ int InSituMPIReader::Statistics(uint64_t bytesInPlace, uint64_t bytesCopied)
 {
     if (bytesInPlace == 0)
         return 0;
-    return ((bytesInPlace + bytesCopied) * 100) / bytesInPlace;
+    return static_cast<int>(((bytesInPlace + bytesCopied) * 100) /
+                            bytesInPlace);
 }
 
 void InSituMPIReader::EndStep()
@@ -412,8 +413,8 @@ void InSituMPIReader::SendReadSchedule(
     TAU_SCOPED_TIMER("InSituMPIReader::SendReadSchedule");
     // Serialized schedules, one per-writer
     std::map<int, std::vector<char>> serializedSchedules =
-        insitumpi::SerializeLocalReadSchedule(m_RankAllPeers.size(),
-                                              variablesSubFileInfo);
+        insitumpi::SerializeLocalReadSchedule(
+            static_cast<int>(m_RankAllPeers.size()), variablesSubFileInfo);
 
     // Writer ID -> number of peer readers
     std::vector<int> nReaderPerWriter(m_RankAllPeers.size());
@@ -441,7 +442,8 @@ void InSituMPIReader::SendReadSchedule(
     // Reader root sends nReaderPerWriter to writer root
     if (m_ReaderRootRank == m_ReaderRank)
     {
-        MPI_Send(nReaderPerWriter.data(), nReaderPerWriter.size(), MPI_INT,
+        MPI_Send(nReaderPerWriter.data(),
+                 static_cast<int>(nReaderPerWriter.size()), MPI_INT,
                  m_WriteRootGlobalRank, insitumpi::MpiTags::NumReaderPerWriter,
                  m_CommWorld);
     }
@@ -456,7 +458,7 @@ void InSituMPIReader::SendReadSchedule(
     {
         const auto peerID = schedulePair.first;
         const auto &schedule = schedulePair.second;
-        rsLengths[i] = schedule.size();
+        rsLengths[i] = static_cast<int>(schedule.size());
 
         if (m_Verbosity == 5)
         {
@@ -514,7 +516,7 @@ void InSituMPIReader::AsyncRecvAllVariables()
 void InSituMPIReader::ProcessReceives()
 {
     TAU_SCOPED_TIMER("InSituMPIReader::ProcessReceives");
-    const int nRequests = m_OngoingReceives.size();
+    const int nRequests = static_cast<int>(m_OngoingReceives.size());
 
     TAU_START("InSituMPIReader::CompleteRequests");
     insitumpi::CompleteRequests(m_MPIRequests, false, m_ReaderRank);

source/adios2/engine/insitumpi/InSituMPIReader.tcc

@@ -130,7 +130,7 @@ void InSituMPIReader::AsyncRecvVariable(
                 const auto &seek = sfi.Seeks;
                 const size_t blockSize = seek.second - seek.first;
                 m_MPIRequests.emplace_back();
-                const int index = m_MPIRequests.size() - 1;
+                const int index = static_cast<int>(m_MPIRequests.size()) - 1;
                 size_t elementOffset, dummy;
 
                 // Do we read a contiguous piece from the source?
@@ -154,7 +154,8 @@ void InSituMPIReader::AsyncRecvVariable(
                     char *ptr = reinterpret_cast<char *>(ptrT);
                     m_OngoingReceives.emplace_back(sfi, &variable.m_Name, ptr);
                     MPI_Irecv(m_OngoingReceives[index].inPlaceDataArray,
-                              blockSize, MPI_CHAR, m_RankAllPeers[writerRank],
+                              static_cast<int>(blockSize), MPI_CHAR,
+                              m_RankAllPeers[writerRank],
                               insitumpi::MpiTags::Data, m_CommWorld,
                               m_MPIRequests.data() + index);
                     if (m_Verbosity == 5)
@@ -174,9 +175,9 @@ void InSituMPIReader::AsyncRecvVariable(
                         blockSize);
                     MPI_Irecv(
                         m_OngoingReceives[index].temporaryDataArray.data(),
-                        blockSize, MPI_CHAR, m_RankAllPeers[writerRank],
-                        insitumpi::MpiTags::Data, m_CommWorld,
-                        m_MPIRequests.data() + index);
+                        static_cast<int>(blockSize), MPI_CHAR,
+                        m_RankAllPeers[writerRank], insitumpi::MpiTags::Data,
+                        m_CommWorld, m_MPIRequests.data() + index);
                     if (m_Verbosity == 5)
                     {
                         std::cout << "InSituMPI Reader " << m_ReaderRank

source/adios2/engine/insitumpi/InSituMPISchedules.cpp

@@ -94,7 +94,8 @@ SerializeLocalReadSchedule(const int nWriters,
         // <writer, <steps, <SubFileInfo>>>
         for (const auto &subFileIndexPair : variableNamePair.second)
         {
-            const size_t subFileIndex = subFileIndexPair.first; // writer
+            const int subFileIndex =
+                static_cast<int>(subFileIndexPair.first); // writer
             // <steps, <SubFileInfo>>  but there is only one step
             for (const auto &stepPair : subFileIndexPair.second)
             {

source/adios2/engine/insitumpi/InSituMPIWriter.cpp

@@ -167,7 +167,7 @@ void InSituMPIWriter::PerformPuts()
 
             // store length long enough to survive Isend() completion
             // so don't move this into the next if branch
-            unsigned long mdLen = m_BP3Serializer.m_Metadata.m_Position;
+            size_t mdLen = m_BP3Serializer.m_Metadata.m_Position;
 
             // Send the metadata to all reader peers, asynchronously
             // we don't care about keeping these requests because
@@ -201,9 +201,9 @@ void InSituMPIWriter::PerformPuts()
                 MPI_Isend(&mdLen, 1, MPI_UNSIGNED_LONG, peerRank,
                           insitumpi::MpiTags::MetadataLength, m_CommWorld,
                           &request);
-                MPI_Isend(m_BP3Serializer.m_Metadata.m_Buffer.data(), mdLen,
-                          MPI_CHAR, peerRank, insitumpi::MpiTags::Metadata,
-                          m_CommWorld, &request);
+                MPI_Isend(m_BP3Serializer.m_Metadata.m_Buffer.data(),
+                          static_cast<int>(mdLen), MPI_CHAR, peerRank,
+                          insitumpi::MpiTags::Metadata, m_CommWorld, &request);
             }
         }
 
@@ -443,7 +443,8 @@ void InSituMPIWriter::ReceiveReadSchedule(
     // Writer root receives nReaderPerWriter from reader root
     if (m_WriterRank == 0)
     {
-        MPI_Recv(nReaderPerWriter.data(), nReaderPerWriter.size(), MPI_INT,
+        MPI_Recv(nReaderPerWriter.data(),
+                 static_cast<int>(nReaderPerWriter.size()), MPI_INT,
                  m_RankDirectPeers[0], insitumpi::MpiTags::NumReaderPerWriter,
                  m_CommWorld, MPI_STATUS_IGNORE);
     }

source/adios2/engine/insitumpi/InSituMPIWriter.tcc

@@ -135,7 +135,8 @@ void InSituMPIWriter::AsyncSendVariable(
                     const size_t blockStart = seek.first;
                     const size_t blockSize = seek.second - seek.first;
 
-                    MPI_Isend(blockInfo.Data + blockStart, blockSize, MPI_CHAR,
+                    MPI_Isend(blockInfo.Data + blockStart,
+                              static_cast<int>(blockSize), MPI_CHAR,
                               m_RankAllPeers[readerPair.first],
                               insitumpi::MpiTags::Data, m_CommWorld,
                               &m_MPIRequests.back());

source/adios2/operator/compress/CompressSZ.cpp

@@ -76,7 +76,6 @@ size_t CompressSZ::Compress(const void *dataIn, const Dims &dimensions,
 
     /* SZ parameters */
     int use_configfile = 0;
-    int use_zchecker = 0;
     std::string sz_configfile = "sz.config";
 
     Params::const_iterator it;
@@ -235,7 +234,9 @@ size_t CompressSZ::Compress(const void *dataIn, const Dims &dimensions,
         else if ((it->first == "zchecker") || (it->first == "zcheck") ||
                  (it->first == "z-checker") || (it->first == "z-check"))
         {
-            use_zchecker = (it->second == "") ? 1 : std::stof(it->second);
+            // TODO:
+            // Z-checker is not currently implemented
+            // use_zchecker = (it->second == "") ? 1 : std::stof(it->second);
         }
         else
         {

source/utils/adios_iotest/decomp.cpp

@@ -26,7 +26,7 @@ void decompRowMajor(const size_t ndim, const size_t rank, const size_t *decomp,
     // pos[k] = rank / prod(decomp[i], i=k+1..n-1) % decomp[k]
 
     size_t prod = 1;
-    for (int k = ndim - 1; k >= 0; --k)
+    for (int k = static_cast<int>(ndim) - 1; k >= 0; --k)
     {
         pos[k] = rank / prod % decomp[k];
         prod *= decomp[k];

source/utils/adios_iotest/processConfig.cpp

@@ -706,8 +706,8 @@ Config processConfig(const Settings &settings, size_t *currentConfigLineNumber)
                         }
                         std::cout << std::endl;
                     }
-                    auto cmd =
-                        std::make_shared<CommandRead>(streamName, groupName, d);
+                    auto cmd = std::make_shared<CommandRead>(
+                        streamName, groupName, static_cast<float>(d));
                     cmd->conditionalStream = conditionalStream;
                     cfg.commands.push_back(cmd);
                     cfg.condMap[streamName] = adios2::StepStatus::OK;

source/utils/adios_iotest/settings.cpp

@@ -208,7 +208,7 @@ int Settings::processArguments(int argc, char *argv[], MPI_Comm worldComm)
 
         int wrank;
         MPI_Comm_rank(worldComm, &wrank);
-        MPI_Comm_split(worldComm, appId, wrank, &appComm);
+        MPI_Comm_split(worldComm, static_cast<int>(appId), wrank, &appComm);
 
         int rank, nproc;
         MPI_Comm_rank(appComm, &rank);

testing/adios2/engine/common/TestEngineCommon.cpp

@@ -65,7 +65,7 @@ adios2::Params ParseEngineParams(std::string Input)
 static unsigned int ParseUintParam(const std::string &optionName, char *arg)
 {
     char *end;
-    int retval = std::strtoll(arg, &end, 10);
+    long retval = std::strtol(arg, &end, 10);
     if (end[0] || errno == ERANGE)
     {
         throw std::invalid_argument("Invalid value given for " + optionName +
@@ -76,7 +76,7 @@ static unsigned int ParseUintParam(const std::string &optionName, char *arg)
         throw std::invalid_argument("Negative value given for " + optionName +
                                     ": " + std::string(arg));
     }
-    return (unsigned int)retval;
+    return static_cast<unsigned int>(retval);
 }
 
 class Common : public ::testing::Test
@@ -163,7 +163,7 @@ TEST_F(Common, NewAttributeEveryStep)
         for (size_t step = 0; step < steps; ++step)
         {
             writer.BeginStep(adios2::StepMode::Append);
-            const double d = step + 1;
+            const double d = static_cast<double>(step + 1);
             if (rank == 0)
                 writer.Put<double>(var, &d);
             const std::string aname = "a" + std::to_string(step);
@@ -253,7 +253,7 @@ TEST_F(Common, NewAttributeEveryStep)
             reader.Get(var, d);
             reader.EndStep();
 
-            double expectedScalarValue = step + 1;
+            double expectedScalarValue = static_cast<double>(step + 1);
 
             EXPECT_EQ(d[0], expectedScalarValue)
                 << "Error in read, did not receive the expected values for "