Merge pull request #222 from JuliaGeodynamics/pa-melting

fix `compute_meltfraction`
JuliaGeodynamics · Oct 12, 2024 · ba13daf · ba13daf
2 parents cd97cfc + 33b9368
commit ba13daf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Energy/Shearheating.jl b/src/Energy/Shearheating.jl
@@ -172,7 +172,7 @@ end
 
 function compute_shearheating(s::AbstractMaterialParamsStruct, args::Vararg{Any,N}) where N
     if isempty(s.ShearHeat)
-        return 0.0  # return zero if not specified
+        return 0e0  # return zero if not specified
     else
         return compute_shearheating(s.ShearHeat[1], args...)
     end

diff --git a/src/MeltFraction/MeltingParameterization.jl b/src/MeltFraction/MeltingParameterization.jl
@@ -747,15 +747,15 @@ end
 # Computational routines needed for computations with the MaterialParams structure
 function compute_meltfraction(s::AbstractMaterialParamsStruct, args)
     if isempty(s.Melting) #in case there is a phase with no melting parametrization
-        return zero(typeof(args).types[1])
+        return 0e0 # return zero if not specified
     else
         return compute_meltfraction(s.Melting[1], args)
     end
 end
 
 function compute_dϕdT(s::AbstractMaterialParamsStruct, args)
     if isempty(s.Melting) #in case there is a phase with no melting parametrization
-        return zero(typeof(args).types[1])
+        return 0e0 # return zero if not specified
     else
         return compute_dϕdT(s.Melting[1], args)
     end