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 'develop' of https://develop.openfoam.com/Development/openfoam into develop

Browse Source
This commit is contained in:
mattijs
2021-03-08 11:07:28 +00:00
parent ba9e573812 22832b87cb
commit aa942aadd4
18 changed files with 62 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
applications/solvers/lagrangian/reactingParcelFoam/pEqn.H
View File

@ -23,6 +23,7 @@ surfaceScalarField phiHbyA
+ phig
);
fvc::makeRelative(phiHbyA, rho, U);
MRF.makeRelative(fvc::interpolate(rho), phiHbyA);
// Update the pressure BCs to ensure flux consistency

4
src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2013 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
Copyright (C) 2020-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -51,7 +51,7 @@ UNARY_FUNCTION(tensor, tensor, cof, pow2)
UNARY_FUNCTION(tensor, tensor, inv, inv)
UNARY_FUNCTION(vector, symmTensor, eigenValues, transform)
UNARY_FUNCTION(symmTensor, symmTensor, eigenVectors, sign)
UNARY_FUNCTION(tensor, symmTensor, eigenVectors, sign)
// * * * * * * * * * * * * * * * global operators * * * * * * * * * * * * * //

4
src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
Copyright (C) 2020-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -64,7 +64,7 @@ UNARY_FUNCTION(tensor, tensor, cof, cof)
UNARY_FUNCTION(tensor, tensor, inv, inv)
UNARY_FUNCTION(vector, symmTensor, eigenValues, transform)
UNARY_FUNCTION(symmTensor, symmTensor, eigenVectors, sign)
UNARY_FUNCTION(tensor, symmTensor, eigenVectors, sign)
// * * * * * * * * * * * * * * * global operators * * * * * * * * * * * * * //

4
src/OpenFOAM/fields/FieldFields/tensorFieldField/tensorFieldField.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation
Copyright (C) 2019-2020 OpenCFD Ltd.
Copyright (C) 2019-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -219,7 +219,7 @@ UNARY_FUNCTION(tensor, tensor, cof)
UNARY_FUNCTION(tensor, tensor, inv)
UNARY_FUNCTION(vector, symmTensor, eigenValues)
UNARY_FUNCTION(symmTensor, symmTensor, eigenVectors)
UNARY_FUNCTION(tensor, symmTensor, eigenVectors)
// * * * * * * * * * * * * * * * Global Operators * * * * * * * * * * * * * //

4
src/OpenFOAM/fields/FieldFields/tensorFieldField/tensorFieldField.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2019-2020 OpenCFD Ltd.
Copyright (C) 2019-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -168,7 +168,7 @@ UNARY_FUNCTION(tensor, tensor, cof)
UNARY_FUNCTION(tensor, tensor, inv)
UNARY_FUNCTION(vector, symmTensor, eigenValues)
UNARY_FUNCTION(symmTensor, symmTensor, eigenVectors)
UNARY_FUNCTION(tensor, symmTensor, eigenVectors)
// * * * * * * * * * * * * * * * global operators * * * * * * * * * * * * * //

4
src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2013 OpenFOAM Foundation
Copyright (C) 2019-2020 OpenCFD Ltd.
Copyright (C) 2019-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -269,7 +269,7 @@ UNARY_FUNCTION(tensor, tensor, cof, pow2)
UNARY_FUNCTION(tensor, tensor, inv, inv)
UNARY_FUNCTION(vector, symmTensor, eigenValues, transform)
UNARY_FUNCTION(symmTensor, symmTensor, eigenVectors, sign)
UNARY_FUNCTION(tensor, symmTensor, eigenVectors, sign)
// * * * * * * * * * * * * * * * Global Operators * * * * * * * * * * * * * //

4
src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2019-2020 OpenCFD Ltd.
Copyright (C) 2019-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -169,7 +169,7 @@ UNARY_FUNCTION(tensor, tensor, cof, cof)
UNARY_FUNCTION(tensor, tensor, inv, inv)
UNARY_FUNCTION(vector, symmTensor, eigenValues, transform)
UNARY_FUNCTION(symmTensor, symmTensor, eigenVectors, sign)
UNARY_FUNCTION(tensor, symmTensor, eigenVectors, sign)
// * * * * * * * * * * * * * * * Global Operators * * * * * * * * * * * * * //

6
src/OpenFOAM/primitives/Scalar/doubleFloat.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation
Copyright (C) 2018-2019 OpenCFD Ltd.
Copyright (C) 2018-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -72,6 +72,10 @@ MAXMINPOW(float, float, int)
MAXMINPOW(float, int, float)
MAXMINPOW(float, float, long)
MAXMINPOW(float, long, float)
#if defined(__APPLE__) && WM_LABEL_SIZE == 64
MAXMINPOW(float, float, int64_t)
MAXMINPOW(float, int64_t, float)
#endif
#undef MAXMINPOW

5
src/OpenFOAM/primitives/complex/complexI.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2014 OpenFOAM Foundation
Copyright (C) 2019-2020 OpenCFD Ltd.
Copyright (C) 2019-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -440,6 +440,9 @@ inline complex pow(const complex& x, const complex& y)
powFuncs(int)
powFuncs(long)
#if defined(__APPLE__) && WM_LABEL_SIZE == 64
powFuncs(int64_t)
#endif
powFuncs(float)
powFuncs(double)

3
src/meshTools/searchableSurfaces/searchableSphere/searchableSphere.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2017 OpenFOAM Foundation
Copyright (C) 2018-2020 OpenCFD Ltd.
Copyright (C) 2018-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -39,6 +39,7 @@ https://www.geometrictools.com/Documentation/DistancePointEllipseEllipsoid.pdf
#include "searchableSphere.H"
#include "addToRunTimeSelectionTable.H"
#include <array>
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

167
src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointBoundaryCondition/adjointBoundaryConditionTemplates.C
View File

@ -1,167 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2007-2019 PCOpt/NTUA
Copyright (C) 2013-2019 FOSS GP
Copyright (C) 2019 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#include "emptyFvPatch.H"
#include "adjointBoundaryCondition.H"
#include "adjointSolverManager.H"
#include "HashTable.H"
#include "surfaceInterpolationScheme.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
template<class Type>
tmp
<
Field<typename Foam::outerProduct<Foam::vector, Type>::type>
>
adjointBoundaryCondition::computePatchGrad(word name)
{
// Return field
typedef typename outerProduct<vector, Type>::type GradType;
auto tresGrad = tmp<Field<GradType>>::New(patch_.size(), Zero);
auto& resGrad = tresGrad.ref();
const labelList& faceCells = patch_.faceCells();
const fvMesh& mesh = patch_.boundaryMesh().mesh();
const cellList& cells = mesh.cells();
// Go through the surfaceInterpolation scheme defined in gradSchemes for
// consistency
const GeometricField<Type, fvPatchField, volMesh>& field =
mesh.lookupObject<volVectorField>(name);
// Gives problems when grad(AdjointVar) is computed using a limited scheme,
// since it is not possible to know a priori how many words to expect in the
// stream.
// Interpolation scheme is now read through interpolation schemes.
/*
word gradSchemeName ("grad(" + name + ')');
Istream& is = mesh.gradScheme(gradSchemeName);
word schemeData(is);
*/
tmp<surfaceInterpolationScheme<Type>> tinterpScheme
(
surfaceInterpolationScheme<Type>::New
(
mesh,
mesh.interpolationScheme("interpolate(" + name + ")")
)
);
GeometricField<Type, fvsPatchField, surfaceMesh> surfField
(
tinterpScheme().interpolate(field)
);
// Auxiliary fields
const surfaceVectorField& Sf = mesh.Sf();
tmp<vectorField> tnf = patch_.nf();
const vectorField& nf = tnf();
const scalarField& V = mesh.V();
const labelUList& owner = mesh.owner();
// Compute grad value of cell adjacent to the boundary
forAll(faceCells, fI)
{
const label cI = faceCells[fI];
const cell& cellI = cells[cI];
for (const label faceI : cellI) // global face numbering
{
label patchID = mesh.boundaryMesh().whichPatch(faceI);
if (patchID == -1) //face is internal
{
const label own = owner[faceI];
tensor flux = Sf[faceI]*surfField[faceI];
if (cI == own)
{
resGrad[fI] += flux;
}
else
{
resGrad[fI] -= flux;
}
}
else // Face is boundary. Covers coupled patches as well
{
if (!isA<emptyFvPatch>(mesh.boundary()[patchID]))
{
const fvPatch& patchForFlux = mesh.boundary()[patchID];
const label boundaryFaceI = faceI - patchForFlux.start();
const vectorField& Sfb = Sf.boundaryField()[patchID];
resGrad[fI] +=
Sfb[boundaryFaceI]
*surfField.boundaryField()[patchID][boundaryFaceI];
}
}
}
resGrad[fI] /= V[cI];
}
// This has concluded the computation of the grad at the cell next to the
// boundary. We now need to compute the grad at the boundary face
const fvPatchField<Type>& bField = field.boundaryField()[patch_.index()];
resGrad = nf*bField.snGrad() + (resGrad - nf*(nf & resGrad));
return tresGrad;
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class Type>
adjointBoundaryCondition::adjointBoundaryCondition
(
const fvPatch& p,
const DimensionedField<Type, volMesh>& iF,
const word& solverName
)
:
patch_(p),
managerName_("objectiveManager" + solverName),
adjointSolverName_(solverName),
simulationType_("incompressible"),
boundaryContrPtr_(nullptr),
addATCUaGradUTerm_(nullptr)
{
// Set the boundaryContribution pointer
setBoundaryContributionPtr();
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* //

54
src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointZeroInlet/adjointZeroInletFvPatchFieldsFwd.C
View File

@ -1,54 +0,0 @@
/*---------------------------------------------------------------------------*\
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2007-2019 PCOpt/NTUA
Copyright (C) 2013-2019 FOSS GP
Copyright (C) 2019 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
OpenFOAM is free software: you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
\*---------------------------------------------------------------------------*/
#ifndef adjointZeroInletFvPatchFieldsFwd_H
#define adjointZeroInletFvPatchFieldsFwd_H
#include "fieldTypes.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
template<class Type> class adjointZeroInletFvPatchField;
makePatchTypeFieldTypedefs(adjointZeroInlet);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //

8
src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager/objectiveManager.C
View File

@ -5,8 +5,8 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2007-2020 PCOpt/NTUA
Copyright (C) 2013-2020 FOSS GP
Copyright (C) 2007-2021 PCOpt/NTUA
Copyright (C) 2013-2021 FOSS GP
Copyright (C) 2019 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -252,7 +252,7 @@ scalar objectiveManager::print()
}
bool objectiveManager::write
bool objectiveManager::writeObjectives
(
const scalar weightedObjective,
const bool valid
@ -289,7 +289,7 @@ void objectiveManager::updateAndWrite()
updateNormalizationFactor();
update();
scalar weightedObjective = print();
write(weightedObjective);
writeObjectives(weightedObjective);
}

6
src/optimisation/adjointOptimisation/adjoint/objectiveManager/objectiveManager/objectiveManager.H
View File

@ -5,8 +5,8 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2007-2020 PCOpt/NTUA
Copyright (C) 2013-2020 FOSS GP
Copyright (C) 2007-2021 PCOpt/NTUA
Copyright (C) 2013-2021 FOSS GP
Copyright (C) 2019 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
@ -146,7 +146,7 @@ public:
scalar print();
//- Write objective function history
virtual bool write
virtual bool writeObjectives
(
const scalar weightedObjective,
const bool valid = true

2
tutorials/IO/fileHandler/system/blockMeshDict
View File

@ -36,7 +36,7 @@ vertices
blocks
(
hex (6 9 10 11 0 3 4 5 ) (20 40 1) simpleGrading (1 1 1)
hex (7 8 9 6 1 2 3 0) (20 8 1) simpleGrading (1 1 1)
hex (7 8 9 6 1 2 3 0) near (20 8 1) simpleGrading (1 1 1)
);
boundary

26
tutorials/lagrangian/sprayFoam/aachenBomb/system/decomposeParDict Normal file
View File

@ -0,0 +1,26 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: v2012 |
| \\ / A nd | Website: www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
object decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
numberOfSubdomains 8;
method simple;
coeffs
{
n (1 8 1);
}
// ************************************************************************* //

4
wmake/scripts/wmake-build-info
View File

@ -6,7 +6,7 @@
# \\ / A nd | www.openfoam.com
# \\/ M anipulation |
#------------------------------------------------------------------------------
# Copyright (C) 2018-2020 OpenCFD Ltd.
# Copyright (C) 2018-2021 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@ -237,7 +237,7 @@ getMakeInfo()
# (api) from WM_DIR/rules/General/general
# - extract WM_VERSION = OPENFOAM=<digits>
api="$(sed -ne '/^ *#/!{ /WM_VERSION.*OPENFOAM=/{ s@^.*OPENFOAM= *\([0-9][0-9]*\).*@\1@p; q }}' "$rulesFile" 2>/dev/null)"
api="$(sed -ne 's@^ *WM_VERSION *= *OPENFOAM=\([0-9][0-9]*\).*@\1@p' "$rulesFile" 2>/dev/null)"
if [ -d "$META_INFO" ]
then

4
wmake/scripts/wmake-with-bear
View File

@ -6,7 +6,7 @@
# \\ / A nd | www.openfoam.com
# \\/ M anipulation |
#-------------------------------------------------------------------------------
# Copyright (C) 2020 OpenCFD Ltd.
# Copyright (C) 2020-2021 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@ -80,7 +80,7 @@ done
# Detect version. Seems to be stderr for some versions!?
if version="$(bear --version 2>&1)"
then
version="$(echo "$version" | sed -ne '1{ s/^[^0-9]*\([1-9]\)/\1/p }')"
version="$(echo "$version" | sed -ne '1s/^[^0-9]*\([1-9]\)/\1/p;')"
else
unset version
fi