Merge pull request #2632 from shbhmexe/fix/python-code-quality

Fix: Improve Python code quality and PEP 8 compliance

Author: pcarruscag

Common/include/geometry/CGeometry.hpp

@@ -1,4 +1,4 @@
-/*!
+/*!
  * \file CGeometry.hpp
  * \brief Headers of the main subroutines for creating the geometrical structure.
  *        The subroutines and functions are in the <i>CGeometry.cpp</i> file.
@@ -51,6 +51,7 @@ extern "C" {
 #include <climits>
 #include <memory>
 #include <unordered_map>
+#include <cstdint>
 
 #include "primal_grid/CPrimalGrid.hpp"
 #include "dual_grid/CDualGrid.hpp"

Common/include/geometry/primal_grid/CPrimalGrid.hpp

@@ -49,7 +49,7 @@ class CPrimalGrid {
   unsigned long GlobalIndex_DomainElement;
 
   std::unique_ptr<unsigned long[]> Nodes;    /*!< \brief Global node indices of the element. */
-  std::unique_ptr<long[]> Neighbor_Elements; /*!< \brief Vector to store the elements surrounding this element. */
+  std::unique_ptr<long[]> Neighbor_Elements; /*!< \brief Vector to store the elements surronding this element. */
 
   su2double Coord_CG[3] = {0.0}; /*!< \brief Coordinates of the center-of-gravity of the element. */
   su2double Volume;              /*!< \brief Volume of the element. */

SU2_CFD/include/variables/CFlowVariable.hpp

@@ -26,6 +26,9 @@
 
 #pragma once
 
+#include <algorithm>
+#include <cstdint>
+
 #include "CVariable.hpp"
 
 /*!

SU2_PY/SU2/io/data.py

@@ -115,7 +115,7 @@ def load_data(file_name, var_names=None, file_format="infer", core_name="python_
     #: with filelock
 
     # load specified varname into dictionary
-    if var_names != None:
+    if var_names is not None:
         # check for one item name array
         if isinstance(var_names, str):
             var_names = [
@@ -365,7 +365,7 @@ def rec2dict(array_in):
         # convert array
         elif isinstance(value, numpy.ndarray):
             # check for another struct level
-            if value.dtype.names == None:
+            if value.dtype.names is None:
                 value = value.tolist()
             # telescoping
             else:

SU2_PY/SU2_CFD.py

@@ -120,7 +120,7 @@ def main():
     options.wave_equation = options.wave_equation.upper() == "TRUE"
     options.heat_equation = options.heat_equation.upper() == "TRUE"
 
-    if options.filename == None:
+    if options.filename is None:
         raise Exception("No config file provided. Use -f flag")
 
     if options.with_MPI == True:
@@ -163,7 +163,7 @@ def main():
     # Finalize the solver and exit cleanly
     SU2Driver.Finalize()
 
-    if SU2Driver != None:
+    if SU2Driver is not None:
         del SU2Driver
 
 

SU2_PY/parallel_computation.py

@@ -64,7 +64,7 @@ def main():
     options.partitions = int(options.partitions)
     options.compute = options.compute.upper() == "TRUE"
 
-    if options.filename == None:
+    if options.filename is None:
         raise Exception("No config file provided. Use -f flag")
 
     parallel_computation(options.filename, options.partitions, options.compute)

SU2_PY/parallel_computation_fsi.py

@@ -64,7 +64,7 @@ def main():
     options.partitions = int(options.partitions)
     options.compute = options.compute.upper() == "TRUE"
 
-    if options.filename == None:
+    if options.filename is None:
         raise Exception("No config file provided. Use -f flag")
 
     parallel_computation(options.filename, options.partitions, options.compute)

SU2_PY/topology_optimization.py

@@ -123,8 +123,8 @@ def obj_val(self, x):
         # clear previous output and run direct solver
         try:
             os.remove(self._objValFile)
-        except:
-            pass
+        except OSError:
+            pass  # Ignore error if file does not exist
 
         try:
             sp.call(self._objValCommand, shell=True)
@@ -136,7 +136,7 @@ def obj_val(self, x):
                     break
             # the return code of mpirun is useless, we test the value of the function
             self._assert_isfinite(val)
-        except:
+        except Exception:
             raise RuntimeError("Objective function evaluation failed")
         # end
 
@@ -150,8 +150,8 @@ def obj_der(self, x):
         # clear previous output and run direct solver
         try:
             os.remove(self._objDerFile)
-        except:
-            pass
+        except OSError:
+            pass  # Ignore error if file does not exist
         N = x.shape[0]
         y = np.ndarray((N,))
 
@@ -167,7 +167,7 @@ def obj_der(self, x):
                 self._assert_isfinite(val)
                 y[i] = val * obj_scale / var_scale
             # end
-        except:
+        except Exception:
             raise RuntimeError("Objective gradient evaluation failed")
         # end
 
@@ -186,7 +186,7 @@ def con_val(self, x):
                     val = float(lines[1].split(",")[col])
                     break
             self._assert_isfinite(val)
-        except:
+        except Exception:
             raise RuntimeError("Constraint function evaluation failed")
         # end
 
@@ -200,8 +200,8 @@ def con_der(self, x):
         # clear previous output and run solver
         try:
             os.remove(self._conDerFile)
-        except:
-            pass
+        except OSError:
+            pass  # Ignore error if file does not exist
         N = x.shape[0]
         y = np.ndarray((N,))
 
@@ -217,7 +217,7 @@ def con_der(self, x):
                 self._assert_isfinite(val)
                 y[i] = val * con_scale / var_scale
             # end
-        except:
+        except Exception:
             raise RuntimeError("Constraint function evaluation failed")
         # end
 
@@ -295,7 +295,7 @@ def finished(self):
         return self._value == self._maxi
 
     def value(self):
-        if self._func == None:
+        if self._func is None:
             return self._value
         else:
             return self._func(self._value)