Merge pull request #84 from robbievanleeuwen/principal_stress

Minor style changes

Author: robbievanleeuwen

docs/source/conf.py

@@ -91,7 +91,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = []
 
 # Custom sidebar templates, must be a dictionary that maps document names
 # to template names.

docs/source/rst/post.rst

@@ -332,14 +332,14 @@ Shear Stress (:math:`\sigma_{zxy}`)
 
 ..  automethod:: sectionproperties.analysis.cross_section.StressPost.plot_vector_zxy
     :noindex:
-    
+
 Major Principal Stress (:math:`\sigma_{1}`)
-""""""""""""""""""""""""""""""""""""
+"""""""""""""""""""""""""""""""""""""""""""
 ..  automethod:: sectionproperties.analysis.cross_section.StressPost.plot_stress_1
     :noindex:
 
 Minor Principal Stress (:math:`\sigma_{2}`)
-""""""""""""""""""""""""""""""""""""
+"""""""""""""""""""""""""""""""""""""""""""
 ..  automethod:: sectionproperties.analysis.cross_section.StressPost.plot_stress_2
     :noindex:
 

sectionproperties/analysis/cross_section.py

@@ -3809,17 +3809,17 @@ def plot_vector_zxy(self, pause=True):
         return self.plot_stress_vector(sigxs, sigys, title, pause)
 
     def plot_stress_1(self, pause=True):
-        """Produces a contour plot of the Major principal stress :math:`\sigma_{1}` resulting from all
-        actions.
+        """Produces a contour plot of the major principal stress :math:`\sigma_{1}` resulting from
+        all actions.
 
         :param bool pause: If set to true, the figure pauses the script until the window is closed.
             If set to false, the script continues immediately after the window is rendered.
 
         :return: Matplotlib figure and axes objects (fig, ax)
         :rtype: (:class:`matplotlib.figure.Figure`, :class:`matplotlib.axes`)
 
-        The following example plots a contour of the Major principal stress within a 150x90x12 UA section
-        resulting from the following actions:
+        The following example plots a contour of the Major principal stress within a 150x90x12 UA
+        section resulting from the following actions:
 
         * :math:`N = 50` kN
         * :math:`M_{xx} = -5` kN.m
@@ -3849,7 +3849,7 @@ def plot_stress_1(self, pause=True):
             :align: center
             :scale: 75 %
 
-            Contour plot of the Major Principal stress.
+            Contour plot of the major principal stress.
         """
 
         title = 'Stress Contour Plot - $\sigma_{1}$'
@@ -3861,17 +3861,17 @@ def plot_stress_1(self, pause=True):
         return self.plot_stress_contour(sigs, title, pause)
 
     def plot_stress_2(self, pause=True):
-        """Produces a contour plot of the Minor principal stress :math:`\sigma_{2}` resulting from all
-        actions.
+        """Produces a contour plot of the minor principal stress :math:`\sigma_{2}` resulting from
+        all actions.
 
         :param bool pause: If set to true, the figure pauses the script until the window is closed.
             If set to false, the script continues immediately after the window is rendered.
 
         :return: Matplotlib figure and axes objects (fig, ax)
         :rtype: (:class:`matplotlib.figure.Figure`, :class:`matplotlib.axes`)
 
-        The following example plots a contour of the Minor principal stress within a 150x90x12 UA section
-        resulting from the following actions:
+        The following example plots a contour of the Minor principal stress within a 150x90x12 UA
+        section resulting from the following actions:
 
         * :math:`N = 50` kN
         * :math:`M_{xx} = -5` kN.m
@@ -3901,7 +3901,7 @@ def plot_stress_2(self, pause=True):
             :align: center
             :scale: 75 %
 
-            Contour plot of the Minor Principal stress.
+            Contour plot of the minor principal stress.
         """
 
         title = 'Stress Contour Plot - $\sigma_{2}$'
@@ -3912,7 +3912,6 @@ def plot_stress_2(self, pause=True):
 
         return self.plot_stress_contour(sigs, title, pause)
 
-    
     def plot_stress_vm(self, pause=True):
         """Produces a contour plot of the von Mises stress :math:`\sigma_{vM}` resulting from all
         actions.
@@ -4127,8 +4126,8 @@ def calculate_combined_stresses(self):
         self.sig_zx = self.sig_zx_mzz + self.sig_zx_v
         self.sig_zy = self.sig_zy_mzz + self.sig_zy_v
         self.sig_zxy = (self.sig_zx ** 2 + self.sig_zy ** 2) ** 0.5
-        self.sig_1 = self.sig_zz / 2 + np.sqrt( (self.sig_zz / 2) ** 2 + self.sig_zxy ** 2)
-        self.sig_2 = self.sig_zz / 2 - np.sqrt( (self.sig_zz / 2) ** 2 + self.sig_zxy ** 2)
+        self.sig_1 = self.sig_zz / 2 + np.sqrt((self.sig_zz / 2) ** 2 + self.sig_zxy ** 2)
+        self.sig_2 = self.sig_zz / 2 - np.sqrt((self.sig_zz / 2) ** 2 + self.sig_zxy ** 2)
         self.sig_vm = (self.sig_zz ** 2 + 3 * self.sig_zxy ** 2) ** 0.5