Correction to isoxml command and cleanup of color from MOOSE for better output in Workbench (6740cc8f) · Commits · Shriwise, Patrick / PyGriffin

pygriffin/pygriffin.py

+6 −2

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ class PyGriffin:
		self.mesh = mesh
		self.n_procs = n_procs

		def run(self, input=None, mesh=None, cwd=None, other_args=None):
		def run(self, input=None, mesh=None, cwd=None, other_args=None, color=True):
		"""
		Execute Griffin

		@@ -77,6 +77,10 @@ class PyGriffin:
		cv.check_type('Additional Griffin arguments', other_args, Iterable)
		cmd += other_args

		# request colorless output
		if not color:
		cmd += ['--color', 'off']

		p = subprocess.Popen(cmd, universal_newlines=True, cwd=str(cwd))

		return p.wait()
		@@ -117,7 +121,7 @@ class PyGriffin:
		raise ValueError(msg)

		# run isoxml executable on the current xs file
		cmd = [self.config.isoxml_exec, p_flag, str(self.xs)]
		cmd = [str(self.config.isoxml_exec), p_flag, str(self.xs)]
		p = subprocess.Popen(cmd, universal_newlines=True, cwd=str(cwd))

		p.wait()