Merge pull request #392 from JustinBonus/master

Celeris updates for Windows and easier random variables

Author: fmckenna

modules/createEVENT/Celeris/Celeris.py

@@ -223,6 +223,9 @@ def writeEVENT(forces, eventFilePath='EVENT.json', floorsCount=1):  # noqa: N802
         addFloorForceToEvent(
             patternsArray, timeSeriesArray, floorForces, 'X', it + 1
         )
+        addFloorForceToEvent(
+            patternsArray, timeSeriesArray, floorForces, 'Y', it + 1
+        )
 
     # subtype = "StochasticWindModel-KwonKareem2006"
     eventClassification = 'Hydro'  # noqa: N806
@@ -239,8 +242,8 @@ def writeEVENT(forces, eventFilePath='EVENT.json', floorsCount=1):  # noqa: N802
         'timeSeries': timeSeriesArray,
         'pressure': pressure,
         'numSteps': len(forces[0].X),
-        'dT': 0.01,
-        'dt': 0.01,
+        'dT': 1.0,
+        'dt': 1.0,
         'units': {'force': 'Newton', 'length': 'Meter', 'time': 'Sec'},
     }
 
@@ -351,24 +354,24 @@ def main():
         floorsCount = GetFloorsCount(arguments.filenameAIM)  # noqa: N816
         filenameEVENT = arguments.filenameEVENT  # noqa: N816
 
-        result = subprocess.run(  # noqa: S603
-            [  # noqa: S607
-                'python3',
-                scriptName,
-                '-d',
-                caseDirectory,
-                '-f',
-                configFilename,
-                '-b',
-                bathymetryFilename,
-                '-w',
-                waveFilename,
-                # f'{os.path.realpath(os.path.dirname(__file__))}'
-                # + '/taichi_script.py',
-            ],
-            stdout=subprocess.PIPE,
-            check=False,
-        )
+        # result = subprocess.run(  # noqa: S603
+        #     [  # noqa: S607
+        #         sys.executable,
+        #         scriptName,
+        #         '-d',
+        #         caseDirectory,
+        #         '-f',
+        #         configFilename,
+        #         '-b',
+        #         bathymetryFilename,
+        #         '-w',
+        #         waveFilename,
+        #         # f'{os.path.realpath(os.path.dirname(__file__))}'
+        #         # + '/taichi_script.py',
+        #     ],
+        #     stdout=subprocess.PIPE,
+        #     check=False,
+        # )
 
         forces = []
         for i in range(floorsCount):
@@ -379,15 +382,25 @@ def main():
 
     else:
         print('No RVs requested')  # noqa: T201
+        
+        # filenameAIM = arguments.filenameAIM  # noqa: N816
+        # Read in Events[0]["config"]
+        configObj = evt['Events'][0]['config']  # noqa: N806
+        # Write configObj to config_rv.json
+        configRVFilename = 'config_rv.json'  # noqa: N816
+        with open(caseDirectory + '/' + configRVFilename, 'w', encoding='utf-8') as file:
+            json.dump(configObj, file)
+        file.close
+        
         filenameEVENT = arguments.filenameEVENT  # noqa: N816
         result = subprocess.run(  # noqa: S603
             [  # noqa: S607
-                'python3',
+                sys.executable,
                 scriptName,
                 '-d',
                 caseDirectory,
                 '-f',
-                configFilename,
+                configRVFilename,
                 '-b',
                 bathymetryFilename,
                 '-w',

modules/createEVENT/Celeris/celeris/runner.py

@@ -490,7 +490,12 @@ def Evolve_Display(  # noqa: C901, N802, D102
         use_ggui = None
         window = None
         canvas = None
+        import platform
+        os_name = platform.system()
         try:
+            if 'Windows' in os_name:
+                # Throw exception to force legacy GUI
+                raise Exception('Windows detected, reverting GGUI to legacy GUI for reliability.')
             window = ti.ui.Window('CelerisAi', (self.solver.nx, self.solver.ny))  # noqa: F405
             canvas = window.get_canvas()
             use_ggui = True

modules/createEVENT/TaichiEvent/TaichiEvent.py

@@ -291,7 +291,7 @@ def main():  # noqa: D103
 
         result = subprocess.run(  # noqa: S603
             [  # noqa: S607
-                'ti',
+                sys.executable,
                 scriptName,
                 # f'{os.path.realpath(os.path.dirname(__file__))}'  # noqa: ISC003, PTH120
                 # + '/taichi_script.py',
@@ -312,7 +312,7 @@ def main():  # noqa: D103
         filenameEVENT = arguments.filenameEVENT  # noqa: N816
         result = subprocess.run(  # noqa: S603
             [  # noqa: S607
-                'ti',
+                sys.executable,
                 scriptName,
                 # f'{os.path.realpath(os.path.dirname(__file__))}'  # noqa: ISC003, PTH120
                 # + '/taichi_script.py',

modules/performUQ/common/createStandardUQ_Input.cpp

@@ -487,4 +487,4 @@ int main(int argc, char **argv) {
 
   size_t flags = 0;
   return json_dump_file(rootINPUT, outputFile, flags);
-}
+}