From c64e7aa6101f21d8633223db61690ecbb6250c98 Mon Sep 17 00:00:00 2001 From: Christophe Geuzaine <cgeuzaine@ulg.ac.be> Date: Sun, 28 Dec 2008 17:23:39 +0000 Subject: [PATCH] *** empty log message *** --- Common/OpenFile.cpp | 2 +- benchmarks/3d/induction3.geo | 483 +----------------------- benchmarks/3d/induction4.geo | 24 +- benchmarks/3d/sphere_hexa.geo | 47 +-- benchmarks/3d/sphere_in_cube_hexa.geo | 57 +-- benchmarks/3d/sphere_in_sphere_hexa.geo | 7 - doc/VERSIONS.txt | 11 +- 7 files changed, 23 insertions(+), 608 deletions(-) diff --git a/Common/OpenFile.cpp b/Common/OpenFile.cpp index e21234a9da..2cdd6e2547 100644 --- a/Common/OpenFile.cpp +++ b/Common/OpenFile.cpp @@ -408,7 +408,7 @@ void OpenProject(const char *name) #endif #if !defined(HAVE_NO_PARSER) // reinitialize the variables defined in the parser (only if the - // current model is not empty: if it's empty it probably mean we + // current model is not empty: if it's empty it probably means we // just launched gmsh, and we don't want to delete variables set // e.g. using the -string command line option) if(GModel::current()->getNumVertices()) gmsh_yysymbols.clear(); diff --git a/benchmarks/3d/induction3.geo b/benchmarks/3d/induction3.geo index c1e77792a8..3949c39935 100644 --- a/benchmarks/3d/induction3.geo +++ b/benchmarks/3d/induction3.geo @@ -173,31 +173,6 @@ Transfinite Line{1000108,-1000111,1000120,1000121,1000112,-1000109} =nbind Using Transfinite Line{1000123,1000124,1000171,1000169} = 6 Using Power 1.0; Transfinite Line{1000174,1000175,1000176,1000177,1000178,1000168,1000179,1000165} = nbext Using Power pwext; -Transfinite Surface{1000160} = {1000017,1000019,1000018,1000016}; -Transfinite Surface{1000158} = {1000011,1000017,1000016,1000010}; -Transfinite Surface{1000150} = {1000011,1000010,1000024,1000023}; -Transfinite Surface{1000142} = {1000024,1000026,1000025,1000023}; -Transfinite Surface{1000140} = {1000023,1000025,1000002,1000004}; -Transfinite Surface{1000144} = {1000026,1000024,1000003,1000001}; -Transfinite Surface{1000146} = {1000003,1000007,1000005,1000001}; -Transfinite Surface{1000158} = {1000011,1000017,1000016,1000010}; -Transfinite Surface{1000156} = {1000011,1000008,1000015,1000017}; -Transfinite Surface{1000152} = {1000008,1000011,1000023,1000004}; -Transfinite Surface{1000154} = {1000008,1000006,1000013,1000015}; -Transfinite Surface{1000164} = {1000005,1000007,1000014,1000012}; -Transfinite Surface{1000162} = {1000007,1000010,1000016,1000014}; -Transfinite Surface{1000148} = {1000003,1000024,1000010,1000007}; -Transfinite Surface{1000138} = {1000006,1000008,1000004,1000002}; -Transfinite Surface{1000181} = {1000015,1000013,1000028,1000034}; -Transfinite Surface{1000183} = {1000017,1000015,1000034,1000030}; -Transfinite Surface{1000187} = {1000032,1000019,1000018,1000031}; -Transfinite Surface{1000191} = {1000029,1000033,1000014,1000016}; -Transfinite Surface{1000193} = {1000033,1000027,1000012,1000014}; -Transfinite Surface{1000185} = {1000019,1000017,1000030,1000032}; -Transfinite Surface{1000189} = {1000016,1000018,1000031,1000029}; -Recombine Surface{1000154,1000160,1000158,1000150,1000142,1000140,1000144,1000146,1000158,1000156,1000152,1000164,1000162,1000148,1000138,1000181,1000183,1000187,1000191,1000193,1000185,1000189}; - - /* COUCHE 2 */ @@ -339,35 +314,8 @@ Transfinite Line{2000108,-2000111,2000120,2000121,2000112,-2000109} =nbind Using Transfinite Line{2000123,2000124,2000171,2000169} = 6 Using Power 1.0; Transfinite Line{2000174,2000175,2000176,2000177,2000178,2000168,2000179,2000165} = nbext Using Power pwext; -Transfinite Surface{2000160} = {2000017,2000019,2000018,2000016}; -Transfinite Surface{2000158} = {2000011,2000017,2000016,2000010}; -Transfinite Surface{2000150} = {2000011,2000010,2000024,2000023}; -Transfinite Surface{2000142} = {2000024,2000026,2000025,2000023}; -Transfinite Surface{2000140} = {2000023,2000025,2000002,2000004}; -Transfinite Surface{2000144} = {2000026,2000024,2000003,2000001}; -Transfinite Surface{2000146} = {2000003,2000007,2000005,2000001}; -Transfinite Surface{2000158} = {2000011,2000017,2000016,2000010}; -Transfinite Surface{2000156} = {2000011,2000008,2000015,2000017}; -Transfinite Surface{2000152} = {2000008,2000011,2000023,2000004}; -Transfinite Surface{2000154} = {2000008,2000006,2000013,2000015}; -Transfinite Surface{2000164} = {2000005,2000007,2000014,2000012}; -Transfinite Surface{2000162} = {2000007,2000010,2000016,2000014}; -Transfinite Surface{2000148} = {2000003,2000024,2000010,2000007}; -Transfinite Surface{2000138} = {2000006,2000008,2000004,2000002}; -Transfinite Surface{2000181} = {2000015,2000013,2000028,2000034}; -Transfinite Surface{2000183} = {2000017,2000015,2000034,2000030}; -Transfinite Surface{2000187} = {2000032,2000019,2000018,2000031}; -Transfinite Surface{2000191} = {2000029,2000033,2000014,2000016}; -Transfinite Surface{2000193} = {2000033,2000027,2000012,2000014}; -Transfinite Surface{2000185} = {2000019,2000017,2000030,2000032}; -Transfinite Surface{2000189} = {2000016,2000018,2000031,2000029}; -Recombine Surface{2000154,2000160,2000158,2000150,2000142,2000140,2000144,2000146,2000158,2000156,2000152,2000164,2000162,2000148,2000138,2000181,2000183,2000187,2000191,2000193,2000185,2000189}; - - - /* COUCHE 3 */ - Point(3000001) = { -largint/4 , 0 , h3 , p1 }; Point(3000002) = { largint/4 , 0 , h3 , p1 }; Point(3000003) = { -largint/4 , x2/2. , h3 , p1 }; @@ -508,33 +456,8 @@ Transfinite Line{3000108,-3000111,3000120,3000121,3000112,-3000109} =nbind Using Transfinite Line{3000123,3000124,3000171,3000169} = 6 Using Power 1.0; Transfinite Line{3000174,3000175,3000176,3000177,3000178,3000168,3000179,3000165} = nbext Using Power pwext; -Transfinite Surface{3000160} = {3000017,3000019,3000018,3000016}; -Transfinite Surface{3000158} = {3000011,3000017,3000016,3000010}; -Transfinite Surface{3000150} = {3000011,3000010,3000024,3000023}; -Transfinite Surface{3000142} = {3000024,3000026,3000025,3000023}; -Transfinite Surface{3000140} = {3000023,3000025,3000002,3000004}; -Transfinite Surface{3000144} = {3000026,3000024,3000003,3000001}; -Transfinite Surface{3000146} = {3000003,3000007,3000005,3000001}; -Transfinite Surface{3000158} = {3000011,3000017,3000016,3000010}; -Transfinite Surface{3000156} = {3000011,3000008,3000015,3000017}; -Transfinite Surface{3000152} = {3000008,3000011,3000023,3000004}; -Transfinite Surface{3000154} = {3000008,3000006,3000013,3000015}; -Transfinite Surface{3000164} = {3000005,3000007,3000014,3000012}; -Transfinite Surface{3000162} = {3000007,3000010,3000016,3000014}; -Transfinite Surface{3000148} = {3000003,3000024,3000010,3000007}; -Transfinite Surface{3000138} = {3000006,3000008,3000004,3000002}; -Transfinite Surface{3000181} = {3000015,3000013,3000028,3000034}; -Transfinite Surface{3000183} = {3000017,3000015,3000034,3000030}; -Transfinite Surface{3000187} = {3000032,3000019,3000018,3000031}; -Transfinite Surface{3000191} = {3000029,3000033,3000014,3000016}; -Transfinite Surface{3000193} = {3000033,3000027,3000012,3000014}; -Transfinite Surface{3000185} = {3000019,3000017,3000030,3000032}; -Transfinite Surface{3000189} = {3000016,3000018,3000031,3000029}; -Recombine Surface{3000154,3000160,3000158,3000150,3000142,3000140,3000144,3000146,3000158,3000156,3000152,3000164,3000162,3000148,3000138,3000181,3000183,3000187,3000191,3000193,3000185,3000189}; - // COUCHE 4 - Point(4000001) = { -largint/4 , 0 , h4 , p1 }; Point(4000002) = { largint/4 , 0 , h4 , p1 }; Point(4000003) = { -largint/4 , x2/2. , h4 , p1 }; @@ -675,34 +598,8 @@ Transfinite Line{4000108,-4000111,4000120,4000121,4000112,-4000109} =nbind Using Transfinite Line{4000123,4000124,4000171,4000169} = 6 Using Power 1.0; Transfinite Line{4000174,4000175,4000176,4000177,4000178,4000168,4000179,4000165} = nbext Using Power pwext; -Transfinite Surface{4000160} = {4000017,4000019,4000018,4000016}; -Transfinite Surface{4000158} = {4000011,4000017,4000016,4000010}; -Transfinite Surface{4000150} = {4000011,4000010,4000024,4000023}; -Transfinite Surface{4000142} = {4000024,4000026,4000025,4000023}; -Transfinite Surface{4000140} = {4000023,4000025,4000002,4000004}; -Transfinite Surface{4000144} = {4000026,4000024,4000003,4000001}; -Transfinite Surface{4000146} = {4000003,4000007,4000005,4000001}; -Transfinite Surface{4000158} = {4000011,4000017,4000016,4000010}; -Transfinite Surface{4000156} = {4000011,4000008,4000015,4000017}; -Transfinite Surface{4000152} = {4000008,4000011,4000023,4000004}; -Transfinite Surface{4000154} = {4000008,4000006,4000013,4000015}; -Transfinite Surface{4000164} = {4000005,4000007,4000014,4000012}; -Transfinite Surface{4000162} = {4000007,4000010,4000016,4000014}; -Transfinite Surface{4000148} = {4000003,4000024,4000010,4000007}; -Transfinite Surface{4000138} = {4000006,4000008,4000004,4000002}; -Transfinite Surface{4000181} = {4000015,4000013,4000028,4000034}; -Transfinite Surface{4000183} = {4000017,4000015,4000034,4000030}; -Transfinite Surface{4000187} = {4000032,4000019,4000018,4000031}; -Transfinite Surface{4000191} = {4000029,4000033,4000014,4000016}; -Transfinite Surface{4000193} = {4000033,4000027,4000012,4000014}; -Transfinite Surface{4000185} = {4000019,4000017,4000030,4000032}; -Transfinite Surface{4000189} = {4000016,4000018,4000031,4000029}; - -Recombine Surface{4000154,4000160,4000158,4000150,4000142,4000140,4000144,4000146,4000158,4000156,4000152,4000164,4000162,4000148,4000138,4000181,4000183,4000187,4000191,4000193,4000185,4000189}; - // COUCHE 5 - Point(5000001) = { -largint/4 , 0 , h5 , p1 }; Point(5000002) = { largint/4 , 0 , h5 , p1 }; Point(5000003) = { -largint/4 , x2/2. , h5 , p1 }; @@ -843,35 +740,8 @@ Transfinite Line{5000108,-5000111,5000120,5000121,5000112,-5000109} =nbind Using Transfinite Line{5000123,5000124,5000171,5000169} = 6 Using Power 1.0; Transfinite Line{5000174,5000175,5000176,5000177,5000178,5000168,5000179,5000165} = nbext Using Power pwext; -Transfinite Surface{5000160} = {5000017,5000019,5000018,5000016}; -Transfinite Surface{5000158} = {5000011,5000017,5000016,5000010}; -Transfinite Surface{5000150} = {5000011,5000010,5000024,5000023}; -Transfinite Surface{5000142} = {5000024,5000026,5000025,5000023}; -Transfinite Surface{5000140} = {5000023,5000025,5000002,5000004}; -Transfinite Surface{5000144} = {5000026,5000024,5000003,5000001}; -Transfinite Surface{5000146} = {5000003,5000007,5000005,5000001}; -Transfinite Surface{5000158} = {5000011,5000017,5000016,5000010}; -Transfinite Surface{5000156} = {5000011,5000008,5000015,5000017}; -Transfinite Surface{5000152} = {5000008,5000011,5000023,5000004}; -Transfinite Surface{5000154} = {5000008,5000006,5000013,5000015}; -Transfinite Surface{5000164} = {5000005,5000007,5000014,5000012}; -Transfinite Surface{5000162} = {5000007,5000010,5000016,5000014}; -Transfinite Surface{5000148} = {5000003,5000024,5000010,5000007}; -Transfinite Surface{5000138} = {5000006,5000008,5000004,5000002}; -Transfinite Surface{5000181} = {5000015,5000013,5000028,5000034}; -Transfinite Surface{5000183} = {5000017,5000015,5000034,5000030}; -Transfinite Surface{5000187} = {5000032,5000019,5000018,5000031}; -Transfinite Surface{5000191} = {5000029,5000033,5000014,5000016}; -Transfinite Surface{5000193} = {5000033,5000027,5000012,5000014}; -Transfinite Surface{5000185} = {5000019,5000017,5000030,5000032}; -Transfinite Surface{5000189} = {5000016,5000018,5000031,5000029}; -Recombine Surface{5000154,5000160,5000158,5000150,5000142,5000140,5000144,5000146,5000158,5000156,5000152,5000164,5000162,5000148,5000138,5000181,5000183,5000187,5000191,5000193,5000185,5000189}; - - // Liens entre couches - - // lignes couche 1->2 Line(6000194) = {1000028,2000028}; @@ -1012,73 +882,8 @@ Plane Surface(6000323) = {6000322}; Line Loop(6000324) = {-2000174,-6000194,1000174,6000195}; Plane Surface(6000325) = {6000324}; - -Transfinite Surface{6000199} = {2000001,1000001,1000026,2000026}; -Transfinite Surface{6000197} = {2000026,1000026,1000025,2000025}; -Transfinite Surface{6000195} = {2000025,1000025,1000002,2000002}; -Transfinite Surface{6000209} = {2000004,1000004,1000002,2000002}; -Transfinite Surface{6000207} = {2000004,2000023,1000023,1000004}; -Transfinite Surface{6000205} = {2000024,1000024,1000023,2000023}; -Transfinite Surface{6000203} = {2000024,2000003,1000003,1000024}; -Transfinite Surface{6000201} = {2000003,1000003,1000001,2000001}; -Transfinite Surface{6000212} = {2000023,2000025,1000025,1000023}; -Transfinite Surface{6000214} = {2000024,2000026,1000026,1000024}; -Transfinite Surface{6000212} = {1000024,1000026,2000026,2000024}; -Transfinite Surface{6000214} = {1000025,2000025,2000023,1000023}; -Transfinite Surface{6000251} = {2000008,1000008,1000004,2000004}; -Transfinite Surface{6000240} = {1000006,1000008,2000008,2000006}; -Transfinite Surface{6000224} = {2000007,2000005,1000005,1000007}; -Transfinite Surface{6000222} = {2000005,1000005,1000001,2000001}; -Transfinite Surface{6000242} = {1000002,1000006,2000006,2000002}; -Transfinite Surface{6000234} = {1000011,2000011,2000008,1000008}; -Transfinite Surface{6000232} = {2000010,2000011,1000011,1000010}; -Transfinite Surface{6000228} = {1000010,1000007,2000007,2000010}; -Transfinite Surface{6000236} = {1000011,1000023,2000023,2000011}; -Transfinite Surface{6000230} = {2000010,2000024,1000024,1000010}; -Transfinite Surface{6000226} = {2000007,2000003,1000003,1000007}; -Transfinite Surface{6000261} = {2000007,1000007,1000005,2000005}; -Transfinite Surface{6000267} = {1000006,2000006,2000013,1000013}; -Transfinite Surface{6000269} = {2000013,1000013,1000015,2000015}; -Transfinite Surface{6000271} = {1000015,1000008,2000008,2000015}; -Transfinite Surface{6000273} = {1000017,2000017,2000015,1000015}; -Transfinite Surface{6000275} = {1000017,1000011,2000011,2000017}; -Transfinite Surface{6000281} = {2000017,1000017,1000016,2000016}; -Transfinite Surface{6000283} = {1000016,2000016,2000010,1000010}; -Transfinite Surface{6000291} = {1000016,1000014,2000014,2000016}; -Transfinite Surface{6000285} = {1000014,2000014,2000007,1000007}; -Transfinite Surface{6000289} = {1000014,1000012,2000012,2000014}; -Transfinite Surface{6000287} = {1000012,2000012,2000005,1000005}; -Transfinite Surface{6000299} = {1000018,2000018,2000019,1000019}; -Transfinite Surface{6000307} = {2000019,2000017,1000017,1000019}; -Transfinite Surface{6000309} = {1000016,2000016,2000018,1000018}; -Transfinite Surface{6000301} = {2000018,1000018,1000031,2000031}; -Transfinite Surface{6000305} = {1000031,2000031,2000032,1000032}; -Transfinite Surface{6000303} = {2000032,1000032,1000019,2000019}; -Transfinite Surface{6000315} = {2000032,2000030,1000030,1000032}; -Transfinite Surface{6000319} = {2000030,2000034,1000034,1000030}; -Transfinite Surface{6000323} = {2000034,2000028,1000028,1000034}; -Transfinite Surface{6000317} = {2000017,2000030,1000030,1000017}; -Transfinite Surface{6000321} = {2000015,2000034,1000034,1000015}; -Transfinite Surface{6000325} = {1000013,2000013,2000028,1000028}; -Transfinite Surface{6000333} = {2000012,1000012,1000027,2000027}; -Transfinite Surface{6000335} = {1000027,2000027,2000033,1000033}; -Transfinite Surface{6000337} = {2000033,2000014,1000014,1000033}; -Transfinite Surface{6000339} = {2000033,2000029,1000029,1000033}; -Transfinite Surface{6000341} = {2000029,2000016,1000016,1000029}; -Transfinite Surface{6000343} = {2000029,2000031,1000031,1000029}; - - -Recombine Surface {6000199,6000197,6000195,6000209,6000207,6000205,6000203,6000201,6000212,6000214}; -Recombine Surface{6000251,6000240,6000224,6000222,6000242,6000234,6000232,6000228,6000236,6000230,6000226,6000261}; -Recombine Surface{6000267,6000269,6000271,6000273,6000275,6000281,6000283,6000291,6000285,6000289,6000287}; -Recombine Surface{6000299,6000307,6000309,6000301,6000305,6000303}; -Recombine Surface{6000315,6000319,6000323,6000317,6000321,6000325}; -Recombine Surface{6000315,6000319,6000323,6000317,6000321,6000325,6000333,6000337,6000339,6000341,6000301,6000335,6000343}; - - Surface Loop(6000276) = {6000240,2000154,-6000271,-6000269,-6000267,1000154}; Volume(6000277) = {6000276}; -Transfinite Volume{6000277} = {2000013,1000013,1000006,2000006,2000015,1000015,1000008,2000008}; Surface Loop(6000278) = {6000234,-2000156,-6000273,6000275,-1000156,-6000271}; @@ -1124,29 +929,6 @@ Volume(6000331) = {6000330}; //Surface Loop(6000210) = {1000144,1000142,1000140,6000195,2000140,2000142,2000144,-6000199,-6000197,-6000201,-6000203,6000205,-6000207,6000209}; -Transfinite Volume{6000216} = {1000001,2000001,2000003,1000003,1000026,2000026,2000024,1000024}; -Transfinite Volume{6000218} = {1000026,2000026,2000024,1000024,1000025,2000025,2000023,1000023}; -Transfinite Volume{6000220} = {1000025,2000025,2000023,1000023,1000002,2000002,2000004,1000004}; -Transfinite Volume{6000255} = {2000004,2000008,1000008,1000004,2000023,2000011,1000011,1000023}; -Transfinite Volume{6000257} = {2000023,2000011,1000011,1000023,2000024,2000010,1000010,1000024}; -Transfinite Volume{6000259} = {1000010,1000024,2000024,2000010,1000007,1000003,2000003,2000007}; -Transfinite Volume{6000263} = {2000007,1000007,1000003,2000003,2000005,1000005,1000001,2000001}; -Transfinite Volume{6000265} = {1000006,1000008,2000008,2000006,1000002,1000004,2000004,2000002}; - - -Transfinite Volume{6000279} = {2000015,1000015,1000008,2000008,2000017,1000017,1000011,2000011}; -Transfinite Volume{6000293} = {2000011,2000017,1000017,1000011,2000010,2000016,1000016,1000010}; -Transfinite Volume{6000295} = {2000010,1000010,1000016,2000016,2000007,1000007,1000014,2000014}; -Transfinite Volume{6000297} = {2000007,1000007,1000014,2000014,2000005,1000005,1000012,2000012}; -Transfinite Volume{6000311} = {2000019,1000019,1000018,2000018,2000032,1000032,1000031,2000031}; -Transfinite Volume{6000313} = {2000019,1000019,1000018,2000018,2000017,1000017,1000016,2000016}; -Transfinite Volume{6000327} = {2000028,1000028,1000013,2000013,2000034,1000034,1000015,2000015}; -Transfinite Volume{6000329} = {2000034,1000034,1000015,2000015,2000030,1000030,1000017,2000017}; -Transfinite Volume{6000331} = {1000017,1000019,2000019,2000017,1000030,1000032,2000032,2000030}; -Transfinite Volume{6000345} = {2000012,1000012,1000027,2000027,2000014,1000014,1000033,2000033}; -Transfinite Volume{6000347} = {2000014,1000014,1000033,2000033,2000016,1000016,1000029,2000029}; -Transfinite Volume{6000349} = {2000016,2000018,1000018,1000016,2000029,2000031,1000031,1000029}; - // lignes couche 2->3 Line(7000194) = {2000028,3000028}; @@ -1286,73 +1068,8 @@ Line Loop(7000324) = {-3000174,-7000194,2000174,7000195}; Plane Surface(7000325) = {7000324}; -Transfinite Surface{7000199} = {3000001,2000001,2000026,3000026}; -Transfinite Surface{7000197} = {3000026,2000026,2000025,3000025}; -Transfinite Surface{7000195} = {3000025,2000025,2000002,3000002}; -Transfinite Surface{7000209} = {3000004,2000004,2000002,3000002}; -Transfinite Surface{7000207} = {3000004,3000023,2000023,2000004}; -Transfinite Surface{7000205} = {3000024,2000024,2000023,3000023}; -Transfinite Surface{7000203} = {3000024,3000003,2000003,2000024}; -Transfinite Surface{7000201} = {3000003,2000003,2000001,3000001}; -Transfinite Surface{7000212} = {3000023,3000025,2000025,2000023}; -Transfinite Surface{7000214} = {3000024,3000026,2000026,2000024}; -Transfinite Surface{7000212} = {2000024,2000026,3000026,3000024}; -Transfinite Surface{7000214} = {2000025,3000025,3000023,2000023}; -Transfinite Surface{7000251} = {3000008,2000008,2000004,3000004}; -Transfinite Surface{7000240} = {2000006,2000008,3000008,3000006}; -Transfinite Surface{7000224} = {3000007,3000005,2000005,2000007}; -Transfinite Surface{7000222} = {3000005,2000005,2000001,3000001}; -Transfinite Surface{7000242} = {2000002,2000006,3000006,3000002}; -Transfinite Surface{7000234} = {2000011,3000011,3000008,2000008}; -Transfinite Surface{7000232} = {3000010,3000011,2000011,2000010}; -Transfinite Surface{7000228} = {2000010,2000007,3000007,3000010}; -Transfinite Surface{7000236} = {2000011,2000023,3000023,3000011}; -Transfinite Surface{7000230} = {3000010,3000024,2000024,2000010}; -Transfinite Surface{7000226} = {3000007,3000003,2000003,2000007}; -Transfinite Surface{7000261} = {3000007,2000007,2000005,3000005}; -Transfinite Surface{7000267} = {2000006,3000006,3000013,2000013}; -Transfinite Surface{7000269} = {3000013,2000013,2000015,3000015}; -Transfinite Surface{7000271} = {2000015,2000008,3000008,3000015}; -Transfinite Surface{7000273} = {2000017,3000017,3000015,2000015}; -Transfinite Surface{7000275} = {2000017,2000011,3000011,3000017}; -Transfinite Surface{7000281} = {3000017,2000017,2000016,3000016}; -Transfinite Surface{7000283} = {2000016,3000016,3000010,2000010}; -Transfinite Surface{7000291} = {2000016,2000014,3000014,3000016}; -Transfinite Surface{7000285} = {2000014,3000014,3000007,2000007}; -Transfinite Surface{7000289} = {2000014,2000012,3000012,3000014}; -Transfinite Surface{7000287} = {2000012,3000012,3000005,2000005}; -Transfinite Surface{7000299} = {2000018,3000018,3000019,2000019}; -Transfinite Surface{7000307} = {3000019,3000017,2000017,2000019}; -Transfinite Surface{7000309} = {2000016,3000016,3000018,2000018}; -Transfinite Surface{7000301} = {3000018,2000018,2000031,3000031}; -Transfinite Surface{7000305} = {2000031,3000031,3000032,2000032}; -Transfinite Surface{7000303} = {3000032,2000032,2000019,3000019}; -Transfinite Surface{7000315} = {3000032,3000030,2000030,2000032}; -Transfinite Surface{7000319} = {3000030,3000034,2000034,2000030}; -Transfinite Surface{7000323} = {3000034,3000028,2000028,2000034}; -Transfinite Surface{7000317} = {3000017,3000030,2000030,2000017}; -Transfinite Surface{7000321} = {3000015,3000034,2000034,2000015}; -Transfinite Surface{7000325} = {2000013,3000013,3000028,2000028}; -Transfinite Surface{7000333} = {3000012,2000012,2000027,3000027}; -Transfinite Surface{7000335} = {2000027,3000027,3000033,2000033}; -Transfinite Surface{7000337} = {3000033,3000014,2000014,2000033}; -Transfinite Surface{7000339} = {3000033,3000029,2000029,2000033}; -Transfinite Surface{7000341} = {3000029,3000016,2000016,2000029}; -Transfinite Surface{7000343} = {3000029,3000031,2000031,2000029}; - - -Recombine Surface {7000199,7000197,7000195,7000209,7000207,7000205,7000203,7000201,7000212,7000214}; -Recombine Surface{7000251,7000240,7000224,7000222,7000242,7000234,7000232,7000228,7000236,7000230,7000226,7000261}; -Recombine Surface{7000267,7000269,7000271,7000273,7000275,7000281,7000283,7000291,7000285,7000289,7000287}; -Recombine Surface{7000299,7000307,7000309,7000301,7000305,7000303}; -Recombine Surface{7000315,7000319,7000323,7000317,7000321,7000325}; -Recombine Surface{7000315,7000319,7000323,7000317,7000321,7000325,7000333,7000337,7000339,7000341,7000301,7000335,7000343}; - - Surface Loop(7000276) = {7000240,3000154,-7000271,-7000269,-7000267,2000154}; Volume(7000277) = {7000276}; -Transfinite Volume{7000277} = {3000013,2000013,2000006,3000006,3000015,2000015,2000008,3000008}; - Surface Loop(7000278) = {7000234,-3000156,-7000273,7000275,-2000156,-7000271}; Volume(7000279) = {7000278}; @@ -1397,30 +1114,7 @@ Volume(7000331) = {7000330}; //Surface Loop(7000210) = {2000144,2000142,2000140,7000195,3000140,3000142,3000144,-7000199,-7000197,-7000201,-7000203,7000205,-7000207,7000209}; -Transfinite Volume{7000216} = {2000001,3000001,3000003,2000003,2000026,3000026,3000024,2000024}; -Transfinite Volume{7000218} = {2000026,3000026,3000024,2000024,2000025,3000025,3000023,2000023}; -Transfinite Volume{7000220} = {2000025,3000025,3000023,2000023,2000002,3000002,3000004,2000004}; -Transfinite Volume{7000255} = {3000004,3000008,2000008,2000004,3000023,3000011,2000011,2000023}; -Transfinite Volume{7000257} = {3000023,3000011,2000011,2000023,3000024,3000010,2000010,2000024}; -Transfinite Volume{7000259} = {2000010,2000024,3000024,3000010,2000007,2000003,3000003,3000007}; -Transfinite Volume{7000263} = {3000007,2000007,2000003,3000003,3000005,2000005,2000001,3000001}; -Transfinite Volume{7000265} = {2000006,2000008,3000008,3000006,2000002,2000004,3000004,3000002}; - - -Transfinite Volume{7000279} = {3000015,2000015,2000008,3000008,3000017,2000017,2000011,3000011}; -Transfinite Volume{7000293} = {3000011,3000017,2000017,2000011,3000010,3000016,2000016,2000010}; -Transfinite Volume{7000295} = {3000010,2000010,2000016,3000016,3000007,2000007,2000014,3000014}; -Transfinite Volume{7000297} = {3000007,2000007,2000014,3000014,3000005,2000005,2000012,3000012}; -Transfinite Volume{7000311} = {3000019,2000019,2000018,3000018,3000032,2000032,2000031,3000031}; -Transfinite Volume{7000313} = {3000019,2000019,2000018,3000018,3000017,2000017,2000016,3000016}; -Transfinite Volume{7000327} = {3000028,2000028,2000013,3000013,3000034,2000034,2000015,3000015}; -Transfinite Volume{7000329} = {3000034,2000034,2000015,3000015,3000030,2000030,2000017,3000017}; -Transfinite Volume{7000331} = {2000017,2000019,3000019,3000017,2000030,2000032,3000032,3000030}; -Transfinite Volume{7000345} = {3000012,2000012,2000027,3000027,3000014,2000014,2000033,3000033}; -Transfinite Volume{7000347} = {3000014,2000014,2000033,3000033,3000016,2000016,2000029,3000029}; -Transfinite Volume{7000349} = {3000016,3000018,2000018,2000016,3000029,3000031,2000031,2000029}; -// lignes couche 3->4 Line(8000194) = {3000028,4000028}; Line(8000195) = {3000013,4000013}; @@ -1559,72 +1253,8 @@ Line Loop(8000324) = {-4000174,-8000194,3000174,8000195}; Plane Surface(8000325) = {8000324}; -Transfinite Surface{8000199} = {4000001,3000001,3000026,4000026}; -Transfinite Surface{8000197} = {4000026,3000026,3000025,4000025}; -Transfinite Surface{8000195} = {4000025,3000025,3000002,4000002}; -Transfinite Surface{8000209} = {4000004,3000004,3000002,4000002}; -Transfinite Surface{8000207} = {4000004,4000023,3000023,3000004}; -Transfinite Surface{8000205} = {4000024,3000024,3000023,4000023}; -Transfinite Surface{8000203} = {4000024,4000003,3000003,3000024}; -Transfinite Surface{8000201} = {4000003,3000003,3000001,4000001}; -Transfinite Surface{8000212} = {4000023,4000025,3000025,3000023}; -Transfinite Surface{8000214} = {4000024,4000026,3000026,3000024}; -Transfinite Surface{8000212} = {3000024,3000026,4000026,4000024}; -Transfinite Surface{8000214} = {3000025,4000025,4000023,3000023}; -Transfinite Surface{8000251} = {4000008,3000008,3000004,4000004}; -Transfinite Surface{8000240} = {3000006,3000008,4000008,4000006}; -Transfinite Surface{8000224} = {4000007,4000005,3000005,3000007}; -Transfinite Surface{8000222} = {4000005,3000005,3000001,4000001}; -Transfinite Surface{8000242} = {3000002,3000006,4000006,4000002}; -Transfinite Surface{8000234} = {3000011,4000011,4000008,3000008}; -Transfinite Surface{8000232} = {4000010,4000011,3000011,3000010}; -Transfinite Surface{8000228} = {3000010,3000007,4000007,4000010}; -Transfinite Surface{8000236} = {3000011,3000023,4000023,4000011}; -Transfinite Surface{8000230} = {4000010,4000024,3000024,3000010}; -Transfinite Surface{8000226} = {4000007,4000003,3000003,3000007}; -Transfinite Surface{8000261} = {4000007,3000007,3000005,4000005}; -Transfinite Surface{8000267} = {3000006,4000006,4000013,3000013}; -Transfinite Surface{8000269} = {4000013,3000013,3000015,4000015}; -Transfinite Surface{8000271} = {3000015,3000008,4000008,4000015}; -Transfinite Surface{8000273} = {3000017,4000017,4000015,3000015}; -Transfinite Surface{8000275} = {3000017,3000011,4000011,4000017}; -Transfinite Surface{8000281} = {4000017,3000017,3000016,4000016}; -Transfinite Surface{8000283} = {3000016,4000016,4000010,3000010}; -Transfinite Surface{8000291} = {3000016,3000014,4000014,4000016}; -Transfinite Surface{8000285} = {3000014,4000014,4000007,3000007}; -Transfinite Surface{8000289} = {3000014,3000012,4000012,4000014}; -Transfinite Surface{8000287} = {3000012,4000012,4000005,3000005}; -Transfinite Surface{8000299} = {3000018,4000018,4000019,3000019}; -Transfinite Surface{8000307} = {4000019,4000017,3000017,3000019}; -Transfinite Surface{8000309} = {3000016,4000016,4000018,3000018}; -Transfinite Surface{8000301} = {4000018,3000018,3000031,4000031}; -Transfinite Surface{8000305} = {3000031,4000031,4000032,3000032}; -Transfinite Surface{8000303} = {4000032,3000032,3000019,4000019}; -Transfinite Surface{8000315} = {4000032,4000030,3000030,3000032}; -Transfinite Surface{8000319} = {4000030,4000034,3000034,3000030}; -Transfinite Surface{8000323} = {4000034,4000028,3000028,3000034}; -Transfinite Surface{8000317} = {4000017,4000030,3000030,3000017}; -Transfinite Surface{8000321} = {4000015,4000034,3000034,3000015}; -Transfinite Surface{8000325} = {3000013,4000013,4000028,3000028}; -Transfinite Surface{8000333} = {4000012,3000012,3000027,4000027}; -Transfinite Surface{8000335} = {3000027,4000027,4000033,3000033}; -Transfinite Surface{8000337} = {4000033,4000014,3000014,3000033}; -Transfinite Surface{8000339} = {4000033,4000029,3000029,3000033}; -Transfinite Surface{8000341} = {4000029,4000016,3000016,3000029}; -Transfinite Surface{8000343} = {4000029,4000031,3000031,3000029}; - - -Recombine Surface {8000199,8000197,8000195,8000209,8000207,8000205,8000203,8000201,8000212,8000214}; -Recombine Surface{8000251,8000240,8000224,8000222,8000242,8000234,8000232,8000228,8000236,8000230,8000226,8000261}; -Recombine Surface{8000267,8000269,8000271,8000273,8000275,8000281,8000283,8000291,8000285,8000289,8000287}; -Recombine Surface{8000299,8000307,8000309,8000301,8000305,8000303}; -Recombine Surface{8000315,8000319,8000323,8000317,8000321,8000325}; -Recombine Surface{8000315,8000319,8000323,8000317,8000321,8000325,8000333,8000337,8000339,8000341,8000301,8000335,8000343}; - - Surface Loop(8000276) = {8000240,4000154,-8000271,-8000269,-8000267,3000154}; Volume(8000277) = {8000276}; -Transfinite Volume{8000277} = {4000013,3000013,3000006,4000006,4000015,3000015,3000008,4000008}; Surface Loop(8000278) = {8000234,-4000156,-8000273,8000275,-3000156,-8000271}; @@ -1670,29 +1300,6 @@ Volume(8000331) = {8000330}; //Surface Loop(8000210) = {3000144,3000142,3000140,8000195,4000140,4000142,4000144,-8000199,-8000197,-8000201,-8000203,8000205,-8000207,8000209}; -Transfinite Volume{8000216} = {3000001,4000001,4000003,3000003,3000026,4000026,4000024,3000024}; -Transfinite Volume{8000218} = {3000026,4000026,4000024,3000024,3000025,4000025,4000023,3000023}; -Transfinite Volume{8000220} = {3000025,4000025,4000023,3000023,3000002,4000002,4000004,3000004}; -Transfinite Volume{8000255} = {4000004,4000008,3000008,3000004,4000023,4000011,3000011,3000023}; -Transfinite Volume{8000257} = {4000023,4000011,3000011,3000023,4000024,4000010,3000010,3000024}; -Transfinite Volume{8000259} = {3000010,3000024,4000024,4000010,3000007,3000003,4000003,4000007}; -Transfinite Volume{8000263} = {4000007,3000007,3000003,4000003,4000005,3000005,3000001,4000001}; -Transfinite Volume{8000265} = {3000006,3000008,4000008,4000006,3000002,3000004,4000004,4000002}; - - -Transfinite Volume{8000279} = {4000015,3000015,3000008,4000008,4000017,3000017,3000011,4000011}; -Transfinite Volume{8000293} = {4000011,4000017,3000017,3000011,4000010,4000016,3000016,3000010}; -Transfinite Volume{8000295} = {4000010,3000010,3000016,4000016,4000007,3000007,3000014,4000014}; -Transfinite Volume{8000297} = {4000007,3000007,3000014,4000014,4000005,3000005,3000012,4000012}; -Transfinite Volume{8000311} = {4000019,3000019,3000018,4000018,4000032,3000032,3000031,4000031}; -Transfinite Volume{8000313} = {4000019,3000019,3000018,4000018,4000017,3000017,3000016,4000016}; -Transfinite Volume{8000327} = {4000028,3000028,3000013,4000013,4000034,3000034,3000015,4000015}; -Transfinite Volume{8000329} = {4000034,3000034,3000015,4000015,4000030,3000030,3000017,4000017}; -Transfinite Volume{8000331} = {3000017,3000019,4000019,4000017,3000030,3000032,4000032,4000030}; -Transfinite Volume{8000345} = {4000012,3000012,3000027,4000027,4000014,3000014,3000033,4000033}; -Transfinite Volume{8000347} = {4000014,3000014,3000033,4000033,4000016,3000016,3000029,4000029}; -Transfinite Volume{8000349} = {4000016,4000018,3000018,3000016,4000029,4000031,3000031,3000029}; - // lignes couche 4->5 Line(9000194) = {4000028,5000028}; @@ -1834,72 +1441,8 @@ Line Loop(9000324) = {-5000174,-9000194,4000174,9000195}; Plane Surface(9000325) = {9000324}; -Transfinite Surface{9000199} = {5000001,4000001,4000026,5000026}; -Transfinite Surface{9000197} = {5000026,4000026,4000025,5000025}; -Transfinite Surface{9000195} = {5000025,4000025,4000002,5000002}; -Transfinite Surface{9000209} = {5000004,4000004,4000002,5000002}; -Transfinite Surface{9000207} = {5000004,5000023,4000023,4000004}; -Transfinite Surface{9000205} = {5000024,4000024,4000023,5000023}; -Transfinite Surface{9000203} = {5000024,5000003,4000003,4000024}; -Transfinite Surface{9000201} = {5000003,4000003,4000001,5000001}; -Transfinite Surface{9000212} = {5000023,5000025,4000025,4000023}; -Transfinite Surface{9000214} = {5000024,5000026,4000026,4000024}; -Transfinite Surface{9000212} = {4000024,4000026,5000026,5000024}; -Transfinite Surface{9000214} = {4000025,5000025,5000023,4000023}; -Transfinite Surface{9000251} = {5000008,4000008,4000004,5000004}; -Transfinite Surface{9000240} = {4000006,4000008,5000008,5000006}; -Transfinite Surface{9000224} = {5000007,5000005,4000005,4000007}; -Transfinite Surface{9000222} = {5000005,4000005,4000001,5000001}; -Transfinite Surface{9000242} = {4000002,4000006,5000006,5000002}; -Transfinite Surface{9000234} = {4000011,5000011,5000008,4000008}; -Transfinite Surface{9000232} = {5000010,5000011,4000011,4000010}; -Transfinite Surface{9000228} = {4000010,4000007,5000007,5000010}; -Transfinite Surface{9000236} = {4000011,4000023,5000023,5000011}; -Transfinite Surface{9000230} = {5000010,5000024,4000024,4000010}; -Transfinite Surface{9000226} = {5000007,5000003,4000003,4000007}; -Transfinite Surface{9000261} = {5000007,4000007,4000005,5000005}; -Transfinite Surface{9000267} = {4000006,5000006,5000013,4000013}; -Transfinite Surface{9000269} = {5000013,4000013,4000015,5000015}; -Transfinite Surface{9000271} = {4000015,4000008,5000008,5000015}; -Transfinite Surface{9000273} = {4000017,5000017,5000015,4000015}; -Transfinite Surface{9000275} = {4000017,4000011,5000011,5000017}; -Transfinite Surface{9000281} = {5000017,4000017,4000016,5000016}; -Transfinite Surface{9000283} = {4000016,5000016,5000010,4000010}; -Transfinite Surface{9000291} = {4000016,4000014,5000014,5000016}; -Transfinite Surface{9000285} = {4000014,5000014,5000007,4000007}; -Transfinite Surface{9000289} = {4000014,4000012,5000012,5000014}; -Transfinite Surface{9000287} = {4000012,5000012,5000005,4000005}; -Transfinite Surface{9000299} = {4000018,5000018,5000019,4000019}; -Transfinite Surface{9000307} = {5000019,5000017,4000017,4000019}; -Transfinite Surface{9000309} = {4000016,5000016,5000018,4000018}; -Transfinite Surface{9000301} = {5000018,4000018,4000031,5000031}; -Transfinite Surface{9000305} = {4000031,5000031,5000032,4000032}; -Transfinite Surface{9000303} = {5000032,4000032,4000019,5000019}; -Transfinite Surface{9000315} = {5000032,5000030,4000030,4000032}; -Transfinite Surface{9000319} = {5000030,5000034,4000034,4000030}; -Transfinite Surface{9000323} = {5000034,5000028,4000028,4000034}; -Transfinite Surface{9000317} = {5000017,5000030,4000030,4000017}; -Transfinite Surface{9000321} = {5000015,5000034,4000034,4000015}; -Transfinite Surface{9000325} = {4000013,5000013,5000028,4000028}; -Transfinite Surface{9000333} = {5000012,4000012,4000027,5000027}; -Transfinite Surface{9000335} = {4000027,5000027,5000033,4000033}; -Transfinite Surface{9000337} = {5000033,5000014,4000014,4000033}; -Transfinite Surface{9000339} = {5000033,5000029,4000029,4000033}; -Transfinite Surface{9000341} = {5000029,5000016,4000016,4000029}; -Transfinite Surface{9000343} = {5000029,5000031,4000031,4000029}; - - -Recombine Surface {9000199,9000197,9000195,9000209,9000207,9000205,9000203,9000201,9000212,9000214}; -Recombine Surface{9000251,9000240,9000224,9000222,9000242,9000234,9000232,9000228,9000236,9000230,9000226,9000261}; -Recombine Surface{9000267,9000269,9000271,9000273,9000275,9000281,9000283,9000291,9000285,9000289,9000287}; -Recombine Surface{9000299,9000307,9000309,9000301,9000305,9000303}; -Recombine Surface{9000315,9000319,9000323,9000317,9000321,9000325}; -Recombine Surface{9000315,9000319,9000323,9000317,9000321,9000325,9000333,9000337,9000339,9000341,9000301,9000335,9000343}; - - Surface Loop(9000276) = {9000240,5000154,-9000271,-9000269,-9000267,4000154}; Volume(9000277) = {9000276}; -Transfinite Volume{9000277} = {5000013,4000013,4000006,5000006,5000015,4000015,4000008,5000008}; Surface Loop(9000278) = {9000234,-5000156,-9000273,9000275,-4000156,-9000271}; @@ -1944,29 +1487,9 @@ Surface Loop(9000330) = {9000303,9000315,9000317,5000185,-9000307,4000185}; Volume(9000331) = {9000330}; //Surface Loop(9000210) = {4000144,4000142,4000140,9000195,5000140,5000142,5000144,-9000199,-9000197,-9000201,-9000203,9000205,-9000207,9000209}; - -Transfinite Volume{9000216} = {4000001,5000001,5000003,4000003,4000026,5000026,5000024,4000024}; -Transfinite Volume{9000218} = {4000026,5000026,5000024,4000024,4000025,5000025,5000023,4000023}; -Transfinite Volume{9000220} = {4000025,5000025,5000023,4000023,4000002,5000002,5000004,4000004}; -Transfinite Volume{9000255} = {5000004,5000008,4000008,4000004,5000023,5000011,4000011,4000023}; -Transfinite Volume{9000257} = {5000023,5000011,4000011,4000023,5000024,5000010,4000010,4000024}; -Transfinite Volume{9000259} = {4000010,4000024,5000024,5000010,4000007,4000003,5000003,5000007}; -Transfinite Volume{9000263} = {5000007,4000007,4000003,5000003,5000005,4000005,4000001,5000001}; -Transfinite Volume{9000265} = {4000006,4000008,5000008,5000006,4000002,4000004,5000004,5000002}; - - -Transfinite Volume{9000279} = {5000015,4000015,4000008,5000008,5000017,4000017,4000011,5000011}; -Transfinite Volume{9000293} = {5000011,5000017,4000017,4000011,5000010,5000016,4000016,4000010}; -Transfinite Volume{9000295} = {5000010,4000010,4000016,5000016,5000007,4000007,4000014,5000014}; -Transfinite Volume{9000297} = {5000007,4000007,4000014,5000014,5000005,4000005,4000012,5000012}; -Transfinite Volume{9000311} = {5000019,4000019,4000018,5000018,5000032,4000032,4000031,5000031}; -Transfinite Volume{9000313} = {5000019,4000019,4000018,5000018,5000017,4000017,4000016,5000016}; -Transfinite Volume{9000327} = {5000028,4000028,4000013,5000013,5000034,4000034,4000015,5000015}; -Transfinite Volume{9000329} = {5000034,4000034,4000015,5000015,5000030,4000030,4000017,5000017}; -Transfinite Volume{9000331} = {4000017,4000019,5000019,5000017,4000030,4000032,5000032,5000030}; -Transfinite Volume{9000345} = {5000012,4000012,4000027,5000027,5000014,4000014,4000033,5000033}; -Transfinite Volume{9000347} = {5000014,4000014,4000033,5000033,5000016,4000016,4000029,5000029}; -Transfinite Volume{9000349} = {5000016,5000018,4000018,4000016,5000029,5000031,4000031,4000029}; +Transfinite Surface "*"; +Recombine Surface "*"; +Transfinite Volume "*"; //Entites physiques diff --git a/benchmarks/3d/induction4.geo b/benchmarks/3d/induction4.geo index cf353ff46b..9dc08cd88e 100644 --- a/benchmarks/3d/induction4.geo +++ b/benchmarks/3d/induction4.geo @@ -173,33 +173,11 @@ Transfinite Line{1000108,-1000111,1000120,1000121,1000112,-1000109} =nbind Using Transfinite Line{1000123,1000124,1000171,1000169} = 6 Using Power 1.0; Transfinite Line{1000174,1000175,1000176,1000177,1000178,1000168,1000179,1000165} = nbext Using Power pwext; -Transfinite Surface{1000160} = {1000017,1000019,1000018,1000016}; -Transfinite Surface{1000158} = {1000011,1000017,1000016,1000010}; -Transfinite Surface{1000150} = {1000011,1000010,1000024,1000023}; -Transfinite Surface{1000142} = {1000024,1000026,1000025,1000023}; -Transfinite Surface{1000140} = {1000023,1000025,1000002,1000004}; -Transfinite Surface{1000144} = {1000026,1000024,1000003,1000001}; -Transfinite Surface{1000146} = {1000003,1000007,1000005,1000001}; -Transfinite Surface{1000158} = {1000011,1000017,1000016,1000010}; -Transfinite Surface{1000156} = {1000011,1000008,1000015,1000017}; -Transfinite Surface{1000152} = {1000008,1000011,1000023,1000004}; -Transfinite Surface{1000154} = {1000008,1000006,1000013,1000015}; -Transfinite Surface{1000164} = {1000005,1000007,1000014,1000012}; -Transfinite Surface{1000162} = {1000007,1000010,1000016,1000014}; -Transfinite Surface{1000148} = {1000003,1000024,1000010,1000007}; -Transfinite Surface{1000138} = {1000006,1000008,1000004,1000002}; -Transfinite Surface{1000181} = {1000015,1000013,1000028,1000034}; -Transfinite Surface{1000183} = {1000017,1000015,1000034,1000030}; -Transfinite Surface{1000187} = {1000032,1000019,1000018,1000031}; -Transfinite Surface{1000191} = {1000029,1000033,1000014,1000016}; -Transfinite Surface{1000193} = {1000033,1000027,1000012,1000014}; -Transfinite Surface{1000185} = {1000019,1000017,1000030,1000032}; -Transfinite Surface{1000189} = {1000016,1000018,1000031,1000029}; - ss[] = {1000154,1000160,1000158,1000150,1000142,1000140,1000144,1000146,1000158, 1000156,1000152,1000164,1000162,1000148,1000138,1000181,1000183,1000187, 1000191,1000193,1000185,1000189}; +Transfinite Surface{ss[]}; Recombine Surface{ss[]}; diff --git a/benchmarks/3d/sphere_hexa.geo b/benchmarks/3d/sphere_hexa.geo index c65892a3da..783ecb16bc 100644 --- a/benchmarks/3d/sphere_hexa.geo +++ b/benchmarks/3d/sphere_hexa.geo @@ -13,24 +13,10 @@ Line(1) = {2,3}; Line(2) = {3,4}; Line(3) = {4,5}; Line(4) = {5,2}; -Transfinite Line{1:4} = n; Line Loop(5) = {4,1,2,3}; Plane Surface(6) = {5}; -Transfinite Surface{6} = {2,3,4,5}; -Recombine Surface{6}; Extrude Surface {6, {0.0,0.0,2*r1}}; -// force transfinite grid in interior cube -Transfinite Line {3,22,11,13,8,4,14,9,1,18,10,2} = n; -Transfinite Surface {6} = {4,5,2,3}; -Transfinite Surface {15} = {5,6,7,2}; -Transfinite Surface {19} = {11,7,2,3}; -Transfinite Surface {23} = {4,15,11,3}; -Transfinite Surface {27} = {15,6,5,4}; -Transfinite Surface {28} = {15,6,7,11}; -Recombine Surface{6,15,19,23,27,28}; -Transfinite Volume{1} = {4,5,2,3,15,6,7,11}; - // exterior shell Point(102) = {r2,r2,-r2,l}; Point(103) = {-r2,r2,-r2,l}; @@ -74,35 +60,10 @@ Surface Loop(90) = {45,-77,-79,-27,83,81};Volume(91) = {90}; Surface Loop(92) = {40,-81,-71,-28,73,-65};Volume(93) = {92}; Surface Loop(94) = {34,61,-75,77,69,6};Volume(95) = {94}; -// force transfinite grid in exterior shell -Transfinite Line{29:59} = n; -Transfinite Surface {34} = {102,103,104,105}; -Transfinite Surface {35} = {106,108,102,103}; -Transfinite Surface {40} = {109,111,108,106}; -Transfinite Surface {45} = {104,105,111,109}; -Transfinite Surface {50} = {104,109,106,103}; -Transfinite Surface {51} = {105,111,108,102}; -Recombine Surface{34,35,40,45,50,51}; -Transfinite Surface {61} = {3,2,102,103}; -Transfinite Surface {63} = {2,7,108,102}; -Transfinite Surface {65} = {11,7,108,106}; -Transfinite Surface {67} = {3,11,106,103}; -Transfinite Surface {69} = {104,4,3,103}; -Transfinite Surface {71} = {109,15,11,106}; -Transfinite Surface {73} = {6,111,108,7}; -Transfinite Surface {75} = {5,105,102,2}; -Transfinite Surface {77} = {104,105,5,4}; -Transfinite Surface {79} = {104,109,15,4}; -Transfinite Surface {81} = {109,111,6,15}; -Transfinite Surface {83} = {6,111,105,5}; -Recombine Surface{61:83:2}; -Transfinite Volume{85} = {105,111,108,102, 5,6,7,2}; // x+ -Transfinite Volume{87} = {15,11,3,4,109,106,103,104}; // x- -Transfinite Volume{89} = {11,7,2,3,106,108,102,103}; // y+ -Transfinite Volume{91} = {15,4,5,6,109,104,105,111}; // y- -Transfinite Volume{93} = {15,6,7,11,109,111,108,106}; // z+ -Transfinite Volume{95} = {4,3,2,5,104,103,102,105}; // z- +Transfinite Line "*" = n; +Transfinite Surface "*"; +Recombine Surface "*"; +Transfinite Volume "*"; // group all hexas in a single volume Physical Volume(1) = {1, 85:95:2}; - diff --git a/benchmarks/3d/sphere_in_cube_hexa.geo b/benchmarks/3d/sphere_in_cube_hexa.geo index 3c29e59018..e3ccfb61ca 100644 --- a/benchmarks/3d/sphere_in_cube_hexa.geo +++ b/benchmarks/3d/sphere_in_cube_hexa.geo @@ -1,9 +1,9 @@ l = 1; -r1 = 3; +r1 = 2; r2 = 0.5; n = 10; n2 = n; -progr = 1.4; +progr = 2; // exterior cube Point(1) = {0,0,0,l}; @@ -15,24 +15,11 @@ Line(1) = {2,3}; Line(2) = {3,4}; Line(3) = {4,5}; Line(4) = {5,2}; -Transfinite Line{1:4} = n; Line Loop(5) = {4,1,2,3}; Plane Surface(6) = {5}; -Transfinite Surface{6} = {2,3,4,5}; -Recombine Surface{6}; Extrude Surface {6, {0.0,0.0,2*r1}}; Delete { Volume{1}; } -// force transfinite grid on exterior cube -Transfinite Line {3,22,11,13,8,4,14,9,1,18,10,2} = n; -Transfinite Surface {6} = {4,5,2,3}; -Transfinite Surface {15} = {5,6,7,2}; -Transfinite Surface {19} = {11,7,2,3}; -Transfinite Surface {23} = {4,15,11,3}; -Transfinite Surface {27} = {15,6,5,4}; -Transfinite Surface {28} = {15,6,7,11}; -Recombine Surface{6,15,19,23,27,28}; - // interior sphere Point(102) = {r2,r2,-r2,l}; Point(103) = {-r2,r2,-r2,l}; @@ -50,16 +37,6 @@ Rotate { {1,0,0},{0,0,0}, 3*Pi/2 } { Duplicata{ Surface{34}; } } Rotate { {0,1,0},{0,0,0}, Pi/2 } { Duplicata { Surface{34}; } } Rotate { {0,1,0},{0,0,0}, -Pi/2 } { Duplicata { Surface{34}; } } -// force transfinite grid on interior sphere -Transfinite Line{29:59} = n; -Transfinite Surface {34} = {102,103,104,105}; -Transfinite Surface {35} = {106,108,102,103}; -Transfinite Surface {40} = {109,111,108,106}; -Transfinite Surface {45} = {104,105,111,109}; -Transfinite Surface {50} = {104,109,106,103}; -Transfinite Surface {51} = {105,111,108,102}; -Recombine Surface{34,35,40,45,50,51}; - // connect sphere and cube Line(52) = {102,2}; Line(53) = {108,7}; @@ -69,7 +46,6 @@ Line(56) = {109,15}; Line(57) = {104,4}; Line(58) = {103,3}; Line(59) = {106,11}; -Transfinite Line{52:59} = n2 Using Progression progr; Line Loop(60) = {58,-1,-52,-29};Plane Surface(61) = {60}; Line Loop(62) = {58,18,-59,-39};Plane Surface(63) = {62}; @@ -84,21 +60,6 @@ Line Loop(78) = {58,2,-57,32};Plane Surface(79) = {78}; Line Loop(80) = {52,-4,-54,-30};Plane Surface(81) = {80}; Line Loop(82) = {42,53,-8,-55};Plane Surface(83) = {82}; -// force transfinite grid on connection surfaces -Transfinite Surface {61} = {103,102,2,3}; -Transfinite Surface {63} = {106,103,3,11}; -Transfinite Surface {65} = {11,7,108,106}; -Transfinite Surface {67} = {102,108,7,2}; -Transfinite Surface {69} = {4,15,109,104}; -Transfinite Surface {71} = {5,4,104,105}; -Transfinite Surface {73} = {6,5,105,111}; -Transfinite Surface {75} = {15,6,111,109}; -Transfinite Surface {77} = {15,109,106,11}; -Transfinite Surface {79} = {4,104,103,3}; -Transfinite Surface {81} = {105,5,2,102}; -Transfinite Surface {83} = {111,6,7,108}; -Recombine Surface{61:83:2}; - // connection volumes Surface Loop(84) = {19,61,-63,-65,67,-35}; Volume(85) = {84}; Surface Loop(86) = {34,61,-79,6,81,-71}; Volume(87) = {86}; @@ -107,13 +68,13 @@ Surface Loop(90) = {28,83,-40,75,-77,65}; Volume(91) = {90}; Surface Loop(92) = {15,81,-67,-51,-83,73}; Volume(93) = {92}; Surface Loop(94) = {27,-71,-45,-73,-75,-69}; Volume(95) = {94}; -// force transfinite grid on connection volume -Transfinite Volume{85} = {106,108,102,103,11,7,2,3}; -Transfinite Volume{87} = {104,105,102,103,4,5,2,3}; -Transfinite Volume{89} = {104,109,106,103,4,15,11,3}; -Transfinite Volume{91} = {109,111,108,106,15,6,7,11}; -Transfinite Volume{93} = {111,105,102,108,6,5,2,7}; -Transfinite Volume{95} = {109,104,105,111,15,4,5,6}; +// define transfinite mesh +Transfinite Line {53, 59, 52, 58, 55, 56, 54, 57} = n Using Progression progr; +Transfinite Line {42, 44, 30, 32, 36, 41, 29, 31, 9, 1, 8, 4, 11, 3, 10, 2, + 18, 22, 14, 13, 39, 49, 37, 47} = n2; +Transfinite Surface "*"; +Recombine Surface "*"; +Transfinite Volume "*"; Physical Volume(1) = {85:95:2}; // ext volume Physical Surface(100) = {34,35,40,45,50,51}; // int surf diff --git a/benchmarks/3d/sphere_in_sphere_hexa.geo b/benchmarks/3d/sphere_in_sphere_hexa.geo index 784956bedf..0fec814b6e 100644 --- a/benchmarks/3d/sphere_in_sphere_hexa.geo +++ b/benchmarks/3d/sphere_in_sphere_hexa.geo @@ -39,13 +39,6 @@ s4 = news; Ruled Surface(s4) = {l4}; s5 = news; Ruled Surface(s5) = {l5}; s6 = news; Ruled Surface(s6) = {l6}; Transfinite Line{c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12} = n_patch; -Transfinite Surface{s1} = {p1,p2,p3,p4}; -Transfinite Surface{s2} = {p5,p6,p7,p8}; -Transfinite Surface{s3} = {p1,p2,p6,p5}; -Transfinite Surface{s4} = {p2,p3,p7,p6}; -Transfinite Surface{s5} = {p3,p4,p8,p7}; -Transfinite Surface{s6} = {p4,p1,p5,p8}; -Recombine Surface{s1,s2,s3,s4,s5,s6}; Return p0 = newp; Point(p0) = {0,0,0,lc}; diff --git a/doc/VERSIONS.txt b/doc/VERSIONS.txt index e4d2bbf7ad..a43052c9e5 100644 --- a/doc/VERSIONS.txt +++ b/doc/VERSIONS.txt @@ -1,12 +1,11 @@ -$Id: VERSIONS.txt,v 1.27 2008-12-28 15:21:33 geuzaine Exp $ +$Id: VERSIONS.txt,v 1.28 2008-12-28 17:23:39 geuzaine Exp $ 2.3.0 (?): restored full-quad recombine algorithm; fixed clipping planes when more than 32 views are present ({Geometry,Mesh,View}.Clip -replaces General.Clip); modified arrow size (View.ArrowSize{Min,Max} -replaces View.ArrowSize) and Transform options; improved visibility -browser; major graphics and GUI code refactoring; improved automatic -transfinite corner selection (now also for volumes); many small -improvements and small bug fixes. +replaces General.Clip); modified arrow size and Transform options; +improved visibility browser; major graphics and GUI code refactoring; +improved automatic transfinite corner selection (now also for +volumes); many small improvements and small bug fixes. 2.2.6 (Nov 21, 2008): better transfinite smoothing and automatic corner selection; fixed high order meshing crashes on Windows and -- GitLab