diff --git a/ReleaseNotes-dev b/ReleaseNotes-dev
index 2e9a025ec81dc20f8e95dcc880180e49295e8ed5..687dda9a4526da2291a0be2371bf0b8e654e1ab6 100644
--- a/ReleaseNotes-dev
+++ b/ReleaseNotes-dev
@@ -196,7 +196,7 @@
#+BEGIN_SRC c++
outlet
{
- type codedFixedValue<scalar>;
+ type codedFixedValue;
value uniform 0;
redirectType fixedValue10;
diff --git a/doc/changes/dynamicCode.org b/doc/changes/dynamicCode.org
index beae07b217da23aa55de35a9e22feda2bb18b02d..cb3a83df091300d3abf5f64b85c83bc10c493074 100644
--- a/doc/changes/dynamicCode.org
+++ b/doc/changes/dynamicCode.org
@@ -36,9 +36,8 @@
scalar start = readScalar(dict["startTime"]);
scalar end = readScalar(dict["endTime"]);
label nDumps = 5;
- label interval = end-start
- os << ((start-end)/nDumps)
- #}
+ os << ((end-start)/nDumps);
+ #};
};
#+END_SRC
@@ -65,7 +64,7 @@
#+BEGIN_SRC c++
outlet
{
- type codedFixedValue<scalar>;
+ type codedFixedValue;
value uniform 0;
redirectType fixedValue10;
@@ -132,6 +131,10 @@
};
#+END_SRC
+ Note: above field initialisation has the problem that the boundary conditions
+ are not evaluated so e.g. processor boundaries will not hold the opposite cell
+ value.
+
* Pitfalls
The syntax of =#codeStream= can be quite hard to get right. These are some
common pitfalls:
@@ -146,19 +149,18 @@
+ the =#codeStream= entry (itself a dictionary) has to end in a ';'
* Exceptions
- There are unfortunately some exceptions. Following applications read
+ There are unfortunately some exceptions to above field massaging.
+ Following applications read
the field as a dictionary, not as an =IOdictionary=:
- =foamFormatConvert=
- =changeDictionaryDict=
- =foamUpgradeCyclics=
- These applications will usually switch off all '#' processing.
-
-
- Note: above field initialisation has the problem that the boundary conditions
- are not evaluated so e.g. processor boundaries will not hold the opposite cell
- value.
+ These applications will usually switch off all '#' processing which
+ just preserves the entries as strings (including all formatting).
* Other
- - the implementation is still changing though the syntax is fixed
- parallel running not tested a lot. What about distributed data
(i.e. non-=NFS=) parallel?
+ - paraview has been patched so it will pass in RTLD_GLOBAL when loading
+ the OpenFOAM reader module. This is necessary for above dictionary
+ processing to work.
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C b/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C
index f6c697ca28525d4cfc4d15c7e69402b987b16ee3..89785d513077ca157b721861025fb56607564bc6 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C
@@ -70,6 +70,9 @@ bool Foam::functionEntries::codeStream::execute
Istream& is
)
{
+ Info<< "Using #codeStream at line " << is.lineNumber()
+ << " in file " << parentDict.name() << endl;
+
dynamicCode::checkSecurity
(
"functionEntries::codeStream::execute(..)",
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 37cfc2837691714cb65d67d87e83e9f0db5462ac..0ff3e598d92c04f3f82ab75041d9cffa49df23a4 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -114,7 +114,6 @@ derivedFvPatchFields = $(fvPatchFields)/derived
$(derivedFvPatchFields)/activeBaffleVelocity/activeBaffleVelocityFvPatchVectorField.C
$(derivedFvPatchFields)/activePressureForceBaffleVelocity/activePressureForceBaffleVelocityFvPatchVectorField.C
$(derivedFvPatchFields)/advective/advectiveFvPatchFields.C
-/* $(derivedFvPatchFields)/codedFixedValue/codedFixedValueFvPatchScalarField.C */
$(derivedFvPatchFields)/codedFixedValue/codedFixedValueFvPatchFields.C
$(derivedFvPatchFields)/directMappedField/directMappedFieldFvPatchFields.C
$(derivedFvPatchFields)/directMappedFixedInternalValue/directMappedFixedInternalValueFvPatchFields.C
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
index 41a3a18891bfe5d03e916a3d79db85c81ff377ed..d3f13fd7a7c0e89c8793c8e028e26888686e3e5c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C
@@ -238,6 +238,10 @@ void Foam::codedFixedValueFvPatchField<Type>::createLibrary
// Write files for new library
if (!dynCode.upToDate(context))
{
+ Info<< "Using dynamicCode for patch " << this->patch().name()
+ << " on field " << this->dimensionedInternalField().name()
+ << endl;
+
// filter with this context
dynCode.reset(context);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchScalarField.C
deleted file mode 100644
index 0f738d022a69c57f77c48283c11fd18ef652c67c..0000000000000000000000000000000000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchScalarField.C
+++ /dev/null
@@ -1,530 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2 of the License, or (at your
- option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "codedFixedValueFvPatchScalarField.H"
-#include "addToRunTimeSelectionTable.H"
-#include "fvPatchFieldMapper.H"
-#include "surfaceFields.H"
-#include "volFields.H"
-#include "dlLibraryTable.H"
-#include "IFstream.H"
-#include "OFstream.H"
-#include "SHA1Digest.H"
-#include "dynamicCode.H"
-#include "dynamicCodeContext.H"
-#include "stringOps.H"
-#include <cstring>
-
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-const Foam::word Foam::codedFixedValueFvPatchScalarField::codeTemplateC
- = "fixedValueFvPatchFieldTemplate.C";
-
-const Foam::word Foam::codedFixedValueFvPatchScalarField::codeTemplateH
- = "fixedValueFvPatchFieldTemplate.H";
-
-
-// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
-
-void* Foam::codedFixedValueFvPatchScalarField::loadLibrary
-(
- const fileName& libPath,
- const string& globalFuncName,
- const dictionary& contextDict
-)
-{
- void* lib = 0;
-
- // avoid compilation by loading an existing library
- if (!libPath.empty() && dlLibraryTable::open(libPath, false))
- {
- lib = dlLibraryTable::findLibrary(libPath);
-
- // verify the loaded version and unload if needed
- if (lib)
- {
- // provision for manual execution of code after loading
- if (dlSymFound(lib, globalFuncName))
- {
- loaderFunctionType function =
- reinterpret_cast<loaderFunctionType>
- (
- dlSym(lib, globalFuncName)
- );
-
- if (function)
- {
- (*function)(true); // force load
- }
- else
- {
- FatalIOErrorIn
- (
- "codedFixedValueFvPatchScalarField::updateLibrary()",
- contextDict
- ) << "Failed looking up symbol " << globalFuncName << nl
- << "from " << libPath << exit(FatalIOError);
- }
- }
- else
- {
- FatalIOErrorIn
- (
- "codedFixedValueFvPatchScalarField::loadLibrary()",
- contextDict
- ) << "Failed looking up symbol " << globalFuncName << nl
- << "from " << libPath << exit(FatalIOError);
-
- lib = 0;
- if (!dlLibraryTable::close(libPath, false))
- {
- FatalIOErrorIn
- (
- "codedFixedValueFvPatchScalarField::loadLibrary()",
- contextDict
- ) << "Failed unloading library "
- << libPath
- << exit(FatalIOError);
- }
- }
- }
- }
-
- return lib;
-}
-
-
-void Foam::codedFixedValueFvPatchScalarField::unloadLibrary
-(
- const fileName& libPath,
- const string& globalFuncName,
- const dictionary& contextDict
-)
-{
- void* lib = 0;
-
- if (!libPath.empty())
- {
- lib = dlLibraryTable::findLibrary(libPath);
- }
-
- if (!lib)
- {
- return;
- }
-
- // provision for manual execution of code before unloading
- if (dlSymFound(lib, globalFuncName))
- {
- loaderFunctionType function =
- reinterpret_cast<loaderFunctionType>
- (
- dlSym(lib, globalFuncName)
- );
-
- if (function)
- {
- (*function)(false); // force unload
- }
- else
- {
- FatalIOErrorIn
- (
- "codedFixedValueFvPatchScalarField::unloadLibrary()",
- contextDict
- ) << "Failed looking up symbol " << globalFuncName << nl
- << "from " << libPath << exit(FatalIOError);
- }
- }
-
- if (!dlLibraryTable::close(libPath, false))
- {
- FatalIOErrorIn
- (
- "codedFixedValueFvPatchScalarField::"
- "updateLibrary()",
- contextDict
- ) << "Failed unloading library " << libPath
- << exit(FatalIOError);
- }
-}
-
-
-
-template<class Type>
-void Foam::codedFixedValueFvPatchScalarField::setFieldTemplates
-(
- dynamicCode& dynCode
-)
-{
- word fieldType(pTraits<Type>::typeName);
-
- // template type for fvPatchField
- dynCode.setFilterVariable("TemplateType", fieldType);
-
- // Name for fvPatchField - eg, ScalarField, VectorField, ...
- fieldType[0] = toupper(fieldType[0]);
- dynCode.setFilterVariable("FieldType", fieldType + "Field");
-}
-
-
-// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
-
-const Foam::IOdictionary& Foam::codedFixedValueFvPatchScalarField::dict() const
-{
- if (db().foundObject<IOdictionary>("codeDict"))
- {
- return db().lookupObject<IOdictionary>("codeDict");
- }
- else
- {
- return db().store
- (
- new IOdictionary
- (
- IOobject
- (
- "codeDict",
- db().time().system(),
- db(),
- IOobject::MUST_READ_IF_MODIFIED,
- IOobject::NO_WRITE
- )
- )
- );
- }
-}
-
-
-void Foam::codedFixedValueFvPatchScalarField::createLibrary
-(
- dynamicCode& dynCode,
- const dynamicCodeContext& context
-) const
-{
- bool create = Pstream::master();
-
- if (create)
- {
- // Write files for new library
- if (!dynCode.upToDate(context))
- {
- // filter with this context
- dynCode.reset(context);
-
- // take no chances - typeName must be identical to redirectType_
- dynCode.setFilterVariable("typeName", redirectType_);
-
- // set TemplateType and FieldType filter variables
- // (for fvPatchField)
- setFieldTemplates<scalar>(dynCode);
-
- // compile filtered C template
- dynCode.addCompileFile(codeTemplateC);
-
- // copy filtered H template
- dynCode.addCopyFile(codeTemplateH);
-
-
- // debugging: make BC verbose
- // dynCode.setFilterVariable("verbose", "true");
- // Info<<"compile " << redirectType_ << " sha1: "
- // << context.sha1() << endl;
-
- // define Make/options
- dynCode.setMakeOptions
- (
- "EXE_INC = -g \\\n"
- "-I$(LIB_SRC)/finiteVolume/lnInclude\\\n"
- + context.options()
- + "\n\nLIB_LIBS = "
- );
-
- if (!dynCode.copyOrCreateFiles(true))
- {
- FatalIOErrorIn
- (
- "codedFixedValueFvPatchScalarField::createLibrary(..)",
- context.dict()
- ) << "Failed writing files for" << nl
- << dynCode.libRelPath() << nl
- << exit(FatalIOError);
- }
- }
-
- if (!dynCode.wmakeLibso())
- {
- FatalIOErrorIn
- (
- "codedFixedValueFvPatchScalarField::createLibrary(..)",
- context.dict()
- ) << "Failed wmake " << dynCode.libRelPath() << nl
- << exit(FatalIOError);
- }
- }
-
-
- // all processes must wait for compile to finish
- reduce(create, orOp<bool>());
-}
-
-
-void Foam::codedFixedValueFvPatchScalarField::updateLibrary() const
-{
- dynamicCode::checkSecurity
- (
- "codedFixedValueFvPatchScalarField::updateLibrary()",
- dict_
- );
-
- // use system/codeDict or in-line
- const dictionary& codeDict =
- (
- dict_.found("code")
- ? dict_
- : this->dict().subDict(redirectType_)
- );
-
- dynamicCodeContext context(codeDict);
-
- // codeName: redirectType + _<sha1>
- // codeDir : redirectType
- dynamicCode dynCode
- (
- redirectType_ + context.sha1().str(true),
- redirectType_
- );
- const fileName libPath = dynCode.libPath();
-
-
- // the correct library was already loaded => we are done
- if (dlLibraryTable::findLibrary(libPath))
- {
- return;
- }
-
- // remove instantiation of fvPatchField provided by library
- redirectPatchFieldPtr_.clear();
-
- // may need to unload old library
- unloadLibrary
- (
- oldLibPath_,
- dynamicCode::libraryBaseName(oldLibPath_),
- context.dict()
- );
-
- // try loading an existing library (avoid compilation when possible)
- if (!loadLibrary(libPath, dynCode.codeName(), context.dict()))
- {
- createLibrary(dynCode, context);
-
- loadLibrary(libPath, dynCode.codeName(), context.dict());
- }
-
- // retain for future reference
- oldLibPath_ = libPath;
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-
-Foam::codedFixedValueFvPatchScalarField::
-codedFixedValueFvPatchScalarField
-(
- const fvPatch& p,
- const DimensionedField<scalar, volMesh>& iF
-)
-:
- fixedValueFvPatchField<scalar>(p, iF),
- oldLibPath_(),
- redirectPatchFieldPtr_()
-{}
-
-
-Foam::codedFixedValueFvPatchScalarField::
-codedFixedValueFvPatchScalarField
-(
- const codedFixedValueFvPatchScalarField& ptf,
- const fvPatch& p,
- const DimensionedField<scalar, volMesh>& iF,
- const fvPatchFieldMapper& mapper
-)
-:
- fixedValueFvPatchField<scalar>(ptf, p, iF, mapper),
- dict_(ptf.dict_),
- redirectType_(ptf.redirectType_),
- oldLibPath_(ptf.oldLibPath_),
- redirectPatchFieldPtr_()
-{}
-
-
-Foam::codedFixedValueFvPatchScalarField::
-codedFixedValueFvPatchScalarField
-(
- const fvPatch& p,
- const DimensionedField<scalar, volMesh>& iF,
- const dictionary& dict
-)
-:
- fixedValueFvPatchField<scalar>(p, iF, dict),
- dict_(dict),
- redirectType_(dict.lookup("redirectType")),
- oldLibPath_(),
- redirectPatchFieldPtr_()
-{
- updateLibrary();
-}
-
-
-Foam::codedFixedValueFvPatchScalarField::
-codedFixedValueFvPatchScalarField
-(
- const codedFixedValueFvPatchScalarField& ptf
-)
-:
- fixedValueFvPatchField<scalar>(ptf),
- dict_(ptf.dict_),
- redirectType_(ptf.redirectType_),
- oldLibPath_(ptf.oldLibPath_),
- redirectPatchFieldPtr_()
-{}
-
-
-Foam::codedFixedValueFvPatchScalarField::
-codedFixedValueFvPatchScalarField
-(
- const codedFixedValueFvPatchScalarField& ptf,
- const DimensionedField<scalar, volMesh>& iF
-)
-:
- fixedValueFvPatchField<scalar>(ptf, iF),
- dict_(ptf.dict_),
- redirectType_(ptf.redirectType_),
- oldLibPath_(ptf.oldLibPath_),
- redirectPatchFieldPtr_()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-const Foam::fvPatchScalarField&
-Foam::codedFixedValueFvPatchScalarField::redirectPatchField() const
-{
- if (!redirectPatchFieldPtr_.valid())
- {
- // Construct a patch
- // Make sure to construct the patchfield with up-to-date value
-
- OStringStream os;
- os.writeKeyword("type") << redirectType_ << token::END_STATEMENT
- << nl;
- static_cast<const scalarField&>(*this).writeEntry("value", os);
- IStringStream is(os.str());
- dictionary dict(is);
-
- redirectPatchFieldPtr_.set
- (
- fvPatchScalarField::New
- (
- patch(),
- dimensionedInternalField(),
- dict
- ).ptr()
- );
- }
- return redirectPatchFieldPtr_();
-}
-
-
-void Foam::codedFixedValueFvPatchScalarField::updateCoeffs()
-{
- if (updated())
- {
- return;
- }
-
- // Make sure library containing user-defined fvPatchField is up-to-date
- updateLibrary();
-
- const fvPatchScalarField& fvp = redirectPatchField();
-
- const_cast<fvPatchScalarField&>(fvp).updateCoeffs();
-
- // Copy through value
- operator==(fvp);
-
- fixedValueFvPatchField<scalar>::updateCoeffs();
-}
-
-
-void Foam::codedFixedValueFvPatchScalarField::evaluate
-(
- const Pstream::commsTypes commsType
-)
-{
- // Make sure library containing user-defined fvPatchField is up-to-date
- updateLibrary();
-
- const fvPatchScalarField& fvp = redirectPatchField();
-
- const_cast<fvPatchScalarField&>(fvp).evaluate(commsType);
-
- fixedValueFvPatchField<scalar>::evaluate(commsType);
-}
-
-
-void Foam::codedFixedValueFvPatchScalarField::write(Ostream& os) const
-{
- fixedValueFvPatchField<scalar>::write(os);
- os.writeKeyword("redirectType") << redirectType_
- << token::END_STATEMENT << nl;
-
- if (dict_.found("code"))
- {
- os.writeKeyword("code")
- << token::HASH << token::BEGIN_BLOCK;
-
- os.writeQuoted(string(dict_["code"]), false)
- << token::HASH << token::END_BLOCK
- << token::END_STATEMENT << nl;
- }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
- makePatchTypeField
- (
- fvPatchScalarField,
- codedFixedValueFvPatchScalarField
- );
-}
-
-// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchScalarField.H
deleted file mode 100644
index 6eb8e9c533887345fd6302c4af027c2f9d2ad578..0000000000000000000000000000000000000000
--- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchScalarField.H
+++ /dev/null
@@ -1,263 +0,0 @@
-/*---------------------------------------------------------------------------*\
- ========= |
- \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
- \\ / O peration |
- \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd.
- \\/ M anipulation |
--------------------------------------------------------------------------------
-License
- This file is part of OpenFOAM.
-
- OpenFOAM is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2 of the License, or (at your
- option) any later version.
-
- OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- for more details.
-
- You should have received a copy of the GNU General Public License
- along with OpenFOAM; if not, write to the Free Software Foundation,
- Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Class
- Foam::codedFixedValueFvPatchScalarField
-
-Description
- Constructs on-the-fly a new boundary condition (derived from
- fixedValueFvPatchScalarField) which is then used to evaluate.
-
- Example:
- \verbatim
- movingWall
- {
- type codedFixedValue<scalar>;
- value uniform 0;
- redirectType rampedFixedValue; // name of generated bc
-
- code
- #{
- operator==(min(10, 0.1*this->db().time().value()));
- #};
-
- //codeInclude
- //#{
- // #include "fvCFD.H"
- //#};
-
- //codeOptions
- //#{
- // -I$(LIB_SRC)/finiteVolume/lnInclude
- //#};
- }
- \endverbatim
-
- A special form is if the 'code' section is not supplied. In this case
- the code gets read from a (runTimeModifiable!) dictionary system/codeDict
- which would have a corresponding entry
-
- \verbatim
- rampedFixedValue
- {
- code
- #{
- operator==(min(10, 0.1*this->db().time().value()));
- #};
- }
- \endverbatim
-
-SeeAlso
- Foam::dynamicCode and Foam::functionEntries::codeStream
-
-SourceFiles
- codedFixedValueFvPatchScalarField.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef codedFixedValueFvPatchScalarField_H
-#define codedFixedValueFvPatchScalarField_H
-
-#include "fixedValueFvPatchFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// Forward declaration of classes
-class dynamicCode;
-class dynamicCodeContext;
-class IOdictionary;
-
-/*---------------------------------------------------------------------------*\
- Class codedFixedValueFvPatchScalarField Declaration
-\*---------------------------------------------------------------------------*/
-
-class codedFixedValueFvPatchScalarField
-:
- public fixedValueFvPatchScalarField
-{
- // Private data
-
- //- Dictionary contents for the boundary condition
- mutable dictionary dict_;
-
- const word redirectType_;
-
- //- Previously loaded library
- mutable fileName oldLibPath_;
-
- mutable autoPtr<fvPatchScalarField> redirectPatchFieldPtr_;
-
-
- // Private Member Functions
-
- const IOdictionary& dict() const;
-
- //- Global loader/unloader function type
- typedef void (*loaderFunctionType)(bool);
-
- //- Load specified library and execute globalFuncName(true)
- static void* loadLibrary
- (
- const fileName& libPath,
- const string& globalFuncName,
- const dictionary& contextDict
- );
-
- //- Execute globalFuncName(false) and unload specified library
- static void unloadLibrary
- (
- const fileName& libPath,
- const string& globalFuncName,
- const dictionary& contextDict
- );
-
-
- //- Set TemplateType and FieldType filter variables
- template<class Type>
- static void setFieldTemplates(dynamicCode&);
-
-
- //- Create library based on the dynamicCodeContext
- void createLibrary(dynamicCode&, const dynamicCodeContext&) const;
-
- //- Update library as required
- void updateLibrary() const;
-
-
-public:
-
- // Static data members
-
- //- Name of the C code template to be used
- static const word codeTemplateC;
-
- //- Name of the H code template to be used
- static const word codeTemplateH;
-
-
- //- Runtime type information
- TypeName("codedFixedValue<scalar>");
-
-
- // Constructors
-
- //- Construct from patch and internal field
- codedFixedValueFvPatchScalarField
- (
- const fvPatch&,
- const DimensionedField<scalar, volMesh>&
- );
-
- //- Construct from patch, internal field and dictionary
- codedFixedValueFvPatchScalarField
- (
- const fvPatch&,
- const DimensionedField<scalar, volMesh>&,
- const dictionary&
- );
-
- //- Construct by mapping given
- // codedFixedValueFvPatchScalarField
- // onto a new patch
- codedFixedValueFvPatchScalarField
- (
- const codedFixedValueFvPatchScalarField&,
- const fvPatch&,
- const DimensionedField<scalar, volMesh>&,
- const fvPatchFieldMapper&
- );
-
- //- Construct as copy
- codedFixedValueFvPatchScalarField
- (
- const codedFixedValueFvPatchScalarField&
- );
-
- //- Construct and return a clone
- virtual tmp<fvPatchScalarField> clone() const
- {
- return tmp<fvPatchScalarField>
- (
- new codedFixedValueFvPatchScalarField
- (
- *this
- )
- );
- }
-
- //- Construct as copy setting internal field reference
- codedFixedValueFvPatchScalarField
- (
- const codedFixedValueFvPatchScalarField&,
- const DimensionedField<scalar, volMesh>&
- );
-
- //- Construct and return a clone setting internal field reference
- virtual tmp<fvPatchScalarField> clone
- (
- const DimensionedField<scalar, volMesh>& iF
- ) const
- {
- return tmp<fvPatchScalarField>
- (
- new codedFixedValueFvPatchScalarField
- (
- *this,
- iF
- )
- );
- }
-
-
- // Member functions
-
- //- Get reference to the underlying patch
- const fvPatchScalarField& redirectPatchField() const;
-
- //- Update the coefficients associated with the patch field
- virtual void updateCoeffs();
-
- //- Evaluate the patch field, sets Updated to false
- virtual void evaluate
- (
- const Pstream::commsTypes commsType=Pstream::blocking
- );
-
- //- Write
- virtual void write(Ostream&) const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes
index f5b6b3d91511ec6d3a934ee58b18383bed4ee185..86400ad877e6e468ec8e63e766c88a9194fbc623 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes
@@ -53,6 +53,7 @@ snGradSchemes
fluxRequired
{
default no;
+ pcorr ;
p;
}
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution
index a76bbd4dcddb2bb79834763004982a7ccca61fa3..90f68beb375a42e2b3715fe1fd85423ef4b0e4b6 100644
--- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution
+++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution
@@ -16,11 +16,11 @@ FoamFile
solvers
{
- p
+ pcorr
{
solver GAMG;
- tolerance 1e-7;
- relTol 0.01;
+ tolerance 0.02;
+ relTol 0;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;
@@ -30,6 +30,13 @@ solvers
mergeLevels 1;
}
+ p
+ {
+ $pcorr
+ tolerance 1e-7;
+ relTol 0.01;
+ }
+
pFinal
{
$p;
diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/extrudeProperties b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/extrudeMeshDict
similarity index 100%
rename from tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/extrudeProperties
rename to tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/extrudeMeshDict