Dev into 2.16.x (#708)

* Fix cohesion bug by adding epsilon1 and epsilon2 (#707) * Update conda-build-test.yml mac-os from build runner. Its not available and that's causing errors. --------- Co-authored-by: tiannh7 <[email protected]>
underworldcode · Feb 28, 2025 · f41a1be · f41a1be
1 parent d997c73
commit f41a1be
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/conda-build-test.yml b/.github/workflows/conda-build-test.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
   test:
-    runs-on: [ubuntu-latest, macos-13] #, macos-latest]
+    runs-on: [ubuntu-latest] #, macos-latest]
 
     steps:
       - name: Checkout repository

diff --git a/src/underworld/UWGeodynamics/_rheology.py b/src/underworld/UWGeodynamics/_rheology.py
@@ -304,7 +304,9 @@ def _cohesionFn(self):
             cohesion = self.cohesionWeakeningFn(
                 self.plasticStrain,
                 Cohesion=nd(self.cohesion),
-                CohesionSw=nd(self.cohesionAfterSoftening))
+                CohesionSw=nd(self.cohesionAfterSoftening),
+                epsilon1=self.epsilon1,
+                epsilon2=self.epsilon2)
         else:
             cohesion = fn.misc.constant(self.cohesion)
         return cohesion
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ on: @@
     jobs:
       test:
-        runs-on: [ubuntu-latest, macos-13] #, macos-latest]
+        runs-on: [ubuntu-latest] #, macos-latest]
         steps:
           - name: Checkout repository
@@ Expand Down @@