GEOPY-1265

.github/workflows/pytest-unix-os.yaml

@@ -40,11 +40,11 @@ jobs:
       CONDA_LOCK_ENV_FILE: environments/conda-py-${{ matrix.python_ver }}-${{ startsWith(matrix.os, 'macos') && 'osx' || 'linux' }}-64-dev.lock.yml
       PIP_EXTRA_INDEX_URL: https://test.pypi.org/simple/
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           lfs: true
       - name: Setup conda env
-        uses: mamba-org/provision-with-micromamba@main
+        uses: mamba-org/setup-micromamba@v1
         with:
           environment-file: ${{ env.CONDA_LOCK_ENV_FILE }}
           environment-name: test_env

.github/workflows/pytest-windows.yaml

@@ -39,14 +39,15 @@ jobs:
       CONDA_LOCK_ENV_FILE: environments/conda-py-${{ matrix.python_ver }}-win-64-dev.lock.yml
       PIP_EXTRA_INDEX_URL: https://test.pypi.org/simple/
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           lfs: true
       - name: Setup conda env
-        uses: mamba-org/provision-with-micromamba@main
+        uses: mamba-org/setup-micromamba@v1
         with:
           environment-file: ${{ env.CONDA_LOCK_ENV_FILE }}
           environment-name: test_env
+          init-shell: powershell
           cache-downloads: true
       - name: pytest
         run: |

.github/workflows/static-analysis.yml

@@ -26,18 +26,18 @@ env:
 jobs:
   pylint:
     name: pylint
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     defaults:
       run:
         shell: bash -l {0}
     env:
       PYTHONUTF8: 1
-      CONDA_LOCK_ENV_FILE: environments/conda-py-3.9-win-64-dev.lock.yml
+      CONDA_LOCK_ENV_FILE: environments/conda-py-3.9-linux-64-dev.lock.yml
       PIP_EXTRA_INDEX_URL: https://test.pypi.org/simple/
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup conda env
-        uses: mamba-org/provision-with-micromamba@main
+        uses: mamba-org/setup-micromamba@v1
         with:
           environment-file: ${{ env.CONDA_LOCK_ENV_FILE }}
           environment-name: linter_env

geoapps/inversion/components/models.py

@@ -114,71 +114,69 @@ def active_cells(self, active_cells):
         self._active_cells = active_cells
 
     @property
-    def starting(self):
-        mstart = self._starting.model
+    def starting(self) -> np.ndarray | None:
+        if self._starting.model is None:
+            return None
+
+        mstart = self._starting.model.copy()
 
         if mstart is not None and self.is_sigma:
-            mstart = mstart.copy()
             mstart = np.log(mstart)
 
         return mstart
 
     @property
-    def reference(self):
+    def reference(self) -> np.ndarray | None:
         mref = self._reference.model
 
         if self.driver.params.forward_only:
             return mref
 
-        if mref is None:
+        if mref is None or (self.is_sigma and all(mref == 0)):
             mref = self.starting
             self.driver.params.alpha_s = 0.0
-        else:
-            mref = mref.copy()
-            if self.is_sigma & (all(mref == 0)):
-                mref = self.starting
-                self.driver.params.alpha_s = 0.0
-            else:
-                mref = np.log(mref) if self.is_sigma else mref
-        return mref
 
-    @property
-    def lower_bound(self):
-        lbound = self._lower_bound.model
+        ref_model = mref.copy()
+        ref_model = np.log(ref_model) if self.is_sigma else ref_model
+
+        return ref_model
 
-        if lbound is None:
+    @property
+    def lower_bound(self) -> np.ndarray | None:
+        if self._lower_bound.model is None:
             return -np.inf
 
-        lbound = lbound.copy()
+        lbound = self._lower_bound.model.copy()
 
         if self.is_sigma:
             is_finite = np.isfinite(lbound)
             lbound[is_finite] = np.log(lbound[is_finite])
         return lbound
 
     @property
-    def upper_bound(self):
-        ubound = self._upper_bound.model
-
-        if ubound is None:
+    def upper_bound(self) -> np.ndarray | None:
+        if self._upper_bound.model is None:
             return np.inf
 
-        ubound = ubound.copy()
+        ubound = self._upper_bound.model.copy()
+
         if self.is_sigma:
             is_finite = np.isfinite(ubound)
             ubound[is_finite] = np.log(ubound[is_finite])
 
         return ubound
 
     @property
-    def conductivity(self):
-        mstart = self._conductivity.model
+    def conductivity(self) -> np.ndarray | None:
+        if self._conductivity.model is None:
+            return None
 
-        if mstart is not None and self.is_sigma:
-            mstart = mstart.copy()
-            mstart = np.log(mstart)
+        cond_model = self._conductivity.model.copy()
 
-        return mstart
+        if cond_model is not None and self.is_sigma:
+            cond_model = np.log(cond_model)
+
+        return cond_model
 
     def _initialize(self, driver):
         self.driver = driver

geoapps/inversion/joint/joint_surveys/driver.py

@@ -47,6 +47,9 @@ def validate_create_models(self):
                 norm = np.array(np.sum(projection, axis=1)).flatten()
                 model = (projection * model_local_values) / (norm + 1e-8)
 
+                if self.drivers[0].models.is_sigma:
+                    model = np.exp(model)
+
                 setattr(
                     getattr(self.models, f"_{model_type}"),
                     "model",

geoapps/octree_creation/application.py

@@ -23,13 +23,23 @@
 
 from geoapps.base.application import BaseApplication
 from geoapps.base.selection import ObjectDataSelection
+from geoapps.octree_creation.constants import app_initializer
+from geoapps.octree_creation.driver import OctreeDriver
+from geoapps.octree_creation.params import OctreeParams
 from geoapps.utils import warn_module_not_found
 
-from . import OctreeParams, app_initializer
-from .driver import OctreeDriver
-
 with warn_module_not_found():
-    from ipywidgets import Dropdown, FloatText, Label, Layout, Text, VBox, Widget
+    from ipywidgets import (
+        Checkbox,
+        Dropdown,
+        FloatText,
+        IntText,
+        Label,
+        Layout,
+        Text,
+        VBox,
+        Widget,
+    )
     from ipywidgets.widgets.widget_selection import TraitError
 
 
@@ -46,6 +56,8 @@ class OctreeMesh(ObjectDataSelection):
     _depth_core = None
     _horizontal_padding = None
     _vertical_padding = None
+    _diagonal_balance = None
+    _minimum_level = None
 
     def __init__(self, ui_json=None, **kwargs):
         app_initializer.update(kwargs)
@@ -79,6 +91,9 @@ def __init__(self, ui_json=None, **kwargs):
                         Label("Padding distance"),
                         self.horizontal_padding,
                         self.vertical_padding,
+                        Label("Basic"),
+                        self.diagonal_balance,
+                        self.minimum_level,
                     ],
                     layout=Layout(border="solid"),
                 ),
@@ -180,6 +195,28 @@ def vertical_padding(self) -> FloatText:
             )
         return self._vertical_padding
 
+    @property
+    def diagonal_balance(self) -> Checkbox:
+        """
+        Widget controlling the diagonal balance.
+        """
+        if getattr(self, "_diagonal_balance", None) is None:
+            self._diagonal_balance = Checkbox(
+                description="UBC compatible",
+            )
+        return self._diagonal_balance
+
+    @property
+    def minimum_level(self) -> IntText:
+        """
+        Widget controlling the minimum refinement level.
+        """
+        if getattr(self, "_minimum_level", None) is None:
+            self._minimum_level = IntText(
+                description="Minimum refinement level",
+            )
+        return self._minimum_level
+
     @property
     def workspace(self):
         """

geoapps/octree_creation/constants.py

@@ -99,6 +99,12 @@
             "main": True,
             "value": 500.0,
         },
+        "diagonal_balance": {
+            "group": "Basic",
+            "label": "UBC Compatible",
+            "main": True,
+            "value": True,
+        },
         "minimum_level": {
             "enabled": True,
             "group": "Basic",