Skip to content

Commit 472f10e

Browse files
Merge pull request #254 from OpenSEMBA/dev
Merge Dev into Master
2 parents 9ca2675 + 19f2841 commit 472f10e

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

src_main_pub/semba_fdtd.F90

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -994,7 +994,12 @@ subroutine initialize_MPI_process(filename, extension)
994994

995995
if (this%l%layoutnumber==0) then
996996
#ifdef CompilePrivateVersion
997-
NFDE_FILE => cargar_NFDE_FILE (filename)
997+
if (trim(adjustl(extension))=='.nfde') then
998+
NFDE_FILE => cargar_NFDE_FILE (filename)
999+
else
1000+
call carga_raw_info(rawFileInfo, filename, extension)
1001+
NFDE_FILE => rawFileInfo
1002+
endif
9981003
#else
9991004
call carga_raw_info(rawFileInfo, filename, extension)
10001005
NFDE_FILE => rawFileInfo

src_pyWrapper/pyWrapper.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,14 +321,18 @@ def run(self):
321321
json.dump(self._input, open(self._filename, 'w'))
322322

323323
os.chdir(self.getFolder())
324-
self.output = subprocess.run(self.run_command)
324+
self.output = subprocess.run(self.run_command, capture_output=True)
325325
self._hasRun = True
326326
assert self.hasFinishedSuccessfully()
327327

328328
def hasFinishedSuccessfully(self):
329329
if self._hasRun and (self.output.returncode == 0):
330330
return True
331331
else:
332+
if self.output.stdout:
333+
print(self.output.stdout.decode('utf-8'), end='')
334+
if self.output.stderr:
335+
print(self.output.stderr.decode('utf-8'), end='')
332336
return False
333337

334338
def __getitem__(self, key):

0 commit comments

Comments
 (0)