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

STYLE: homogenised the use of "topO" instead of "topo"

Browse Source 
whenever refering to topology optimisation.
This commit is contained in:
Vaggelis Papoutsis
2023-12-07 18:28:38 +02:00
committed by Andrew Heather
parent a6e9a29f41
commit afe9b90d04
4 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/optimisation/adjointOptimisation/adjoint/Make/files
View File

@ -186,30 +186,30 @@ $(updateMethod)/ISQP/ISQP.C
/* DESIGN VARIABLES */ /* DESIGN VARIABLES */
optimisation/designVariables/designVariables/designVariables.C optimisation/designVariables/designVariables/designVariables.C
topoVars=optimisation/designVariables/topODesignVariables topOVars=optimisation/designVariables/topODesignVariables
$(topoVars)/topOVariablesBase/topOVariablesBase.C $(topOVars)/topOVariablesBase/topOVariablesBase.C
$(topoVars)/topODesignVariables.C $(topOVars)/topODesignVariables.C
$(topoVars)/dynamicTopODesignVariables/dynamicTopODesignVariables.C $(topOVars)/dynamicTopODesignVariables/dynamicTopODesignVariables.C
$(topoVars)/betaMax/betaMax/betaMax.C $(topOVars)/betaMax/betaMax/betaMax.C
$(topoVars)/betaMax/value/betaMaxValue.C $(topOVars)/betaMax/value/betaMaxValue.C
$(topoVars)/betaMax/Darcy/betaMaxDarcy.C $(topOVars)/betaMax/Darcy/betaMaxDarcy.C
$(topoVars)/betaMax/ReynoldsDarcy/betaMaxReynoldsDarcy.C $(topOVars)/betaMax/ReynoldsDarcy/betaMaxReynoldsDarcy.C
$(topoVars)/betaMax/stepRamp/betaMaxStepRamp.C $(topOVars)/betaMax/stepRamp/betaMaxStepRamp.C
$(topoVars)/topOZones/topOZones.C $(topOVars)/topOZones/topOZones.C
$(topoVars)/regularisation/fieldRegularisation.C $(topOVars)/regularisation/fieldRegularisation.C
$(topoVars)/regularisation/regularisationRadius/regularisationRadius/regularisationRadius.C $(topOVars)/regularisation/regularisationRadius/regularisationRadius/regularisationRadius.C
$(topoVars)/regularisation/regularisationRadius/isotropic/regularisationRadiusIsotropic.C $(topOVars)/regularisation/regularisationRadius/isotropic/regularisationRadiusIsotropic.C
$(topoVars)/regularisation/regularisationPDE/regularisationPDE/regularisationPDE.C $(topOVars)/regularisation/regularisationPDE/regularisationPDE/regularisationPDE.C
$(topoVars)/regularisation/regularisationPDE/Helmoltz/Helmholtz.C $(topOVars)/regularisation/regularisationPDE/Helmoltz/Helmholtz.C
$(topoVars)/marchingCells/marchingCells.C $(topOVars)/marchingCells/marchingCells.C
$(topoVars)/interpolationFunctions/interpolationFunction/topOInterpolationFunction.C $(topOVars)/interpolationFunctions/interpolationFunction/topOInterpolationFunction.C
$(topoVars)/interpolationFunctions/BorrvallPetersson/BorrvallPeterssonInterpolation.C $(topOVars)/interpolationFunctions/BorrvallPetersson/BorrvallPeterssonInterpolation.C
$(topoVars)/interpolationFunctions/invBP/invBP.C $(topOVars)/interpolationFunctions/invBP/invBP.C
$(topoVars)/interpolationFunctions/linear/linearInterpolation.C $(topOVars)/interpolationFunctions/linear/linearInterpolation.C
$(topoVars)/interpolationFunctions/SIMP/SIMPInterpolation.C $(topOVars)/interpolationFunctions/SIMP/SIMPInterpolation.C
$(topoVars)/interpolationFunctions/sinh/sinhInterpolation.C $(topOVars)/interpolationFunctions/sinh/sinhInterpolation.C
$(topoVars)/interpolationFunctions/tanh/tanhInterpolation.C $(topOVars)/interpolationFunctions/tanh/tanhInterpolation.C
$(topoVars)/interpolationFunctions/exp/expInterpolation.C $(topOVars)/interpolationFunctions/exp/expInterpolation.C
levelSetVars=optimisation/designVariables/levelSet levelSetVars=optimisation/designVariables/levelSet
$(levelSetVars)/levelSetDesignVariables.C $(levelSetVars)/levelSetDesignVariables.C
$(levelSetVars)/interpolationFunctions/sigmoidalHeaviside/sigmoidalHeaviside.C $(levelSetVars)/interpolationFunctions/sigmoidalHeaviside/sigmoidalHeaviside.C

12
src/optimisation/adjointOptimisation/adjoint/fvOptions/sources/TopO/topOSource/topOSource.C
View File

@ -73,10 +73,10 @@ Foam::fv::topOSource::getSource()
); );
DimensionedField<scalar, volMesh>& interpolant = tinterpolant.ref(); DimensionedField<scalar, volMesh>& interpolant = tinterpolant.ref();
if (mesh_.foundObject<topOVariablesBase>("topoVars")) if (mesh_.foundObject<topOVariablesBase>("topOVars"))
{ {
const topOVariablesBase& vars = const topOVariablesBase& vars =
mesh_.lookupObject<topOVariablesBase>("topoVars"); mesh_.lookupObject<topOVariablesBase>("topOVars");
vars.sourceTerm vars.sourceTerm
(interpolant, interpolation_(), betaMax_, interpolationFieldName_); (interpolant, interpolation_(), betaMax_, interpolationFieldName_);
@ -178,14 +178,14 @@ void Foam::fv::topOSource::postProcessSens
if if
( (
fieldi != -1 fieldi != -1
&& mesh_.foundObject<topOVariablesBase>("topoVars") && mesh_.foundObject<topOVariablesBase>("topOVars")
) )
{ {
DebugInfo DebugInfo
<< "Postprocessing Brinkman sensitivities for field " << "Postprocessing Brinkman sensitivities for field "
<< fieldName << endl; << fieldName << endl;
const topOVariablesBase& vars = const topOVariablesBase& vars =
mesh_.lookupObject<topOVariablesBase>("topoVars"); mesh_.lookupObject<topOVariablesBase>("topOVars");
vars.sourceTermSensitivities vars.sourceTermSensitivities
( (
sens, sens,
@ -205,10 +205,10 @@ bool Foam::fv::topOSource::read(const dictionary& dict)
fieldNames_ = coeffs_.get<wordList>("names"); fieldNames_ = coeffs_.get<wordList>("names");
interpolationFieldName_ = coeffs_.get<word>("interpolationField"); interpolationFieldName_ = coeffs_.get<word>("interpolationField");
applied_.setSize(fieldNames_.size(), false); applied_.setSize(fieldNames_.size(), false);
if (mesh_.foundObject<topOVariablesBase>("topoVars")) if (mesh_.foundObject<topOVariablesBase>("topOVars"))
{ {
const topOVariablesBase& vars = const topOVariablesBase& vars =
mesh_.lookupObject<topOVariablesBase>("topoVars"); mesh_.lookupObject<topOVariablesBase>("topOVars");
betaMax_ = betaMax_ =
coeffs_.getOrDefault<scalar>("betaMax", vars.getBetaMax()); coeffs_.getOrDefault<scalar>("betaMax", vars.getBetaMax());
} }

12
src/optimisation/adjointOptimisation/adjoint/objectives/incompressible/objectivePowerDissipation/objectivePowerDissipation.C
View File

@ -163,10 +163,10 @@ scalar objectivePowerDissipation::J()
scalarField integrandZone(integrand.primitiveField(), zoneI); scalarField integrandZone(integrand.primitiveField(), zoneI);
J_ += 0.5*gSum(integrandZone*VZone); J_ += 0.5*gSum(integrandZone*VZone);
if (mesh_.foundObject<topOVariablesBase>("topoVars")) if (mesh_.foundObject<topOVariablesBase>("topOVars"))
{ {
const topOVariablesBase& vars = const topOVariablesBase& vars =
mesh_.lookupObject<topOVariablesBase>("topoVars"); mesh_.lookupObject<topOVariablesBase>("topOVars");
const volScalarField& beta = vars.beta(); const volScalarField& beta = vars.beta();
scalar porosityContr = Zero; scalar porosityContr = Zero;
for (const label cellI : zoneI) for (const label cellI : zoneI)
@ -225,10 +225,10 @@ void objectivePowerDissipation::update_dJdv()
} }
// Add source from porosity dependencies // Add source from porosity dependencies
if (mesh_.foundObject<topOVariablesBase>("topoVars")) if (mesh_.foundObject<topOVariablesBase>("topOVars"))
{ {
const topOVariablesBase& vars = const topOVariablesBase& vars =
mesh_.lookupObject<topOVariablesBase>("topoVars"); mesh_.lookupObject<topOVariablesBase>("topOVars");
const volScalarField& beta = vars.beta(); const volScalarField& beta = vars.beta();
const scalar betaMax = vars.getBetaMax(); const scalar betaMax = vars.getBetaMax();
for (const label zI : zones_) for (const label zI : zones_)
@ -314,13 +314,13 @@ void objectivePowerDissipation::update_gradDxDbMultiplier()
void objectivePowerDissipation::update_dJdb() void objectivePowerDissipation::update_dJdb()
{ {
if (mesh_.foundObject<topOVariablesBase>("topoVars")) if (mesh_.foundObject<topOVariablesBase>("topOVars"))
{ {
scalarField& dJdb = dJdbPtr_().primitiveFieldRef(); scalarField& dJdb = dJdbPtr_().primitiveFieldRef();
dJdb = Zero; dJdb = Zero;
const volVectorField& U = vars_.UInst(); const volVectorField& U = vars_.UInst();
const topOVariablesBase& vars = const topOVariablesBase& vars =
mesh_.lookupObject<topOVariablesBase>("topoVars"); mesh_.lookupObject<topOVariablesBase>("topOVars");
const scalar betaMax = vars.getBetaMax(); const scalar betaMax = vars.getBetaMax();
for (const label zI : zones_) for (const label zI : zones_)
{ {

2
src/optimisation/adjointOptimisation/adjoint/optimisation/designVariables/topODesignVariables/topOVariablesBase/topOVariablesBase.C
View File

@ -437,7 +437,7 @@ Foam::topOVariablesBase::topOVariablesBase
( (
IOobject IOobject
( (
"topoVars", "topOVars",
mesh.time().timeName(), mesh.time().timeName(),
fileName("uniform"), fileName("uniform"),
mesh, mesh,