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

Merge branch 'fix-function-objects-in-optimisation' into 'develop'

Browse Source 
FIX: functions objects in optimisation

See merge request Development/openfoam!654
This commit is contained in:
Andrew Heather 2023-12-21 09:50:33 +00:00
commit f88e06cac2
8 changed files with 9 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/incompressible/simple/simple.C
View File

@ -107,7 +107,8 @@ Foam::simple::simple
incoVars_(allocateVars()),
MRF_(mesh, word(useSolverNameForFields() ? solverName_ : word::null)),
cumulativeContErr_(Zero),
objectives_()
objectives_(),
allowFunctionObjects_(dict.getOrDefault("allowFunctionObjects", false))
{
addExtraSchemes();
setRefCell
@ -246,7 +247,7 @@ void Foam::simple::postIter()
{
// Execute function objects in optimisation cases
// Disabled in Time since we are subsycling
if (managerType_ == "steadyOptimisation")
if (managerType_ == "steadyOptimisation" && allowFunctionObjects_)
{
const_cast<Time&>(mesh_.time()).functionObjects().execute(false);
}

6
src/optimisation/adjointOptimisation/adjoint/solvers/primalSolvers/incompressible/simple/simple.H
View File

@ -86,6 +86,12 @@ protected:
//- List of objectives related to this primal solver
UPtrList<objective> objectives_;
//- Allow the execution of function objects in optimisation mode.
// Depending on the functions used and the setup, this might lead
// to a high amount of data written to the hard drive.
// WIP
bool allowFunctionObjects_;
//- Protected Member Functions

11
tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-continuation/system/controlDict
View File

@ -44,16 +44,5 @@ timePrecision 6;
runTimeModifiable yes;
functions
{
yPlus
{
type yPlus;
libs ( fieldFunctionObjects );
writeFields yes;
writeControl writeTime;
}
}
// ************************************************************************* //

11
tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS-oneGo/system/controlDict
View File

@ -44,16 +44,5 @@ timePrecision 6;
runTimeModifiable yes;
functions
{
yPlus
{
type yPlus;
libs (fieldFunctionObjects);
writeFields yes;
writeControl writeTime;
}
}
// ************************************************************************* //

11
tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/losses/BFGS/op1/system/controlDict
View File

@ -44,16 +44,5 @@ timePrecision 6;
runTimeModifiable yes;
functions
{
yPlus
{
type yPlus;
libs (fieldFunctionObjects);
writeFields yes;
writeControl writeTime;
}
}
// ************************************************************************* //

10
tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/nutSqr/system/controlDict
View File

@ -44,15 +44,5 @@ timePrecision 6;
runTimeModifiable yes;
functions
{
yPlus
{
type yPlus;
libs (fieldFunctionObjects);
writeFields yes;
writeControl writeTime;
}
}
// ************************************************************************* //

10
tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/SA/opt/powerDissipation/system/controlDict
View File

@ -44,15 +44,5 @@ timePrecision 6;
runTimeModifiable yes;
functions
{
yPlus
{
type yPlus;
libs (fieldFunctionObjects);
writeFields yes;
writeControl writeTime;
}
}
// ************************************************************************* //

10
tutorials/incompressible/adjointOptimisationFoam/shapeOptimisation/sbend/turbulent/kOmegaSST/opt/system/controlDict
View File

@ -44,15 +44,5 @@ timePrecision 6;
runTimeModifiable yes;
functions
{
// yPlus
// {
// type yPlus;
// libs ("libfieldFunctionObjects.so");
// writeFields yes;
// writeControl writeTime;
// }
}
// ************************************************************************* //