zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Function1: Renamed integrate -> integral for consistency with value

Browse Source 
The integral function returns the integral as the value function returns the
value.
This commit is contained in:
Henry Weller
2020-12-02 16:15:55 +00:00
parent f85dbc557f
commit 57b1655934
47 changed files with 99 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etc/codeTemplates/dynamicCode/Function1Template.C
View File

@ -127,7 +127,7 @@ Foam::Function1s::${typeName}Function1${TemplateType}::
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::${TemplateType}
Foam::Function1s::${typeName}Function1${TemplateType}::integrate
Foam::Function1s::${typeName}Function1${TemplateType}::integral
(
const scalar x1,
const scalar x2

2
etc/codeTemplates/dynamicCode/Function1Template.H
View File

@ -107,7 +107,7 @@ public:
}
//- Integrate between two values
virtual ${TemplateType} integrate
virtual ${TemplateType} integral
(
const scalar x1,
const scalar x2

22
etc/codeTemplates/dynamicCode/Function2Template.C
View File

@ -62,6 +62,17 @@ extern "C"
}
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void Foam::Function2s::${typeName}Function2${TemplateType}::writeData
(
Ostream& os
) const
{
NotImplemented;
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::Function2s::${typeName}Function2${TemplateType}::
@ -113,15 +124,4 @@ Foam::Function2s::${typeName}Function2${TemplateType}::
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::Function2s::${typeName}Function2${TemplateType}::writeData
(
Ostream& os
) const
{
NotImplemented;
}
// ************************************************************************* i/

8
etc/codeTemplates/dynamicCode/Function2Template.H
View File

@ -55,6 +55,11 @@ class ${typeName}Function2${TemplateType}
:
public FieldFunction2<${TemplateType}, ${typeName}Function2${TemplateType}>
{
// Private Member Functions
//- Write data to dictionary stream
virtual void writeData(Ostream& os) const;
public:
@ -105,9 +110,6 @@ public:
//}}} end code
}
//- Write in dictionary format
virtual void writeData(Ostream& os) const;
// Member Operators

4
src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1.C
View File

@ -149,7 +149,7 @@ Foam::tmp<Foam::Field<Type>> Foam::Function1s::Coded<Type>::value
template<class Type>
inline Type Foam::Function1s::Coded<Type>::integrate
inline Type Foam::Function1s::Coded<Type>::integral
(
const scalar x1,
const scalar x2
@ -161,7 +161,7 @@ inline Type Foam::Function1s::Coded<Type>::integrate
template<class Type>
Foam::tmp<Foam::Field<Type>> Foam::Function1s::Coded<Type>::integrate
Foam::tmp<Foam::Field<Type>> Foam::Function1s::Coded<Type>::integral
(
const scalarField& x1,
const scalarField& x2

4
src/OpenFOAM/primitives/functions/Function1/Coded/CodedFunction1.H
View File

@ -155,10 +155,10 @@ public:
virtual tmp<Field<Type>> value(const scalarField& x) const;
//- Integrate between two scalars
virtual Type integrate(const scalar x1, const scalar x2) const;
virtual Type integral(const scalar x1, const scalar x2) const;
//- Integrate between two scalar fields
virtual tmp<Field<Type>> integrate
virtual tmp<Field<Type>> integral
(
const scalarField& x1,
const scalarField& x2

2
src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
View File

@ -103,7 +103,7 @@ public:
virtual inline Type value(const scalar) const;
//- Integrate between two values
virtual inline Type integrate(const scalar x1, const scalar x2) const;
virtual inline Type integral(const scalar x1, const scalar x2) const;
//- Write in dictionary format
virtual void write(Ostream& os) const;

4
src/OpenFOAM/primitives/functions/Function1/Constant/ConstantI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2017-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -35,7 +35,7 @@ inline Type Foam::Function1s::Constant<Type>::value(const scalar x) const
template<class Type>
inline Type Foam::Function1s::Constant<Type>::integrate
inline Type Foam::Function1s::Constant<Type>::integral
(
const scalar x1,
const scalar x2

4
src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
View File

@ -138,7 +138,7 @@ Foam::tmp<Foam::Field<Type>> Foam::FieldFunction1<Type, Function1Type>::value
template<class Type, class Function1Type>
Foam::tmp<Foam::Field<Type>>
Foam::FieldFunction1<Type, Function1Type>::integrate
Foam::FieldFunction1<Type, Function1Type>::integral
(
const scalarField& x1,
const scalarField& x2
@ -149,7 +149,7 @@ Foam::FieldFunction1<Type, Function1Type>::integrate
forAll(x1, i)
{
fld[i] = refCast<const Function1Type>(*this).integrate(x1[i], x2[i]);
fld[i] = refCast<const Function1Type>(*this).integral(x1[i], x2[i]);
}
return tfld;

8
src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
View File

@ -137,10 +137,10 @@ public:
virtual tmp<Field<Type>> value(const scalarField& x) const = 0;
//- Integrate between two scalars
virtual Type integrate(const scalar x1, const scalar x2) const = 0;
virtual Type integral(const scalar x1, const scalar x2) const = 0;
//- Integrate between two scalar fields
virtual tmp<Field<Type>> integrate
virtual tmp<Field<Type>> integral
(
const scalarField& x1,
const scalarField& x2
@ -208,10 +208,10 @@ public:
virtual tmp<Field<Type>> value(const scalarField& x) const;
//- Integrate between two scalar values
virtual Type integrate(const scalar x1, const scalar x2) const = 0;
virtual Type integral(const scalar x1, const scalar x2) const = 0;
//- Integrate between two scalar fields
virtual tmp<Field<Type>> integrate
virtual tmp<Field<Type>> integral
(
const scalarField& x1,
const scalarField& x2

2
src/OpenFOAM/primitives/functions/Function1/One/OneConstant.H
View File

@ -84,7 +84,7 @@ public:
virtual inline Type value(const scalar) const;
//- Integrate between two values
virtual inline Type integrate(const scalar x1, const scalar x2) const;
virtual inline Type integral(const scalar x1, const scalar x2) const;
//- Write in dictionary format
virtual void write(Ostream& os) const;

4
src/OpenFOAM/primitives/functions/Function1/One/OneConstantI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2017-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -35,7 +35,7 @@ inline Type Foam::Function1s::OneConstant<Type>::value(const scalar x) const
template<class Type>
inline Type Foam::Function1s::OneConstant<Type>::integrate
inline Type Foam::Function1s::OneConstant<Type>::integral
(
const scalar x1,
const scalar x2

6
src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.C
View File

@ -64,7 +64,7 @@ Foam::Function1s::Polynomial<Type>::Polynomial
if (!canIntegrate_)
{
WarningInFunction
<< "Polynomial " << this->name_ << " cannot be integrated"
<< "Polynomial " << this->name_ << " cannot be integrald"
<< endl;
}
}
@ -103,7 +103,7 @@ Foam::Function1s::Polynomial<Type>::Polynomial
if (!canIntegrate_)
{
WarningInFunction
<< "Polynomial " << this->name_ << " cannot be integrated"
<< "Polynomial " << this->name_ << " cannot be integrald"
<< endl;
}
}
@ -146,7 +146,7 @@ Type Foam::Function1s::Polynomial<Type>::value(const scalar x) const
template<class Type>
Type Foam::Function1s::Polynomial<Type>::integrate
Type Foam::Function1s::Polynomial<Type>::integral
(
const scalar x1,
const scalar x2

4
src/OpenFOAM/primitives/functions/Function1/PolynomialEntry/PolynomialEntry.H
View File

@ -70,7 +70,7 @@ class Polynomial
//- Polynomial coefficients - list of prefactor, exponent
List<Tuple2<Type, Type>> coeffs_;
//- Flag to indicate whether poly can be integrated
//- Flag to indicate whether poly can be integrald
bool canIntegrate_;
@ -107,7 +107,7 @@ public:
virtual Type value(const scalar x) const;
//- Integrate between two scalar fields
virtual Type integrate(const scalar x1, const scalar x2) const;
virtual Type integral(const scalar x1, const scalar x2) const;
//- Write in dictionary format

2
src/OpenFOAM/primitives/functions/Function1/Scale/Scale.H
View File

@ -193,7 +193,7 @@ public:
virtual inline Type value(const scalar x) const;
//- Integrate between two values
virtual inline Type integrate(const scalar x1, const scalar x2) const;
virtual inline Type integral(const scalar x1, const scalar x2) const;
// Member Operators

8
src/OpenFOAM/primitives/functions/Function1/Scale/ScaleI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2017-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -36,7 +36,7 @@ inline Type Foam::Function1s::Scale<Type>::value(const scalar x) const
template<class Type>
inline Type Foam::Function1s::Scale<Type>::integrate
inline Type Foam::Function1s::Scale<Type>::integral
(
const scalar x1,
const scalar x2
@ -45,13 +45,13 @@ inline Type Foam::Function1s::Scale<Type>::integrate
if (integrableScale_)
{
const scalar sx = xScale_->value(NaN);
return scale_->value(NaN)*value_->integrate(sx*x1, sx*x2)/sx;
return scale_->value(NaN)*value_->integral(sx*x1, sx*x2)/sx;
}
if (integrableValue_)
{
const scalar sx = xScale_->value(NaN);
return scale_->integrate(sx*x1, sx*x2)/sx*value_->value(NaN);
return scale_->integral(sx*x1, sx*x2)/sx*value_->value(NaN);
}
FatalErrorInFunction

2
src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
View File

@ -147,7 +147,7 @@ public:
virtual inline Type value(const scalar x) const;
//- Integrate between two values
virtual inline Type integrate(const scalar x1, const scalar x2) const;
virtual inline Type integral(const scalar x1, const scalar x2) const;
// Member Operators

6
src/OpenFOAM/primitives/functions/Function1/Sine/SineI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2017-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -38,7 +38,7 @@ inline Type Foam::Function1s::Sine<Type>::value(const scalar x) const
template<class Type>
inline Type Foam::Function1s::Sine<Type>::integrate
inline Type Foam::Function1s::Sine<Type>::integral
(
const scalar x1,
const scalar x2
@ -59,7 +59,7 @@ inline Type Foam::Function1s::Sine<Type>::integrate
return
- amplitude_->value(NaN)*(cos(phi2) - cos(phi1))/(twoPi*frequency_)
+ level_->integrate(x1, x2);
+ level_->integral(x1, x2);
}

2
src/OpenFOAM/primitives/functions/Function1/Square/Square.H
View File

@ -158,7 +158,7 @@ public:
virtual inline Type value(const scalar x) const;
//- Integrate between two values
virtual inline Type integrate(const scalar x1, const scalar x2) const;
virtual inline Type integral(const scalar x1, const scalar x2) const;
// Member Operators

8
src/OpenFOAM/primitives/functions/Function1/Square/SquareI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2017-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -43,7 +43,7 @@ inline Type Foam::Function1s::Square<Type>::value(const scalar x) const
template<class Type>
inline Type Foam::Function1s::Square<Type>::integrate
inline Type Foam::Function1s::Square<Type>::integral
(
const scalar x1,
const scalar x2
@ -57,7 +57,7 @@ inline Type Foam::Function1s::Square<Type>::integrate
<< exit(FatalError);
}
auto integrate0 = [&](const scalar x)
auto integral0 = [&](const scalar x)
{
const scalar markFraction = markSpace_/(1 + markSpace_);
@ -73,7 +73,7 @@ inline Type Foam::Function1s::Square<Type>::integrate
);
};
return integrate0(x2) - integrate0(x1) + level_->integrate(x1, x2);
return integral0(x2) - integral0(x1) + level_->integral(x1, x2);
}

2
src/OpenFOAM/primitives/functions/Function1/Table/Table.C
View File

@ -243,7 +243,7 @@ Type Foam::Function1s::Table<Type>::value
template<class Type>
Type Foam::Function1s::Table<Type>::integrate
Type Foam::Function1s::Table<Type>::integral
(
const scalar x1,
const scalar x2

2
src/OpenFOAM/primitives/functions/Function1/Table/Table.H
View File

@ -200,7 +200,7 @@ public:
virtual Type value(const scalar x) const;
//- Integrate between two scalars
virtual Type integrate(const scalar x1, const scalar x2) const;
virtual Type integral(const scalar x1, const scalar x2) const;
//- Return the reference values
virtual tmp<scalarField> x() const;

2
src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H
View File

@ -81,7 +81,7 @@ public:
virtual inline Type value(const scalar) const;
//- Integrate between two values
virtual inline Type integrate(const scalar x1, const scalar x2) const;
virtual inline Type integral(const scalar x1, const scalar x2) const;
//- Write in dictionary format
virtual void write(Ostream& os) const;

4
src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstantI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2017-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -38,7 +38,7 @@ inline Type Foam::Function1s::ZeroConstant<Type>::value
template<class Type>
inline Type Foam::Function1s::ZeroConstant<Type>::integrate
inline Type Foam::Function1s::ZeroConstant<Type>::integral
(
const scalar x1,
const scalar x2

2
src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.H
View File

@ -83,7 +83,7 @@ public:
virtual inline scalar value(const scalar t) const;
//- Return the integral between times t1 and t2
virtual inline scalar integrate
virtual inline scalar integral
(
const scalar t1,
const scalar t2

4
src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRampI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2017-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -37,7 +37,7 @@ inline Foam::scalar Foam::Function1s::halfCosineRamp::value
}
inline Foam::scalar Foam::Function1s::halfCosineRamp::integrate
inline Foam::scalar Foam::Function1s::halfCosineRamp::integral
(
const scalar t1,
const scalar t2

2
src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.H
View File

@ -83,7 +83,7 @@ public:
virtual inline scalar value(const scalar t) const;
//- Return the integral between times t1 and t2
virtual inline scalar integrate
virtual inline scalar integral
(
const scalar t1,
const scalar t2

4
src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRampI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2017-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -36,7 +36,7 @@ inline Foam::scalar Foam::Function1s::linearRamp::value
}
inline Foam::scalar Foam::Function1s::linearRamp::integrate
inline Foam::scalar Foam::Function1s::linearRamp::integral
(
const scalar t1,
const scalar t2

4
src/OpenFOAM/primitives/functions/Function1/objectFunction1/objectFunction1.H
View File

@ -106,11 +106,11 @@ public:
//- Integrate between two scalars
template <class PrimitiveType>
PrimitiveType integrate(const scalar x1, const scalar x2) const;
PrimitiveType integral(const scalar x1, const scalar x2) const;
//- Integrate between two scalar fields
template <class PrimitiveType>
tmp<Field<PrimitiveType>> integrate
tmp<Field<PrimitiveType>> integral
(
const scalarField& x1,
const scalarField& x2

8
src/OpenFOAM/primitives/functions/Function1/objectFunction1/objectFunction1Templates.C
View File

@ -107,24 +107,24 @@ Foam::tmp<Foam::Field<PrimitiveType>> Foam::objectFunction1::value
template <class PrimitiveType>
PrimitiveType Foam::objectFunction1::integrate
PrimitiveType Foam::objectFunction1::integral
(
const scalar x1,
const scalar x2
) const
{
return autoPtr<Function1<PrimitiveType>>::operator*().integrate(x1, x2);
return autoPtr<Function1<PrimitiveType>>::operator*().integral(x1, x2);
}
template <class PrimitiveType>
Foam::tmp<Foam::Field<PrimitiveType>> Foam::objectFunction1::integrate
Foam::tmp<Foam::Field<PrimitiveType>> Foam::objectFunction1::integral
(
const scalarField& x1,
const scalarField& x2
) const
{
return autoPtr<Function1<PrimitiveType>>::operator*().integrate(x1, x2);
return autoPtr<Function1<PrimitiveType>>::operator*().integral(x1, x2);
}

2
src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.H
View File

@ -83,7 +83,7 @@ public:
virtual inline scalar value(const scalar t) const;
//- Return the integral between times t1 and t2
virtual inline scalar integrate
virtual inline scalar integral
(
const scalar t1,
const scalar t2

4
src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRampI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2017-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -36,7 +36,7 @@ inline Foam::scalar Foam::Function1s::quadraticRamp::value
}
inline Foam::scalar Foam::Function1s::quadraticRamp::integrate
inline Foam::scalar Foam::Function1s::quadraticRamp::integral
(
const scalar t1,
const scalar t2

2
src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.H
View File

@ -83,7 +83,7 @@ public:
virtual inline scalar value(const scalar t) const;
//- Return the integral between times t1 and t2
virtual inline scalar integrate
virtual inline scalar integral
(
const scalar t1,
const scalar t2

4
src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRampI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2017-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -37,7 +37,7 @@ inline Foam::scalar Foam::Function1s::quarterCosineRamp::value
}
inline Foam::scalar Foam::Function1s::quarterCosineRamp::integrate
inline Foam::scalar Foam::Function1s::quarterCosineRamp::integral
(
const scalar t1,
const scalar t2

2
src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.H
View File

@ -83,7 +83,7 @@ public:
virtual inline scalar value(const scalar t) const;
//- Return the integral between times t1 and t2
virtual inline scalar integrate
virtual inline scalar integral
(
const scalar t1,
const scalar t2

4
src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRampI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2017-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -37,7 +37,7 @@ inline Foam::scalar Foam::Function1s::quarterSineRamp::value
}
inline Foam::scalar Foam::Function1s::quarterSineRamp::integrate
inline Foam::scalar Foam::Function1s::quarterSineRamp::integral
(
const scalar t1,
const scalar t2

2
src/OpenFOAM/primitives/functions/Function1/reverseRamp/reverseRamp.H
View File

@ -124,7 +124,7 @@ public:
virtual inline scalar value(const scalar t) const;
//- Return the integral between times t1 and t2
virtual inline scalar integrate
virtual inline scalar integral
(
const scalar t1,
const scalar t2

6
src/OpenFOAM/primitives/functions/Function1/reverseRamp/reverseRampI.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2019-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -36,13 +36,13 @@ inline Foam::scalar Foam::Function1s::reverseRamp::value
}
inline Foam::scalar Foam::Function1s::reverseRamp::integrate
inline Foam::scalar Foam::Function1s::reverseRamp::integral
(
const scalar t1,
const scalar t2
) const
{
return (t2 - t1) - ramp_->integrate(t1, t2);
return (t2 - t1) - ramp_->integral(t1, t2);
}

4
src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C
View File

@ -90,7 +90,7 @@ Type Foam::TimeFunction1<Type>::value(const scalar x) const
template<class Type>
Type Foam::TimeFunction1<Type>::integrate
Type Foam::TimeFunction1<Type>::integral
(
const scalar x1,
const scalar x2
@ -98,7 +98,7 @@ Type Foam::TimeFunction1<Type>::integrate
{
return
time_.timeToUserTimeRatio()
*function_->integrate
*function_->integral
(
time_.userTimeToTime(x1),
time_.userTimeToTime(x2)

2
src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.H
View File

@ -115,7 +115,7 @@ public:
virtual Type value(const scalar x) const;
//- Integrate between two scalars
virtual Type integrate(const scalar x1, const scalar x2) const;
virtual Type integral(const scalar x1, const scalar x2) const;
// I/O

4
src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -75,7 +75,7 @@ Foam::solidBodyMotionFunctions::rotatingMotion::transformation() const
scalar t = time_.value();
// Rotation around axis
scalar angle = omega_->integrate(0, t);
scalar angle = omega_->integral(0, t);
quaternion R(axis_, angle);
septernion TR(septernion(-origin_)*R*septernion(origin_));

2
src/lagrangian/parcel/integrationScheme/integrationScheme/integrationScheme.H
View File

@ -25,7 +25,7 @@ Class
Foam::integrationScheme
Description
Base for a set of schemes which integrate simple ODEs which arise from
Base for a set of schemes which integral simple ODEs which arise from
semi-implcit rate expressions.
\f[

2
src/lagrangian/parcel/submodels/MPPIC/AveragingMethods/Moment/Moment.H
View File

@ -29,7 +29,7 @@ Description
Point values and moments from the cell centroid are summed over
computational cells. A linear function is generated which has the same
integrated moment as that of the point data.
integrald moment as that of the point data.
The computed linear function is used to interpolate values within a cell.
The gradient is calculated from the coefficients of the function, and is

4
src/lagrangian/parcel/submodels/Momentum/InjectionModel/ConeInjection/ConeInjection.C
View File

@ -193,7 +193,7 @@ Foam::ConeInjection<CloudType>::ConeInjection
setFlowType();
// Set total volume to inject
this->volumeTotal_ = flowRateProfile_.integrate(0, duration_);
this->volumeTotal_ = flowRateProfile_.integral(0, duration_);
updateMesh();
}
@ -292,7 +292,7 @@ Foam::scalar Foam::ConeInjection<CloudType>::volumeToInject
{
if (time0 >= 0 && time0 < duration_)
{
return flowRateProfile_.integrate(time0, time1);
return flowRateProfile_.integral(time0, time1);
}
else
{

6
src/lagrangian/parcel/submodels/Momentum/InjectionModel/InflationInjection/InflationInjection.C
View File

@ -116,7 +116,7 @@ Foam::InflationInjection<CloudType>::InflationInjection
}
// Set total volume/mass to inject
this->volumeTotal_ = fraction_*flowRateProfile_.integrate(0.0, duration_);
this->volumeTotal_ = fraction_*flowRateProfile_.integral(0.0, duration_);
this->massTotal_ *= fraction_;
}
@ -212,7 +212,7 @@ Foam::label Foam::InflationInjection<CloudType>::parcelsToInject
if ((time0 >= 0.0) && (time0 < duration_))
{
volumeAccumulator_ +=
fraction_*flowRateProfile_.integrate(time0, time1);
fraction_*flowRateProfile_.integral(time0, time1);
}
labelHashSet cellCentresUsed;
@ -420,7 +420,7 @@ Foam::scalar Foam::InflationInjection<CloudType>::volumeToInject
{
if ((time0 >= 0.0) && (time0 < duration_))
{
return fraction_*flowRateProfile_.integrate(time0, time1);
return fraction_*flowRateProfile_.integral(time0, time1);
}
else
{

4
src/lagrangian/parcel/submodels/Momentum/InjectionModel/PatchInjection/PatchInjection.C
View File

@ -68,7 +68,7 @@ Foam::PatchInjection<CloudType>::PatchInjection
patchInjectionBase::updateMesh(owner.mesh());
// Set total volume/mass to inject
this->volumeTotal_ = flowRateProfile_.integrate(0.0, duration_);
this->volumeTotal_ = flowRateProfile_.integral(0.0, duration_);
}
@ -155,7 +155,7 @@ Foam::scalar Foam::PatchInjection<CloudType>::volumeToInject
{
if ((time0 >= 0.0) && (time0 < duration_))
{
return flowRateProfile_.integrate(time0, time1);
return flowRateProfile_.integral(time0, time1);
}
else
{

4
src/waves/waveSuperpositions/waveSuperposition/waveSuperposition.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2017-2019 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2017-2020 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -66,7 +66,7 @@ void Foam::waveSuperposition::transformation
axes = tensor(dSurfHat, - gHat ^ dSurfHat, - gHat);
xyz = axes & (p - origin_ - UMean_->integrate(0, t));
xyz = axes & (p - origin_ - UMean_->integral(0, t));
}