Fix some missing initializations and more warnings. (AMReX-Combustion#297)

jrood-nrel · web-flow · commit 05dc43de5239 · 2022-06-08T14:26:51.000-06:00
diff --git a/Reactions/ReactorCvodeJacobian.cpp b/Reactions/ReactorCvodeJacobian.cpp
@@ -133,13 +133,15 @@ cJac(
 
     // fill the sunMat and scale
     for (int i = 0; i < NUM_SPECIES; i++) {
+      // cppcheck-suppress cstyleCast
       amrex::Real* J_col = SM_COLUMN_D(J, offset + i);
       for (int k = 0; k < NUM_SPECIES; k++) {
         J_col[offset + k] = Jmat_tmp[i * (NUM_SPECIES + 1) + k] * mw[k] / mw[i];
       }
       J_col[offset + NUM_SPECIES] =
         Jmat_tmp[i * (NUM_SPECIES + 1) + NUM_SPECIES] / mw[i];
     }
+    // cppcheck-suppress cstyleCast
     amrex::Real* J_col = SM_COLUMN_D(J, offset + NUM_SPECIES);
     for (int i = 0; i < NUM_SPECIES; i++) {
       J_col[offset + i] = Jmat_tmp[NUM_SPECIES * (NUM_SPECIES + 1) + i] * mw[i];
diff --git a/Transport/Constant.H b/Transport/Constant.H
@@ -91,7 +91,7 @@ struct ConstTransport
   }
 
   template <class... Args>
-  AMREX_GPU_HOST_DEVICE ConstTransport(Args... /*unused*/)
+  AMREX_GPU_HOST_DEVICE explicit ConstTransport(Args... /*unused*/)
   {
   }
 };
diff --git a/Transport/TransportParams.H b/Transport/TransportParams.H
@@ -351,7 +351,7 @@ public:
 
 private:
   TransParm<EosType, TransportType> m_h_trans_parm;
-  TransParm<EosType, TransportType>* m_d_trans_parm;
+  TransParm<EosType, TransportType>* m_d_trans_parm{nullptr};
   bool m_device_allocated{false};
 };
 } // namespace transport
diff --git a/Utility/PltFileManager/PltFileManager.H b/Utility/PltFileManager/PltFileManager.H
@@ -32,11 +32,10 @@ public:
 protected:
   // MetaData
   std::string m_pltFile;             // pltfile name
-  int m_nvars;                       // number of variables
+  int m_nvars{0};                    // number of variables
   amrex::Vector<std::string> m_vars; // list of variable in the plotfile
-  int m_nlevels;                     // number of levels
-  amrex::Real m_time;                // Simulation time
-  amrex::Real m_nsteps;              // Simulation step count
+  int m_nlevels{0};                  // number of levels
+  amrex::Real m_time{0.0};           // Simulation time
 
   amrex::Vector<amrex::BoxArray> m_grids;
   amrex::Vector<amrex::Geometry> m_geoms;
diff --git a/Utility/PltFileManager/PltFileManager.cpp b/Utility/PltFileManager/PltFileManager.cpp
@@ -22,9 +22,8 @@ GotoNextLine(std::istream& is)
 }
 
 PltFileManager::PltFileManager(const std::string& a_pltFile)
+  : m_pltFile{a_pltFile}
 {
-  m_pltFile = a_pltFile;
-
   // Get the plt metadata and resize part of the data vectors
   std::string pltFileHeader(m_pltFile + "/Header");
   readGenericPlotfileHeader(pltFileHeader);

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ struct ConstTransport`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`template <class... Args>`
`94`		`- AMREX_GPU_HOST_DEVICE ConstTransport(Args... /unused/)`
	`94`	`+ AMREX_GPU_HOST_DEVICE explicit ConstTransport(Args... /unused/)`
`95`	`95`	`{`
`96`	`96`	`}`
`97`	`97`	`};`
Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,8 @@ GotoNextLine(std::istream& is)`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`PltFileManager::PltFileManager(const std::string& a_pltFile)`
	`25`	`+ : m_pltFile{a_pltFile}`
`25`	`26`	`{`
`26`		`- m_pltFile = a_pltFile;`
`27`		`-`
`28`	`27`	`// Get the plt metadata and resize part of the data vectors`
`29`	`28`	`std::string pltFileHeader(m_pltFile + "/Header");`
`30`	`29`	`readGenericPlotfileHeader(pltFileHeader);`