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

OpenFOAM: Updated all libraries, solvers and utilities to use the new const-safe tmp

Browse Source 
The deprecated non-const tmp functionality is now on the compiler switch
NON_CONST_TMP which can be enabled by adding -DNON_CONST_TMP to EXE_INC
in the Make/options file.  However, it is recommended to upgrade all
code to the new safer tmp by using the '.ref()' member function rather
than the non-const '()' dereference operator when non-const access to
the temporary object is required.

Please report any problems on Mantis.

Henry G. Weller
CFD Direct.
This commit is contained in:
Henry Weller
2016-02-26 17:31:28 +00:00
parent f4ba71ddd0
commit cd852be3da
169 changed files with 511 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C
View File

@ -155,17 +155,17 @@ Foam::BlendedInterfacialModel<modelType>::K() const
if (model_.valid())
{
x() += model_->K()*(f1() - f2());
x.ref() += model_->K()*(f1() - f2());
}
if (model1In2_.valid())
{
x() += model1In2_->K()*(1 - f1);
x.ref() += model1In2_->K()*(1 - f1);
}
if (model2In1_.valid())
{
x() += model2In1_->K()*f2;
x.ref() += model2In1_->K()*f2;
}
if
@ -174,7 +174,7 @@ Foam::BlendedInterfacialModel<modelType>::K() const
&& (model_.valid() || model1In2_.valid() || model2In1_.valid())
)
{
correctFixedFluxBCs(x());
correctFixedFluxBCs(x.ref());
}
return x;
@ -223,17 +223,17 @@ Foam::BlendedInterfacialModel<modelType>::Kf() const
if (model_.valid())
{
x() += model_->Kf()*(f1() - f2());
x.ref() += model_->Kf()*(f1() - f2());
}
if (model1In2_.valid())
{
x() += model1In2_->Kf()*(1 - f1);
x.ref() += model1In2_->Kf()*(1 - f1);
}
if (model2In1_.valid())
{
x() += model2In1_->Kf()*f2;
x.ref() += model2In1_->Kf()*f2;
}
if
@ -242,7 +242,7 @@ Foam::BlendedInterfacialModel<modelType>::Kf() const
&& (model_.valid() || model1In2_.valid() || model2In1_.valid())
)
{
correctFixedFluxBCs(x());
correctFixedFluxBCs(x.ref());
}
return x;
@ -286,17 +286,17 @@ Foam::BlendedInterfacialModel<modelType>::F() const
if (model_.valid())
{
x() += model_->F()*(f1() - f2());
x.ref() += model_->F()*(f1() - f2());
}
if (model1In2_.valid())
{
x() += model1In2_->F()*(1 - f1);
x.ref() += model1In2_->F()*(1 - f1);
}
if (model2In1_.valid())
{
x() -= model2In1_->F()*f2; // note : subtraction
x.ref() -= model2In1_->F()*f2; // note : subtraction
}
if
@ -305,7 +305,7 @@ Foam::BlendedInterfacialModel<modelType>::F() const
&& (model_.valid() || model1In2_.valid() || model2In1_.valid())
)
{
correctFixedFluxBCs(x());
correctFixedFluxBCs(x.ref());
}
return x;
@ -354,17 +354,17 @@ Foam::BlendedInterfacialModel<modelType>::Ff() const
if (model_.valid())
{
x() += model_->Ff()*(f1() - f2());
x.ref() += model_->Ff()*(f1() - f2());
}
if (model1In2_.valid())
{
x() += model1In2_->Ff()*(1 - f1);
x.ref() += model1In2_->Ff()*(1 - f1);
}
if (model2In1_.valid())
{
x() -= model2In1_->Ff()*f2; // note : subtraction
x.ref() -= model2In1_->Ff()*f2; // note : subtraction
}
if
@ -373,7 +373,7 @@ Foam::BlendedInterfacialModel<modelType>::Ff() const
&& (model_.valid() || model1In2_.valid() || model2In1_.valid())
)
{
correctFixedFluxBCs(x());
correctFixedFluxBCs(x.ref());
}
return x;
@ -416,17 +416,17 @@ Foam::BlendedInterfacialModel<modelType>::D() const
if (model_.valid())
{
x() += model_->D()*(f1() - f2());
x.ref() += model_->D()*(f1() - f2());
}
if (model1In2_.valid())
{
x() += model1In2_->D()*(1 - f1);
x.ref() += model1In2_->D()*(1 - f1);
}
if (model2In1_.valid())
{
x() += model2In1_->D()*f2;
x.ref() += model2In1_->D()*f2;
}
if
@ -435,7 +435,7 @@ Foam::BlendedInterfacialModel<modelType>::D() const
&& (model_.valid() || model1In2_.valid() || model2In1_.valid())
)
{
correctFixedFluxBCs(x());
correctFixedFluxBCs(x.ref());
}
return x;