Merge pull request #1271 from CCSI-Toolset/database_programdata-2025.09.03

Database programdata 2025.09.03

Author: boverhof

docs/source/chapt_sinter/tutorial/gproms.rst

@@ -283,7 +283,7 @@ configuration can be done.
    Save Location** at the top of the window. This is where the Sinter
    configuration file is saved. The system suggests a file location and
    name. The user should confirm this is the intended location of the
-   files to not accidently overwrite other files. Enter the remaining
+   files to not accidentally overwrite other files. Enter the remaining
    fields to provide the meta-data to describe the simulation that was
    just opened and then click **Next**.
 

foqus_lib/core.py

@@ -204,7 +204,12 @@ class TurbineLiteDependencyTracker(WindowsPackageDependencyTracker):
 
     package_name = "TurbineLite"
     install_path = "C:/Program Files/Turbine/Lite"
+    database_path = "C:/ProgramData/Turbine/Data/TurbineCompactDatabase.sdf"
 
     @property
     def path(self):
         return self.install_path
+
+    @property
+    def database(self):
+        return self.database_path

foqus_lib/foqus.py

@@ -406,7 +406,6 @@ def main(args_to_parse=None):
             fs = generalSettings()  # foqus settings
             fs.load(logging=False)
             db = turbineLiteDB()
-            db.dbFile = os.path.join(fs.turbLiteHome, "Data/TurbineCompactDatabase.sdf")
             print("terminating consumer {0}".format(args.terminateConsumer))
             db.consumer_status(args.terminateConsumer, "terminate")
             sys.exit(0)
@@ -423,7 +422,6 @@ def main(args_to_parse=None):
             fs = generalSettings()  # foqus settings
             fs.load(logging=False)
             db = turbineLiteDB()
-            db.dbFile = os.path.join(fs.turbLiteHome, "Data/TurbineCompactDatabase.sdf")
             print(
                 "Adding application '{0}' to TurbineLite database".format(
                     args.addTurbineApp
@@ -626,10 +624,7 @@ def main(args_to_parse=None):
         signal.signal(signal.SIGINT, signal_handler)
         # Register consumer TurbineLite DB
         db = turbineLiteDB()
-        db.dbFile = os.path.join(
-            dat.foqusSettings.turbLiteHome, "Data/TurbineCompactDatabase.sdf"
-        )
-        _logger.info("TurbineLite Database:\n   {0}".format(db.dbFile))
+        _logger.info("TurbineLite Database:\n   {0}".format(db.database))
         # add 'foqus' app to TurbineLite DB if not already there
         db.add_new_application("foqus")
         # register the consumer in the database

foqus_lib/framework/sim/turbineConfiguration.py

@@ -66,6 +66,20 @@
         _log.exception("Problem importing turbineLiteDB")
 
 
+class sinter_AppError:
+    si_OKAY = 0
+    si_SIMULATION_ERROR = 1
+    si_SIMULATION_WARNING = 2
+    si_COULD_NOT_CONTACT = 3
+    si_UNKNOWN_FIELD = 4
+    si_INPUT_ERROR = 5
+    si_SIMULATION_NOT_RUN = 6
+    si_SIMULATION_STOPPED = 7  # //The user stopped the simulation
+    si_STOP_FAILED = 8  # //The user tried to stop the sim, but the stop timed out.  Terminate should probably be called.
+    si_NONCONVERGENCE_ERROR = 9  #        //The user tried to stop the sim, but the stop timed out.  Terminate should probably be called.
+    si_COM_EXCEPTION = 100
+
+
 class TurbineInterfaceEx(foqusException):
     """
     This is an exception class for FOQUS interaction with Turbine, it also tries
@@ -262,11 +276,7 @@ def notification(self, url):
 
     def getTurbineLiteDB(self):
         if self.tldb is None:
-            db = turbineLiteDB.turbineLiteDB()
-            db.dbFile = os.path.join(
-                self.dat.foqusSettings.turbLiteHome, "Data/TurbineCompactDatabase.sdf"
-            )
-            self.tldb = db
+            self.tldb = turbineLiteDB.turbineLiteDB()
         return self.tldb
 
     def closeTurbineLiteDB(self):
@@ -1072,11 +1082,13 @@ def monitorJob(
                 if (
                     not allowWarnings
                     and state == "success"
-                    and res.get("Status", 1) == 2
+                    and res.get("Status", sinter_AppError.si_OKAY)
+                    == sinter_AppError.si_SIMULATION_WARNING
                 ):
                     state = "error"
                 failure = state in failedStates
                 success = state in successStates
+
                 # Check for the run start time instead of the state just
                 # in case job started and completed between checks
                 if not setupStart and state == "setup":

foqus_lib/framework/sim/turbineLiteDB.py

@@ -59,17 +59,17 @@ class turbineLiteDB:
     def __init__(self, close_after=True):
         self.conn = None
         self.close_after = close_after
-        self.dbFile = os.path.join(
-            core.TurbineLiteDependencyTracker.load().path,
-            "/Data/TurbineCompactDatabase.sdf",
-        )
 
     def __del__(self):
         self.closeConnection()
 
+    @property
+    def database(self):
+        return core.TurbineLiteDependencyTracker.load().database
+
     def connectionString(self):
         prov = "Provider=Microsoft.SQLSERVER.CE.OLEDB.4.0;"
-        data = "Data Source={0};".format(self.dbFile)
+        data = "Data Source={0};".format(self.database)
         return " ".join([prov, data])
 
     def getConnection(self, rc=0):