From 2eab4044f609d57135a365fed1df2e3c79e801c2 Mon Sep 17 00:00:00 2001 From: mattijs <mattijs> Date: Wed, 2 Jun 2010 11:08:52 +0100 Subject: [PATCH] COMP: cellSource compilation --- .../PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C | 2 +- .../graphics/fieldview9Reader/readerDatabase.C | 2 +- .../field/fieldValues/cellSource/cellSource.C | 6 +++--- .../field/fieldValues/cellSource/cellSource.H | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C index 1cd6f06b030..a73b46621ed 100644 --- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C +++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C @@ -444,7 +444,7 @@ void Foam::vtkPV3Foam::updateFoamMesh() meshRegion_, dbPtr_().timeName(), dbPtr_(), - IOobject::MUST_READ_IF_MODIFIED + IOobject::MUST_READ ) ); diff --git a/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C b/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C index 536eed7fb49..e18963c3d13 100644 --- a/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C +++ b/applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.C @@ -260,7 +260,7 @@ void Foam::readerDatabase::loadMesh() meshPtr_ = new fvMeshSubset ( *runTimePtr_, - IOobject::MUST_READ_IF_MODIFIED, + IOobject::MUST_READ, IOobject::AUTO_WRITE ); diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C index 7f20d750473..51f08c461e0 100644 --- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C +++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C @@ -32,11 +32,11 @@ License defineTypeNameAndDebug(Foam::fieldValues::cellSource, 0); template<> -const char* NamedEnum<fieldValues::cellSource::sourceType, 2>:: +const char* Foam::NamedEnum<Foam::fieldValues::cellSource::sourceType, 2>:: names[] = {"cellZone", "all"}; -const NamedEnum<fieldValues::cellSource::sourceType, 2> - fieldValues::cellSource::sourceTypeNames_; +const Foam::NamedEnum<Foam::fieldValues::cellSource::sourceType, 2> + Foam::fieldValues::cellSource::sourceTypeNames_; template<> const char* Foam::NamedEnum<Foam::fieldValues::cellSource::operationType, 7>:: diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H index 44f836428a9..c3a033f6442 100644 --- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H +++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.H @@ -94,7 +94,7 @@ public: }; //- Source type names - static const NamedEnum<sourceType, 1> sourceTypeNames_; + static const NamedEnum<sourceType, 2> sourceTypeNames_; //- Operation type enumeration -- GitLab