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

resolve merge conflict

Browse Source
This commit is contained in:
andy
2009-11-19 10:50:22 +00:00
parent efb0d93a0c 08e4e5c556
commit 8ce765e3f5
5 changed files with 78 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H
View File

@ -1,4 +1,26 @@
{
if (mesh.changing())
{
forAll(U.boundaryField(), patchi)
{
if (U.boundaryField()[patchi].fixesValue())
{
U.boundaryField()[patchi].initEvaluate();
}
}
forAll(U.boundaryField(), patchi)
{
if (U.boundaryField()[patchi].fixesValue())
{
U.boundaryField()[patchi].evaluate();
phi.boundaryField()[patchi] =
U.boundaryField()[patchi] & mesh.Sf().boundaryField()[patchi];
}
}
}
wordList pcorrTypes
(
p.boundaryField().size(),

22
applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H
View File

@ -1,4 +1,26 @@
{
if (mesh.changing())
{
forAll(U.boundaryField(), patchi)
{
if (U.boundaryField()[patchi].fixesValue())
{
U.boundaryField()[patchi].initEvaluate();
}
}
forAll(U.boundaryField(), patchi)
{
if (U.boundaryField()[patchi].fixesValue())
{
U.boundaryField()[patchi].evaluate();
phi.boundaryField()[patchi] =
U.boundaryField()[patchi] & mesh.Sf().boundaryField()[patchi];
}
}
}
#include "continuityErrs.H"
volScalarField pcorr

22
applications/solvers/multiphase/interDyMFoam/correctPhi.H
View File

@ -1,4 +1,26 @@
{
if (mesh.changing())
{
forAll(U.boundaryField(), patchi)
{
if (U.boundaryField()[patchi].fixesValue())
{
U.boundaryField()[patchi].initEvaluate();
}
}
forAll(U.boundaryField(), patchi)
{
if (U.boundaryField()[patchi].fixesValue())
{
U.boundaryField()[patchi].evaluate();
phi.boundaryField()[patchi] =
U.boundaryField()[patchi] & mesh.Sf().boundaryField()[patchi];
}
}
}
#include "continuityErrs.H"
volScalarField pcorr

4
src/Pstream/mpi/UPstream.C
View File

@ -177,7 +177,7 @@ void Foam::reduce(scalar& Value, const sumOp<scalar>& bop)
{
if (Pstream::debug)
{
Pout<< "UPstream::reduce : value:" << Value << endl;
Pout<< "Foam::reduce : value:" << Value << endl;
}
if (!UPstream::parRun())
@ -452,7 +452,7 @@ void Foam::reduce(scalar& Value, const sumOp<scalar>& bop)
if (Pstream::debug)
{
Pout<< "UPstream::reduce : reduced value:" << Value << endl;
Pout<< "Foam::reduce : reduced value:" << Value << endl;
}
}

10
tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/dynamicMeshDict
View File

@ -19,14 +19,23 @@ dynamicFvMesh dynamicRefineFvMesh;
dynamicRefineFvMeshCoeffs
{
// How often to refine
refineInterval 1;
// Field to be refinement on
field alpha1;
// Refine field inbetween lower..upper
lowerRefineLevel 0.001;
upperRefineLevel 0.999;
// If value < unrefineLevel unrefine
unrefineLevel 10;
// Have slower than 2:1 refinement
nBufferLayers 1;
// Refine cells only up to maxRefinement levels
maxRefinement 2;
// Stop refinement if maxCells reached
maxCells 200000;
// Flux field and corresponding velocity field. Fluxes on changed
// faces get recalculated by interpolating the velocity.
correctFluxes
(
(
@ -34,6 +43,7 @@ dynamicRefineFvMeshCoeffs
U
)
);
// Write the refinement level as a volScalarField
dumpLevel true;
}