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

This commit is contained in:
mattijs
2012-07-03 15:06:34 +01:00
2 changed files with 4 additions and 5 deletions

View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -198,8 +198,7 @@ void Foam::interRegionHeatTransferModel::addSup
<< endl; << endl;
} }
//SAF: temporarily output if (debug && mesh_.time().outputTime())
if (mesh_.time().outputTime())
{ {
Tmapped.write(); Tmapped.write();
htc_.write(); htc_.write();

View File

@ -142,8 +142,8 @@ class fvMatrix
mutable GeometricField<Type, fvsPatchField, surfaceMesh> mutable GeometricField<Type, fvsPatchField, surfaceMesh>
*faceFluxCorrectionPtr_; *faceFluxCorrectionPtr_;
// ***HGW for testing LduMatrix protected:
public: protected:
//- Declare friendship with the fvSolver class //- Declare friendship with the fvSolver class
friend class fvSolver; friend class fvSolver;