From 072e564c20e0463d8a2a35984c39e74461c72eb0 Mon Sep 17 00:00:00 2001
From: ludovic noels <l.noels@ulg.ac.be>
Date: Mon, 23 Jan 2023 21:13:16 +0100
Subject: [PATCH] bugs

---
 .../cube.geo                                  | 82 ++++++++++++++++---
 .../cube.msh                                  | 67 +++++++++++----
 .../ClusteringWovenTFA_offlinePlastic/cube.py | 12 +--
 3 files changed, 129 insertions(+), 32 deletions(-)

diff --git a/dG3D/benchmarks/ClusteringWovenTFA_offlinePlastic/cube.geo b/dG3D/benchmarks/ClusteringWovenTFA_offlinePlastic/cube.geo
index 1633d0e48..5ab8446d5 100644
--- a/dG3D/benchmarks/ClusteringWovenTFA_offlinePlastic/cube.geo
+++ b/dG3D/benchmarks/ClusteringWovenTFA_offlinePlastic/cube.geo
@@ -1,39 +1,101 @@
 // Test case a SCB with a vertical load at its free extremity
 // Size
 
-x=1.;
-y=1.;
+
+
+//x=1.;
+//y=1.;
+//z=1.;
+
+x=3.2941281137;
+y=3.2941281137;
+z=0.2245;
+
+// Characteristic length
+//Lc1=R/2.5;
+Lc1 = 1.;
 
 // definition of points
-Point(1) = { 0.0 , 0.0 , 0.0 };
-Point(2) = {  x  , 0.0 , 0.0 };
-Point(3) = {  x  ,  y  , 0.0 };
-Point(4) = { 0.0 ,  y  , 0.0 };
+Point(1) = { 0.0 , 0.0 , 0.0 , Lc1};
+Point(2) = {  x  , 0.0 , 0.0 , Lc1};
+Point(3) = {  x  ,  y  , 0.0 , Lc1};
+Point(4) = { 0.0 ,  y  , 0.0 , Lc1};
+Point(5) = { 0.0 , 0.0 , z , Lc1};
+Point(6) = {  x  , 0.0 , z , Lc1};
+Point(7) = {  x  ,  y  , z , Lc1};
+Point(8) = { 0.0 ,  y  , z , Lc1};
 
 // Line between points
 Line(1) = {1,2};
 Line(2) = {2,3};
 Line(3) = {3,4};
 Line(4) = {4,1};
+Line(5) = {5,6};
+Line(6) = {6,7};
+Line(7) = {7,8};
+Line(8) = {8,5};
+Line(9) = {1,5};
+Line(10)= {2,6};
+Line(11)= {3,7};
+Line(12)= {4,8};
 
 // Surface definition
 Line Loop(1) = {1,2,3,4};
+Line Loop(2) = {5,6,7,8};
+Line Loop(3) = {1,10,-5,-9};
+Line Loop(4) = {2,11,-6,-10};
+Line Loop(5) = {3,12,-7,-11};
+Line Loop(6) = {4,9,-8,-12};
 
 Plane Surface(1) = {1};
+Plane Surface(2) = {2};
+Plane Surface(3) = {3};
+Plane Surface(4) = {4};
+Plane Surface(5) = {5};
+Plane Surface(6) = {6};
+
+//VOlume
+
+Surface Loop(7) = {1,2,3,4,5,6};
+Volume(1) = {7};
 
 // Physical objects to applied BC and material
 Physical Surface(1234) = {1};
-
+Physical Surface(5678) = {2};
+Physical Surface(1265) = {3};
+Physical Surface(2376) = {4};
+Physical Surface(3487) = {5};
+Physical Surface(4158) = {6};
 Physical Line(12) = {1};
 Physical Line(23) = {2};
 Physical Line(34) = {3};
 Physical Line(41) = {4};
+Physical Line(56) = {5};
+Physical Line(67) = {6};
+Physical Line(78) = {7};
+Physical Line(85) = {8};
+Physical Line(15) = {9};
+Physical Line(26) = {10};
+Physical Line(37) = {11};
+Physical Line(48) = {12};
 
 Physical Point(1) ={1};
 Physical Point(2) ={2};
 Physical Point(3) ={3};
 Physical Point(4) ={4};
+Physical Point(5) ={5};
+Physical Point(6) ={6};
+Physical Point(7) ={7};
+Physical Point(8) ={8};
+
+Physical Volume(10) ={1};
+
+// define transfinite mesh
+Transfinite Line {1,2,3,4,5,6,7,8} = 2;
+Transfinite Line {9,10,11,12} = 2;
+Transfinite Surface {1,2,3,4,5,6} ;
+Recombine Surface {1,2,3,4,5,6} ;
+Transfinite Volume {1};
+Plane Surface(6) = {6};
+
 
-Transfinite Line {1,2,3,4} = 2;
-Transfinite Surface {1};
-Recombine Surface {1};
diff --git a/dG3D/benchmarks/ClusteringWovenTFA_offlinePlastic/cube.msh b/dG3D/benchmarks/ClusteringWovenTFA_offlinePlastic/cube.msh
index c5304c3a4..18093f95e 100644
--- a/dG3D/benchmarks/ClusteringWovenTFA_offlinePlastic/cube.msh
+++ b/dG3D/benchmarks/ClusteringWovenTFA_offlinePlastic/cube.msh
@@ -2,38 +2,73 @@ $MeshFormat
 3 0 8
 $EndMeshFormat
 $Entities
-4 4 1 0
+8 12 6 1
 1 1 1 
 2 1 2 
 3 1 3 
 4 1 4 
+5 1 5 
+6 1 6 
+7 1 7 
+8 1 8 
 1 2 1 2 1 12 
 2 2 2 3 1 23 
 3 2 3 4 1 34 
 4 2 4 1 1 41 
+5 2 5 6 1 56 
+6 2 6 7 1 67 
+7 2 7 8 1 78 
+8 2 8 5 1 85 
+9 2 1 5 1 15 
+10 2 2 6 1 26 
+11 2 3 7 1 37 
+12 2 4 8 1 48 
 1 4 1 2 3 4 1 1234 
+2 4 5 6 7 8 1 5678 
+3 4 1 10 -5 -9 1 1265 
+4 4 2 11 -6 -10 1 2376 
+5 4 3 12 -7 -11 1 3487 
+6 4 4 9 -8 -12 1 4158 
+1 6 1 2 3 4 5 6 1 10 
 $EndEntities
 $Nodes
-9
+8
 1 0 0 0 0
-2 1 0 0 0
-3 1 1 0 0
-4 0 1 0 0
-5 0.4999999999986718 0 0 0
-6 1 0.4999999999986718 0 0
-7 0.5000000000013305 1 0 0
-8 0 0.5000000000013305 0 0
-9 0.5000000000000011 0.5000000000000011 0 0
+2 3.2941281137 0 0 0
+3 3.2941281137 3.2941281137 0 0
+4 0 3.2941281137 0 0
+5 0 0 0.2245 0
+6 3.2941281137 0 0.2245 0
+7 3.2941281137 3.2941281137 0.2245 0
+8 0 3.2941281137 0.2245 0
 $EndNodes
 $Elements
-9
-9 10 1 9 1 2 3 4 5 6 7 8 9
-5 8 1 3 1 2 5
-6 8 2 3 2 3 6
-7 8 3 3 3 4 7
-8 8 4 3 4 1 8
+27
+27 5 1 8 1 2 3 4 5 6 7 8
+21 3 1 4 1 2 3 4
+22 3 2 4 5 6 7 8
+23 3 3 4 1 2 6 5
+24 3 4 4 2 3 7 6
+25 3 5 4 3 4 8 7
+26 3 6 4 4 1 5 8
+9 1 1 2 1 2
+10 1 2 2 2 3
+11 1 3 2 3 4
+12 1 4 2 4 1
+13 1 5 2 5 6
+14 1 6 2 6 7
+15 1 7 2 7 8
+16 1 8 2 8 5
+17 1 9 2 1 5
+18 1 10 2 2 6
+19 1 11 2 3 7
+20 1 12 2 4 8
 1 15 1 1 1
 2 15 2 1 2
 3 15 3 1 3
 4 15 4 1 4
+5 15 5 1 5
+6 15 6 1 6
+7 15 7 1 7
+8 15 8 1 8
 $EndElements
diff --git a/dG3D/benchmarks/ClusteringWovenTFA_offlinePlastic/cube.py b/dG3D/benchmarks/ClusteringWovenTFA_offlinePlastic/cube.py
index 67b0bd1d4..1dd1fc4f1 100644
--- a/dG3D/benchmarks/ClusteringWovenTFA_offlinePlastic/cube.py
+++ b/dG3D/benchmarks/ClusteringWovenTFA_offlinePlastic/cube.py
@@ -294,17 +294,17 @@ if incOri == 1:
   lawRed.setClusterIncOrientation()
   
 if TFAmethod==0:
-  lawRed.loadClusterSummaryAndInteractionTensorsFromFiles('ClusterDataSummary_nbClusters_20.csv',
-                                                        'InteractionTensorData_nbClusters_20.csv')
+  lawRed.loadClusterSummaryAndInteractionTensorsFromFiles('ClusterDataSummary_nbClusters_10.csv',
+                                                        'InteractionTensorData_nbClusters_10.csv')
   if incOri == 1:
-    lawRed.loadClusterFiberOrientationFromFile('ClusterMeanFiberOrientation_nbClusters_20.csv')
+    lawRed.loadClusterFiberOrientationFromFile('ClusterMeanFiberOrientation_nbClusters_10.csv')
 if TFAmethod==2:
-  lawRed.loadClusterSummaryAndInteractionTensorsFromFiles('ClusterDataSummary_nbClusters_20.csv',
-                                                        'InteractionTensorData_nbClusters_20.csv')
+  lawRed.loadClusterSummaryAndInteractionTensorsFromFiles('ClusterDataSummary_nbClusters_10.csv',
+                                                        'InteractionTensorData_nbClusters_10.csv')
   lawRed.loadReferenceStiffnessFromFile('ElasticStiffnessHom.csv')
   lawRed.loadReferenceStiffnessIsoFromFile('ElasticStiffnessHomIso_muFix.csv')
   if incOri == 1:
-    lawRed.loadClusterFiberOrientationFromFile('ClusterMeanFiberOrientation_nbClusters_20.csv')
+    lawRed.loadClusterFiberOrientationFromFile('ClusterMeanFiberOrientation_nbClusters_10.csv')
   
 
 # geometry
-- 
GitLab