Changing Naming Conventions

trunk/SUAVE/Analyses/Weights/Weights_electricHelicopter.py

@@ -17,7 +17,7 @@
 #  Analysis
 # ----------------------------------------------------------------------
 
-class Weights_electricHelicopter(Weights):
+class Weights_electric_helicopter(Weights):
     """ SUAVE.Analyses.Weights.Weights_electricHelicopter()
     """
     def __defaults__(self):

trunk/SUAVE/Analyses/Weights/Weights_electricStoppedRotor.py

@@ -18,7 +18,7 @@
 #  Analysis
 # ----------------------------------------------------------------------
 
-class Weights_electricStoppedRotor(Weights):
+class Weights_electric_stopped_rotor(Weights):
     """ SUAVE.Analyses.Weights.Weights_electricStoppedRotor()
     """
     def __defaults__(self):

trunk/SUAVE/Analyses/Weights/Weights_electricTiltrotor.py

@@ -15,7 +15,7 @@
 #  Analysis
 # ----------------------------------------------------------------------
 
-class Weights_electricTiltrotor(Weights):
+class Weights_electric_tiltrotor(Weights):
     """ SUAVE.Analyses.Weights.Weights_electricTiltrotor()
     """
     def __defaults__(self):

trunk/SUAVE/Analyses/Weights/__init__.py

@@ -7,6 +7,6 @@
 from Weights_BWB                    import Weights_BWB
 from Weights_Tube_Wing              import Weights_Tube_Wing
 from Weights_UAV                    import Weights_UAV
-from Weights_electricHelicopter     import Weights_electricHelicopter
-from Weights_electricStoppedRotor   import Weights_electricStoppedRotor
-from Weights_electricTiltrotor      import Weights_electricTiltrotor
+from Weights_electricHelicopter     import Weights_electric_helicopter
+from Weights_electricStoppedRotor   import Weights_electric_stopped_rotor
+from Weights_electricTiltrotor      import Weights_electric_tiltrotor

trunk/SUAVE/Attributes/Solids/Acrylic.py

@@ -8,14 +8,14 @@
 # Imports
 #-------------------------------------------------------------------------------
 
-from Solid import Solid
+from Solid import solid
 from SUAVE.Core import Data, Units
 
 #-------------------------------------------------------------------------------
 # Acrylic Solid Class
 #-------------------------------------------------------------------------------
 
-class Acrylic(Solid):
+class acrylic(solid):
 
     """ Physical Constants Specific to Polymethyl Methacrylate"""
 

trunk/SUAVE/Attributes/Solids/Aluminum.py

@@ -7,14 +7,14 @@
 #-------------------------------------------------------------------------------
 ## @ingroup Attributes-Solids
 
-from Solid import Solid
+from Solid import solid
 from SUAVE.Core import Data, Units
 
 #-------------------------------------------------------------------------------
 # Aluminum 6061-T6 Solid Class
 #-------------------------------------------------------------------------------
 
-class Aluminum(Solid):
+class aluminum(solid):
 
     """ Physical Constants Specific to Aluminum 6061-T6"""
 

trunk/SUAVE/Attributes/Solids/BiCF.py

@@ -1,21 +1,21 @@
 ## @ingroup Attributes-Solids
 
-# BiCF.py
+# B[a-z]_[a_z]F.py
 #
 # Created: Jul 2017, J. Smart
 
 #-------------------------------------------------------------------------------
 # Imports
 #-------------------------------------------------------------------------------
 
-from Solid import Solid
+from Solid import solid
 from SUAVE.Core import Data, Units
 
 #-------------------------------------------------------------------------------
 # Bi-Directional Carbon Fiber Solid Class
 #-------------------------------------------------------------------------------
 
-class BiCF(Solid):
+class bidirectional_carbon_fiber(solid):
 
     """ Physical Constants of a Specific to Bi-Directional Carbon Fiber"""
 

trunk/SUAVE/Attributes/Solids/Epoxy.py

@@ -8,14 +8,14 @@
 # Imports
 #-------------------------------------------------------------------------------
 
-from Solid import Solid
+from Solid import solid
 from SUAVE.Core import Data, Units
 
 #-------------------------------------------------------------------------------
 # Hardened Epoxy Resin Solid Class
 #-------------------------------------------------------------------------------
 
-class Epoxy(Solid):
+class epoxy(solid):
 
     """ Physical Constants Specific to Hardened Expoy Resin"""
 

trunk/SUAVE/Attributes/Solids/Honeycomb.py

@@ -8,14 +8,14 @@
 # Imports
 #-------------------------------------------------------------------------------
 
-from Solid import Solid
+from Solid import solid
 from SUAVE.Core import Data, Units
 
 #-------------------------------------------------------------------------------
 # Carbon Fiber Honeycomb Core Solid Class
 #-------------------------------------------------------------------------------
 
-class Honeycomb(Solid):
+class honeycomb(solid):
 
     """ Physical Constants Specific to Carbon Fiber Honeycomb Core Material"""
 

trunk/SUAVE/Attributes/Solids/Nickel.py

@@ -8,14 +8,14 @@
 # Imports
 #-------------------------------------------------------------------------------
 
-from Solid import Solid
+from Solid import solid
 from SUAVE.Core import Data, Units
 
 #-------------------------------------------------------------------------------
 # Cold Rolled Nickel/Cobalt Chromoly Alloy Solid Class
 #-------------------------------------------------------------------------------
 
-class Nickel(Solid):
+class nickel(solid):
 
     """ Physical Constants Specific to Cold Rolled Nickel/Cobalt Chromoly Alloy"""
 

trunk/SUAVE/Attributes/Solids/Paint.py

@@ -8,14 +8,14 @@
 # Imports
 #-------------------------------------------------------------------------------
 
-from Solid import Solid
+from Solid import solid
 from SUAVE.Core import Data, Units
 
 #-------------------------------------------------------------------------------
 # Paint and/or Vinyl Surface Convering Solid Class
 #-------------------------------------------------------------------------------
 
-class Paint(Solid):
+class paint(solid):
 
     """ Physical Constants Specific to Paint and/or Vinyl Surface Covering"""
 

trunk/SUAVE/Attributes/Solids/Rib.py

@@ -8,15 +8,15 @@
 # Imports
 #-------------------------------------------------------------------------------
 
-from Solid import Solid
-from Aluminum import Aluminum
+from Solid import solid
+from Aluminum import aluminum
 from SUAVE.Core import Data, Units
 
 #-------------------------------------------------------------------------------
 # Solid Data Class
 #-------------------------------------------------------------------------------
 
-class Rib(Aluminum):
+class rib(aluminum):
 
     """ Physical Constants of an Aluminum 6061-T6 Rib"""
 

trunk/SUAVE/Attributes/Solids/Solid.py

@@ -14,7 +14,7 @@
 # Solid Data Class
 #-------------------------------------------------------------------------------
 
-class Solid(Data):
+class solid(Data):
 
     """ Physical Constants of a Solid"""
 

trunk/SUAVE/Attributes/Solids/Steel.py

@@ -8,14 +8,14 @@
 # Imports
 #-------------------------------------------------------------------------------
 
-from Solid import Solid
+from Solid import solid
 from SUAVE.Core import Data, Units
 
 #-------------------------------------------------------------------------------
 # AISI 4340 Steel Solid Class
 #-------------------------------------------------------------------------------
 
-class Steel(Solid):
+class steel(solid):
 
     """ Physical Constants Specific to AISI 4340 Steel"""
 

trunk/SUAVE/Attributes/Solids/UniCF.py

@@ -8,14 +8,14 @@
 # Imports
 #-------------------------------------------------------------------------------
 
-from Solid import Solid
+from Solid import solid
 from SUAVE.Core import Data, Units
 
 #-------------------------------------------------------------------------------
 # Uni-Directional Carbon Fiber Solid Class
 #-------------------------------------------------------------------------------
 
-class UniCF(Solid):
+class unidirectional_carbon_fiber(solid):
 
     """ Physical Constants Specific to Uni-Directional Carbon Fiber"""
 

trunk/SUAVE/Attributes/Solids/__init__.py

@@ -1,13 +1,13 @@
 ## @defgroup Attributes-Solids Solids
 
-from Solid import Solid
-from UniCF import UniCF
-from BiCF import BiCF
-from Honeycomb import Honeycomb
-from Epoxy import Epoxy
-from Rib import Rib
-from Paint import Paint
-from Aluminum import Aluminum
-from Acrylic import Acrylic
-from Steel import Steel
-from Nickel import Nickel
+from Solid import solid
+from UniCF import unidirectional_carbon_fiber
+from BiCF import bidirectional_carbon_fiber
+from Honeycomb import honeycomb
+from Epoxy import epoxy
+from Rib import rib
+from Paint import paint
+from Aluminum import aluminum
+from Acrylic import acrylic
+from Steel import steel
+from Nickel import nickel

trunk/SUAVE/Methods/Weights/Buildups/Common/fuselage.py

@@ -11,7 +11,7 @@
 
 from SUAVE.Core import Units
 from SUAVE.Attributes.Solids import (
-    BiCF, Honeycomb, Paint, UniCF, Acrylic, Steel, Aluminum, Epoxy, Nickel, Rib)
+    bidirectional_carbon_fiber, honeycomb, paint, unidirectional_carbon_fiber, acrylic, steel, aluminum, epoxy, nickel, rib)
 import numpy as np
 
 
@@ -20,14 +20,14 @@
 #-------------------------------------------------------------------------------
 
 def fuselage(config,
-             maxGLoad = 3.8,
-             landingImpactFactor = 3.5,
-             safetyFactor = 1.5):
+             maximum_g_load = 3.8,
+             landing_impact_factor = 3.5,
+             safety_factor = 1.5):
     """ weight = SUAVE.Methods.Weights.Buildups.Common.fuselage(
             config,
-            maxGLoad = 3.8,
-            landingImpactFactor = 3.5,
-            safetyFactor = 1.5)
+            max_g_load = 3.8,
+            landing_impact_factor = 3.5,
+            safety_factor = 1.5)
 
         Calculates the structural mass of a fuselage for an eVTOL vehicle,
         assuming a structural keel taking bending an torsional loads.
@@ -44,9 +44,9 @@ def fuselage(config,
 
         Inputs:
 
-            config                  SUAVE Vehicle Configuration
-            maxGLoad                Max Accelerative Load During Flight [Unitless]
-            landingImpactFactor     Maximum Load Multiplier on Landing  [Unitless]
+            config                      SUAVE Vehicle Configuration
+            max_g_load                  Max Accelerative Load During Flight [Unitless]
+            landing_impact_factor       Maximum Load Multiplier on Landing  [Unitless]
 
         Outputs:
 
@@ -62,18 +62,18 @@ def fuselage(config,
     fHeight = config.fuselages.fuselage.heights.maximum
     maxSpan = config.wings["main_wing"].spans.projected
     MTOW    = config.mass_properties.max_takeoff
-    G_max   = maxGLoad
-    LIF     = landingImpactFactor
-    SF      = safetyFactor
+    G_max   = maximum_g_load
+    LIF     = landing_impact_factor
+    SF      = safety_factor
 
     # Calculate Skin Weight Per Unit Area (arealWeight) based on material
     # properties. In this instance we assume the use of
     # Bi-directional Carbon Fiber, a Honeycomb Core, and Paint:
 
     arealWeight =(
-          BiCF().minimum_gage_thickness      * BiCF().density
-        + Honeycomb().minimum_gage_thickness * Honeycomb().density
-        + Paint().minimum_gage_thickness     * Paint().density
+          bidirectional_carbon_fiber().minimum_gage_thickness      * bidirectional_carbon_fiber().density
+        + honeycomb().minimum_gage_thickness * honeycomb().density
+        + paint().minimum_gage_thickness     * paint().density
         )
 
     # Calculate fuselage area (using assumption of ellipsoid), and weight:
@@ -89,7 +89,7 @@ def fuselage(config,
 
     # Calculate the mass of a canopy, assuming Acrylic:
 
-    canopyMass = S_wet/8 * Acrylic().minimum_gage_thickness * Acrylic().density
+    canopyMass = S_wet/8 * acrylic().minimum_gage_thickness * acrylic().density
 
     # Calculate keel mass needed to carry lifting moment, assuming
     # Uni-directional Carbon Fiber used to carry load
@@ -99,27 +99,27 @@ def fuselage(config,
     beamWidth   = fWidth/3.                # Allowable Keel Width
     beamHeight  = fHeight/10.              # Allowable Keel Height
 
-    beamArea    = M_lift * beamHeight/(4*UniCF().ultimate_tensile_strength*(beamHeight/2)**2)
-    massKeel    = beamArea * fLength * UniCF().density
+    beamArea    = M_lift * beamHeight/(4*unidirectional_carbon_fiber().ultimate_tensile_strength*(beamHeight/2)**2)
+    massKeel    = beamArea * fLength * unidirectional_carbon_fiber().density
 
     # Calculate keel mass needed to carry wing bending moment, assuming
     # thin walled Bi-directional Carbon Fiber used to carry load
 
     M_bend      = L_max/2 * maxSpan/2                          # Max Bending Moment
     beamArea    = beamHeight * beamWidth                       # Enclosed Beam Area
-    beamThk     = 0.5 * M_bend/(BiCF().ultimate_shear_strength*beamArea)    # Beam Thickness
-    massKeel   += 2*(beamHeight + beamWidth)*beamThk*BiCF().density
+    beamThk     = 0.5 * M_bend/(bidirectional_carbon_fiber().ultimate_shear_strength*beamArea)    # Beam Thickness
+    massKeel   += 2*(beamHeight + beamWidth)*beamThk*bidirectional_carbon_fiber().density
 
     # Calculate keel mass needed to carry landing impact load assuming
     # Steel bolts, and Bi-directional Carbon Fiber laminate pads used to carry
     # loads in a side landing
 
     F_landing   = SF * MTOW * 9.8 * LIF * 0.6403              # Side Landing Force
-    boltArea    = F_landing/Steel().ultimate_shear_strength              # Required Bolt Area
+    boltArea    = F_landing/steel().ultimate_shear_strength              # Required Bolt Area
     boltDiam    = 2 * np.sqrt(boltArea/np.pi)           # Bolt Diameter
-    lamThk      = F_landing/(boltDiam*BiCF().ultimate_bearing_strength)    # Laminate Thickness
+    lamThk      = F_landing/(boltDiam*bidirectional_carbon_fiber().ultimate_bearing_strength)    # Laminate Thickness
     lamVol      = (np.pi*(20*lamThk)**2)*(lamThk/3)     # Laminate Pad volume
-    massKeel   += 4*lamVol*BiCF().density            # Mass of 4 Pads
+    massKeel   += 4*lamVol*bidirectional_carbon_fiber().density            # Mass of 4 Pads
 
     # Calculate total mass as the sum of skin mass, bulkhead mass, canopy pass,
     # and keel mass. Called weight by SUAVE convention