Merge branch 'main' into paellig-patch-2

PTsolvers · Sep 10, 2024 · 91771ee · 91771ee
2 parents db8bd33 + caf9e12
commit 91771ee
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/SpellCheck.yml b/.github/workflows/SpellCheck.yml
@@ -10,4 +10,4 @@ jobs:
       - name: Checkout Actions Repository
         uses: actions/checkout@v4
       - name: Check spelling
-        uses: crate-ci/typos@v1.23.6
+        uses: crate-ci/typos@v1.24.3
diff --git a/Project.toml b/Project.toml
@@ -36,7 +36,7 @@ CellArrays = "0.2"
 GeoParams = "0.5, 0.6"
 HDF5 = "0.17.1"
 ImplicitGlobalGrid = "0.15.0"
-JLD2 = "0.4"
+JLD2 = "0.4, 0.5"
 MPI = "0.20"
 MuladdMacro = "0.2"
 ParallelStencil = "0.12, 0.13"

diff --git a/src/rheology/GeoParams.jl b/src/rheology/GeoParams.jl
@@ -25,6 +25,7 @@ end
 @inline get_α(p::MaterialParams) = get_α(p.Density[1])
 @inline get_α(p::MaterialParams, args::NamedTuple) = get_α(p.Density[1], args)
 @inline get_α(p::Union{T_Density,PT_Density}) = GeoParams.get_α(p)
-@inline get_α(rho::MeltDependent_Density, args) = get_α(rho; args...)
+@inline get_α(p::Union{T_Density,PT_Density}, ::Any) = GeoParams.get_α(p)
+@inline get_α(rho::MeltDependent_Density, ::Any) = get_α(rho)
 @inline get_α(rho::ConstantDensity, args) = 0
 @inline get_α(rho::ConstantDensity) = 0
diff --git a/test/Project.toml b/test/Project.toml
@@ -27,6 +27,7 @@ GeoParams = "0.5, 0.6"
 JustPIC = "0.3.4, 0.3.5, 0.3.6, 0.4"
 MPI = "0.20"
 ParallelStencil = "0.11, 0.12, 0.13"
+SpecialFunctions = "2"
 StaticArrays = "1"
 Statistics = "1"
 Suppressor = "0.2"