Skip to content

Commit

Permalink
Merge branch 'master' into change_deriv_plot_colorbar
Browse files Browse the repository at this point in the history
  • Loading branch information
swryan committed Apr 3, 2024
2 parents 453e328 + b68c8cc commit 47ba152
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ To install all the optional dependencies:
This allows you to install **OpenMDAO** from a local copy of the source code.

git clone http://github.com/OpenMDAO/OpenMDAO
pip install OpenMDAO
cd OpenMDAO
pip install .

If you would like to make changes to **OpenMDAO** it is recommended you
install it in *[editable][16]* mode (i.e., development mode) by adding the `-e`
Expand Down
3 changes: 2 additions & 1 deletion openmdao/components/external_code_comp.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,8 @@ def _execute_local(self, command):
comp = self._comp

if isinstance(command, str):
program_to_execute = re.findall(r"^([\w\-]+)", command)[0]
# parse for the first word, which may contain dashes and path separators
program_to_execute = re.findall(r"^([\w\-\/\:]+)", command)[0]
else:
program_to_execute = command[0]

Expand Down
3 changes: 2 additions & 1 deletion openmdao/components/tests/test_external_code_comp.py
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,8 @@ def setup(self):
# sys.executable, 'extcode_paraboloid.py', self.input_file, self.output_file
# ]

self.options['command'] = ('python extcode_paraboloid.py {} {}').format(self.input_file, self.output_file)
self.options['command'] = ('{} extcode_paraboloid.py {} {}').format(
sys.executable, self.input_file, self.output_file)

def compute(self, inputs, outputs):
x = inputs['x'].item()
Expand Down

0 comments on commit 47ba152

Please sign in to comment.