From 61ad54ec039c9633b640743ebb598cd2e725190a Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Sun, 18 Oct 2009 21:14:15 +0100
Subject: [PATCH] skip group type 7 (nodes) as output by salome
---
.../ideasUnvToFoam/ideasUnvToFoam.C | 53 ++-
.../conversion/ideasUnvToFoam/unv/mesh.unv | 394 ++++++++++++++++++
2 files changed, 424 insertions(+), 23 deletions(-)
create mode 100644 applications/utilities/mesh/conversion/ideasUnvToFoam/unv/mesh.unv
diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
index 6a9d85ba301..1776285e462 100644
--- a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
+++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
@@ -208,12 +208,13 @@ void readPoints
{
hasWarned = true;
- WarningIn
+ IOWarningIn
(
"readPoints(IFstream&, label&, DynamicList<point>"
- ", DynamicList<label>&)"
+ ", DynamicList<label>&)",
+ is
) << "Points not in order starting at point " << pointI
- << " at line " << is.lineNumber()
+ //<< " at line " << is.lineNumber()
//<< abort(FatalError);
<< endl;
}
@@ -429,47 +430,53 @@ void readPatches
>> dofSet >> tempSet >> contactSet >> nFaces;
is.getLine(line);
- patchNames.append(string::validate<word>(line));
+ word groupName = string::validate<word>(line);
- Info<< "For facegroup " << group
- << " named " << patchNames[patchNames.size()-1]
+ Info<< "For group " << group
+ << " named " << groupName
<< " trying to read " << nFaces << " patch face indices."
<< endl;
- patchFaceIndices.append(labelList(0));
- labelList& faceIndices = patchFaceIndices[patchFaceIndices.size()-1];
- faceIndices.setSize(nFaces);
- label faceI = 0;
+ labelList groupIndices(nFaces);
+ label groupType = -1;
+ nFaces = 0;
- while (faceI < faceIndices.size())
+ while (nFaces < groupIndices.size())
{
is.getLine(line);
IStringStream lineStr(line);
// Read one (for last face) or two entries from line.
label nRead = 2;
- if (faceI == faceIndices.size()-1)
+ if (nFaces == groupIndices.size()-1)
{
nRead = 1;
}
for (label i = 0; i < nRead; i++)
{
- label typeCode, tag, nodeLeaf, component;
+ label tag, nodeLeaf, component;
- lineStr >> typeCode >> tag >> nodeLeaf >> component;
+ lineStr >> groupType >> tag >> nodeLeaf >> component;
- if (typeCode != 8)
- {
- FatalErrorIn("readPatches")
- << "When reading patches expect Entity Type Code 8"
- << nl << "At line " << is.lineNumber()
- << exit(FatalError);
- }
-
- faceIndices[faceI++] = tag;
+ groupIndices[nFaces++] = tag;
}
}
+
+
+ // Store
+ if (groupType == 8)
+ {
+ patchNames.append(groupName);
+ patchFaceIndices.append(groupIndices);
+ }
+ else
+ {
+ IOWarningIn("readPatches(..)", is)
+ << "When reading patches expect entity type code 8"
+ << nl << " Skipping group code " << groupType
+ << endl;
+ }
}
patchNames.shrink();
diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/unv/mesh.unv b/applications/utilities/mesh/conversion/ideasUnvToFoam/unv/mesh.unv
new file mode 100644
index 00000000000..650a447a003
--- /dev/null
+++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/unv/mesh.unv
@@ -0,0 +1,394 @@
+ -1
+ 2411
+ 1 0 0 0
+ 2.0000000000000000E+02 3.0000000000000000E+02 0.0000000000000000E+00
+ 2 0 0 0
+ 2.0000000000000000E+02 3.0000000000000000E+02 2.1000000000000000E+02
+ 3 0 0 0
+ 2.0000000000000000E+02 0.0000000000000000E+00 0.0000000000000000E+00
+ 4 0 0 0
+ 2.0000000000000000E+02 0.0000000000000000E+00 2.1000000000000000E+02
+ 5 0 0 0
+ 0.0000000000000000E+00 3.0000000000000000E+02 0.0000000000000000E+00
+ 6 0 0 0
+ 0.0000000000000000E+00 3.0000000000000000E+02 2.1000000000000000E+02
+ 7 0 0 0
+ 0.0000000000000000E+00 0.0000000000000000E+00 0.0000000000000000E+00
+ 8 0 0 0
+ 0.0000000000000000E+00 0.0000000000000000E+00 2.1000000000000000E+02
+ 9 0 0 0
+ 0.0000000000000000E+00 1.0020000000000000E+02 2.1000000000000000E+02
+ 10 0 0 0
+ 0.0000000000000000E+00 2.0009999999999999E+02 2.1000000000000000E+02
+ 11 0 0 0
+ 1.0000000000000000E+02 3.0000000000000000E+02 2.1000000000000000E+02
+ 12 0 0 0
+ 2.0000000000000000E+02 1.0020000000000000E+02 2.1000000000000000E+02
+ 13 0 0 0
+ 2.0000000000000000E+02 2.0009999999999999E+02 2.1000000000000000E+02
+ 14 0 0 0
+ 1.0000000000000000E+02 0.0000000000000000E+00 2.1000000000000000E+02
+ 15 0 0 0
+ 0.0000000000000000E+00 1.0020000000000000E+02 0.0000000000000000E+00
+ 16 0 0 0
+ 0.0000000000000000E+00 2.0009999999999999E+02 0.0000000000000000E+00
+ 17 0 0 0
+ 1.0000000000000000E+02 3.0000000000000000E+02 0.0000000000000000E+00
+ 18 0 0 0
+ 2.0000000000000000E+02 1.0020000000000000E+02 0.0000000000000000E+00
+ 19 0 0 0
+ 2.0000000000000000E+02 2.0009999999999999E+02 0.0000000000000000E+00
+ 20 0 0 0
+ 1.0000000000000000E+02 0.0000000000000000E+00 0.0000000000000000E+00
+ 21 0 0 0
+ 2.0000000000000000E+02 3.0000000000000000E+02 1.0500000000000000E+02
+ 22 0 0 0
+ 0.0000000000000000E+00 3.0000000000000000E+02 1.0500000000000000E+02
+ 23 0 0 0
+ 2.0000000000000000E+02 0.0000000000000000E+00 1.0500000000000000E+02
+ 24 0 0 0
+ 0.0000000000000000E+00 0.0000000000000000E+00 1.0500000000000000E+02
+ 25 0 0 0
+ 9.6161727574445891E+01 1.3290789499900029E+02 2.1000000000000000E+02
+ 26 0 0 0
+ 8.0082880863556014E+01 2.2412763570985578E+02 2.1000000000000000E+02
+ 27 0 0 0
+ 9.6161727574240444E+01 1.3290789499883087E+02 0.0000000000000000E+00
+ 28 0 0 0
+ 8.0082880863392205E+01 2.2412763570989483E+02 0.0000000000000000E+00
+ 29 0 0 0
+ 2.0000000000000000E+02 1.5011560268321134E+02 1.0500000000592973E+02
+ 30 0 0 0
+ 0.0000000000000000E+00 1.5011560299451648E+02 1.0499999963389952E+02
+ 31 0 0 0
+ 9.9094099553883055E+01 7.2457929267250009E+01 1.0499999994714025E+02
+ -1
+ -1
+ 2412
+ 1 11 2 1 7 2
+ 0 0 0
+ 9 8
+ 2 11 2 1 7 2
+ 0 0 0
+ 10 9
+ 3 11 2 1 7 2
+ 0 0 0
+ 6 10
+ 4 11 2 1 7 2
+ 0 0 0
+ 11 6
+ 5 11 2 1 7 2
+ 0 0 0
+ 2 11
+ 6 11 2 1 7 2
+ 0 0 0
+ 4 12
+ 7 11 2 1 7 2
+ 0 0 0
+ 12 13
+ 8 11 2 1 7 2
+ 0 0 0
+ 13 2
+ 9 11 2 1 7 2
+ 0 0 0
+ 8 14
+ 10 11 2 1 7 2
+ 0 0 0
+ 14 4
+ 11 11 2 1 7 2
+ 0 0 0
+ 7 15
+ 12 11 2 1 7 2
+ 0 0 0
+ 15 16
+ 13 11 2 1 7 2
+ 0 0 0
+ 16 5
+ 14 11 2 1 7 2
+ 0 0 0
+ 5 17
+ 15 11 2 1 7 2
+ 0 0 0
+ 17 1
+ 16 11 2 1 7 2
+ 0 0 0
+ 18 3
+ 17 11 2 1 7 2
+ 0 0 0
+ 19 18
+ 18 11 2 1 7 2
+ 0 0 0
+ 1 19
+ 19 11 2 1 7 2
+ 0 0 0
+ 20 7
+ 20 11 2 1 7 2
+ 0 0 0
+ 3 20
+ 21 11 2 1 7 2
+ 0 0 0
+ 21 1
+ 22 11 2 1 7 2
+ 0 0 0
+ 2 21
+ 23 11 2 1 7 2
+ 0 0 0
+ 5 22
+ 24 11 2 1 7 2
+ 0 0 0
+ 22 6
+ 25 11 2 1 7 2
+ 0 0 0
+ 3 23
+ 26 11 2 1 7 2
+ 0 0 0
+ 23 4
+ 27 11 2 1 7 2
+ 0 0 0
+ 24 7
+ 28 11 2 1 7 2
+ 0 0 0
+ 8 24
+ 29 41 2 1 7 3
+ 9 8 14
+ 30 41 2 1 7 3
+ 10 9 25
+ 31 41 2 1 7 3
+ 6 10 26
+ 32 41 2 1 7 3
+ 11 6 26
+ 33 41 2 1 7 3
+ 10 25 26
+ 34 41 2 1 7 3
+ 2 11 13
+ 35 41 2 1 7 3
+ 4 12 14
+ 36 41 2 1 7 3
+ 12 13 25
+ 37 41 2 1 7 3
+ 14 12 25
+ 38 41 2 1 7 3
+ 9 14 25
+ 39 41 2 1 7 3
+ 13 11 26
+ 40 41 2 1 7 3
+ 13 26 25
+ 41 41 2 1 7 3
+ 7 15 20
+ 42 41 2 1 7 3
+ 15 16 27
+ 43 41 2 1 7 3
+ 16 5 28
+ 44 41 2 1 7 3
+ 27 16 28
+ 45 41 2 1 7 3
+ 5 17 28
+ 46 41 2 1 7 3
+ 17 1 19
+ 47 41 2 1 7 3
+ 18 3 20
+ 48 41 2 1 7 3
+ 19 18 27
+ 49 41 2 1 7 3
+ 18 20 27
+ 50 41 2 1 7 3
+ 20 15 27
+ 51 41 2 1 7 3
+ 17 19 28
+ 52 41 2 1 7 3
+ 28 19 27
+ 53 41 2 1 7 3
+ 17 5 22
+ 54 41 2 1 7 3
+ 1 17 21
+ 55 41 2 1 7 3
+ 2 21 11
+ 56 41 2 1 7 3
+ 6 11 22
+ 57 41 2 1 7 3
+ 22 11 21
+ 58 41 2 1 7 3
+ 22 21 17
+ 59 41 2 1 7 3
+ 7 20 24
+ 60 41 2 1 7 3
+ 20 3 23
+ 61 41 2 1 7 3
+ 23 4 14
+ 62 41 2 1 7 3
+ 14 8 24
+ 63 41 2 1 7 3
+ 14 24 23
+ 64 41 2 1 7 3
+ 20 23 24
+ 65 41 2 1 7 3
+ 23 3 18
+ 66 41 2 1 7 3
+ 4 23 12
+ 67 41 2 1 7 3
+ 13 12 29
+ 68 41 2 1 7 3
+ 2 13 21
+ 69 41 2 1 7 3
+ 22 16 30
+ 70 41 2 1 7 3
+ 13 29 21
+ 71 41 2 1 7 3
+ 1 21 19
+ 72 41 2 1 7 3
+ 12 23 29
+ 73 41 2 1 7 3
+ 18 19 29
+ 74 41 2 1 7 3
+ 23 18 29
+ 75 41 2 1 7 3
+ 15 24 30
+ 76 41 2 1 7 3
+ 29 19 21
+ 77 41 2 1 7 3
+ 7 24 15
+ 78 41 2 1 7 3
+ 24 8 9
+ 79 41 2 1 7 3
+ 9 10 30
+ 80 41 2 1 7 3
+ 10 6 22
+ 81 41 2 1 7 3
+ 30 10 22
+ 82 41 2 1 7 3
+ 16 15 30
+ 83 41 2 1 7 3
+ 22 5 16
+ 84 41 2 1 7 3
+ 24 9 30
+ 85 111 2 1 7 4
+ 21 28 22 17
+ 86 111 2 1 7 4
+ 31 18 29 23
+ 87 111 2 1 7 4
+ 31 29 18 27
+ 88 111 2 1 7 4
+ 29 21 26 13
+ 89 111 2 1 7 4
+ 29 25 26 30
+ 90 111 2 1 7 4
+ 26 28 29 30
+ 91 111 2 1 7 4
+ 16 28 5 22
+ 92 111 2 1 7 4
+ 30 25 10 9
+ 93 111 2 1 7 4
+ 16 30 15 27
+ 94 111 2 1 7 4
+ 26 25 10 30
+ 95 111 2 1 7 4
+ 21 28 26 22
+ 96 111 2 1 7 4
+ 31 20 18 23
+ 97 111 2 1 7 4
+ 27 28 16 30
+ 98 111 2 1 7 4
+ 18 27 29 19
+ 99 111 2 1 7 4
+ 21 22 26 11
+ 100 111 2 1 7 4
+ 23 4 12 14
+ 101 111 2 1 7 4
+ 31 25 29 30
+ 102 111 2 1 7 4
+ 31 18 20 27
+ 103 111 2 1 7 4
+ 21 11 26 13
+ 104 111 2 1 7 4
+ 22 28 5 17
+ 105 111 2 1 7 4
+ 2 11 21 13
+ 106 111 2 1 7 4
+ 29 25 12 13
+ 107 111 2 1 7 4
+ 30 28 16 22
+ 108 111 2 1 7 4
+ 31 24 20 23
+ 109 111 2 1 7 4
+ 26 28 30 22
+ 110 111 2 1 7 4
+ 21 17 19 28
+ 111 111 2 1 7 4
+ 15 24 31 30
+ 112 111 2 1 7 4
+ 31 9 30 24
+ 113 111 2 1 7 4
+ 15 30 31 27
+ 114 111 2 1 7 4
+ 8 14 24 9
+ 115 111 2 1 7 4
+ 26 22 10 6
+ 116 111 2 1 7 4
+ 31 25 12 29
+ 117 111 2 1 7 4
+ 31 29 12 23
+ 118 111 2 1 7 4
+ 31 30 9 25
+ 119 111 2 1 7 4
+ 21 1 19 17
+ 120 111 2 1 7 4
+ 29 19 27 28
+ 121 111 2 1 7 4
+ 10 22 26 30
+ 122 111 2 1 7 4
+ 29 28 26 21
+ 123 111 2 1 7 4
+ 7 20 15 24
+ 124 111 2 1 7 4
+ 11 22 26 6
+ 125 111 2 1 7 4
+ 29 28 27 30
+ 126 111 2 1 7 4
+ 31 23 12 14
+ 127 111 2 1 7 4
+ 26 25 29 13
+ 128 111 2 1 7 4
+ 15 27 31 20
+ 129 111 2 1 7 4
+ 21 19 29 28
+ 130 111 2 1 7 4
+ 18 3 23 20
+ 131 111 2 1 7 4
+ 15 20 31 24
+ 132 111 2 1 7 4
+ 27 31 29 30
+ 133 111 2 1 7 4
+ 31 14 9 24
+ 134 111 2 1 7 4
+ 31 9 14 25
+ 135 111 2 1 7 4
+ 31 14 12 25
+ 136 111 2 1 7 4
+ 31 23 14 24
+ -1
+ -1
+ 2467
+ 0 0 0 0 0 0 0 10
+outlet
+ 8 70 0 0 8 67 0 0
+ 8 68 0 0 8 71 0 0
+ 8 76 0 0 8 66 0 0
+ 8 72 0 0 8 73 0 0
+ 8 74 0 0 8 65 0 0
+ 1 0 0 0 0 0 0 12
+inlet
+ 8 36 0 0 8 30 0 0
+ 8 31 0 0 8 37 0 0
+ 8 34 0 0 8 38 0 0
+ 8 33 0 0 8 35 0 0
+ 8 32 0 0 8 29 0 0
+ 8 39 0 0 8 40 0 0
+ 2 0 0 0 0 0 0 12
+nodes
+ 7 2 0 0 7 4 0 0
+ 7 6 0 0 7 8 0 0
+ 7 9 0 0 7 10 0 0
+ 7 11 0 0 7 12 0 0
+ 7 13 0 0 7 14 0 0
+ 7 25 0 0 7 26 0 0
+ -1
--
GitLab