fix exceptions

Author: PetrKryslUCSD

examples/frame_5_8.py

@@ -73,8 +73,8 @@
     > 1.0e-5
 ):
     raise ValueError("Displacement calculation error")
-else:
-    print("Displacement calculation OK")
+
+print("Displacement calculation OK")
 
 # print('Reference: ', [-0.02238452,  0.00419677,  0.00593197])
 

examples/slanted_frame_7_3.py

@@ -61,12 +61,12 @@
     m["joints"][1]["displacements"] - [8.8622e-05, -2.2798e-04, -1.8971e-02]
 ) > 1.0e-3 * norm(m["joints"][1]["displacements"]):
     raise ValueError("Displacement calculation error")
-else:
-    print("Displacement calculation OK")
+
+print("Displacement calculation OK")
 
 if norm(
     m["joints"][3]["displacements"] - [4.4311e-05, -4.6696e-02, 4.7854e-03]
 ) > 1.0e-3 * norm(m["joints"][3]["displacements"]):
     raise ValueError("Displacement calculation error")
-else:
-    print("Displacement calculation OK")
+
+print("Displacement calculation OK")

examples/slanted_frame_7_3_1.py

@@ -61,8 +61,8 @@
     > 1.0e-3
 ):
     raise ValueError("Displacement calculation error")
-else:
-    print("Displacement calculation OK")
+
+print("Displacement calculation OK")
 
 plots.plot_setup(m)
 plots.plot_members(m)

pystran/model.py

@@ -50,11 +50,11 @@ def add_joint(m, identifier, coordinates):
     Add a joint to the model.
     """
     if identifier in m["joints"]:
-        raise Exception("Joint already exists")
+        raise RuntimeError("Joint already exists")
     else:
         m["joints"][identifier] = {"coordinates": array(coordinates)}
     if m["joints"][identifier]["coordinates"].shape != (m["dim"],):
-        raise Exception("Coordinate dimension mismatch")
+        raise RuntimeError("Coordinate dimension mismatch")
     return None
 
 
@@ -63,7 +63,7 @@ def add_truss_member(m, identifier, connectivity, sect):
     Add a truss member to the model.
     """
     if identifier in m["truss_members"]:
-        raise Exception("Truss member already exists")
+        raise RuntimeError("Truss member already exists")
     else:
         m["truss_members"][identifier] = {
             "connectivity": array(connectivity, dtype=numpy.int32),
@@ -77,7 +77,7 @@ def add_beam_member(m, identifier, connectivity, sect):
     Add a beam member to the model.
     """
     if identifier in m["beam_members"]:
-        raise Exception("Beam member already exists")
+        raise RuntimeError("Beam member already exists")
     else:
         m["beam_members"][identifier] = {
             "connectivity": array(connectivity, dtype=numpy.int32),

pystran/plots.py

@@ -287,7 +287,7 @@ def plot_shear_forces(m, scale=1.0):
         connectivity = member["connectivity"]
         i, j = m["joints"][connectivity[0]], m["joints"][connectivity[1]]
         if m["dim"] == 3:
-            raise Exception("3D not implemented")
+            raise NotImplementedError("3D not implemented")
         else:
             line = _plot_2d_beam_shear_forces(ax, member, i, j, scale)
     return ax
@@ -301,7 +301,7 @@ def plot_beam_orientation(m, scale=1.0):
         ci, cj = i["coordinates"], j["coordinates"]
         xm = (ci + cj) / 2.0
         if m["dim"] == 3:
-            raise Exception("3D not implemented")
+            raise NotImplementedError("3D not implemented")
         else:
             e_x, e_z, h = beam_2d_member_geometry(i, j)
             xs = zeros(2)

pystran/truss.py

@@ -19,7 +19,7 @@ def truss_member_geometry(i, j):
     e_x = geometry.delt(i["coordinates"], j["coordinates"])
     h = geometry.len(i["coordinates"], j["coordinates"])
     if h <= 0.0:
-        raise Exception("Length of element must be positive")
+        raise ZeroDivisionError("Length of element must be positive")
     e_x /= h
     return e_x, h