Add missing methods to get_Kb and get_G (#217)

* missing methods for get_Kb and get_G * revert change * more methods * fix test * and more methods * bump minor
JuliaGeodynamics · Sep 12, 2024 · b8f88d5 · b8f88d5 · albert-de-montserrat · Sep 12, 2024
1 parent 602e704
commit b8f88d5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "GeoParams"
 uuid = "e018b62d-d9de-4a26-8697-af89c310ae38"
 authors = ["Boris Kaus <kaus@uni-mainz.de>, Albert De Montserrat <albertdemontserratnavarro@erdw.ethz.ch>"]
-version = "0.6.2"
+version = "0.6.3"
 
 [deps]
 BibTeX = "7b0aa2c9-049f-5cec-894a-2b6b781bb25e"

diff --git a/src/GeoParams.jl b/src/GeoParams.jl
@@ -436,20 +436,23 @@ end
 include("aliases.jl")
 export ntuple_idx
 
-
 for modulus in (:G, :Kb)
     fun = Symbol("get_$(string(modulus))")
     @eval begin
         @inline $(fun)(a::ConstantElasticity) = a.$(modulus).val
         @inline $(fun)(c::CompositeRheology) = $(fun)(isviscoelastic(c), c)
         @inline $(fun)(::ElasticRheologyTrait, c::CompositeRheology) = mapreduce(x->$(fun)(x), +, c.elements)
-        @inline $(fun)(::AbstractCreepLaw) = 0
-        @inline $(fun)(::AbstractPlasticity) = 0
         @inline $(fun)(r::AbstractMaterialParamsStruct) = $(fun)(r.CompositeRheology[1])
         @inline $(fun)(a::NTuple{N, AbstractMaterialParamsStruct}, phase) where N = nphase($(fun), phase, a)
     end
 end
 
+@inline get_G(::NonElasticRheologyTrait, c::CompositeRheology) = 0
+@inline get_G(::Union{NonElasticRheologyTrait, AbstractCreepLaw, AbstractPlasticity, AbstractConstitutiveLaw}) = 0
+
+@inline get_Kb(::NonElasticRheologyTrait, c::CompositeRheology) = Inf
+@inline get_Kb(::Union{NonElasticRheologyTrait, AbstractCreepLaw, AbstractPlasticity, AbstractConstitutiveLaw}) = Inf
+
 export get_G, get_Kb
 
 const get_shearmodulus = get_G

diff --git a/test/test_Traits.jl b/test/test_Traits.jl
@@ -63,6 +63,11 @@ using Test, GeoParams
     @test isviscoelastic(r1[3]) isa ElasticRheologyTrait
     @test isviscoelastic(r1[4]) isa NonElasticRheologyTrait
 
+    # test get_G and get_Kb
+    r = CompositeRheology(v1, v2, v3)
+    @test GeoParams.get_G(isviscoelastic(r), r) == 0
+    @test GeoParams.get_Kb(isviscoelastic(r), r) == Inf
+
     ## linear rheology traits
     # test basic cases
     for r in (v1, v2, pl)
@@ -133,4 +138,5 @@ end
     @test isconstant(r1) isa NonConstantDensityTrait
     @test isconstant(r2) isa ConstantDensityTrait
     @test_throws ArgumentError isconstant("potato")
-end
+end
+