Merge pull request OpenMDAO#581 from crecine/update_json

adding unit test for json

aviary/docs/examples/off_design_example.ipynb

@@ -11,8 +11,8 @@
     "Running a sizing mission followed by running fallout and alternate missions on the sized aircraft will be presented.\n",
     "An overview of off-design missions is presented in [Off-Design Mission User Guide](../user_guide/off_design_missions).\n",
     "\n",
-    "The example is available in `aviary/examples/off_design_example.py`\n",
-    "The examples start with `run_aviary_example.py` and add off-design missions.\n",
+    "The example is available in `aviary/examples/run_off_design_example.py`\n",
+    "The examples start with `run_aviary_example.py` and adds off-design missions.\n",
     "\n",
     "The results of the sizing problem are saved using `prob.save_sizing_to_json()`.\n",
     "By default, this method saves the results to `sizing_problem.json` but the name of the file may be changed using the `json_filename` argument.\n",

aviary/docs/user_guide/off_design_missions.ipynb

@@ -34,7 +34,7 @@
    "metadata": {},
    "source": [
     "You may also run multiple off-design missions in the same script used to solve the design mission.\n",
-    "An examples of this is shown in `off_design_example.py`."
+    "An examples of this is shown in `run_off_design_example.py`."
    ]
   },
   {
@@ -54,7 +54,7 @@
     "\n",
     "off_design_examples = av.get_path(os.path.join('examples'))\n",
     "check_contains(\n",
-    "    ('off_design_example.py'),\n",
+    "    ('run_off_design_example.py'),\n",
     "    os.listdir(off_design_examples),\n",
     "    error_string=\"{var} not in \"+str(off_design_examples),\n",
     "    error_type=FileNotFoundError)"

aviary/examples/off_design_example.py → aviary/examples/run_off_design_example.py

@@ -8,6 +8,7 @@
 We then call the correct methods in order to set up and run an Aviary optimization problem.
 This performs a coupled design-mission optimization and outputs the results from Aviary into the `reports` folder.
 """
+from openmdao.utils.general_utils import env_truthy
 import aviary.api as av
 
 from aviary.interface.default_phase_info.height_energy import phase_info_parameterization
@@ -117,7 +118,10 @@
 
 # Link phases and variables
 prob.link_phases()
-prob.add_driver('SNOPT', max_iter=100)
+if env_truthy("TESTFLO_RUNNING"):
+    prob.add_driver('SLSQP', max_iter=100)
+else:
+    prob.add_driver('SNOPT', max_iter=100)
 prob.add_design_variables()
 
 # Load optimization problem formulation

aviary/interface/methods_for_level2.py

@@ -2509,12 +2509,12 @@ def save_sizing_to_json(self, json_filename='sizing_problem.json'):
 
                     # Lists are fine except if they contain enums
                     if type_value == list:
-                        if type(type(value[0])) == enum.EnumType:
+                        if isinstance(value[0], enum.Enum):
                             for i in range(len(value)):
                                 value[i] = str([value[i]])
 
                     # Enums need converting to a string
-                    if type(type(value)) == enum.EnumType:
+                    if isinstance(value, enum.Enum):
                         value = str([value])
 
                 # Append the data to the list