Added more test cases

.gitlab-ci.yml

@@ -29,6 +29,7 @@ test cardmech 1/2:
   script:
     - ./test/cellmodels/TestElphyModels
     - ./test/elasticity/TestMaterial
+    - ./test/elasticity/TestAssembleConsistency
 
 
 test cardmech 2/2:

test/elasticity/TestAssembleConsistency.cpp

@@ -92,21 +92,23 @@ TEST_P(LagrangeElasticityTest, AssembleConsistency) {
 }
 
 INSTANTIATE_TEST_SUITE_P(Degree_1_Consistency, LagrangeElasticityTest, Values(
-        TestBeamParameter({0, 1, "Linear", "None", 0}),
+    TestBeamParameter({0, 1, "Laplace", "None", 0}),
+    TestBeamParameter({1, 1, "Laplace", "None", 0}),
+    TestBeamParameter({0, 1, "Linear", "None", 0}),
         TestBeamParameter({ 1, 1, "Linear", "None",  0 }),
-        /*TestBeamParameter({ 2, 1, "Linear", "None", 0}),*/
         TestBeamParameter({0, 1, "Bonet", "Ciarlet", 0}),
         TestBeamParameter({1, 1, "Bonet", "Ciarlet", 0})
-        /*TestBeamParameter({2, 1, "Bonet", "Ciarlet", 0})*/
+        //TestBeamParameter({0, 1, "Holzapfel", "Ciarlet", 0}),
+        //TestBeamParameter({1, 1, "Holzapfel", "Ciarlet", 0})
 ));
 
 INSTANTIATE_TEST_SUITE_P(Degree_2_Consistency, LagrangeElasticityTest,Values(
-        TestBeamParameter({0, 2, "Linear", "None", 0})/*,
+        TestBeamParameter({0, 2, "Linear", "None", 0}),
         TestBeamParameter({1, 2, "Linear", "None", 0 }),
-        TestBeamParameter({2, 2, "Linear", "None", 0}),
         TestBeamParameter({0, 2, "Bonet", "Ciarlet", 0}),
-        TestBeamParameter({1, 2, "Bonet", "Ciarlet", 0}),
-        TestBeamParameter({2, 2, "Bonet", "Ciarlet", 0})*/
+        TestBeamParameter({1, 2, "Bonet", "Ciarlet", 0})
+        //TestBeamParameter({0, 1, "Holzapfel", "Ciarlet", 0}),
+        //TestBeamParameter({1, 1, "Holzapfel", "Ciarlet", 0})
 ));
 
 
@@ -175,6 +177,8 @@ INSTANTIATE_TEST_SUITE_P(EG_Degree_2_Consistency, EGElasticityTest,Values(
 int main(int argc, char **argv) {
     return MppTest(
             MppTestBuilder(argc, argv).
+                WithConfPath(std::string(ProjectSourceDir) + "/conf/elasticity/").
+                WithGeoPath(std::string(ProjectSourceDir) + "/geo/").
                     //WithSearchPath("/../../../..").
                     WithoutDefaultConfig().
                     WithScreenLogging().

test/elasticity/TestCirculation.cpp

@@ -6,9 +6,6 @@
 
 TEST(CirculationTest, SingleStep) {
   MCircModel circModel;
-
-
-
 }
 
 

test/elasticity/TestLaplaceElasticity.cpp

@@ -76,23 +76,23 @@ TEST_P(TestTetLaplace, L2ErrorTest) {
 }
 
 auto laplace2DValues = Values(
+    TestLaplaceParameter({2, 0, 1}),
     TestLaplaceParameter({2, 1, 1}),
-    TestLaplaceParameter({2, 2, 1}),
+    TestLaplaceParameter({2, 0, 2}),
     TestLaplaceParameter({2, 1, 2}),
-    TestLaplaceParameter({2, 2, 2}),
+    TestLaplaceParameter({2, 0, 3}),
     TestLaplaceParameter({2, 1, 3}),
-    TestLaplaceParameter({2, 2, 3}),
-    TestLaplaceParameter({2, 1, 4}),
-    TestLaplaceParameter({2, 2, 4}));
+    TestLaplaceParameter({2, 0, 4}),
+    TestLaplaceParameter({2, 1, 4}));
 
 auto laplace3DValues = Values(
+    TestLaplaceParameter({3, 0, 1}),
     TestLaplaceParameter({3, 1, 1}),
-    TestLaplaceParameter({3, 2, 1}),
-    TestLaplaceParameter({3, 1, 2}),
-    TestLaplaceParameter({3, 2, 2})/*,
+    TestLaplaceParameter({3, 0, 2}),
+    TestLaplaceParameter({3, 1, 2})/*,
+    TestLaplaceParameter({3, 0, 3}),
     TestLaplaceParameter({3, 1, 3}),
-    TestLaplaceParameter({3, 2, 3}),
-    TestLaplaceParameter({3, 1, 4})*/
+    TestLaplaceParameter({3, 0, 4})*/
     );
 
 INSTANTIATE_TEST_SUITE_P(Test2DLaplace, TestQuadLaplace, laplace2DValues);