0708

msgpi/dakota_interface.py

@@ -9,8 +9,8 @@
 import dakota.interfacing as di
 
 def process(fn_json_args, logger=None):
-    if logger is None:
-        logger = mlog.initLogger(__name__)
+    # if logger is None:
+    #     logger = mlog.initLogger(__name__)
     # if timer is None:
     #     timer = mtime.Timer(logger=logger.info)
 
@@ -21,11 +21,12 @@ def process(fn_json_args, logger=None):
     with open(fn_json_args, 'r') as fo:
         interface_args = json.load(fo)
 
-    # logging.basicConfig(
-    #     filename='app.log', filemode='w',
-    #     format='%(asctime)s - %(message)s', datefmt='%d-%b-%y %H:%M:%S',
-    #     level=20
-    # )
+    # Set logger
+    log_level = 'INFO'
+    if 'log_level' in interface_args.keys():
+        if interface_args['log_level'] == 'debug':
+            log_level = 'DEBUG'
+    logger = mlog.initLogger(__name__, cout_level=log_level)
 
     # Load data processing module
     if 'data_process_functions_file' in interface_args.keys():
@@ -73,6 +74,9 @@ def process(fn_json_args, logger=None):
             ppcmd = interface_args['prevabs_cmd_linux']
 
         solver = interface_args['solver']
+        integrated = False
+        if 'integrated' in interface_args.keys():
+            integrated = interface_args['integrated']
         timeout = 30
         if 'timeout' in interface_args.keys():
             timeout = interface_args['timeout']
@@ -85,7 +89,7 @@ def process(fn_json_args, logger=None):
 
         # timer.start()
         bp = sga.solve(
-            fn_main, analysis, ppcmd, solver,
+            fn_main, analysis, ppcmd, solver, integrated,
             timeout=timeout, scrnout=scrnout, logger=logger
         )
         # timer.stop()