diff --git a/benchmarks/stl/PelvisARTHUR_CLASS_GEO.geo b/benchmarks/stl/PelvisARTHUR_CLASS_GEO.geo deleted file mode 100644 index 1991c97dedeaa04ce63a990035354bbfb4f4aee3..0000000000000000000000000000000000000000 --- a/benchmarks/stl/PelvisARTHUR_CLASS_GEO.geo +++ /dev/null @@ -1,15 +0,0 @@ -Mesh.CharacteristicLengthFactor=0.133; - -Merge "PelvisARTHUR_CLASS.msh"; -CreateTopology; - -Surface Loop(1002)={2,3}; -Volume(1003)={1002}; - -Compound Line(10)={4}; -Compound Line(20)={5}; - -Compound Surface(200)={2}; -Compound Surface(400)={3}; - -//Compound Volume(2000) = {1003}; diff --git a/benchmarks/stl/artery_GEO.geo b/benchmarks/stl/artery_GEO.geo index 71a9ea5e8d4fb6884fe1ae780bdc8f5072a8ed48..d1843ff642239abc1903a8904e73d83306f43b88 100644 --- a/benchmarks/stl/artery_GEO.geo +++ b/benchmarks/stl/artery_GEO.geo @@ -5,18 +5,22 @@ Merge "artery.stl"; CreateTopology; -//Create Inlet and outler surfaces -Line Loop(1) = {1}; -Line Loop(2) = {2}; -Line Loop(3) = {3}; -Plane Surface(10)={1}; -Plane Surface(20)={2}; -Plane Surface(30)={3}; +Compound Line(10) = {1}; +Compound Line(20) = {2}; +Compound Line(30) = {3}; +Compound Surface(110)={1}; + +//Line Loop(11)={10}; +//Plane Surface(12)={10}; +//Line Loop(21)={20}; +//Plane Surface(22)={21}; +//Line Loop(31)={30}; +//Plane Surface(23)={3}; //Create a Volume defined by a surface loop -Surface Loop(100)={1,10,20,30}; -Volume(101)={100}; +//Surface Loop(100)={1,10,20,30}; +//Volume(101)={100}; //REMESHING THE INITIAL TRIANGULATION in 2D then 3D -Compound Surface(110)={1} Boundary {{3},{1,2},{},{}}; -Compound Volume(111)={101}; \ No newline at end of file + +//Compound Volume(111)={101}; \ No newline at end of file diff --git a/benchmarks/stl/pelvis.geo b/benchmarks/stl/pelvis.geo new file mode 100644 index 0000000000000000000000000000000000000000..7c06bc19f05ac77454db4ca45c36739fb0f48b79 --- /dev/null +++ b/benchmarks/stl/pelvis.geo @@ -0,0 +1,14 @@ +Mesh.CharacteristicLengthFactor=0.133; + +Merge "pelvisSMOOTH.stl"; +CreateTopology; + +Compound Surface(200)={1}; + +Surface Loop(1000)={200}; +Volume(1001)={1000}; + +Physical Surface (100)={200}; + + + diff --git a/benchmarks/stl/PelvisARTHUR2.stl b/benchmarks/stl/pelvis.stl similarity index 100% rename from benchmarks/stl/PelvisARTHUR2.stl rename to benchmarks/stl/pelvis.stl diff --git a/benchmarks/stl/pelvisSMOOTH.stl b/benchmarks/stl/pelvisSMOOTH.stl new file mode 100644 index 0000000000000000000000000000000000000000..db4770d05ccb88d4db1b52ecda4fb56f5648aed6 Binary files /dev/null and b/benchmarks/stl/pelvisSMOOTH.stl differ