exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cleaning up idxtype mess

Browse source
This commit is contained in:
Hrvoje Jasak 2010-12-07 15:15:46 +00:00
parent 9ce5c5edaf
commit 31d95a14c8
2 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomerate.C
View file

@ -31,10 +31,16 @@ Description
#include "fvMesh.H" #include "fvMesh.H"
#include "syncTools.H" #include "syncTools.H"
//extern "C" extern "C"
//{ {
//# include "mgridgen.h" # include "mgridgen.h"
//} # ifdef darwin
# undef FALSE
# undef TRUE
# endif
#undef sign
}
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@ -42,8 +48,8 @@ void Foam::MGridGenGAMGAgglomeration::
makeCompactCellFaceAddressingAndFaceWeights makeCompactCellFaceAddressingAndFaceWeights
( (
const lduAddressing& fineAddressing, const lduAddressing& fineAddressing,
List<idxtype>& cellCells, labelList& cellCells,
List<idxtype>& cellCellOffsets, labelList& cellCellOffsets,
const vectorField& Si, const vectorField& Si,
List<scalar>& faceWeights List<scalar>& faceWeights
) )
@ -113,8 +119,8 @@ Foam::tmp<Foam::labelField> Foam::MGridGenGAMGAgglomeration::agglomerate
const label nFineCells = fineAddressing.size(); const label nFineCells = fineAddressing.size();
// Compact addressing for cellCells // Compact addressing for cellCells
List<idxtype> cellCells; labelList cellCells;
List<idxtype> cellCellOffsets; labelList cellCellOffsets;
// Face weights = face areas of the internal faces // Face weights = face areas of the internal faces
List<scalar> faceWeights; List<scalar> faceWeights;
@ -130,7 +136,7 @@ Foam::tmp<Foam::labelField> Foam::MGridGenGAMGAgglomeration::agglomerate
); );
// MGridGen agglomeration options. // MGridGen agglomeration options.
List<int> options(4, 0); labelList options(4, 0);
options[0] = 4; // globular agglom options[0] = 4; // globular agglom
options[1] = 6; // objective F3 and F2 options[1] = 6; // objective F3 and F2
options[2] = 128; // debugging output level options[2] = 128; // debugging output level

14
src/fvAgglomerationMethods/MGridGenGamgAgglomeration/MGridGenGAMGAgglomeration.H
View file

@ -40,16 +40,6 @@ SourceFiles
#include "fvMesh.H" #include "fvMesh.H"
#include "GAMGAgglomeration.H" #include "GAMGAgglomeration.H"
extern "C"
{
# include "mgridgen.h"
# ifdef darwin
# undef FALSE
# undef TRUE
# endif
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
@ -76,8 +66,8 @@ class MGridGenGAMGAgglomeration
void makeCompactCellFaceAddressingAndFaceWeights void makeCompactCellFaceAddressingAndFaceWeights
( (
const lduAddressing& fineAddressing, const lduAddressing& fineAddressing,
List<idxtype>& cellCells, labelList& cellCells,
List<idxtype>& cellCellOffsets, labelList& cellCellOffsets,
const vectorField& Si, const vectorField& Si,
List<scalar>& faceWeights List<scalar>& faceWeights
); );