Fixed tests that broke due to change of the default model

Author: kaipartmann

src/physics/correspondence_rotated.jl

@@ -27,8 +27,8 @@ function CRMaterial(; kernel::Function=linear_kernel,
                     model::AbstractConstitutiveModel=SaintVenantKirchhoff(),
                     zem::AbstractZEMStabilization=ZEMSilling(),
                     dmgmodel::AbstractDamageModel=CriticalStretch(), maxdmg::Real=0.85)
-    if !(model <: Union{SaintVenantKirchhoff,LinearElastic})
-        msg = "model `$(model)` is currently not supported for `CRMaterial`!\n"
+    if !(typeof(model) <: Union{SaintVenantKirchhoff,LinearElastic})
+        msg = "model `$(typeof(model))` is currently not supported for `CRMaterial`!\n"
         throw(ArgumentError(msg))
     end
     return CRMaterial(kernel, model, zem, dmgmodel, maxdmg)

src/physics/rk_correspondence_rotated.jl

@@ -28,8 +28,8 @@ function RKCRMaterial(; kernel::Function=cubic_b_spline_kernel,
                         model::AbstractConstitutiveModel=SaintVenantKirchhoff(),
                         dmgmodel::AbstractDamageModel=CriticalStretch(), maxdmg::Real=1.0,
                         reprkernel::Symbol=:C1, regfactor::Real=1e-13)
-    if !(model <: Union{SaintVenantKirchhoff,LinearElastic})
-        msg = "model `$(model)` is currently not supported for `CRMaterial`!\n"
+    if !(typeof(model) <: Union{SaintVenantKirchhoff,LinearElastic})
+        msg = "model `$(typeof(model))` is currently not supported for `RKCRMaterial`!\n"
         throw(ArgumentError(msg))
     end
     get_q_dim(reprkernel) # check if the kernel is implemented

test/discretization/test_body.jl

@@ -774,7 +774,7 @@ end
           MATERIAL
             material type ...................................................... CMaterial
             kernel function ................................................ linear_kernel
-            constitutive model .............................. Peridynamics.LinearElastic()
+            constitutive model ....................... Peridynamics.SaintVenantKirchhoff()
             zero-energy mode stabilization ................ Peridynamics.ZEMSilling(100.0)
             damage model type ............................... Peridynamics.CriticalStretch
             maximum damage .......................................................... 0.85
@@ -839,7 +839,7 @@ end
           MATERIAL
             material type .................................................... BACMaterial
             kernel function ................................................ linear_kernel
-            constitutive model .............................. Peridynamics.LinearElastic()
+            constitutive model ....................... Peridynamics.SaintVenantKirchhoff()
             damage model type ............................... Peridynamics.CriticalStretch
             maximum damage .......................................................... 0.85
             MATERIAL PROPERTIES #1

test/physics/test_correspondence_rotated.jl

@@ -1,6 +1,6 @@
 @testitem "CRMaterial" begin
     mat = CRMaterial()
-    @test mat.constitutive_model isa LinearElastic
+    @test mat.constitutive_model isa SaintVenantKirchhoff
 
     @test_throws ArgumentError CRMaterial(model=NeoHookePenalty())
 

test/physics/test_rk_correspondence.jl

@@ -40,7 +40,7 @@ end
     # Test default constructor
     mat1 = RKCMaterial()
     @test mat1.kernel == cubic_b_spline_kernel
-    @test mat1.constitutive_model isa LinearElastic
+    @test mat1.constitutive_model isa SaintVenantKirchhoff
     @test mat1.dmgmodel isa CriticalStretch
     @test mat1.maxdmg == 1.0
     @test mat1.reprkernel == :C1
@@ -49,14 +49,14 @@ end
     # Test constructor with parameters
     mat2 = RKCMaterial(
         kernel = linear_kernel,
-        model = SaintVenantKirchhoff(),
+        model = LinearElastic(),
         dmgmodel = CriticalStretch(),
         maxdmg = 0.75,
         reprkernel = :C1,
         regfactor = 1e-10
     )
     @test mat2.kernel == linear_kernel
-    @test mat2.constitutive_model isa SaintVenantKirchhoff
+    @test mat2.constitutive_model isa LinearElastic
     @test mat2.dmgmodel isa CriticalStretch
     @test mat2.maxdmg == 0.75
     @test mat2.reprkernel == :C1
@@ -71,13 +71,13 @@ end
     # Test default constructor
     mat1 = RKCRMaterial()
     @test mat1.kernel == cubic_b_spline_kernel
-    @test mat1.constitutive_model isa LinearElastic
+    @test mat1.constitutive_model isa SaintVenantKirchhoff
     @test mat1.dmgmodel isa CriticalStretch
     @test mat1.maxdmg == 1.0
     @test mat1.reprkernel == :C1
     @test mat1.regfactor == 1e-13
 
-    # Test constructor with parameters (only LinearElastic is supported)
+    # Test constructor with parameters (only linear elastic models are supported)
     mat2 = RKCRMaterial(
         kernel = linear_kernel,
         model = LinearElastic(),
@@ -94,7 +94,7 @@ end
     @test mat2.regfactor == 1e-10
 
     # Test failure with non-LinearElastic model
-    @test_throws ArgumentError RKCRMaterial(model = SaintVenantKirchhoff())
+    @test_throws ArgumentError RKCRMaterial(model = NeoHooke())
 
     # Test constructor with invalid regfactor
     @test_throws ArgumentError RKCRMaterial(regfactor = 2.0)