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 remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Andrew Heather
2020-12-11 17:42:29 +00:00
parent 821222834d cfde0d679a
commit 8534983b0a
3 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/optimisationType/optimisationTypeIncompressible.C
View File

@ -175,9 +175,6 @@ void optimisationType::update()
void optimisationType::update(scalarField& direction) void optimisationType::update(scalarField& direction)
{ {
// Compute eta if needed
computeEta(direction);
// Multiply with line search step, if necessary // Multiply with line search step, if necessary
scalarField correction(direction); scalarField correction(direction);
if (lineSearch_) if (lineSearch_)
@ -218,6 +215,9 @@ tmp<scalarField> optimisationType::computeDirection()
scalarField& correction = tcorrection.ref(); scalarField& correction = tcorrection.ref();
correction = updateMethod_->returnCorrection(); correction = updateMethod_->returnCorrection();
// Compute eta if needed
computeEta(correction);
return tcorrection; return tcorrection;
} }

2
src/optimisation/adjointOptimisation/adjoint/optimisation/updateMethod/updateMethod/updateMethod.C
View File

@ -376,7 +376,7 @@ Foam::scalar Foam::updateMethod::computeMeritFunction()
Foam::scalar Foam::updateMethod::meritFunctionDirectionalDerivative() Foam::scalar Foam::updateMethod::meritFunctionDirectionalDerivative()
{ {
return sum(objectiveDerivatives_*correction_); return globalSum(objectiveDerivatives_*correction_);
} }

41
src/optimisation/adjointOptimisation/adjoint/parameterization/NURBS/NURBS3DVolume/NURBS3DVolume/NURBS3DVolume.C
View File

@ -1828,31 +1828,28 @@ void Foam::NURBS3DVolume::writeCps
void Foam::NURBS3DVolume::writeCpsInDict() const void Foam::NURBS3DVolume::writeCpsInDict() const
{ {
if (Pstream::master()) IOdictionary cpsDict
{ (
IOdictionary cpsDict IOobject
( (
IOobject name_ + "cpsBsplines" + mesh_.time().timeName(),
( mesh_.time().caseConstant(),
name_ + "cpsBsplines" + mesh_.time().timeName(), cpsFolder_,
mesh_.time().caseConstant(), mesh_,
cpsFolder_, IOobject::NO_READ,
mesh_, IOobject::NO_WRITE,
IOobject::NO_READ, false
IOobject::NO_WRITE, )
false );
)
);
cpsDict.add("controlPoints", cps_); cpsDict.add("controlPoints", cps_);
// Always write in ASCII, but allow compression // Always write in ASCII, but allow compression
cpsDict.regIOobject::writeObject cpsDict.regIOobject::writeObject
( (
IOstreamOption(IOstream::ASCII, mesh_.time().writeCompression()), IOstreamOption(IOstream::ASCII, mesh_.time().writeCompression()),
true true
); );
}
} }