Use new slice_data function from OpenMC (#172)

Author: paulromano

.github/workflows/ci.yml

@@ -24,23 +24,26 @@ jobs:
     env:
       DISPLAY: ':99.0'
     steps:
-      -
-        name: Apt dependencies
+      - name: Apt dependencies
         shell: bash
         run: |
           apt update
           apt install -y libglu1-mesa libglib2.0-0 libfontconfig1 libegl-dev libxkbcommon-x11-0 xvfb libdbus-1-3
           /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1920x1200x24 -ac +extension GLX
-      -
-        uses: actions/checkout@v4
-      -
-        name: Install
+
+      - uses: actions/checkout@v4
+
+      - name: Configure Git safe directory
+        shell: bash
+        run: git config --global --add safe.directory "${GITHUB_WORKSPACE}"
+
+      - name: Install
         shell: bash
         run: |
           cd ${GITHUB_WORKSPACE}
           pip install .[test]
-      -
-        name: Test
+
+      - name: Test
         shell: bash
         run: |
           cd ${GITHUB_WORKSPACE}

openmc_plotter/main_window.py

@@ -702,7 +702,7 @@ def redo(self):
     def restoreDefault(self):
         if self.model.currentView != self.model.defaultView:
             self.model.storeCurrent()
-            self.model.activeView.adopt_plotbase(self.model.defaultView)
+            self.model.activeView.adopt_view_params(self.model.defaultView)
             self.geometryPanel.update()
             self.colorDialog.updateDialogValues()
             self.requestPlotUpdate()
@@ -1242,7 +1242,7 @@ def requestPlotUpdate(self, view=None):
             view_params = self.model.view_params_payload(view_snapshot)
             self.plot_manager.set_latest_view_params(view_params)
             self.plot_manager.clear_pending()
-            self.model.makePlot(view_snapshot, self.model.ids_map, self.model.properties)
+            self.model.makePlot(view_snapshot, self.model.geom_data, self.model.property_data)
             self.resetModels()
             self.showCurrentView()
             if not self.plot_manager.is_busy:
@@ -1262,10 +1262,10 @@ def _on_plot_started(self):
     def _on_plot_queued(self):
         self.plotIm.showUpdatingOverlay("Generating Plot... (update queued)")
 
-    def _on_plot_finished(self, view_snapshot, view_params, ids_map, properties):
+    def _on_plot_finished(self, view_snapshot, view_params, geom_data, property_data):
         if view_params != self.plot_manager.latest_view_params:
             return
-        self.model.makePlot(view_snapshot, ids_map, properties)
+        self.model.makePlot(view_snapshot, geom_data, property_data)
         self.resetModels()
         self.showCurrentView()
 

openmc_plotter/plotgui.py

@@ -310,8 +310,8 @@ def getIDinfo(self, event):
            and 0 <= xPos and xPos < self.model.currentView.h_res:
             id = self.model.ids[yPos, xPos]
             instance = self.model.instances[yPos, xPos]
-            temp = "{:g}".format(self.model.properties[yPos, xPos, 0])
-            density = "{:g}".format(self.model.properties[yPos, xPos, 1])
+            temp = "{:g}".format(self.model.property_data[yPos, xPos, 0])
+            density = "{:g}".format(self.model.property_data[yPos, xPos, 1])
         else:
             id = _NOT_FOUND
             instance = _NOT_FOUND
@@ -635,7 +635,7 @@ def updatePixmap(self):
             norm = SymLogNorm(
                 1E-10) if cv.color_scale_log[cv.colorby] else None
 
-            data = self.model.properties[:, :, idx]
+            data = self.model.property_data[:, :, idx]
             self.image = self.figure.subplots().imshow(data,
                                                        cmap=cmap,
                                                        norm=norm,