diff --git a/msgpi/analysis.py b/msgpi/analysis.py index 51689df..d3387c1 100644 --- a/msgpi/analysis.py +++ b/msgpi/analysis.py @@ -79,6 +79,12 @@ def solve(sg_xml, analysis, ppcmd, solver, timeout=30, scrnout=True, logger=None timer.stop() pass elif 'f' in analysis: + if analysis == 'fi': + fis, srs = miosc.readSCOutFailure(sg_in, analysis) + if timer: + timer.stop() + return fis, srs + results = miosc.readSCOutFailure(sg_in, analysis) if timer: timer.stop() diff --git a/msgpi/io/iosc.py b/msgpi/io/iosc.py index 93a67b4..99c7746 100644 --- a/msgpi/io/iosc.py +++ b/msgpi/io/iosc.py @@ -546,9 +546,14 @@ def readSCOutFailure(fn_swiftcomp_in, failure_analysis): results.append([int(line[0]), float(line[1]), float(line[2])]) elif failure_analysis == 'fi': # initial failure indices and strength ratios + fis = [] + srs = [] for line in lines: line = line.strip().split() - results.append([int(line[0]), float(line[1]), float(line[2])]) + # results.append([int(line[0]), float(line[1]), float(line[2])]) + fis.append(float(line[1])) + srs.append(float(line[2])) + return fis, srs return results