Commit b97b101d authored by Andrew Heather's avatar Andrew Heather
Browse files
parents 5c31d908 91c2d774
......@@ -45,4 +45,7 @@ doc/[Dd]oxygen/man
# ignore .timeStamp in the main directory
/.timeStamp
# ignore .ebrowse in the main directory
/.ebrowse
# end-of-file
......@@ -451,7 +451,7 @@ void doRefinement
const labelHashSet& refCells,
labelList& refLevel
)
{
{
label oldCells = mesh.nCells();
// Multi-iteration, multi-direction topology modifier.
......@@ -565,7 +565,7 @@ void subsetMesh
// Update cutCells for removed cells.
cutCells.updateMesh(morphMap());
}
// Divide the cells according to status compared to surface. Constructs sets:
// - cutCells : all cells cut by surface
......@@ -877,7 +877,7 @@ int main(int argc, char *argv[])
// Added cells from 2:1 refinement level restriction.
while
while
(
limitRefinementLevel
(
......@@ -887,7 +887,8 @@ int main(int argc, char *argv[])
refLevel,
cutCells
)
);
)
{}
Info<< " Current cells : " << mesh.nCells() << nl
......@@ -988,7 +989,8 @@ int main(int argc, char *argv[])
refLevel,
hanging
)
);
)
{}
doRefinement(mesh, refineDict, hanging, refLevel);
......
......@@ -26,12 +26,12 @@ Description
Tries to figure out what the refinement level is on refined cartesian
meshes. Run BEFORE snapping.
Writes
Writes
- volScalarField 'refinementLevel' with current refinement level.
- cellSet 'refCells' which are the cells that need to be refined to satisfy
2:1 refinement.
Works by dividing cells into volume bins.
Works by dividing cells into volume bins.
\*---------------------------------------------------------------------------*/
......@@ -77,7 +77,7 @@ bool limitRefinementLevel
}
}
}
if (refCells.size() > oldNCells)
{
Info<< "Added an additional " << refCells.size() - oldNCells
......@@ -143,7 +143,7 @@ int main(int argc, char *argv[])
<< lowerLimits[lowerLimits.size()-1] << " .. "
<< upperLimits[upperLimits.size()-1] << endl;
// Create new bin.
// Create new bin.
bins.append(DynamicList<label>());
lowerLimits.append(sortedVols[i]);
upperLimits.append(1.1*lowerLimits[lowerLimits.size()-1]);
......@@ -243,7 +243,7 @@ int main(int argc, char *argv[])
return 1;
}
labelIOList refLevel
(
IOobject
......@@ -308,7 +308,7 @@ int main(int argc, char *argv[])
bField[faceI] = postRefLevel[own];
}
}
Info<< "Determined current refinement level and writing to "
<< postRefLevel.name() << " (as volScalarField; for post processing)"
<< nl
......@@ -325,7 +325,7 @@ int main(int argc, char *argv[])
// Cells to refine
cellSet refCells(mesh, "refCells", 100);
while
while
(
limitRefinementLevel
(
......@@ -333,7 +333,8 @@ int main(int argc, char *argv[])
refLevel, // current refinement level
refCells // cells to refine
)
);
)
{}
if (refCells.size() > 0)
{
......
......@@ -265,7 +265,8 @@ int main(int argc, char *argv[])
}
yyFlexLexer lexer(&ansysStream);
while(lexer.yylex() != 0);
while(lexer.yylex() != 0)
{}
Info << "Creating points" << endl;
......
......@@ -583,7 +583,8 @@ endOfSection {space}")"{space}
<readCellData>{spaceNl}{lbrac} {
// Quickly scan to the end of the cell data block and discard
register int c;
while ((c = yyinput()) != 0 && c != ')');
while ((c = yyinput()) != 0 && c != ')')
{}
}
{faceTree} {
......@@ -763,7 +764,8 @@ int main(int argc, char *argv[])
yyFlexLexer lexer(&fluentStream.stdStream());
while(lexer.yylex() != 0);
while(lexer.yylex() != 0)
{}
Info<< "\nFINISHED LEXING\n\n";
......
......@@ -901,7 +901,8 @@ int main(int argc, char *argv[])
}
yyFlexLexer lexer(&fluentStream);
while(lexer.yylex() != 0);
while(lexer.yylex() != 0)
{}
Info<< "\n\nFINISHED LEXING\n\n\n";
// Lookup table giving number of vertices given a fluent cell type ID
......
......@@ -665,7 +665,8 @@ int main(int argc, char *argv[])
}
yyFlexLexer lexer(&gambitStream);
while(lexer.yylex() != 0);
while(lexer.yylex() != 0)
{}
Info << "Finished lexing" << endl;
......
......@@ -189,7 +189,7 @@ void writeVTK
faceList setFaces(cellFaces.size());
labelList faceValues(cellFaces.size());
label setFaceI = 0;
forAllConstIter(Map<label>, cellFaces, iter)
{
setFaces[setFaceI] = mesh.faces()[iter.key()];
......@@ -217,7 +217,7 @@ void writeVTK
mesh,
currentSet,
mesh.time().path()/vtkName
);
);
}
else
{
......@@ -331,7 +331,7 @@ bool doCommand
// Get some size estimate for set.
const globalMeshData& parData = mesh.globalData();
label typSize =
label typSize =
max
(
parData.nTotalCells(),
......@@ -449,7 +449,7 @@ bool doCommand
}
}
else
{
{
if (is >> sourceType)
{
autoPtr<topoSetSource> setSource
......@@ -743,7 +743,7 @@ int main(int argc, char *argv[])
else if (!read_history(historyFile))
{
Info<< "Successfully read history from " << historyFile << endl;
}
}
#endif
......@@ -754,7 +754,7 @@ int main(int argc, char *argv[])
FatalError.throwExceptions();
FatalIOError.throwExceptions();
while (1)
do
{
string rawLine;
......
......@@ -4,5 +4,4 @@ EXE_INC = \
EXE_LIBS = \
-ldynamicMesh \
-lmeshTools \
-lmeshTools
......@@ -2,5 +2,4 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-lfiniteVolume \
-lfiniteVolume
......@@ -4,5 +4,4 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-llagrangian \
-llagrangian
......@@ -4,5 +4,4 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-llagrangian \
-llagrangian
......@@ -6,5 +6,5 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-llagrangian \
-lmeshTools \
-lmeshTools
......@@ -24,7 +24,7 @@
-lgen -lnsl -lsocket -lw -lintl -ldl
#elif defined(sgiN32) || defined(sgiN32Gcc)
FV_LIBS = \
$(FV_HOME)/user/obj/iris/fv.o \
$(FV_HOME)/user/obj/iris/fv2.o \
......@@ -94,12 +94,9 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/browser/lnInclude \
-I$(FOAM_SRC)/lagrangian/basic/lnInclude \
-I$(FOAM_SRC)/lagrangian/basic/lnInclude
EXE_LIBS = \
$(FV_LIBS) \
-lfiniteVolume \
-lmeshTools \
-lmeshTools
......@@ -17,4 +17,3 @@ EXE_LIBS = \
-lspecie \
-lcompressibleTurbulenceModels \
-lcompressibleLESmodels
......@@ -4,5 +4,4 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-lsampling \
-lsampling
......@@ -2,5 +2,4 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-lfiniteVolume \
-lfiniteVolume
......@@ -2,5 +2,4 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-lfiniteVolume \
-lfiniteVolume
......@@ -3,7 +3,7 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude
EXE_LIBS = \
-lfiniteVolume \
......
......@@ -3,7 +3,7 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/triSurface/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude
EXE_LIBS = \
-lfiniteVolume \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment