diff --git a/msgpi/analysis.py b/msgpi/analysis.py index d3387c1..72c49c2 100644 --- a/msgpi/analysis.py +++ b/msgpi/analysis.py @@ -9,7 +9,6 @@ import msgpi.io.iovabs as miovabs import msgpi.utils as utils - def solve(sg_xml, analysis, ppcmd, solver, timeout=30, scrnout=True, logger=None, timer=None): """Solve @@ -51,12 +50,13 @@ def solve(sg_xml, analysis, ppcmd, solver, timeout=30, scrnout=True, logger=None timer.stop() # Solve - logger.info('running analysis...') - if timer: - timer.start() - run(sg_in, analysis, solver, smdim, scrnout, logger=logger) - if timer: - timer.stop() + if solver != 'integrated': + logger.info('running analysis...') + if timer: + timer.start() + run(sg_in, analysis, solver, smdim, scrnout, logger=logger) + if timer: + timer.stop() # Parse results # print(' - reading results...') @@ -64,7 +64,7 @@ def solve(sg_xml, analysis, ppcmd, solver, timeout=30, scrnout=True, logger=None if timer: timer.start() if analysis == 'h': - if solver == 'vabs': + if solver == 'vabs' or solver == 'integrated': bp = miovabs.readVABSOutHomo(sg_in + '.K') if timer: timer.stop() diff --git a/msgpi/dakota_interface.py b/msgpi/dakota_interface.py index 38011fc..4d185b8 100644 --- a/msgpi/dakota_interface.py +++ b/msgpi/dakota_interface.py @@ -18,8 +18,6 @@ import msgpi.io.iovabs as miovabs import dakota.interfacing as di - - def process(fn_json_args, logger=None): if logger is None: logger = mlog.initLogger(__name__) diff --git a/msgpi/presg.py b/msgpi/presg.py index 3c92554..9278b48 100644 --- a/msgpi/presg.py +++ b/msgpi/presg.py @@ -334,6 +334,9 @@ def preSG( cmd.append('-vabs') elif 'swiftcomp' in solver: cmd.append('-sc') + elif 'integrated' in solver: + cmd.append('-e') + cmd.append('-integrated') cmd.append('-' + analysis) # cmd = ' '.join(cmd)