fixes

PTsolvers · May 3, 2024 · bc20c75 · bc20c75
1 parent ae5b77f
commit bc20c75
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/stokes/Stokes2D.jl b/src/stokes/Stokes2D.jl
@@ -322,7 +322,7 @@ function _solve!(
 
     # compute buoyancy forces and viscosity
     compute_ρg!(ρg[end], phase_ratios, rheology, args)
-    compute_viscosity!(stokes, phase_ratios, args, rheology, cutoff_visc)
+    compute_viscosity!(stokes, phase_ratios, args, rheology, viscosity_cutoff)
 
     while iter < 2 || (err > ϵ && iter ≤ iterMax)
         wtime0 += @elapsed begin
@@ -508,7 +508,7 @@ function _solve!(
 
     # compute buoyancy forces and viscosity
     compute_ρg!(ρg[end], phase_ratios, rheology, args)
-    compute_viscosity!(stokes, phase_ratios, args, rheology, cutoff_visc)
+    compute_viscosity!(stokes, phase_ratios, args, rheology, viscosity_cutoff)
 
     while iter ≤ iterMax
         iterMin < iter && err < ϵ && break

diff --git a/src/stokes/Stokes3D.jl b/src/stokes/Stokes3D.jl
@@ -171,6 +171,7 @@ function _solve!(
     nout=500,
     b_width=(4, 4, 4),
     viscosity_relaxation=1e-2,
+    viscosity_cutoff = (-Inf, Inf),
     verbose=true,
     kwargs...,
 ) where {T}
@@ -204,7 +205,7 @@ function _solve!(
 
     # compute buoyancy forces and viscosity
     compute_ρg!(ρg[end], phase_ratios, rheology, args)
-    compute_viscosity!(stokes, phase_ratios, args, rheology, cutoff_visc)
+    compute_viscosity!(stokes, phase_ratios, args, rheology, viscosity_cutoff)
 
     # solver loop
     wtime0 = 0.0
@@ -232,7 +233,7 @@ function _solve!(
             # Update buoyancy
             update_ρg!(ρg[3], rheology, args)
 
-            compute_viscosity!(
+            update_viscosity!(
                 stokes,
                 phase_ratios,
                 args,
@@ -388,7 +389,7 @@ function _solve!(
 
     # compute buoyancy forces and viscosity
     compute_ρg!(ρg[end], phase_ratios, rheology, args)
-    compute_viscosity!(stokes, phase_ratios, args, rheology, cutoff_visc)
+    compute_viscosity!(stokes, phase_ratios, args, rheology, viscosity_cutoff)
 
     while iter < 2 || (err > ϵ && iter ≤ iterMax)
         wtime0 += @elapsed begin
@@ -419,7 +420,7 @@ function _solve!(
             update_ρg!(ρg[end], phase_ratios, rheology, args)
 
             # Update viscosity
-            compute_viscosity!(
+            update_viscosity!(
                 stokes,
                 phase_ratios,
                 args,