Skip to content

Commit 7afdf4b

Browse files
JTHesseJTHesse
committed
refac
1 parent d19db59 commit 7afdf4b

File tree

6 files changed

+19
-21
lines changed

6 files changed

+19
-21
lines changed

‎src/Models/Material/Material_Models/Correspondence/Correspondence_UMAT.jl‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ function init_model(nodes::AbstractVector{Int64},
5656
return
5757
end
5858
directory = Data_Manager.get_directory()
59-
material_parameter["File"] = joinpath(joinpath(pwd(), directory),
60-
material_parameter["File"])
59+
material_parameter["File"] = joinpath(pwd(), directory, material_parameter["File"])
6160
global umat_file_path = material_parameter["File"]
6261
if !isfile(material_parameter["File"])
6362
@error "File $(material_parameter["File"]) does not exist, please check name and directory."

‎src/Models/Material/Material_Models/Correspondence/Correspondence_VUMAT.jl‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ function init_model(nodes::AbstractVector{Int64},
5656
return
5757
end
5858
directory = Data_Manager.get_directory()
59-
material_parameter["File"] = joinpath(joinpath(pwd(), directory),
60-
material_parameter["File"])
59+
material_parameter["File"] = joinpath(pwd(), directory, material_parameter["File"])
6160
global vumat_file_path = material_parameter["File"]
6261
if !isfile(material_parameter["File"])
6362
@error "File $(material_parameter["File"]) does not exist, please check name and directory."

‎src/Models/Thermal/hetval.jl‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,7 @@ function init_model(nodes::AbstractVector{Int64},
137137
return
138138
end
139139
directory = Data_Manager.get_directory()
140-
thermal_parameter["File"] = joinpath(joinpath(pwd(), directory),
141-
thermal_parameter["File"])
140+
thermal_parameter["File"] = joinpath(pwd(), directory, thermal_parameter["File"])
142141
global hetval_file_path = thermal_parameter["File"]
143142
if !isfile(thermal_parameter["File"])
144143
@error "File $(thermal_parameter["File"]) does not exist, please check name and directory."

‎test/unit_tests/Models/Material/Material_Models/Correspondence/ut_Correspondence_UMAT.jl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ end
2121
if !isfile(file)
2222
file = "../src/Models/Material/UMATs/libperuser.so"
2323
end
24-
24+
directory = PeriLab.Data_Manager.get_directory()
2525
@test !isnothing(PeriLab.Solver_Manager.Model_Factory.Material.Correspondence.Correspondence_UMAT.init_model(Vector{Int64}(1:nodes),
2626
Dict{String,
2727
Any}("File" => file,
@@ -31,11 +31,11 @@ end
3131
"Property_3" => 2.4,
3232
"Property_4" => 2)))
3333
@test_logs (:error,
34-
"File /localdata/hess_ja/PeriLab.jl/test/../src/Models/Material/UMATs/libperuser.so_not_there does not exist, please check name and directory.") PeriLab.Solver_Manager.Model_Factory.Material.Correspondence.Correspondence_UMAT.init_model(Vector{Int64}(1:nodes),
35-
Dict{String,
36-
Any}("File" => file *
37-
"_not_there",
38-
"Number of Properties" => 3))
34+
"File $(joinpath(pwd(), directory, file * "_not_there")) does not exist, please check name and directory.") PeriLab.Solver_Manager.Model_Factory.Material.Correspondence.Correspondence_UMAT.init_model(Vector{Int64}(1:nodes),
35+
Dict{String,
36+
Any}("File" => file *
37+
"_not_there",
38+
"Number of Properties" => 3))
3939
@test_logs (:error, "Number of Properties must be at least equal 1") PeriLab.Solver_Manager.Model_Factory.Material.Correspondence.Correspondence_UMAT.init_model(Vector{Int64}(1:nodes),
4040
Dict{String,
4141
Any}("File" => file))

‎test/unit_tests/Models/Material/Material_Models/Correspondence/ut_Correspondence_VUMAT.jl‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ end
2222
if !isfile(file)
2323
file = "../src/Models/Material/UMATs/libperuser.so"
2424
end
25-
25+
directory = PeriLab.Data_Manager.get_directory()
2626
@test !isnothing(PeriLab.Solver_Manager.Model_Factory.Material.Correspondence.Correspondence_VUMAT.init_model(Vector{Int64}(1:nodes),
2727
Dict{String,
2828
Any}("File" => file,
@@ -32,10 +32,10 @@ end
3232
"Property_3" => 2.4,
3333
"Property_4" => 2)))
3434
@test_logs (:error,
35-
"File /localdata/hess_ja/PeriLab.jl/test/../src/Models/Material/UMATs/libperuser.so_not_there does not exist, please check name and directory.") PeriLab.Solver_Manager.Model_Factory.Material.Correspondence.Correspondence_VUMAT.init_model(Vector{Int64}(1:nodes),
36-
Dict{String,
37-
Any}("File" => file *
38-
"_not_there"))
35+
"File $(joinpath(pwd(), directory, file * "_not_there")) does not exist, please check name and directory.") PeriLab.Solver_Manager.Model_Factory.Material.Correspondence.Correspondence_VUMAT.init_model(Vector{Int64}(1:nodes),
36+
Dict{String,
37+
Any}("File" => file *
38+
"_not_there"))
3939
@test_logs (:error, "Number of Properties must be at least equal 1") PeriLab.Solver_Manager.Model_Factory.Material.Correspondence.Correspondence_VUMAT.init_model(Vector{Int64}(1:nodes),
4040
Dict{String,
4141
Any}("File" => file))

‎test/unit_tests/Models/Thermal/ut_HETVAL.jl‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ end
2121
if !isfile(file)
2222
file = "../src/Models/Thermal/HETVALs/hetval.so"
2323
end
24+
directory = PeriLab.Data_Manager.get_directory()
2425
@test_logs (:error,
25-
"File /localdata/hess_ja/PeriLab.jl/test/../src/Models/Thermal/HETVALs/hetval.so_not_there does not exist, please check name and directory.") PeriLab.Solver_Manager.Model_Factory.Thermal.HETVAL.init_model(Vector{Int64}(1:nodes),
26-
Dict{String,
27-
Any}("File" => file *
28-
"_not_there"))
26+
"File $(joinpath(pwd(), directory, file * "_not_there")) does not exist, please check name and directory.") PeriLab.Solver_Manager.Model_Factory.Thermal.HETVAL.init_model(Vector{Int64}(1:nodes),
27+
Dict{String,
28+
Any}("File" => file *
29+
"_not_there"))
2930

3031
@test_logs (:error, "HETVAL file is not defined.") PeriLab.Solver_Manager.Model_Factory.Thermal.HETVAL.init_model(Vector{Int64}(1:nodes),
3132
Dict{String,

0 commit comments

Comments
 (0)