Merge pull request #2633 from shbhmexe/fix/python-bare-except-clauses

fix: Replace bare except clauses with specific exception types in Python utilities
Signed-off-by: shbhmexe <[email protected]>

Author: pcarruscag

SU2_CFD/src/solvers/CRadP1Solver.cpp

@@ -282,6 +282,14 @@ void CRadP1Solver::BC_Isothermal_Wall(CGeometry *geometry, CSolver **solver_cont
   /*--- Get the specified wall emissivity from config ---*/
   Wall_Emissivity = config->GetWall_Emissivity(Marker_Tag);
 
+  /*--- Clamp emissivity to valid physical range [0,1] to prevent division by zero ---*/
+  if (Wall_Emissivity < 0.0) {
+    Wall_Emissivity = 0.0;
+  }
+  if (Wall_Emissivity > 1.0) {
+    Wall_Emissivity = 1.0;
+  }
+
   /*--- Compute the constant for the wall theta ---*/
   Theta = Wall_Emissivity / (2.0*(2.0 - Wall_Emissivity));
 
@@ -356,6 +364,14 @@ void CRadP1Solver::BC_Far_Field(CGeometry *geometry, CSolver **solver_container,
   /*--- Get the specified wall emissivity from config ---*/
   Wall_Emissivity = config->GetWall_Emissivity(Marker_Tag);
 
+  /*--- Clamp emissivity to valid physical range [0,1] to prevent division by zero ---*/
+  if (Wall_Emissivity < 0.0) {
+    Wall_Emissivity = 0.0;
+  }
+  if (Wall_Emissivity > 1.0) {
+    Wall_Emissivity = 1.0;
+  }
+
   /*--- Compute the constant for the wall theta ---*/
   Theta = Wall_Emissivity / (2.0*(2.0 - Wall_Emissivity));
 
@@ -430,6 +446,19 @@ void CRadP1Solver::BC_Marshak(CGeometry *geometry, CSolver **solver_container, C
   /*--- Get the specified wall emissivity from config ---*/
   Wall_Emissivity = config->GetWall_Emissivity(Marker_Tag);
 
+  /*--- Clamp emissivity to valid physical range [0,1] to prevent division by zero ---*/
+<<<<<<< HEAD
+  if (Wall_Emissivity < 0.0) {
+    Wall_Emissivity = 0.0;
+  }
+  if (Wall_Emissivity > 1.0) {
+    Wall_Emissivity = 1.0;
+  }
+=======
+  if (Wall_Emissivity < 0.0) Wall_Emissivity = 0.0;
+  if (Wall_Emissivity > 1.0) Wall_Emissivity = 1.0;
+>>>>>>> 46baac1286ba393e261fef83bced67d0d4d3f269
+
   /*--- Compute the constant for the wall theta ---*/
   Theta = Wall_Emissivity / (2.0*(2.0 - Wall_Emissivity));
 

SU2_CFD/src/solvers/CSolver.cpp

@@ -3381,10 +3381,10 @@ void CSolver::Read_SU2_Restart_Metadata(CGeometry *geometry, CConfig *config, bo
 
       /*--- External iteration ---*/
 
-      position = text_line.find ("ITER=",0);
+      position = text_line.find("ITER=", 0);
       if (position != string::npos) {
-        // TODO: 'ITER=' has 5 chars, not 9!
-        text_line.erase (0,9); InnerIter_ = atoi(text_line.c_str());
+        text_line.erase(0, 5);
+        InnerIter_ = atoi(text_line.c_str());  // 'ITER=' has 5 chars
       }
 
       /*--- Angle of attack ---*/

SU2_PY/SU2/__init__.py

@@ -28,5 +28,5 @@ class DivergenceFailure(EvaluationFailure):
         readline.parse_and_bind("bind ^I rl_complete")
     else:
         readline.parse_and_bind("tab: complete")
-except:
-    pass
+except Exception:
+    pass  # readline is optional, continue without it

SU2_PY/SU2/io/config.py

@@ -94,7 +94,7 @@ def __init__(self, *args, **kwarg):
                 self.read(filename)
             except IOError:
                 print("Could not find config file: %s" % filename)
-            except:
+            except Exception:
                 print("Unexpected error: ", sys.exc_info()[0])
                 raise
         self._filename = filename

SU2_PY/SU2/util/bunch.py

@@ -82,7 +82,7 @@ def __contains__(self, k):
         """
         try:
             return hasattr(self, k) or dict.__contains__(self, k)
-        except:
+        except Exception:
             return False
 
     # only called if k not found in normal places
@@ -140,7 +140,7 @@ def __setattr__(self, k, v):
         except AttributeError:
             try:
                 self[k] = v
-            except:
+            except (KeyError, TypeError):
                 raise AttributeError(k)
         else:
             object.__setattr__(self, k, v)

SU2_PY/SU2/util/ordered_bunch.py

@@ -97,7 +97,7 @@ def __contains__(self, k):
         """
         try:
             return hasattr(self, k) or dict.__contains__(self, k)
-        except:
+        except Exception:
             return False
 
     # only called if k not found in normal places
@@ -160,7 +160,7 @@ def __setattr__(self, k, v):
         except AttributeError:
             try:
                 self[k] = v
-            except:
+            except (KeyError, TypeError):
                 raise AttributeError(k)
         else:
             object.__setattr__(self, k, v)