Merge pull request #291 from suavecode/develop

Mini 2 Merge
suavecode · Feb 14, 2019 · be2f49f · be2f49f
2 parents 63f860b + 0a9a2c4
commit be2f49f
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 29 deletions.
diff --git a/doc/suave_config b/doc/suave_config
@@ -38,7 +38,7 @@ PROJECT_NAME           = SUAVE
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.1.0
+PROJECT_NUMBER         = 2.0.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/trunk/SUAVE/Methods/Weights/Buildups/Common/__init__.py b/trunk/SUAVE/Methods/Weights/Buildups/Common/__init__.py
@@ -1,8 +1,7 @@
-## @defgroup Methods-Weights-Buildups-Common
-'''
-The Common buildup methods are those which are shared between vehicle types
-utilizing buildup weight methods.
-'''
+## @defgroup Methods-Weights-Buildups-Common Common
+# The Common buildup methods are those which are shared between vehicle types
+# utilizing buildup weight methods.
+# @ingroup Methods-Weights-Buildups
 
 from . import fuselage
 from . import prop

diff --git a/trunk/SUAVE/Methods/Weights/Buildups/Electric_Helicopter/__init__.py b/trunk/SUAVE/Methods/Weights/Buildups/Electric_Helicopter/__init__.py
@@ -1,9 +1,7 @@
 ## @defgroup Methods-Weights-Buildups-Electric_Helicopter Electric_Helicopter
-
-"""SUAVE.Methods.Weights.Buildups.Electric_Helicopter
-   contains methods and attributes used for estimating
-   electric helicopter weights on a component-by-component
-   basis.
-"""
+# contains methods and attributes used for estimating
+# electric helicopter weights on a component-by-component
+# basis.
+# @ingroup Methods-Weights-Buildups
 
 from .empty import empty
diff --git a/trunk/SUAVE/Methods/Weights/Buildups/Electric_Stopped_Rotor/__init__.py b/trunk/SUAVE/Methods/Weights/Buildups/Electric_Stopped_Rotor/__init__.py
@@ -1,9 +1,7 @@
 ## @defgroup Methods-Weights-Buildups-Electric_Stopped_Rotor Electric_Stopped_Rotor
-
-"""SUAVE.Methods.Weights.Buildups.Electric_Stopped_Rotor
-   contains methods and attributes used for estimating
-   electric helicopter weights on a component-by-component
-   basis.
-"""
+# contains methods and attributes used for estimating
+# electric helicopter weights on a component-by-component
+# basis.
+# @ingroup Methods-Weights-Buildups
 
 from .empty import empty
diff --git a/trunk/SUAVE/Methods/Weights/Buildups/Electric_Tiltrotor/__init__.py b/trunk/SUAVE/Methods/Weights/Buildups/Electric_Tiltrotor/__init__.py
@@ -1,9 +1,7 @@
 ## @defgroup Methods-Weights-Buildups-Electric_Tiltrotor Electric_Tiltrotor
-
-"""SUAVE.Methods.Weights.Buildups.Electric_Tiltrotor
-   contains methods and attributes used for estimating
-   electric helicopter weights on a component-by-component
-   basis.
-"""
+# contains methods and attributes used for estimating
+# electric helicopter weights on a component-by-component
+# basis.
+# @ingroup Methods-Weights-Buildups
 
 from .empty import empty
diff --git a/trunk/SUAVE/Methods/Weights/Buildups/__init__.py b/trunk/SUAVE/Methods/Weights/Buildups/__init__.py
@@ -1,9 +1,7 @@
 ## @defgroup Methods-Weights-Buildups Buildups
-'''
-Buildup weight methods provide weight breakdowns for vehicles based on part-by-part
-sizing.
-'''
-
+# Buildup weight methods provide weight breakdowns for vehicles based on part-by-part
+# sizing.
+# @ingroup Methods-Weights
 
 from . import Electric_Helicopter
 from . import Electric_Stopped_Rotor