current status

Author: CWillberg

src/Physics/Material/Material_Models/Correspondence_UMAT.jl

@@ -76,7 +76,7 @@ function init_material_model(datamanager::Module, nodes::Union{SubArray,Vector{I
     end
     properties[iID] = material_parameter["Property_$iID"]
   end
-  println()
+
   if !haskey(material_parameter, "UMAT Material Name")
     @warn "No UMAT Material Name is defined. Please check if you use it as method to check different material in your UMAT."
     material_parameter["UMAT Material Name"] = ""
@@ -169,7 +169,11 @@ Example:
 function compute_stresses(datamanager::Module, nodes::Union{SubArray,Vector{Int64}}, dof::Int64, material_parameter::Dict, time::Float64, dt::Float64, strain_increment::SubArray, stress_N::SubArray, stress_NP1::SubArray)
   # the notation from the Abaqus Fortran subroutine is used. 
   nstatev = material_parameter["Number of State Variables"]
+  nprops = material_parameter["Number of Properties"]
+  props = datamanager.get_field("Properties")
+
   statev = datamanager.get_field("State Variables")
+
   stress_temp::Vector{Float64} = zeros(Float64, 3 * dof - 3)
   DDSDDE = zeros(Float64, 3 * dof - 3, 3 * dof - 3)
   SSE = datamanager.get_field("Specific Elastic Strain Energy")
@@ -195,15 +199,15 @@ function compute_stresses(datamanager::Module, nodes::Union{SubArray,Vector{Int6
   nshr = 2 * dof - 3
   # Size of the stress or strain component array
   ntens = ndi + nshr
-  not_supported_float = 0.0
+  not_supported_float::Float64 = 0.0
   angles = datamanager.get_field("Angles")
   DFGRD0 = datamanager.get_field("Deformation Gradient", "N")
   DFGRD1 = datamanager.get_field("Deformation Gradient", "NP1")
-  not_supported_int = 0
+  not_supported_int::Int64 = 0
   for iID in nodes
     stress_NP1[iID, :, :] = UMAT_interface
     rotNP1[iID, :, :] = Geometry.rotation_tensor(angles[iID, :])
-    UMAT_interface(material_parameter["file"], stress_temp, statev[iID, :], DDSDDE, SSE, SPD, SCD, RPL, DDSDDT, DRPLDE, DRPLDT, matrix_to_voigt(strain_N[iID, :, :]), matrix_to_voigt(strain_increment[iID, :, :]), time, time + dt, dt, temperature_N[iID], temperature_increment[iID], PREDEF[iID, :], DPRED[iID, :], CMNAME, ndi, nshr, ntens, nstatev, coords[iID, :], rot_NP1[iID, :, :] - rot_N[iID, :, :], not_supported_float, not_supported_float, DFGRD0, DFGRD1, not_supported_int, not_supported_int, not_supported_int, not_supported_int, not_supported_int, not_supported_int)
+    UMAT_interface(material_parameter["file"], stress_temp, statev[iID, :], DDSDDE, SSE, SPD, SCD, RPL, DDSDDT, DRPLDE, DRPLDT, matrix_to_voigt(strain_N[iID, :, :]), matrix_to_voigt(strain_increment[iID, :, :]), time, dt, temperature_N[iID], temperature_increment[iID], PREDEF[iID, :], DPRED[iID, :], CMNAME, ndi, nshr, ntens, nstatev, props, nprops, coords[iID, :], rot_NP1[iID, :, :] - rot_N[iID, :, :], not_supported_float, not_supported_float, DFGRD0, DFGRD1, not_supported_int, not_supported_int, not_supported_int, not_supported_int, not_supported_int, not_supported_int)
     stress_NP1[iID, :, :] = voigt_to_matrix(stress_temp)
   end
   # CORRESPONDENCE::UMATINT(sigmaNP1LocVoigt, statev, DDSDDE, &SSE, &SPD, &SCD, &RPL,
@@ -236,10 +240,58 @@ Example:
 ```julia
 ```
 """
-function UMAT_interface(filename::String)
-  #ccall((:__simplemodule_MOD_foo, "./simplemodule.so"), Int32, (Ptr{Int32},), a)
-  #ccall((:__simplemodule_MOD_foo, filename), Int32, (Ptr{Int32},), a)
-
+function UMAT_interface(filename::String, STRESS::Vector{Float64}, STATEV::Vector{Float64}, DDSDDE::Matrix{Float64}, SSE::Float64, SPD::Float64, SCD::Float64, RPL::Float64, DDSDDT::Vector{Float64}, DRPLDE::Vector{Float64}, DRPLDT::Float64, STRAN::Vector{Float64}, DSTRAN::Vector{Float64}, TIME::Float64, DTIME::Float64, TEMP::Float64, DTEMP::Float64, PREDEF::Vector{Float64}, DPRED::Vector{Float64}, CMNAME::Cstring, NDI::Int64, NSHR::Int64, NTENS::Int64, NSTATEV::Int64, PROPS::Vector{Float64}, NPROPS::Int64, COORDS::Vector{Float64}, DROT::Matrix{Float64}, PNEWDT::Float64, CELENT::Float64, DFGRD0::Matrix{Float64}, DFGRD1::Matrix{Float64}, NOEL::Int64, NPT::Int64, LAYER::Int64, KSPT::Int64, JSTEP::Int64, KINC::Int64)
+  # Define the path to the shared library
+  global libtest = filename
+  println()
+  # Call the UMAT subroutine with uppercase variables
+  """
+   ccall((:UMAT, libtest), Cvoid,
+     (
+       Ptr{Float64},    # STRESS
+       Ptr{Float64},    # STATEV
+       Ptr{Float64},    # DDSDDE
+       Ptr{Float64},    # SSE
+       Ptr{Float64},    # SPD
+       Ptr{Float64},    # SCD
+       Ptr{Float64},    # RPL
+       Ptr{Float64},    # DDSDDT
+       Ptr{Float64},    # DRPLDE
+       Ptr{Float64},    # DRPLDT
+       Ptr{Float64},    # STRAN
+       Ptr{Float64},    # DSTRAN
+       Ptr{Float64},    # TIME
+       Ptr{Float64},    # DTIME
+       Ptr{Float64},    # TEMP
+       Ptr{Float64},    # DTEMP
+       Ptr{Float64},    # PREDEF
+       Ptr{Float64},    # DPRED
+       Ptr{UInt8},      # CMNAME
+       Cint,            # NDI
+       Cint,            # NSHR
+       Cint,            # NTENS
+       Cint,            # NSTATEV
+       Ptr{Float64},    # PROPS
+       Cint,            # NPROPS
+       Ptr{Float64},    # COORDS
+       Ptr{Float64},    # DROT
+       Ptr{Float64},    # PNEWDT
+       Ptr{Float64},    # CELENT
+       Ptr{Float64},    # DFGRD0
+       Ptr{Float64},    # DFGRD1
+       Ptr{Cint},       # NOEL
+       Ptr{Cint},       # NPT
+       Ptr{Cint},       # LAYER
+       Ptr{Cint},       # KSPT
+       Ptr{Cint},       # JSTEP
+       Ptr{Cint}        # KINC
+     ),
+     STRESS, STATEV, DDSDDE, SSE, SPD, SCD, RPL, DDSDDT, DRPLDE, DRPLDT,
+     STRAN, DSTRAN, TIME, DTIME, TEMP, DTEMP, PREDEF, DPRED, CMNAME,
+     NDI, NSHR, NTENS, NSTATEV, PROPS, NPROPS, COORDS, DROT, PNEWDT,
+     CELENT, DFGRD0, DFGRD1, NOEL, NPT, LAYER, KSPT, JSTEP, KINC
+   )
+ """
 end
 
 

test/unit_tests/Physics/Material/Material_Models/ut_Correspondence_UMAT.jl

@@ -2,15 +2,16 @@
 #
 # SPDX-License-Identifier: BSD-3-Clause
 using Test
+using LinearAlgebra
 include("../../../../../src/Physics/Material/Material_Models/Correspondence_UMAT.jl")
-# include("../../../../../src/Support/data_manager.jl")
+include("../../../../../src/Support/data_manager.jl")
 @testset "get_name&fe_support" begin
     @test Correspondence_UMAT.correspondence_name() == "Correspondence UMAT"
     @test Correspondence_UMAT.fe_support()
 end
 @testset "init exceptions" begin
     nodes = 2
-    test_Data_manager = PeriLab.Data_manager
+    test_Data_manager = Data_manager
     test_Data_manager.set_num_controller(nodes)
     dof = 3
     test_Data_manager.set_dof(dof)
@@ -50,4 +51,60 @@ end
     @test fields[2, 1] == test_1[2]
     @test fields[1, 2] == test_2[1]
     @test fields[2, 2] == test_2[2]
-end
+end
+@testset "ut_malloc_cstring" begin
+    CMNAME = Correspondence_UMAT.malloc_cstring("UMAT_TEST")
+    @test typeof(CMNAME) == Cstring
+end
+
+# Test wrapper function for UMAT_interface
+#@testset "UMAT_interface Tests" begin
+# Example test case (you should define your own)
+file = "./src/Physics/Material/UMATs/libusertest.so"
+if !isfile(file)
+    file = "../src/Physics/Material/UMATs/libusertest.so"
+end
+STRESS::Vector{Float64} = zeros(Float64, 6)  # Example initialization, adjust the size as needed
+STATEV::Vector{Float64} = zeros(Float64, 10)  # Adjust the size and values as needed
+DDSDDE::Matrix{Float64} = Matrix{Float64}(I, 6, 6)  # Identity matrix for simplicity, adjust as needed
+SSE::Float64 = 0.0
+SPD::Float64 = 0.0
+SCD::Float64 = 0.0
+RPL::Float64 = 0.0
+DDSDDT::Vector{Float64} = zeros(Float64, 6)  # Adjust as needed
+DRPLDE::Vector{Float64} = zeros(Float64, 6)  # Adjust as needed
+DRPLDT::Float64 = 0.0  # Adjust as needed
+STRAN::Vector{Float64} = zeros(Float64, 6)  # Adjust as needed
+DSTRAN::Vector{Float64} = zeros(Float64, 6)  # Adjust as needed
+TIME::Float64 = 0.0
+DTIME::Float64 = 0.1
+TEMP::Float64 = 25.0
+DTEMP::Float64 = 0.1
+PREDEF::Vector{Float64} = zeros(Float64, 1)  # Adjust as needed
+DPRED::Vector{Float64} = zeros(Float64, 1)  # Adjust as needed
+CMNAME::Cstring = Correspondence_UMAT.malloc_cstring("UMAT_TEST")  # Adjust as needed
+NDI::Int64 = 3
+NSHR::Int64 = 3
+NTENS::Int64 = 6
+NSTATEV::Int64 = length(STATEV)
+PROPS::Vector{Float64} = zeros(Float64, 2)  # Adjust as needed
+NPROPS::Int64 = 2
+COORDS::Vector{Float64} = zeros(Float64, 3)  # Adjust as needed
+DROT::Matrix{Float64} = Matrix{Float64}(I, 3, 3)  # Adjust as needed
+PNEWDT::Float64 = 0.1
+CELENT::Float64 = 1.0
+DFGRD0::Matrix{Float64} = Matrix{Float64}(I, 3, 3)  # Adjust as needed
+DFGRD1::Matrix{Float64} = Matrix{Float64}(I, 3, 3)  # Adjust as needed
+NOEL::Int64 = 1
+NPT::Int64 = 1
+LAYER::Int64 = 1
+KSPT::Int64 = 1
+JSTEP::Int64 = 1
+KINC::Int64 = 1
+
+# Call the UMAT_interface
+Correspondence_UMAT.UMAT_interface(file, STRESS, STATEV, DDSDDE, SSE, SPD, SCD, RPL, DDSDDT, DRPLDE, DRPLDT, STRAN, DSTRAN, TIME, DTIME, TEMP, DTEMP, PREDEF, DPRED, CMNAME, NDI, NSHR, NTENS, NSTATEV, PROPS, NPROPS, COORDS, DROT, PNEWDT, CELENT, DFGRD0, DFGRD1, NOEL, NPT, LAYER, KSPT, JSTEP, KINC)
+println()
+# Example assertion (you should define appropriate checks based on your UMAT's expected behavior)
+# @test STRESS != zeros(Float64, 6)  # Check if STRESS was updated (or any other appropriate check)
+#end