From 35ed4853a64edda7bc0179131c3b3a48cef92600 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Fri, 24 Jul 2015 11:30:48 +0100 Subject: [PATCH] waveSurfacePressureFvPatchScalarField: Upgrade timeScheme -> ddtScheme --- .../waveSurfacePressureFvPatchScalarField.C | 12 ++++++------ .../waveSurfacePressureFvPatchScalarField.H | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C index 3dff6c94e1..ba6db1315c 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,7 +40,7 @@ namespace Foam template<> const char* NamedEnum < - waveSurfacePressureFvPatchScalarField::timeSchemeType, + waveSurfacePressureFvPatchScalarField::ddtSchemeType, 3 >::names[] = { @@ -53,9 +53,9 @@ namespace Foam const Foam::NamedEnum < - Foam::waveSurfacePressureFvPatchScalarField::timeSchemeType, + Foam::waveSurfacePressureFvPatchScalarField::ddtSchemeType, 3 -> Foam::waveSurfacePressureFvPatchScalarField::timeSchemeTypeNames_; +> Foam::waveSurfacePressureFvPatchScalarField::ddtSchemeTypeNames_; // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -160,7 +160,7 @@ void Foam::waveSurfacePressureFvPatchScalarField::updateCoeffs() // lookup d/dt scheme from database for zeta const word ddtSchemeName(zeta.mesh().ddtScheme(zeta.name())); - timeSchemeType timeScheme(timeSchemeTypeNames_[ddtSchemeName]); + ddtSchemeType ddtScheme(ddtSchemeTypeNames_[ddtSchemeName]); // retrieve the flux field from the database const surfaceScalarField& phi = @@ -180,7 +180,7 @@ void Foam::waveSurfacePressureFvPatchScalarField::updateCoeffs() dZetap /= rhop; } - switch (timeScheme) + switch (ddtScheme) { case tsEuler: case tsCrankNicolson: diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.H index 83f989fb12..e3303dd59c 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -99,8 +99,8 @@ public: // Public data - //- Enumeration defining the available time schemes - enum timeSchemeType + //- Enumeration defining the available ddt schemes + enum ddtSchemeType { tsEuler, tsCrankNicolson, @@ -122,7 +122,7 @@ private: word rhoName_; //- Time scheme type names - static const NamedEnum timeSchemeTypeNames_; + static const NamedEnum ddtSchemeTypeNames_; public: