allow integrated vabs

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,20 +50,21 @@ 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...')
     logger.info('reading results...')
     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()

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__)

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)