From e41cd49dc981a94886d741121fedd34ef74da178 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 25 Feb 2009 13:48:13 +0000 Subject: [PATCH] tidying up --- .../submodels/IO/DataEntry/Constant/Constant.H | 4 ++-- .../IO/DataEntry/DataEntry/DataEntry.H | 17 ++++++++++------- .../submodels/IO/DataEntry/Table/Table.C | 10 +++++----- .../submodels/IO/DataEntry/Table/Table.H | 11 +++-------- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H index add02c1199..b4af73e247 100644 --- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H +++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H @@ -62,6 +62,7 @@ class Constant { // Private data + //- Constant value Type value_; @@ -91,8 +92,7 @@ public: //- Destructor - - ~Constant(); + virtual ~Constant(); // Member Functions diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H index 2aeb5b0c7e..f9a5cd6396 100644 --- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H +++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H @@ -26,6 +26,10 @@ Class Foam::DataEntry Description + Top level data entry class for use in dictionaries. Provides a mechanism + to specify a variable as a certain type, e.g. constant or table, and + provide functions to return the (interpolated) value, and integral between + limits. SourceFiles DataEntry.C @@ -101,16 +105,15 @@ public: //- Selector - static autoPtr > New - ( - const word& entryName, - const dictionary& dict - ); + static autoPtr > New + ( + const word& entryName, + const dictionary& dict + ); //- Destructor - - virtual ~DataEntry(); + virtual ~DataEntry(); // Member Functions diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C index f7d5dff6ca..3897049722 100644 --- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C +++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C @@ -42,11 +42,11 @@ Foam::Table::Table { FatalErrorIn ( - "Foam::Table::Table" - "(" - "const word& entryName," - "const dictionary& dict" - ")" + "Foam::Table::Table\n" + "(\n" + " const word& entryName,\n" + " const dictionary& dict\n" + ")\n" ) << "Table is invalid (empty)" << nl << exit(FatalError); } diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H index c336840567..c30ba5e937 100644 --- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H +++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H @@ -84,23 +84,18 @@ class Table public: - // Runtime type information + //- Runtime type information TypeName("Table"); // Constructors //- Construct from dictionary - Table - ( - const word& entryName, - const dictionary& dict - ); + Table(const word& entryName, const dictionary& dict); //- Destructor - - ~Table(); + virtual ~Table(); // Member Functions