zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
andy
2012-03-13 09:34:03 +00:00
parent 94bacb8c18 8bf98fdded
commit c2418635db
4 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
View File

@ -35,7 +35,6 @@
{
phaseModel& phase = iter();
phase.phi().oldTime();
mrfZones.absoluteFlux(phase.phi().oldTime());
mrfZones.absoluteFlux(phase.phi());
@ -173,7 +172,6 @@
phase.phi() =
phiHbyAs[phasei]
+ rAlphaAUfs[phasei]*mSfGradp/phase.rho();
mrfZones.relativeFlux(phase.phi());
mrfZones.relativeFlux(phase.phi().oldTime());
phi += alphafs[phasei]*phase.phi();
@ -206,7 +204,7 @@
+ rAlphaAUfs[phasei]*mSfGradp/phase.rho()
);
phase.U() = fvc::reconstruct(phase.phi());
// phase.U() = fvc::reconstruct(phase.phi());
phase.U().correctBoundaryConditions();
U += alpha*phase.U();

2
etc/bashrc
View File

@ -80,7 +80,7 @@ export WM_COMPILE_OPTION=Opt
#- MPI implementation:
# WM_MPLIB = SYSTEMOPENMPI | OPENMPI | MPICH | MPICH-GM | HPMPI
# | GAMMA | MPI | QSMPI
# | GAMMA | MPI | QSMPI | SGIMPI
export WM_MPLIB=OPENMPI
#- Operating System:

2
etc/cshrc
View File

@ -80,7 +80,7 @@ setenv WM_COMPILE_OPTION Opt
#- MPI implementation:
# WM_MPLIB = SYSTEMOPENMPI | OPENMPI | MPICH | MPICH-GM | HPMPI
# | GAMMA | MPI | QSMPI
# | GAMMA | MPI | QSMPI | SGIMPI
setenv WM_MPLIB OPENMPI
#- Operating System:

19
src/parallel/decompose/decompositionMethods/decompositionMethod/decompositionMethod.C
View File

@ -307,12 +307,20 @@ void Foam::decompositionMethod::calcCellCells
// Done as postprocessing step since we now have cellCells.
label newIndex = 0;
labelHashSet nbrCells;
if (cellCells.size() == 0)
{
return;
}
label startIndex = cellCells.offsets()[0];
forAll(cellCells, cellI)
{
nbrCells.clear();
nbrCells.insert(globalAgglom.toGlobal(cellI));
label startIndex = cellCells.offsets()[cellI];
label endIndex = cellCells.offsets()[cellI+1];
for (label i = startIndex; i < endIndex; i++)
@ -322,16 +330,21 @@ void Foam::decompositionMethod::calcCellCells
cellCells.m()[newIndex++] = cellCells.m()[i];
}
}
startIndex = endIndex;
cellCells.offsets()[cellI+1] = newIndex;
}
cellCells.m().setSize(newIndex);
//forAll(cellCells, cellI)
//{
// const labelUList cCells = cellCells[cellI];
// Pout<< "Original: Coarse cell " << cellI << endl;
// forAll(mesh.cellCells()[cellI], i)
// {
// Pout<< " nbr:" << mesh.cellCells()[cellI][i] << endl;
// }
// Pout<< "Compacted: Coarse cell " << cellI << endl;
// const labelUList cCells = cellCells[cellI];
// forAll(cCells, i)
// {
// Pout<< " nbr:" << cCells[i] << endl;