songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Mark Olesen 2022-03-13 22:37:22 +01:00
commit fd2544b27e
15 changed files with 71 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
META-INFO/api-info
View File

@ -1,2 +1,2 @@
api=2112
patch=0
patch=220310

4
etc/config.csh/adios2
View File

@ -5,7 +5,7 @@
# \\ / A nd | www.openfoam.com
# \\/ M anipulation |
#------------------------------------------------------------------------------
# Copyright (C) 2017-2020 OpenCFD Ltd.
# Copyright (C) 2017-2022 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@ -20,7 +20,7 @@
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade
set adios2_version=ADIOS2-2.6.0
set adios2_version=ADIOS2-2.7.1
setenv ADIOS2_ARCH_PATH "$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$adios2_version"
# END OF (NORMAL) USER EDITABLE PART

4
etc/config.sh/adios2
View File

@ -5,7 +5,7 @@
# \\ / A nd | www.openfoam.com
# \\/ M anipulation |
#------------------------------------------------------------------------------
# Copyright (C) 2017-2020 OpenCFD Ltd.
# Copyright (C) 2017-2022 OpenCFD Ltd.
#------------------------------------------------------------------------------
# License
# This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@ -21,7 +21,7 @@
#------------------------------------------------------------------------------
# USER EDITABLE PART: Changes made here may be lost with the next upgrade
adios2_version=ADIOS2-2.6.0
adios2_version=ADIOS2-2.7.1
export ADIOS2_ARCH_PATH="$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$adios2_version"
# END OF (NORMAL) USER EDITABLE PART

2
etc/config.sh/functions
View File

@ -149,7 +149,7 @@ then
then
case "$foamVar_end" in
(/*) # Absolute path
_foamAddLib "foamVar_end"
_foamAddLib "$foamVar_end"
;;
(*) # Relative to prefix
_foamAddLib "$foamVar_prefix/$foamVar_end"

9
src/OpenFOAM/db/runTimeSelection/construction/runTimeSelectionTables.H
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2019-2021 OpenCFD Ltd.
Copyright (C) 2019-2022 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -37,8 +37,8 @@ Description
#include "token.H"
#ifndef runTimeSelectionTables_H
#define runTimeSelectionTables_H
#ifndef Foam_runTimeSelectionTables_H
#define Foam_runTimeSelectionTables_H
#include <memory> // For std::unique_ptr
#include <utility> // For std::pair
@ -89,6 +89,7 @@ Description
// Not used directly: storage and helper methods for runtime tables
// - uses automatic cleanup for compat table (issue #2314)
#define defineRunTimeSelectionTableBase(baseType,prefix,Tspecialize) \
\
/* Define table singleton (storage) */ \
@ -124,8 +125,6 @@ Description
{ \
delete prefix##TablePtr_; \
prefix##TablePtr_ = nullptr; \
prefix##CompatTablePtr_.reset(nullptr); \
constructed = false; \
} \
} \
\

5
src/OpenFOAM/global/argList/argList.C
View File

@ -1273,6 +1273,7 @@ void Foam::argList::parse
{
source = "-roots";
runControl_.distributed(true);
if (roots.empty())
{
FatalErrorInFunction
@ -1487,12 +1488,12 @@ void Foam::argList::parse
options_.set("case", roots[subproci-1]/globalCase_);
OPstream toProc(Pstream::commsTypes::scheduled, subproci);
toProc
<< args_ << options_
<< runControl_.distributed()
<< label(runControl_.dryRun())
<< label(runControl_.verbose());
}
options_.erase("case");
@ -1540,6 +1541,7 @@ void Foam::argList::parse
for (const int subproci : Pstream::subProcs())
{
OPstream toProc(Pstream::commsTypes::scheduled, subproci);
toProc
<< args_ << options_
<< runControl_.distributed()
@ -1559,6 +1561,7 @@ void Foam::argList::parse
Pstream::commsTypes::scheduled,
Pstream::masterNo()
);
fromMaster
>> args_ >> options_
>> isDistributed

6
src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2020 ENERCON GmbH
Copyright (C) 2020-2021 OpenCFD Ltd.
Copyright (C) 2020-2022 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -131,7 +131,7 @@ atmTurbulentHeatFluxTemperatureFvPatchScalarField
fixedGradientFvPatchScalarField(atmpsf),
heatSource_(atmpsf.heatSource_),
alphaEffName_(atmpsf.alphaEffName_),
Cp0_(atmpsf.Cp0_),
Cp0_(atmpsf.Cp0_.clone()),
q_(atmpsf.q_.clone(this->patch().patch()))
{}
@ -146,7 +146,7 @@ atmTurbulentHeatFluxTemperatureFvPatchScalarField
fixedGradientFvPatchScalarField(atmpsf, iF),
heatSource_(atmpsf.heatSource_),
alphaEffName_(atmpsf.alphaEffName_),
Cp0_(atmpsf.Cp0_),
Cp0_(atmpsf.Cp0_.clone()),
q_(atmpsf.q_.clone(this->patch().patch()))
{}

40
src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2015-2019 OpenCFD Ltd.
Copyright (C) 2015-2022 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -67,15 +67,20 @@ void Foam::functionObjects::timeActivatedFileUpdate::updateFile()
if (i > lastIndex_)
{
Log << nl << type() << ": copying file" << nl << timeVsFile_[i].second()
<< nl << "to:" << nl << fileToUpdate_ << nl << endl;
const fileName& srcFile = timeVsFile_[i].second();
// Report case-relative path for information
Log << nl << type() << ": copying file" << nl
<< "from: " << time_.relativePath(srcFile, true) << nl
<< "to : " << time_.relativePath(fileToUpdate_, true) << nl
<< endl;
if (Pstream::master() || time_.distributed())
{
// Slaves do not copy if running non-distributed
fileName destFile(fileToUpdate_ + Foam::name(pid()));
cp(timeVsFile_[i].second(), destFile);
mv(destFile, fileToUpdate_);
fileName tmpFile(fileToUpdate_ + Foam::name(pid()));
Foam::cp(srcFile, tmpFile);
Foam::mv(tmpFile, fileToUpdate_);
}
lastIndex_ = i;
modified_ = true;
@ -122,16 +127,23 @@ bool Foam::functionObjects::timeActivatedFileUpdate::read
forAll(timeVsFile_, i)
{
timeVsFile_[i].second() = timeVsFile_[i].second().expand();
if (!isFile(timeVsFile_[i].second()))
{
FatalErrorInFunction
<< "File: " << timeVsFile_[i].second() << " not found"
<< nl << exit(FatalError);
}
timeVsFile_[i].second().expand();
const fileName& srcFile = timeVsFile_[i].second();
// Report case-relative path for information
Info<< " " << timeVsFile_[i].first() << tab
<< timeVsFile_[i].second() << endl;
<< time_.relativePath(srcFile, true) << endl;
if (Pstream::master() || time_.distributed())
{
if (!Foam::isFile(srcFile))
{
// Report full path on error
FatalErrorInFunction
<< "File not found: " << srcFile << endl
<< exit(FatalError);
}
}
}
// Copy starting files

3
src/lagrangian/intermediate/parcels/include/makeParcelCloudFunctionObjects.H
View File

@ -62,7 +62,8 @@ License
makeCloudFunctionObjectType(PatchPostProcessing, CloudType); \
makeCloudFunctionObjectType(PatchParticleHistogram, CloudType); \
makeCloudFunctionObjectType(RemoveParcels, CloudType); \
makeCloudFunctionObjectType(VoidFraction, CloudType);
makeCloudFunctionObjectType(VoidFraction, CloudType); \
makeCloudFunctionObjectType(KinematicReynoldsNumber, CloudType);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

8
src/lagrangian/intermediate/submodels/CloudFunctionObjects/KinematicReynoldsNumber/KinematicReynoldsNumber.H
View File

@ -51,7 +51,7 @@ Description
Operand | Type | Location
input | - | -
output file | - | -
output field | scalarField | \<time\>/lagrangian/\<cloud\>/kinematicRe
output field | scalarField | \<time\>/lagrangian/\<cloud\>/Re
\endtable
Usage
@ -62,15 +62,15 @@ Usage
KinematicReynoldsNumber1
{
// Mandatory entries
type KinematicReynoldsNumber;
type ReynoldsNumber;
}
}
\endverbatim
where the entries mean:
\table
Property | Description | Type | Reqd | Deflt
type | Type name: KinematicReynoldsNumber | word | yes | -
Property | Description | Type | Reqd | Deflt
type | Type name: ReynoldsNumber | word | yes | -
\endtable
See also

14
src/lagrangian/intermediate/submodels/CloudFunctionObjects/ThermoReynoldsNumber/ThermoReynoldsNumber.H
View File

@ -51,7 +51,7 @@ Description
Operand | Type | Location
input | - | -
output file | - | -
output field | scalarField | \<time\>/lagrangian/\<cloud\>/thermoRe
output field | scalarField | \<time\>/lagrangian/\<cloud\>/Re
\endtable
Usage
@ -62,22 +62,22 @@ Usage
ThermoReynoldsNumber1
{
// Mandatory entries
type ThermoReynoldsNumber;
type ReynoldsNumber;
}
}
\endverbatim
where the entries mean:
\table
Property | Description | Type | Reqd | Deflt
type | Type name: ThermoReynoldsNumber | word | yes | -
Property | Description | Type | Reqd | Deflt
type | Type name: ReynoldsNumber | word | yes | -
\endtable
Note
- Normalisation factors \c rhoc and \c muc are based on temperature
dependent values calculated inside the film surrounding the particle
rather than freestream values; therefore, \c ThermoReynoldsNumber should not
be expected to operate with kinematic (non-thermo) applications.
dependent values calculated inside the film surrounding the particle
rather than freestream values; therefore, the thermo \c ReynoldsNumber
should not be expected to operate with kinematic (non-thermo) applications.
See also
- Foam::KinematicReynoldsNumber

6
src/surfMesh/polySurface/polySurfaceTemplates.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2022 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -106,7 +106,7 @@ void Foam::polySurface::storeField
if (dimfield)
{
dimfield->dimensions() = dims;
dimfield->dimensions().reset(dims); // Dimensions may have changed
dimfield->field() = values;
}
else
@ -147,7 +147,7 @@ void Foam::polySurface::storeField
if (dimfield)
{
dimfield->dimensions() = dims;
dimfield->dimensions().reset(dims); // Dimensions may have changed
dimfield->field() = std::move(values);
}
else

6
src/surfMesh/surfMesh/surfMeshTemplates.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2022 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -45,7 +45,7 @@ void Foam::surfMesh::storeField
if (dimfield)
{
dimfield->dimensions() = dims;
dimfield->dimensions().reset(dims); // Dimensions may have changed
dimfield->field() = values;
}
else
@ -85,7 +85,7 @@ void Foam::surfMesh::storeField
if (dimfield)
{
dimfield->dimensions() = dims;
dimfield->dimensions().reset(dims); // Dimensions may have changed
dimfield->field() = std::move(values);
}
else

4
tutorials/incompressible/pimpleFoam/RAS/rotatingFanInRoom/system/relVelocity
View File

@ -14,6 +14,8 @@ relVelocity
name relVelocity;
libs ( utilityFunctionObjects );
writeControl writeTime;
coeffs
{
// User input (duplicate of constant/dynamicMeshDict)
@ -72,7 +74,7 @@ relVelocity
}
#};
codeExecute // codeWrite
codeWrite
#{
const dictionary& context = this->codeContext();

7
tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties
View File

@ -121,7 +121,12 @@ subModels
cloudFunctions
{}
{
ReynoldsNumber1
{
type ReynoldsNumber;
}
}
// ************************************************************************* //