Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
albert-de-montserrat committed May 13, 2024
1 parent a8fad17 commit 91218d5
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/ConstitutiveRelationships.jl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ using Base: Float64
using Parameters, LaTeXStrings, Unitful, MuladdMacro
using ..Units
using GeoParams: AbstractMaterialParam, AbstractConstitutiveLaw, AbstractComposite
import GeoParams: param_info, fastpow, pow_check, nphase, ntuple_idx, @print, @pow, str2tuple, uint2str, ptr2string
import GeoParams: param_info, fastpow, pow_check, nphase, ntuple_idx, @print, @pow, ptr2string
import GeoParams: second_invariant, second_invariant_staggered, value_and_partial, @extractors, add_extractor_functions
using BibTeX
using ..MaterialParameters: MaterialParamsInfo
Expand Down
2 changes: 1 addition & 1 deletion src/GeoParams.jl
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ function param_info end
export AbstractMaterialParam, AbstractMaterialParamsStruct, AbstractPhaseDiagramsStruct

include("Utils.jl")
export value_and_partial, str2tuple
export value_and_partial

include("TensorAlgebra/TensorAlgebra.jl")
export second_invariant, second_invariant_staggered, rotate_elastic_stress
Expand Down
6 changes: 1 addition & 5 deletions src/MaterialParameters.jl
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ using Static

import Base.show, Base.convert
using GeoParams:
AbstractMaterialParam, AbstractMaterialParamsStruct, AbstractPhaseDiagramsStruct, AbstractComposite, str2tuple, ptr2string
AbstractMaterialParam, AbstractMaterialParamsStruct, AbstractPhaseDiagramsStruct, AbstractComposite, ptr2string

# Define an "empty" Material parameter structure
struct No_MaterialParam{_T} <: AbstractMaterialParam end
Expand Down Expand Up @@ -267,10 +267,6 @@ end
@inline nondimensionalize_phase(phase, ::Nothing) = phase
@inline nondimensionalize_phase(phase, CharDim) = error("CharDim should be of type GeoUnits")

@inline str2char(str::String) = str2char(str, static(length(str)))
@inline str2char(str, ::StaticInt{N}) where N = ntuple(i->str[i], Val(N))
@inline str2char(str, ::StaticInt{0}) = ()

# In case density is defined and gravity not, set gravity to default value
function set_gravity(Gravity::Nothing, Density::AbstractMaterialParam)
GravitationalAcceleration.ConstantGravity()
Expand Down
2 changes: 1 addition & 1 deletion src/Tables.jl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module Tables

using Unidecode
using GeoParams: AbstractMaterialParam, param_info, LinearViscous, PowerlawViscous, DislocationCreep, DiffusionCreep, CompositeRheology, Parallel, make_tuple, uint2str
using GeoParams: AbstractMaterialParam, param_info, LinearViscous, PowerlawViscous, DislocationCreep, DiffusionCreep, CompositeRheology, Parallel, make_tuple
using ..Units
using ..MaterialParameters: MaterialParamsInfo

Expand Down

0 comments on commit 91218d5

Please sign in to comment.