1- #! /usr/bin/env python
1+ #!/usr/bin/env python
22# -------------------------------------------------------------------------------
33# Copyright 2006-2021 UT-Battelle, LLC. See LICENSE for more information.
44# -------------------------------------------------------------------------------
@@ -89,10 +89,6 @@ def run(self): # noqa: C901
8989 if k not in list (self .template_conf .keys ()) and not any (x in v for x in '{}()$' ):
9090 self .template_conf [k ] = v
9191
92- alt_paths .append (self .template_conf ['IPS_ROOT' ])
93- alt_paths .append (os .path .join (self .template_conf ['IPS_ROOT' ], 'bin' ))
94- alt_paths .append (os .path .join (self .template_conf ['IPS_ROOT' ], 'framework/src' ))
95-
9692 new_dakota_config = self .dakota_cfg + '.resolved'
9793 comp_vars = {}
9894 for line in self .dakota_conf :
@@ -113,7 +109,7 @@ def run(self): # noqa: C901
113109 elif tokens [0 ] == 'analysis_driver' :
114110 raw_prog = line .split ('=' )[1 ]
115111 prog = raw_prog .strip (' "\' ' )
116- exec_prog = which (prog , alt_paths )
112+ exec_prog = which (prog )
117113 if not exec_prog :
118114 raise Exception ('Error: analysis driver %s not found in path' % prog )
119115 line .replace (prog , exec_prog )
@@ -136,23 +132,13 @@ def run(self): # noqa: C901
136132 driver_conf ['SUB_CLASS' ] = 'BRIDGE'
137133 driver_conf ['NAME' ] = 'Driver'
138134 driver_conf ['NPROC' ] = 1
139- driver_conf ['BIN_PATH' ] = os . path . join ( self . template_conf [ 'IPS_ROOT' ], 'bin' )
135+ driver_conf ['BIN_PATH' ] = ''
140136 driver_conf ['BIN_DIR' ] = driver_conf ['BIN_PATH' ]
141137 driver_conf ['INPUT_DIR' ] = '/dev/null'
142138 driver_conf ['INPUT_FILES' ] = ''
143139 driver_conf ['OUTPUT_FILES' ] = ''
144- script = os .path .join (self .template_conf ['IPS_ROOT' ],
145- 'bin' , 'dakota_bridge.py' )
146- if os .path .isfile (script ):
147- driver_conf ['SCRIPT' ] = script
148- else :
149- script = os .path .join (self .template_conf ['IPS_ROOT' ], 'framework' ,
150- 'src' , 'dakota_bridge.py' )
151- if os .path .isfile (script ):
152- driver_conf ['SCRIPT' ] = script
153- else :
154- raise Exception ('Error: unable to locate dakota_bridge.py in \
155- IPS_ROOT/bin or IPS_ROOT/framework/src' )
140+ driver_conf ['SCRIPT' ] = ""
141+ driver_conf ['MODULE' ] = 'ipsframework.dakota_bridge'
156142 self .master_conf ['DAKOTA_BRIDGE' ] = driver_conf
157143
158144 for comp in comp_vars :
@@ -200,16 +186,16 @@ def run(self): # noqa: C901
200186 if not os .path .isfile (self .restart_file ):
201187 raise Exception ("Error accessing DAKOTA restart file %s" % (self .restart_file ))
202188
203- cmd = '%s --all -- simulation=%s --platform=%s --verbose' % (ips , self .master_conf .filename ,
204- os .environ ['IPS_DAKOTA_platform' ])
189+ cmd = '%s --simulation=%s --platform=%s --verbose' % (ips , self .master_conf .filename ,
190+ os .environ ['IPS_DAKOTA_platform' ])
205191 if self .log_file :
206192 cmd += ' --log=' + self .log_file
207193
208194 if self .debug :
209195 cmd += ' --debug'
210196
211197 print ('cmd =' , cmd )
212- ips_server_proc = subprocess .Popen (cmd )
198+ ips_server_proc = subprocess .Popen (cmd . split () )
213199 print ('%s Launched IPS' % (time .strftime ("%b %d %Y %H:%M:%S" , time .localtime ())))
214200 sys .stdout .flush ()
215201 msg = {'SIMSTATUS' : 'START' }
@@ -240,7 +226,7 @@ def run(self): # noqa: C901
240226 else :
241227 command = 'dakota %s ' % new_dakota_config
242228 dakota_logfile = open ('dakota_%s.log' % (str (os .getpid ())), 'w' )
243- proc = subprocess .Popen (command , stdout = dakota_logfile , stderr = subprocess .STDOUT )
229+ proc = subprocess .Popen (command . split () , stdout = dakota_logfile , stderr = subprocess .STDOUT )
244230 print ('%s Launched DAKOTA' % (time .strftime ("%b %d %Y %H:%M:%S" , time .localtime ())))
245231 sys .stdout .flush ()
246232 proc .wait ()
0 commit comments