Skip to content

Commit 4951c4d

Browse files
refactor(materials): reformat and use Base.error in materialslibrary.jl
1 parent a9b2f0d commit 4951c4d

1 file changed

Lines changed: 47 additions & 47 deletions

File tree

src/materials/materialslibrary.jl

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ Stores a collection of predefined materials for cable modeling, indexed by mater
55
66
$(TYPEDFIELDS)
77
"""
8-
mutable struct MaterialsLibrary <: AbstractDict{String,Material}
9-
"Dictionary mapping material names to [`Material`](@ref) objects."
10-
data::Dict{String,Material} # Key: Material name, Value: Material object
8+
mutable struct MaterialsLibrary <: AbstractDict{String, Material}
9+
"Dictionary mapping material names to [`Material`](@ref) objects."
10+
data::Dict{String, Material} # Key: Material name, Value: Material object
1111
end
1212

1313
"""
@@ -35,15 +35,15 @@ library = $(FUNCTIONNAME)()
3535
- [`Material`](@ref)
3636
- [`_add_default_materials!`](@ref)
3737
"""
38-
function MaterialsLibrary(; add_defaults::Bool=true)::MaterialsLibrary
39-
library = MaterialsLibrary(Dict{String,Material}())
38+
function MaterialsLibrary(; add_defaults::Bool = true)::MaterialsLibrary
39+
library = MaterialsLibrary(Dict{String, Material}())
4040

41-
if add_defaults
42-
@info "Initializing default materials database..."
43-
_add_default_materials!(library)
44-
end
41+
if add_defaults
42+
@info "Initializing default materials database..."
43+
_add_default_materials!(library)
44+
end
4545

46-
return library
46+
return library
4747
end
4848

4949
"""
@@ -71,35 +71,35 @@ $(FUNCTIONNAME)(library)
7171
- [`add!`](@ref)
7272
"""
7373
function _add_default_materials!(library::MaterialsLibrary)
74-
add!(library, "air", Material(Inf, 1.0, 1.0, 20.0, 0.0))
75-
add!(library, "pec", Material(eps(), 1.0, 1.0, 20.0, 0.0))
76-
add!(
77-
library,
78-
"copper",
79-
Material(1.7241e-8, 1.0, 0.999994, 20.0, 0.00393),
80-
)
81-
add!(
82-
library,
83-
"aluminum",
84-
Material(2.8264e-8, 1.0, 1.000022, 20.0, 0.00429),
85-
)
86-
add!(library, "xlpe", Material(1.97e14, 2.5, 1.0, 20.0, 0.0))
87-
add!(library, "pe", Material(1.97e14, 2.3, 1.0, 20.0, 0.0))
88-
add!(
89-
library,
90-
"semicon1",
91-
Material(1000.0, 1000.0, 1.0, 20.0, 0.0),
92-
)
93-
add!(
94-
library,
95-
"semicon2",
96-
Material(500.0, 1000.0, 1.0, 20.0, 0.0),
97-
)
98-
add!(
99-
library,
100-
"polyacrylate",
101-
Material(5.3e3, 32.3, 1.0, 20.0, 0.0),
102-
)
74+
add!(library, "air", Material(Inf, 1.0, 1.0, 20.0, 0.0))
75+
add!(library, "pec", Material(eps(), 1.0, 1.0, 20.0, 0.0))
76+
add!(
77+
library,
78+
"copper",
79+
Material(1.7241e-8, 1.0, 0.999994, 20.0, 0.00393),
80+
)
81+
add!(
82+
library,
83+
"aluminum",
84+
Material(2.8264e-8, 1.0, 1.000022, 20.0, 0.00429),
85+
)
86+
add!(library, "xlpe", Material(1.97e14, 2.5, 1.0, 20.0, 0.0))
87+
add!(library, "pe", Material(1.97e14, 2.3, 1.0, 20.0, 0.0))
88+
add!(
89+
library,
90+
"semicon1",
91+
Material(1000.0, 1000.0, 1.0, 20.0, 0.0),
92+
)
93+
add!(
94+
library,
95+
"semicon2",
96+
Material(500.0, 1000.0, 1.0, 20.0, 0.0),
97+
)
98+
add!(
99+
library,
100+
"polyacrylate",
101+
Material(5.3e3, 32.3, 1.0, 20.0, 0.0),
102+
)
103103
end
104104

105105

@@ -131,14 +131,14 @@ $(FUNCTIONNAME)(library, "copper", material)
131131
```
132132
"""
133133
function add!(
134-
library::MaterialsLibrary,
135-
name::AbstractString,
136-
material::Material,
134+
library::MaterialsLibrary,
135+
name::AbstractString,
136+
material::Material,
137137
)
138-
if haskey(library, name)
139-
error("Material $name already exists in the library.")
140-
end
141-
library[String(name)] = material
142-
library
138+
if haskey(library, name)
139+
Base.error("Material $name already exists in the library.")
140+
end
141+
library[String(name)] = material
142+
library
143143
end
144144

0 commit comments

Comments
 (0)