Merge branch 'master' of github.com:OpenMDAO/openmdao

.travis.yml

@@ -69,7 +69,7 @@ install:
 # keeping numpy pinned at 1.12 because pySNOPT dies with 1.13 because numpy broke callback
 - conda install --yes python=$PY numpy==1.12 scipy nose sphinx mock swig
 
-# trying a manual install of pyoptsparse
+# install pyoptsparse
 - wget https://bitbucket.org/mdolab/pyoptsparse/get/tip.zip;
 - unzip tip.zip;
 - cd mdolab-pyoptsparse*;
@@ -112,9 +112,9 @@ deploy:
   skip_cleanup: true
   script:
   - if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
-      if [ "$MPI" ] && [ "$PY" = "3.4" ]; then
+      if [ "$MPI" ] && [ "$PY" = "3.6" ]; then
         rsync -r --delete-after -v _build/html/* [email protected]:webapps/twodocversions/latest;
       fi
     fi
   on:
-    branch: master
+    branch: master

README.md

@@ -8,13 +8,13 @@
 OpenMDAO Naming/Legacy OpenMDAO
 -------------------------------
 
-PLEASE NOTE: Until recently, this repository was named OpenMDAO/blue. If you had cloned that repository, please update 
+PLEASE NOTE: Until recently, this repository was named OpenMDAO/blue. If you had cloned that repository, please update
 your repository name and remotes to reflect these changes.
 
-The OpenMDAO 1.7.3 codebase repo has been renamed to OpenMDAO1, and it resides 
+The OpenMDAO 1.7.3 codebase repo has been renamed to OpenMDAO1, and it resides
 at https://github.com/OpenMDAO/OpenMDAO1
 
-The OpenMDAO 2.0.x code has taken the name OpenMDAO, 
+The OpenMDAO 2.0.x code has taken the name OpenMDAO,
 and it resides at https://github.com/OpenMDAO/OpenMDAO.
 
 Installation of 2.0.x code will now work with `pip install openmdao`.  
@@ -47,8 +47,8 @@ make sure you pull these updates often.
 Features of OpenMDAO 1.7.x Not Yet in 2.x
 -----------------------------------------
 
-Be aware that this is an Alpha. 
-Not all the features of 1.7.x exist in 2.x yet. 
+Be aware that this is an Alpha.
+Not all the features of 1.7.x exist in 2.x yet.
 
 Here is a list of things that have not yet been fully developed in 2.x:
 
@@ -61,6 +61,7 @@ Here is a list of things that have not yet been fully developed in 2.x:
 * Active-set constraint calculation disabling
 * Brent Solver
 * CaseRecording using CSV, HDF5, and dump recorders (SqliteRecorder and WebRecorder are currently supported)
+* 'auto' selection of mode based on sizes of design variables and responses
 
 Installation Instructions:
 --------------------------
@@ -86,4 +87,3 @@ Documentation Building Instructions:
 This will build the docs into `openmdao/docs/_build/html`.
 
 Then, just open  `openmdao/docs/_build/html/index.html` in a browser to begin.
-

openmdao/components/external_code.py

@@ -78,7 +78,7 @@ def __init__(self):
         self.return_code = 0  # Return code from the command
         self.stdin = self.DEV_NULL
         self.stdout = None
-        self.stderr = "error.out"
+        self.stderr = "external_code_error.out"
 
     def check_config(self, logger):
         """
@@ -101,11 +101,12 @@ def check_config(self, logger):
                 logger.error("The command to be executed, '%s', "
                              "cannot be found" % program_to_execute)
 
-        # Check for missing input files
+        # Check for missing input files. This just generates a warning during
+        # setup, since these files may be generated later during execution.
         missing = self._check_for_files(self.options['external_input_files'])
         if missing:
-            logger.error("The following input files are missing at setup "
-                         " time: %s" % missing)
+            logger.warning("The following input files are missing at setup "
+                           "time: %s" % missing)
 
     def compute(self, inputs, outputs):
         """

openmdao/components/tests/external_code_sample.py → openmdao/components/tests/extcode_example.py

@@ -2,15 +2,23 @@
 import time
 import argparse
 
+
 def main():
-    """ Just an external program for testing ExternalCode. """
+    """
+    A standalone program for testing ExternalCode.
+
+    Writes "test data" to the specified output file after an optional delay.
+    Optionally writes the value of the environment variable "TEST_ENV_VAR"
+    to the file.
+    """
 
     parser = argparse.ArgumentParser()
     parser.add_argument("output_filename")
-    parser.add_argument("-e", "--write_test_env_var", help="Write the value of TEST_ENV_VAR to the file",
-                    action="store_true", default=False)
+    parser.add_argument("-e", "--write_test_env_var",
+                        help="Write the value of TEST_ENV_VAR to the file",
+                        action="store_true", default=False)
     parser.add_argument("-d", "--delay", type=float,
-                    help="time in seconds to delay")
+                        help="time in seconds to delay")
 
     args = parser.parse_args()
 
@@ -26,6 +34,6 @@ def main():
 
     return 0
 
+
 if __name__ == '__main__':
     main()
-

openmdao/components/tests/extcode_paraboloid.py

@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+#
+# usage: extcode_paraboloid.py input_filename output_filename
+#
+# Read the values of `x` and `y` from input file
+# and write the value of `f_xy` to output file.
+
+if __name__ == '__main__':
+    import sys
+
+    input_filename = sys.argv[1]
+    output_filename = sys.argv[2]
+
+    with open(input_filename, 'r') as input_file:
+        file_contents = input_file.readlines()
+
+    x, y = [float(f) for f in file_contents]
+
+    f_xy = (x-3.0)**2 + x*y + (y+4.0)**2 - 3.0
+
+    with open(output_filename, 'w') as output_file:
+        output_file.write('%f\n' % f_xy)