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

GIT: Resolve merge conflict

Browse Source
This commit is contained in:
andy
2016-04-22 13:31:37 +01:00
parent ef29ad4ca1 7854e426cc
commit 69ae5a9a78
22 changed files with 378 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/postProcessing/functionObjects/graphics/runTimePostProcessing/scene.C
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -348,7 +348,14 @@ bool Foam::scene::loop(vtkRenderer* renderer)
currentFrameI_++;
position_ += currentFrameI_*dPosition_;
if (position_ > (1 + 0.5*dPosition_))
{
WarningInFunction
<< "Current position exceeded 1 - please check your setup"
<< endl;
}
position_ += dPosition_;
if (currentFrameI_ < nFrameTotal_)
{

3
src/postProcessing/functionObjects/utilities/Make/files
View File

@ -27,6 +27,9 @@ pressureTools/pressureToolsFunctionObject.C
Q/Q.C
Q/QFunctionObject.C
residuals/residuals.C
residuals/residualsFunctionObject.C
scalarTransport/scalarTransport.C
scalarTransport/scalarTransportFunctionObject.C