From c08917f1963ed53974a560d9cb3ce2c945c855d7 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 13 May 2013 09:38:54 +0100
Subject: [PATCH] STYLE: Code formatting
---
.../functions/DataEntry/DataEntry/DataEntry.H | 88 +++++++++----------
1 file changed, 43 insertions(+), 45 deletions(-)
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
index 9cfdb66e256..a9b1686d587 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -142,62 +142,60 @@ public:
virtual void convertTimeBase(const Time& t);
-public:
-
+ // Evaluation
- // Evaluation
+ //- Return value as a function of (scalar) independent variable
+ virtual Type value(const scalar x) const;
- //- Return value as a function of (scalar) independent variable
- virtual Type value(const scalar x) const;
+ //- Return value as a function of (scalar) independent variable
+ virtual tmp<Field<Type> > value(const scalarField& x) const;
- //- Return value as a function of (scalar) independent variable
- virtual tmp<Field<Type> > value(const scalarField& x) const;
+ //- Integrate between two (scalar) values
+ virtual Type integrate(const scalar x1, const scalar x2) const;
- //- Integrate between two (scalar) values
- virtual Type integrate(const scalar x1, const scalar x2) const;
-
- //- Integrate between two (scalar) values
- virtual tmp<Field<Type> > integrate
- (
- const scalarField& x1,
- const scalarField& x2
- ) const;
+ //- Integrate between two (scalar) values
+ virtual tmp<Field<Type> > integrate
+ (
+ const scalarField& x1,
+ const scalarField& x2
+ ) const;
- //- Return dimensioned type
- virtual dimensioned<Type> dimValue(const scalar x) const;
+ //- Return dimensioned type
+ virtual dimensioned<Type> dimValue(const scalar x) const;
- //- Return dimensioned type as a function of (scalar)
- virtual tmp<Field<dimensioned<Type> > > dimValue
- (
- const scalarField& x
- ) const;
+ //- Return dimensioned type as a function of (scalar)
+ virtual tmp<Field<dimensioned<Type> > > dimValue
+ (
+ const scalarField& x
+ ) const;
- //- Integrate between two scalars and returns a dimensioned type
- virtual dimensioned<Type> dimIntegrate
- (
- const scalar x1,
- const scalar x2
- ) const;
+ //- Integrate between two scalars and return a dimensioned type
+ virtual dimensioned<Type> dimIntegrate
+ (
+ const scalar x1,
+ const scalar x2
+ ) const;
- //- Integrate between two scalars and returns list of dimensioned type
- virtual tmp<Field<dimensioned<Type> > > dimIntegrate
- (
- const scalarField& x1,
- const scalarField& x2
- ) const;
+ //- Integrate between two scalar fields and return a field of
+ // dimensioned type
+ virtual tmp<Field<dimensioned<Type> > > dimIntegrate
+ (
+ const scalarField& x1,
+ const scalarField& x2
+ ) const;
- // I/O
+ // I/O
- //- Ostream Operator
- friend Ostream& operator<< <Type>
- (
- Ostream& os,
- const DataEntry<Type>& de
- );
+ //- Ostream Operator
+ friend Ostream& operator<< <Type>
+ (
+ Ostream& os,
+ const DataEntry<Type>& de
+ );
- //- Write in dictionary format
- virtual void writeData(Ostream& os) const;
+ //- Write in dictionary format
+ virtual void writeData(Ostream& os) const;
};
--
GitLab