From 6f19d7dfa201cd9e988d447df8bcfdcb2eb43474 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 10 Feb 2017 08:09:09 +0000
Subject: [PATCH] cleanup demos
---
Geo/GModelIO_OCC.cpp | 3 ++-
{benchmarks => demos}/boolean/component8.step | 0
{benchmarks => demos}/boolean/compsolid.geo | 0
{benchmarks => demos}/boolean/compsolid2.geo | 0
{benchmarks => demos}/boolean/import.geo | 0
{benchmarks => demos}/boolean/neuron.geo | 0
{benchmarks => demos}/boolean/simple.geo | 0
{benchmarks => demos}/boolean/simple2.geo | 0
{benchmarks => demos}/boolean/simple3.geo | 0
{benchmarks => demos}/boolean/simple4.geo | 0
{benchmarks => demos}/boolean/simple5.geo | 0
{benchmarks => demos}/boolean/transform.geo | 0
{benchmarks => demos}/boolean/wikipedia.geo | 0
demos/{ => post_processing}/anim.script | 0
demos/{ => post_processing}/encode.script | 0
demos/{ => post_processing}/isosurf.script | 0
demos/{ => post_processing}/lowmem-anim.geo | 0
demos/{ => post_processing}/multislice.script | 0
demos/{ => post_processing}/plot2d.geo | 0
demos/{ => post_processing}/primitives.pos | 0
demos/{ => post_processing}/rotate.script | 0
demos/{ => post_processing}/title.script | 0
demos/{ => post_processing}/view_groups.geo | 0
demos/{ => simple_geo}/antenna.geo | 0
demos/{ => simple_geo}/antenna.i1 | 0
demos/{ => simple_geo}/component8.step | 0
demos/{ => simple_geo}/component8_in_a_box.geo | 0
demos/{ => simple_geo}/cone.geo | 0
demos/{ => simple_geo}/cube.geo | 0
demos/{ => simple_geo}/fields.geo | 0
demos/{ => simple_geo}/filter.geo | 0
demos/{ => simple_geo}/hex.geo | 0
demos/{ => simple_geo}/homology.geo | 0
demos/{ => simple_geo}/indheat.geo | 0
demos/{ => simple_geo}/machine.geo | 0
demos/{ => simple_geo}/machine.i1 | 0
demos/{ => simple_geo}/machine.i2 | 0
demos/{ => simple_geo}/nested.geo | 0
demos/{ => simple_geo}/piece-extr-rec.geo | 0
demos/{ => simple_geo}/piece-extr.geo | 0
demos/{ => simple_geo}/piece.geo | 0
demos/{ => simple_geo}/pripyrtet.geo | 0
demos/{ => simple_geo}/sphere-discrete.geo | 0
demos/{ => simple_geo}/sphere-surf.stl | 0
demos/{ => simple_geo}/sphere.geo | 0
demos/{ => simple_geo}/splines.geo | 0
demos/{ => simple_geo}/square_regular.geo | 0
demos/{ => simple_geo}/tower.geo | 0
demos/{ => simple_geo}/tower.i1 | 0
demos/{ => simple_geo}/tower.i2 | 0
demos/{ => simple_geo}/tower.i3 | 0
demos/{ => simple_geo}/tower.i4 | 0
demos/{ => simple_geo}/tower.i5 | 0
demos/{ => simple_geo}/transfinite.geo | 0
54 files changed, 2 insertions(+), 1 deletion(-)
rename {benchmarks => demos}/boolean/component8.step (100%)
rename {benchmarks => demos}/boolean/compsolid.geo (100%)
rename {benchmarks => demos}/boolean/compsolid2.geo (100%)
rename {benchmarks => demos}/boolean/import.geo (100%)
rename {benchmarks => demos}/boolean/neuron.geo (100%)
rename {benchmarks => demos}/boolean/simple.geo (100%)
rename {benchmarks => demos}/boolean/simple2.geo (100%)
rename {benchmarks => demos}/boolean/simple3.geo (100%)
rename {benchmarks => demos}/boolean/simple4.geo (100%)
rename {benchmarks => demos}/boolean/simple5.geo (100%)
rename {benchmarks => demos}/boolean/transform.geo (100%)
rename {benchmarks => demos}/boolean/wikipedia.geo (100%)
rename demos/{ => post_processing}/anim.script (100%)
rename demos/{ => post_processing}/encode.script (100%)
rename demos/{ => post_processing}/isosurf.script (100%)
rename demos/{ => post_processing}/lowmem-anim.geo (100%)
rename demos/{ => post_processing}/multislice.script (100%)
rename demos/{ => post_processing}/plot2d.geo (100%)
rename demos/{ => post_processing}/primitives.pos (100%)
rename demos/{ => post_processing}/rotate.script (100%)
rename demos/{ => post_processing}/title.script (100%)
rename demos/{ => post_processing}/view_groups.geo (100%)
rename demos/{ => simple_geo}/antenna.geo (100%)
rename demos/{ => simple_geo}/antenna.i1 (100%)
rename demos/{ => simple_geo}/component8.step (100%)
rename demos/{ => simple_geo}/component8_in_a_box.geo (100%)
rename demos/{ => simple_geo}/cone.geo (100%)
rename demos/{ => simple_geo}/cube.geo (100%)
rename demos/{ => simple_geo}/fields.geo (100%)
rename demos/{ => simple_geo}/filter.geo (100%)
rename demos/{ => simple_geo}/hex.geo (100%)
rename demos/{ => simple_geo}/homology.geo (100%)
rename demos/{ => simple_geo}/indheat.geo (100%)
rename demos/{ => simple_geo}/machine.geo (100%)
rename demos/{ => simple_geo}/machine.i1 (100%)
rename demos/{ => simple_geo}/machine.i2 (100%)
rename demos/{ => simple_geo}/nested.geo (100%)
rename demos/{ => simple_geo}/piece-extr-rec.geo (100%)
rename demos/{ => simple_geo}/piece-extr.geo (100%)
rename demos/{ => simple_geo}/piece.geo (100%)
rename demos/{ => simple_geo}/pripyrtet.geo (100%)
rename demos/{ => simple_geo}/sphere-discrete.geo (100%)
rename demos/{ => simple_geo}/sphere-surf.stl (100%)
rename demos/{ => simple_geo}/sphere.geo (100%)
rename demos/{ => simple_geo}/splines.geo (100%)
rename demos/{ => simple_geo}/square_regular.geo (100%)
rename demos/{ => simple_geo}/tower.geo (100%)
rename demos/{ => simple_geo}/tower.i1 (100%)
rename demos/{ => simple_geo}/tower.i2 (100%)
rename demos/{ => simple_geo}/tower.i3 (100%)
rename demos/{ => simple_geo}/tower.i4 (100%)
rename demos/{ => simple_geo}/tower.i5 (100%)
rename demos/{ => simple_geo}/transfinite.geo (100%)
diff --git a/Geo/GModelIO_OCC.cpp b/Geo/GModelIO_OCC.cpp
index 7dc2aeda5b..da31514190 100644
--- a/Geo/GModelIO_OCC.cpp
+++ b/Geo/GModelIO_OCC.cpp
@@ -1277,7 +1277,8 @@ void OCC_Internals::_addShapeToMaps(TopoDS_Shape shape)
if(_fmap.FindIndex(face) < 1){
_fmap.Add(face);
- for(exp3.Init(face.Oriented(TopAbs_FORWARD), TopAbs_WIRE); exp3.More(); exp3.Next()){
+ for(exp3.Init(face.Oriented(TopAbs_FORWARD), TopAbs_WIRE);
+ exp3.More(); exp3.Next()){
//for(exp3.Init(face, TopAbs_WIRE); exp3.More(); exp3.Next()){
TopoDS_Wire wire = TopoDS::Wire(exp3.Current());
if(_wmap.FindIndex(wire) < 1){
diff --git a/benchmarks/boolean/component8.step b/demos/boolean/component8.step
similarity index 100%
rename from benchmarks/boolean/component8.step
rename to demos/boolean/component8.step
diff --git a/benchmarks/boolean/compsolid.geo b/demos/boolean/compsolid.geo
similarity index 100%
rename from benchmarks/boolean/compsolid.geo
rename to demos/boolean/compsolid.geo
diff --git a/benchmarks/boolean/compsolid2.geo b/demos/boolean/compsolid2.geo
similarity index 100%
rename from benchmarks/boolean/compsolid2.geo
rename to demos/boolean/compsolid2.geo
diff --git a/benchmarks/boolean/import.geo b/demos/boolean/import.geo
similarity index 100%
rename from benchmarks/boolean/import.geo
rename to demos/boolean/import.geo
diff --git a/benchmarks/boolean/neuron.geo b/demos/boolean/neuron.geo
similarity index 100%
rename from benchmarks/boolean/neuron.geo
rename to demos/boolean/neuron.geo
diff --git a/benchmarks/boolean/simple.geo b/demos/boolean/simple.geo
similarity index 100%
rename from benchmarks/boolean/simple.geo
rename to demos/boolean/simple.geo
diff --git a/benchmarks/boolean/simple2.geo b/demos/boolean/simple2.geo
similarity index 100%
rename from benchmarks/boolean/simple2.geo
rename to demos/boolean/simple2.geo
diff --git a/benchmarks/boolean/simple3.geo b/demos/boolean/simple3.geo
similarity index 100%
rename from benchmarks/boolean/simple3.geo
rename to demos/boolean/simple3.geo
diff --git a/benchmarks/boolean/simple4.geo b/demos/boolean/simple4.geo
similarity index 100%
rename from benchmarks/boolean/simple4.geo
rename to demos/boolean/simple4.geo
diff --git a/benchmarks/boolean/simple5.geo b/demos/boolean/simple5.geo
similarity index 100%
rename from benchmarks/boolean/simple5.geo
rename to demos/boolean/simple5.geo
diff --git a/benchmarks/boolean/transform.geo b/demos/boolean/transform.geo
similarity index 100%
rename from benchmarks/boolean/transform.geo
rename to demos/boolean/transform.geo
diff --git a/benchmarks/boolean/wikipedia.geo b/demos/boolean/wikipedia.geo
similarity index 100%
rename from benchmarks/boolean/wikipedia.geo
rename to demos/boolean/wikipedia.geo
diff --git a/demos/anim.script b/demos/post_processing/anim.script
similarity index 100%
rename from demos/anim.script
rename to demos/post_processing/anim.script
diff --git a/demos/encode.script b/demos/post_processing/encode.script
similarity index 100%
rename from demos/encode.script
rename to demos/post_processing/encode.script
diff --git a/demos/isosurf.script b/demos/post_processing/isosurf.script
similarity index 100%
rename from demos/isosurf.script
rename to demos/post_processing/isosurf.script
diff --git a/demos/lowmem-anim.geo b/demos/post_processing/lowmem-anim.geo
similarity index 100%
rename from demos/lowmem-anim.geo
rename to demos/post_processing/lowmem-anim.geo
diff --git a/demos/multislice.script b/demos/post_processing/multislice.script
similarity index 100%
rename from demos/multislice.script
rename to demos/post_processing/multislice.script
diff --git a/demos/plot2d.geo b/demos/post_processing/plot2d.geo
similarity index 100%
rename from demos/plot2d.geo
rename to demos/post_processing/plot2d.geo
diff --git a/demos/primitives.pos b/demos/post_processing/primitives.pos
similarity index 100%
rename from demos/primitives.pos
rename to demos/post_processing/primitives.pos
diff --git a/demos/rotate.script b/demos/post_processing/rotate.script
similarity index 100%
rename from demos/rotate.script
rename to demos/post_processing/rotate.script
diff --git a/demos/title.script b/demos/post_processing/title.script
similarity index 100%
rename from demos/title.script
rename to demos/post_processing/title.script
diff --git a/demos/view_groups.geo b/demos/post_processing/view_groups.geo
similarity index 100%
rename from demos/view_groups.geo
rename to demos/post_processing/view_groups.geo
diff --git a/demos/antenna.geo b/demos/simple_geo/antenna.geo
similarity index 100%
rename from demos/antenna.geo
rename to demos/simple_geo/antenna.geo
diff --git a/demos/antenna.i1 b/demos/simple_geo/antenna.i1
similarity index 100%
rename from demos/antenna.i1
rename to demos/simple_geo/antenna.i1
diff --git a/demos/component8.step b/demos/simple_geo/component8.step
similarity index 100%
rename from demos/component8.step
rename to demos/simple_geo/component8.step
diff --git a/demos/component8_in_a_box.geo b/demos/simple_geo/component8_in_a_box.geo
similarity index 100%
rename from demos/component8_in_a_box.geo
rename to demos/simple_geo/component8_in_a_box.geo
diff --git a/demos/cone.geo b/demos/simple_geo/cone.geo
similarity index 100%
rename from demos/cone.geo
rename to demos/simple_geo/cone.geo
diff --git a/demos/cube.geo b/demos/simple_geo/cube.geo
similarity index 100%
rename from demos/cube.geo
rename to demos/simple_geo/cube.geo
diff --git a/demos/fields.geo b/demos/simple_geo/fields.geo
similarity index 100%
rename from demos/fields.geo
rename to demos/simple_geo/fields.geo
diff --git a/demos/filter.geo b/demos/simple_geo/filter.geo
similarity index 100%
rename from demos/filter.geo
rename to demos/simple_geo/filter.geo
diff --git a/demos/hex.geo b/demos/simple_geo/hex.geo
similarity index 100%
rename from demos/hex.geo
rename to demos/simple_geo/hex.geo
diff --git a/demos/homology.geo b/demos/simple_geo/homology.geo
similarity index 100%
rename from demos/homology.geo
rename to demos/simple_geo/homology.geo
diff --git a/demos/indheat.geo b/demos/simple_geo/indheat.geo
similarity index 100%
rename from demos/indheat.geo
rename to demos/simple_geo/indheat.geo
diff --git a/demos/machine.geo b/demos/simple_geo/machine.geo
similarity index 100%
rename from demos/machine.geo
rename to demos/simple_geo/machine.geo
diff --git a/demos/machine.i1 b/demos/simple_geo/machine.i1
similarity index 100%
rename from demos/machine.i1
rename to demos/simple_geo/machine.i1
diff --git a/demos/machine.i2 b/demos/simple_geo/machine.i2
similarity index 100%
rename from demos/machine.i2
rename to demos/simple_geo/machine.i2
diff --git a/demos/nested.geo b/demos/simple_geo/nested.geo
similarity index 100%
rename from demos/nested.geo
rename to demos/simple_geo/nested.geo
diff --git a/demos/piece-extr-rec.geo b/demos/simple_geo/piece-extr-rec.geo
similarity index 100%
rename from demos/piece-extr-rec.geo
rename to demos/simple_geo/piece-extr-rec.geo
diff --git a/demos/piece-extr.geo b/demos/simple_geo/piece-extr.geo
similarity index 100%
rename from demos/piece-extr.geo
rename to demos/simple_geo/piece-extr.geo
diff --git a/demos/piece.geo b/demos/simple_geo/piece.geo
similarity index 100%
rename from demos/piece.geo
rename to demos/simple_geo/piece.geo
diff --git a/demos/pripyrtet.geo b/demos/simple_geo/pripyrtet.geo
similarity index 100%
rename from demos/pripyrtet.geo
rename to demos/simple_geo/pripyrtet.geo
diff --git a/demos/sphere-discrete.geo b/demos/simple_geo/sphere-discrete.geo
similarity index 100%
rename from demos/sphere-discrete.geo
rename to demos/simple_geo/sphere-discrete.geo
diff --git a/demos/sphere-surf.stl b/demos/simple_geo/sphere-surf.stl
similarity index 100%
rename from demos/sphere-surf.stl
rename to demos/simple_geo/sphere-surf.stl
diff --git a/demos/sphere.geo b/demos/simple_geo/sphere.geo
similarity index 100%
rename from demos/sphere.geo
rename to demos/simple_geo/sphere.geo
diff --git a/demos/splines.geo b/demos/simple_geo/splines.geo
similarity index 100%
rename from demos/splines.geo
rename to demos/simple_geo/splines.geo
diff --git a/demos/square_regular.geo b/demos/simple_geo/square_regular.geo
similarity index 100%
rename from demos/square_regular.geo
rename to demos/simple_geo/square_regular.geo
diff --git a/demos/tower.geo b/demos/simple_geo/tower.geo
similarity index 100%
rename from demos/tower.geo
rename to demos/simple_geo/tower.geo
diff --git a/demos/tower.i1 b/demos/simple_geo/tower.i1
similarity index 100%
rename from demos/tower.i1
rename to demos/simple_geo/tower.i1
diff --git a/demos/tower.i2 b/demos/simple_geo/tower.i2
similarity index 100%
rename from demos/tower.i2
rename to demos/simple_geo/tower.i2
diff --git a/demos/tower.i3 b/demos/simple_geo/tower.i3
similarity index 100%
rename from demos/tower.i3
rename to demos/simple_geo/tower.i3
diff --git a/demos/tower.i4 b/demos/simple_geo/tower.i4
similarity index 100%
rename from demos/tower.i4
rename to demos/simple_geo/tower.i4
diff --git a/demos/tower.i5 b/demos/simple_geo/tower.i5
similarity index 100%
rename from demos/tower.i5
rename to demos/simple_geo/tower.i5
diff --git a/demos/transfinite.geo b/demos/simple_geo/transfinite.geo
similarity index 100%
rename from demos/transfinite.geo
rename to demos/simple_geo/transfinite.geo
--
GitLab