Update Celeris and TaichiEvent

Author: JustinBonus

modules/createEVENT/Celeris/Celeris.py

@@ -399,23 +399,24 @@ def main():
     for event in evt['Events']:
         # Redesign the input structure in backend CelerisAi later.
         # For now assume waveFile, bathymetryFile, configFile, etc. are in the same directory.
-        caseDirectory = event['configFilePath']  # noqa: N816
+        # caseDirectory = event['configFilePath']  # noqa: N816
+        caseDirectory = '.'
         configDirectory = event['configFilePath']  # noqa: N816
         configFilename = event['configFile']  # noqa: N816
         bathymetryDirectory = event['bathymetryFilePath']  # noqa: N816
         bathymetryFilename = event['bathymetryFile']  # noqa: N816
         waveDirectory = event['waveFilePath']  # noqa: N816
         waveFilename = event['waveFile']  # noqa: N816
 
-        configFilename = os.path.join(  # noqa: PTH118
-            configDirectory, configFilename
-        )  # noqa: N816, PTH118
-        bathymetryFilename = os.path.join(  # noqa: PTH118
-            bathymetryDirectory, bathymetryFilename
-        )  # noqa: N816, PTH118
-        waveFilename = os.path.join( # noqa: PTH118
-            waveDirectory, waveFilename
-        )  # noqa: N816, PTH118
+        # configFilename = os.path.join(  # noqa: PTH118
+        #     configDirectory, configFilename
+        # )  # noqa: N816, PTH118
+        # bathymetryFilename = os.path.join(  # noqa: PTH118
+        #     bathymetryDirectory, bathymetryFilename
+        # )  # noqa: N816, PTH118
+        # waveFilename = os.path.join( # noqa: PTH118
+        #     waveDirectory, waveFilename
+        # )  # noqa: N816, PTH118
 
         # Check if the config file exists
         if not os.path.exists(configFilename):  # noqa: PTH110

modules/createEVENT/Celeris/celeris/runner.py

@@ -532,15 +532,20 @@ def Evolve_1D_Display(self):
         while window.running:
             self.eta_paint()
             if use_ggui:
-                canvas.circles(self.eta1D,radius=0.005,color = (0., 150/255., 255./255))
-                canvas.lines(self.bottom1D,width=0.01,indices=self.indexbottom1D,color = (128/255., 0.0, 0.))
+                try:
+                    canvas.circles(self.eta1D,radius=0.005,color = (0., 150/255., 255./255))
+                    canvas.lines(self.bottom1D,width=0.01,indices=self.indexbottom1D,color = (128/255., 0.0, 0.))
+                except Exception as e:
+                    print(f"Error in GGUI circles / lines rendering: {e}")
             else:
-                for ii in range(self.solver.nx):
-                    window.circle(pos=[self.eta1D[ii][0], self.eta1D[ii][1]], radius=1, color=0x00FFFF)
-                    if ii >= self.solver.nx - 1:
-                        continue 
-                    window.line(self.bottom1D[ii], self.bottom1D[ii+1], radius=1, color = 0x39FF14)
-
+                try:
+                    for ii in range(self.solver.nx):
+                        window.circle(pos=[self.eta1D[ii][0], self.eta1D[ii][1]], radius=1, color=0x00FFFF)
+                        if ii >= self.solver.nx - 1:
+                            continue 
+                        window.line(self.bottom1D[ii], self.bottom1D[ii+1], radius=1, color = 0x39FF14)
+                except Exception as e:
+                    print(f"Error in legacy GUI circle / line rendering: {e}")
             self.Evolve_Steps(i)
 
             if i==1 or (i%100)==0:
@@ -685,10 +690,12 @@ def Evolve_Display(  # noqa: C901, N802, D102
                 )  # using the Taichi tensors to render the image
             self.Evolve_Steps(i)
 
-            window.line(self.solver.force_sensor_begin_scaled, self.solver.force_sensor_end_scaled, radius=1, color=0x39FF14)
-            for k in range(self.solver.num_wave_gauges):
-                window.circle(pos=[self.solver.wave_gauge_scaled[int(k),int(0)], self.solver.wave_gauge_scaled[int(k),int(1)]], radius=2, color=0xFF5733)
-            
+            try:
+                window.line(self.solver.force_sensor_begin_scaled, self.solver.force_sensor_end_scaled, radius=1, color=0x39FF14)
+                for k in range(self.solver.num_wave_gauges):
+                    window.circle(pos=[self.solver.wave_gauge_scaled[int(k),int(0)], self.solver.wave_gauge_scaled[int(k),int(1)]], radius=2, color=0xFF5733)
+            except Exception as e:  # noqa: BLE001
+                print(f'Error in rendering sensors or wave gauges using line / circle: {e}')  # noqa:
 
             if i == self.buffer_step:
                 start_time = (

modules/createEVENT/TaichiEvent/TaichiEvent.py

@@ -58,7 +58,7 @@ def __init__(self, recorderID=-1):  # noqa: N803
                             continue
                         # Assume there is no header in the file
                         # Assume recorder IDs are sequential, starting from 1
-                        if (j + 1) == recorderID:
+                        if (j) == recorderID:
                             # Strip away leading / trailing white-space,
                             # Delimit by regex to capture " ", \s, "  ", tabs, etc.
                             # Each value should be a number, rep. the force on recorder j at a time-step i