From d217b8bd7461d99f8b8e6ff909482a9b4bb16a11 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Tue, 4 Aug 2009 10:13:01 +0100
Subject: [PATCH] Changed "default" to "generic" for consistency with
fvPatchField.
---
etc/controlDict | 2 +-
.../fields/fvsPatchFields/fvsPatchField/fvsPatchField.H | 4 ++--
.../fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C | 4 ++--
.../fields/fvsPatchFields/fvsPatchField/newFvsPatchField.C | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/etc/controlDict b/etc/controlDict
index a76ef3c3350..f95e8ef56c8 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -366,7 +366,7 @@ DebugSwitches
directMappedVelocityFlux 0;
directionMixed 0;
directional 0;
- disallowDefaultFvsPatchField 0;
+ disallowGenericFvsPatchField 0;
disallowGenericFvPatchField 0;
disallowGenericPointPatchField 0;
disallowGenericPolyPatch 0;
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
index a98785aedc1..d0a664ddd4a 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H
@@ -96,8 +96,8 @@ public:
//- Runtime type information
TypeName("fvsPatchField");
- //- Debug switch to disallow the use of
- static int disallowDefaultFvsPatchField;
+ //- Debug switch to disallow the use of genericFvsPatchField
+ static int disallowGenericFvsPatchField;
// Declare run-time constructor selection tables
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C
index 88ebe16059c..12091f66999 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchFields.C
@@ -37,9 +37,9 @@ namespace Foam
\
defineNamedTemplateTypeNameAndDebug(fvsPatchTypeField, 0); \
template<> \
-int fvsPatchTypeField::disallowDefaultFvsPatchField \
+int fvsPatchTypeField::disallowGenericFvsPatchField \
( \
- debug::debugSwitch("disallowDefaultFvsPatchField", 0) \
+ debug::debugSwitch("disallowGenericFvsPatchField", 0) \
); \
defineTemplateRunTimeSelectionTable(fvsPatchTypeField, patch); \
defineTemplateRunTimeSelectionTable(fvsPatchTypeField, patchMapper); \
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/newFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/newFvsPatchField.C
index f74f3ed87a8..38abb38d8c4 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/newFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/newFvsPatchField.C
@@ -100,9 +100,9 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
if (cstrIter == dictionaryConstructorTablePtr_->end())
{
- if (!disallowDefaultFvsPatchField)
+ if (!disallowGenericFvsPatchField)
{
- cstrIter = dictionaryConstructorTablePtr_->find("default");
+ cstrIter = dictionaryConstructorTablePtr_->find("generic");
}
if (cstrIter == dictionaryConstructorTablePtr_->end())
@@ -120,7 +120,7 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::New
}
}
- if
+ if
(
!dict.found("patchType")
|| word(dict.lookup("patchType")) != p.type()
--
GitLab