diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSet.C b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
index d794ae342dadc1ccf673d4164ff2c07a8346f708..18466603b300f46d6b96519f8db9851fee202f77 100644
--- a/applications/utilities/mesh/manipulation/topoSet/topoSet.C
+++ b/applications/utilities/mesh/manipulation/topoSet/topoSet.C
@@ -140,7 +140,6 @@ int main(int argc, char *argv[])
case topoSetSource::NEW:
case topoSetSource::ADD:
case topoSetSource::DELETE:
- case topoSetSource::SUBSET:
{
Info<< " Applying source " << word(dict.lookup("source"))
<< endl;
@@ -148,7 +147,7 @@ int main(int argc, char *argv[])
(
dict.lookup("source"),
mesh,
- dict.subDict("sourceDict")
+ dict.subDict("sourceInfo")
);
source().applyToSet(action, currentSet());
@@ -158,6 +157,40 @@ int main(int argc, char *argv[])
}
break;
+ case topoSetSource::SUBSET:
+ {
+ Info<< " Applying source " << word(dict.lookup("source"))
+ << endl;
+ autoPtr<topoSetSource> source = topoSetSource::New
+ (
+ dict.lookup("source"),
+ mesh,
+ dict.subDict("sourceInfo")
+ );
+
+ // Backup current set.
+ autoPtr<topoSet> oldSet
+ (
+ topoSet::New
+ (
+ setType,
+ mesh,
+ currentSet().name() + "_old2",
+ currentSet()
+ )
+ );
+
+ currentSet().clear();
+ source().applyToSet(topoSetSource::NEW, currentSet());
+
+ // Combine new value of currentSet with old one.
+ currentSet().subset(oldSet());
+ // Synchronize for coupled patches.
+ currentSet().sync(mesh);
+ currentSet().write();
+ }
+ break;
+
case topoSetSource::CLEAR:
Info<< " Clearing set" << endl;
currentSet().clear();
diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSetDict b/applications/utilities/mesh/manipulation/topoSet/topoSetDict
index ff487c6e6482f500b5d939ae6b2005de58316ce6..40afc5ecb92b10cb5cf5d37db2f0efa459cfe420 100644
--- a/applications/utilities/mesh/manipulation/topoSet/topoSetDict
+++ b/applications/utilities/mesh/manipulation/topoSet/topoSetDict
@@ -301,31 +301,61 @@ FoamFile
actions
(
+ // Example:pick up internal faces on outside of cellSet
+ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ // Load initial cellSet
{
name c0;
type cellSet;
action new;
source labelToCell;
- sourceDict
+ sourceInfo
{
value (12 13 56);
}
}
+ // Get all faces in cellSet
{
- name c0;
+ name f0;
+ type faceSet;
+ action new;
+ source cellToFace;
+ sourceInfo
+ {
+ set c0;
+ option all;
+ }
+ }
+
+ // Determine inverse cellSet
+ {
+ name c1;
+ type cellSet;
+ action new;
+ source cellToCell;
+ sourceInfo
+ {
+ set c0;
+ }
+ }
+ {
+ name c1;
type cellSet;
action invert;
}
+ // Keep in f0 all faces in c1
{
- name c0;
- type cellSet;
- action delete;
- source labelToCell;
- sourceDict
+ name f0;
+ type faceSet;
+ action subset;
+ source cellToFace;
+ sourceInfo
{
- value (1 2 3);
+ set c1;
+ option all;
}
}
);
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict
index ccaf0363cd2ef22c4f6fbb6592e7c86d3a2644de..814c5a8f9e21d4398b60b8851dcdc32407e4460e 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/topoSetDict
@@ -23,7 +23,7 @@ actions
action new;
source sphereToCell;
- sourceDict
+ sourceInfo
{
centre ( 0.125 0.375 0.05 );
radius 0.005;
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.1
index 1e1592ee3947fda488902ffe223d0cd80cb10a87..99b65f210c7c27fb3976ab1e5dad3558274cc5a7 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.1
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.1
@@ -22,7 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceDict
+ sourceInfo
{
box (0.004 -0.001 -1) (0.012 0.001 1);
}
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.2
index ab0289c1567a526370b45505a04f387746cf0c85..f0bc41c9b68300016a53de364b11b3c0489a35dc 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.2
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.2
@@ -22,7 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceDict
+ sourceInfo
{
box (0.0045 -0.00075 -1) (0.0095 0.00075 1);
}
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.3
index 3e504e9aef3625c77ba795e15386b6f30782472e..fd1ed7949fdd33722bea117ac7de566891d77cb2 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.3
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.3
@@ -22,7 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceDict
+ sourceInfo
{
box (0.00475 -0.000375 -1) (0.009 0.000375 1);
}
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.1
index cd2329f57dc9a5147b8a2119d8a6b38c1a251a79..5fb3df6565ece84f5a38251f59a84d0e2dbe3860 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.1
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.1
@@ -22,7 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceDict
+ sourceInfo
{
box ( 0.004 -0.001 -1 ) ( 0.012 0.001 1 );
}
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.2
index a8a80dff4d06f5a83814132ac693a86dd43c8737..59c77c8d37e80f2ae64461d987273a02552a46ed 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.2
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.2
@@ -22,7 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceDict
+ sourceInfo
{
box ( 0.0045 -0.00075 -1 ) ( 0.0095 0.00075 1 );
}
diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.3
index 67021ba21966f0bb8674a7e3025413596fac0a86..1dcc0ebc3ff444aa4cd1ca5c60070350ddde9b86 100644
--- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.3
+++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.3
@@ -22,7 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceDict
+ sourceInfo
{
box ( 0.00475 -0.000375 -1 ) ( 0.009 0.000375 1 );
}
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict
index 30e3ea000690d8013563d83f490e46eb87b284d5..e833aa533bfa66cd5e63313eb83434329fcdc5ca 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict
@@ -22,7 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceDict
+ sourceInfo
{
box ( 0.00475 -0.000375 -1 ) ( 0.009 0.000375 1 ) ;
}
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.1
index 01e4f46a66a52ea3358ae27ed27cf4b1e598e0c4..cfb66b9b728d222997f37a35498465a0002e3479 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.1
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.1
@@ -22,7 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceDict
+ sourceInfo
{
box ( 0.004 -0.001 -1 ) ( 0.012 0.001 1 ) ;
}
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.2
index 20bc81f6ba96ab1d17f6d0d0c793af7672bc07da..d3cf8a3aebeb421bad7cd503bfb8a64d426f14c1 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.2
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.2
@@ -22,7 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceDict
+ sourceInfo
{
box ( 0.0045 -0.00075 -1 ) ( 0.0095 0.00075 1 ) ;
}
diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.3
index 30e3ea000690d8013563d83f490e46eb87b284d5..e833aa533bfa66cd5e63313eb83434329fcdc5ca 100644
--- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.3
+++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.3
@@ -22,7 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceDict
+ sourceInfo
{
box ( 0.00475 -0.000375 -1 ) ( 0.009 0.000375 1 ) ;
}
diff --git a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/topoSetDict b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/topoSetDict
index c696d169b42e2ae2a11b894e1b11e774f9c29e01..7fdf7ca03a211e2ca66f32fcb6edf24eea0d4753 100644
--- a/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/topoSetDict
+++ b/tutorials/multiphase/interDyMFoam/ras/floatingObject/system/topoSetDict
@@ -22,7 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceDict
+ sourceInfo
{
box (0.35 0.35 0.44) (0.65 0.65 0.56);
}
diff --git a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/topoSetDict b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/topoSetDict
index b89e6319bf4bd7d6cb248e0105e475ee765b957a..a36ee3b31a562295a51d7da5d1b33d105fe01e37 100644
--- a/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/MRFInterFoam/mixerVessel2D/system/topoSetDict
@@ -23,7 +23,7 @@ actions
type cellSet;
action new;
source zoneToCell;
- sourceDict
+ sourceInfo
{
name rotor;
}
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict
index cf1a5033ebedb5c82f5c12eca3daeee6b5e20c07..e6dc5a068771145675c1318820a27620984b854f 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict
@@ -22,7 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceDict
+ sourceInfo
{
box ( 0 0 -2e-05 ) ( 0.0036 0.0003 2e-05 );
}
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.1 b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.1
index 5c87356b4a86979b6d34150daf439621cb586346..02ae84ba2dae285b183e5b9c54d298d50d6c5b4a 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.1
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.1
@@ -22,7 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceDict
+ sourceInfo
{
box ( 0 0 -2e-05 ) ( 0.0036 0.0008 4e-05 ) ;
}
diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.2 b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.2
index cf1a5033ebedb5c82f5c12eca3daeee6b5e20c07..e6dc5a068771145675c1318820a27620984b854f 100644
--- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.2
+++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.2
@@ -22,7 +22,7 @@ actions
type cellSet;
action new;
source boxToCell;
- sourceDict
+ sourceInfo
{
box ( 0 0 -2e-05 ) ( 0.0036 0.0003 2e-05 );
}