codeQL

Exawind · Jul 25, 2023 · 72429c0 · 72429c0
1 parent f78e548
commit 72429c0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/tools/utilities/CheckpointToCSV/CheckpointFileUtil.cpp b/tools/utilities/CheckpointToCSV/CheckpointFileUtil.cpp
@@ -155,9 +155,6 @@ MultiFab CheckpointFileDataImpl::get(int level) noexcept
             MultiFab tmp_mfab(
                 m_ba[level], m_dmap[level], m_var_ncomp[nf], m_ngrow[level]);
 
-            const auto& fab_file = amrex::MultiFabFileFullPrefix(
-                lev, m_chkptfile_name, level_prefix, m_var_names[nf]);
-
             // Read current field into temporary fab
             amrex::VisMF::Read(
                 tmp_mfab,

diff --git a/tools/utilities/CheckpointToCSV/CheckpointToCSV.cpp b/tools/utilities/CheckpointToCSV/CheckpointToCSV.cpp
@@ -28,16 +28,16 @@ void main_main()
     Vector<std::string> addl_fnames{};
 
     // CLI handling: Collect parameters and help
-    for (unsigned char i = 1; i <= nargs; i++) {
+    for (int i = 1; i <= nargs; i += 2) {
         const std::string& arg = amrex::get_command_argument(i);
         if (arg == "--format" || arg == "-f") {
             // Select format. See enumeration for available options.
-            const std::string& arg_format = amrex::get_command_argument(++i);
+            const std::string& arg_format = amrex::get_command_argument(i + 1);
             if (arg_format == "csv") {
                 out_format = csv;
                 format_str = "csv";
             } else if (arg_format == "hdf5") {
-                // out_format = hdf5;
+                out_format = hdf5;
                 amrex::Abort("HDF5 format has not been implemented yet.");
             } else {
                 amrex::Print() << "Invalid format: " << arg_format << std::endl;
@@ -47,15 +47,15 @@ void main_main()
         }
         if (arg == "--chk" || arg == "--checkpointfile" || arg == "--file" ||
             arg == "-c") {
-            const std::string& chk_tmp = amrex::get_command_argument(++i);
+            const std::string& chk_tmp = amrex::get_command_argument(i + 1);
             checkpointfile = chk_tmp;
             continue;
         }
         if (arg == "-o" || arg == "--output") {
-            output_file = amrex::get_command_argument(++i);
+            output_file = amrex::get_command_argument(i + 1);
         }
         if (arg == "-af" || arg == "--addfield") {
-            addl_fname = amrex::get_command_argument(++i);
+            addl_fname = amrex::get_command_argument(i + 1);
             addl_fnames.push_back(addl_fname);
         }
     }

diff --git a/tools/utilities/PlotfileToCSV/PlotfileToCSV.cpp b/tools/utilities/PlotfileToCSV/PlotfileToCSV.cpp
@@ -26,16 +26,16 @@ void main_main()
     std::string output_file;
 
     // CLI handling: Collect parameters and help
-    for (unsigned char i = 1; i <= nargs; i++) {
+    for (int i = 1; i <= nargs; i += 2) {
         const std::string& arg = amrex::get_command_argument(i);
         if (arg == "--format" || arg == "-f") {
             // Select format. See enumeration for available options.
-            const std::string& arg_format = amrex::get_command_argument(++i);
+            const std::string& arg_format = amrex::get_command_argument(i + 1);
             if (arg_format == "csv") {
                 out_format = csv;
                 format_str = "csv";
             } else if (arg_format == "hdf5") {
-                // out_format = hdf5;
+                out_format = hdf5;
                 amrex::Abort("HDF5 format has not been implemented yet.");
             } else {
                 amrex::Print() << "Invalid format: " << arg_format << std::endl;
@@ -45,12 +45,12 @@ void main_main()
         }
         if (arg == "--plt" || arg == "--plotfile" || arg == "--file" ||
             arg == "-p") {
-            const std::string& plt_tmp = amrex::get_command_argument(++i);
+            const std::string& plt_tmp = amrex::get_command_argument(i + 1);
             plotfile = plt_tmp;
             continue;
         }
         if (arg == "-o" || arg == "--output") {
-            output_file = amrex::get_command_argument(++i);
+            output_file = amrex::get_command_argument(i + 1);
         }
     }
     amrex::Print() << "Converting plotfile " << plotfile << " to format "