From 817e863d2f0a415864fa1a3abfdc7682d0a460b3 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 29 Nov 2013 16:56:03 +0000
Subject: [PATCH] fvcReconstruct: Added reconstruction of vector magnitude from
flux magnitude
---
src/finiteVolume/Make/files | 1 +
.../finiteVolume/fvc/fvcReconstruct.C | 3 +
.../finiteVolume/fvc/fvcReconstruct.H | 3 +
...econstructSimple.C => fvcReconstructMag.C} | 66 +++++++------------
4 files changed, 31 insertions(+), 42 deletions(-)
rename src/finiteVolume/finiteVolume/fvc/{fvcReconstructSimple.C => fvcReconstructMag.C} (67%)
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index bf626a6aaf2..c9f11150e84 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -377,6 +377,7 @@ $(laplacianSchemes)/gaussLaplacianScheme/gaussLaplacianSchemes.C
finiteVolume/fvc/fvcMeshPhi.C
finiteVolume/fvc/fvcSmooth/fvcSmooth.C
+finiteVolume/fvc/fvcReconstructMag.C
general = cfdTools/general
$(general)/findRefCell/findRefCell.C
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C b/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C
index 5c886900e82..880bd7f72ee 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C
@@ -25,6 +25,9 @@ License
#include "fvcReconstruct.H"
#include "fvMesh.H"
+#include "volFields.H"
+#include "surfaceFields.H"
+#include "fvcSurfaceIntegrate.H"
#include "zeroGradientFvPatchFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.H b/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.H
index fa85c36abd4..63a2adaac34 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.H
+++ b/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.H
@@ -69,6 +69,9 @@ namespace fvc
(
const tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >&
);
+
+ tmp<volScalarField> reconstructMag(const surfaceScalarField&);
+ tmp<volScalarField> reconstructMag(const tmp<surfaceScalarField>&);
}
diff --git a/src/finiteVolume/finiteVolume/fvc/fvcReconstructSimple.C b/src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C
similarity index 67%
rename from src/finiteVolume/finiteVolume/fvc/fvcReconstructSimple.C
rename to src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C
index c3e7f8dc859..63c03590ca9 100644
--- a/src/finiteVolume/finiteVolume/fvc/fvcReconstructSimple.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -25,6 +25,8 @@ License
#include "fvcReconstruct.H"
#include "fvMesh.H"
+#include "volFields.H"
+#include "surfaceFields.H"
#include "zeroGradientFvPatchFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -39,21 +41,8 @@ namespace fvc
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-template<class Type>
-tmp
-<
- GeometricField
- <
- typename outerProduct<vector,Type>::type, fvPatchField, volMesh
- >
->
-reconstruct
-(
- const GeometricField<Type, fvsPatchField, surfaceMesh>& ssf
-)
+tmp<volScalarField> reconstructMag(const surfaceScalarField& ssf)
{
- typedef typename outerProduct<vector, Type>::type GradType;
-
const fvMesh& mesh = ssf.mesh();
const labelUList& owner = mesh.owner();
@@ -61,10 +50,12 @@ reconstruct
const volVectorField& C = mesh.C();
const surfaceVectorField& Cf = mesh.Cf();
+ const surfaceVectorField& Sf = mesh.Sf();
+ const surfaceScalarField& magSf = mesh.magSf();
- tmp<GeometricField<GradType, fvPatchField, volMesh> > treconField
+ tmp<volScalarField> treconField
(
- new GeometricField<GradType, fvPatchField, volMesh>
+ new volScalarField
(
IOobject
(
@@ -75,41 +66,44 @@ reconstruct
IOobject::NO_WRITE
),
mesh,
- dimensioned<GradType>
+ dimensionedScalar
(
"0",
ssf.dimensions()/dimArea,
- pTraits<GradType>::zero
+ scalar(0)
),
- zeroGradientFvPatchField<GradType>::typeName
+ zeroGradientFvPatchScalarField::typeName
)
);
- Field<GradType>& rf = treconField();
+ scalarField& rf = treconField();
forAll(owner, facei)
{
label own = owner[facei];
label nei = neighbour[facei];
- rf[own] += (Cf[facei] - C[own])*ssf[facei];
- rf[nei] -= (Cf[facei] - C[nei])*ssf[facei];
+ rf[own] += (Sf[facei] & (Cf[facei] - C[own]))*ssf[facei]/magSf[facei];
+ rf[nei] -= (Sf[facei] & (Cf[facei] - C[nei]))*ssf[facei]/magSf[facei];
}
- const typename GeometricField<Type, fvsPatchField, surfaceMesh>::
- GeometricBoundaryField& bsf = ssf.boundaryField();
+ const surfaceScalarField::GeometricBoundaryField& bsf = ssf.boundaryField();
forAll(bsf, patchi)
{
- const fvsPatchField<Type>& psf = bsf[patchi];
+ const fvsPatchScalarField& psf = bsf[patchi];
const labelUList& pOwner = mesh.boundary()[patchi].faceCells();
const vectorField& pCf = Cf.boundaryField()[patchi];
+ const vectorField& pSf = Sf.boundaryField()[patchi];
+ const scalarField& pMagSf = magSf.boundaryField()[patchi];
forAll(pOwner, pFacei)
{
label own = pOwner[pFacei];
- rf[own] += (pCf[pFacei] - C[own])*psf[pFacei];
+ rf[own] +=
+ (pSf[pFacei] & (pCf[pFacei] - C[own]))
+ *psf[pFacei]/pMagSf[pFacei];
}
}
@@ -121,23 +115,11 @@ reconstruct
}
-template<class Type>
-tmp
-<
- GeometricField
- <
- typename outerProduct<vector, Type>::type, fvPatchField, volMesh
- >
->
-reconstruct
-(
- const tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >& tssf
-)
+tmp<volScalarField> reconstructMag(const tmp<surfaceScalarField>& tssf)
{
- typedef typename outerProduct<vector, Type>::type GradType;
- tmp<GeometricField<GradType, fvPatchField, volMesh> > tvf
+ tmp<volScalarField> tvf
(
- fvc::reconstruct(tssf())
+ fvc::reconstructMag(tssf())
);
tssf.clear();
return tvf;
--
GitLab