research/OpenFOAM-2.4.x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fluent3DMeshToFoam: Updated to handle ',' and '|' characters in headers

Browse source 
Patch provided by Bruno Santos
Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1826
This commit is contained in:
Henry Weller 2015-08-24 17:49:02 +01:00
parent a0fd606186
commit ee9849afbf
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L
View file

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -137,7 +137,6 @@ int yyFlexLexer::yywrap()
one_space [ \t\f]
space {one_space}*
some_space {one_space}+
cspace ","{space}
alpha [_[:alpha:]]
digit [[:digit:]]
@ -150,6 +149,7 @@ rbrac ")"
quote \"
dash "-"
dotColonDash [.:-]
commaPipe [,\|]
schemeSpecialInitial [!$%&*/\\:<=>?~_^#.@']
schemeSpecialSubsequent [.+-]
@ -164,6 +164,7 @@ zeroLabel {digit}*
signedInteger [-+]?{integer}
word ({alpha}|{digit}|{dotColonDash})*
wordBraces ({word}|{lbrac}|{rbrac})*
wordBracesExtras ({word}|{lbrac}|{rbrac}|{commaPipe})*
exponent_part [eE][-+]?{digit}+
fractional_constant [-+]?(({digit}*"."{digit}+)|({digit}+".")|({digit}))
@ -186,6 +187,8 @@ schemeSymbolList ({schemeSymbolListElement}+{space})
starStar ("**")
text ({space}({word}*{space})*)
textBraces ({space}({wordBraces}*{space})*)
textExtras ({space}({word}*{commaPipe}{space})*)
textBracesExtras ({space}({wordBracesExtras}*{space})*)
anythingInBlock ([^)]*)
dateDDMMYYYY ({digit}{digit}"/"{digit}{digit}"/"{digit}{digit}{digit}{digit})
@ -278,7 +281,7 @@ endOfSection {space}")"{space}
BEGIN(readHeader);
}
<readHeader>{quote}{textBraces}{quote} {
<readHeader>{quote}{textBracesExtras}{quote} {
Info<< "Reading header: " << YYText() << endl;
}
@ -604,7 +607,7 @@ endOfSection {space}")"{space}
<readCellData>{space}{lbrac} {
// Quickly scan to the end of the cell data block and discard
register int c;
int c;
while ((c = yyinput()) != 0 && c != ')')
{}
}
@ -727,6 +730,8 @@ endOfSection {space}")"{space}
<ignoreBlock,ignoreEmbeddedBlock>{space}{text} {
}
<ignoreBlock,ignoreEmbeddedBlock>{space}{textExtras} {
}
/* ------ Count newlines. ------ */
@ -814,7 +819,7 @@ int main(int argc, char *argv[])
}
# include "createTime.H"
#include "createTime.H"
const fileName fluentFile = args[1];
IFstream fluentStream(fluentFile);