diff --git a/src/regionModels/regionModel/regionModel/regionModel.C b/src/regionModels/regionModel/regionModel/regionModel.C index 98e152c3f1784818c406da85352ebf0651f012e9..3ab10f4e86c99450cf3bfc3b8deb6d5f4f6392f8 100644 --- a/src/regionModels/regionModel/regionModel/regionModel.C +++ b/src/regionModels/regionModel/regionModel/regionModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -315,18 +315,6 @@ Foam::regionModels::regionModel::~regionModel() // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // -void Foam::regionModels::regionModel::preEvolveRegion() -{ - // do nothing -} - - -void Foam::regionModels::regionModel::evolveRegion() -{ - // do nothing -} - - void Foam::regionModels::regionModel::evolve() { if (active_) @@ -334,15 +322,14 @@ void Foam::regionModels::regionModel::evolve() Info<< "\nEvolving " << modelName_ << " for region " << regionMesh().name() << endl; - // Update any input information //read(); - // Pre-evolve preEvolveRegion(); - // Increment the region equations up to the new time level evolveRegion(); + postEvolveRegion(); + // Provide some feedback if (infoOutput_) { @@ -354,6 +341,24 @@ void Foam::regionModels::regionModel::evolve() } +void Foam::regionModels::regionModel::preEvolveRegion() +{ + // do nothing +} + + +void Foam::regionModels::regionModel::evolveRegion() +{ + // do nothing +} + + +void Foam::regionModels::regionModel::postEvolveRegion() +{ + // do nothing +} + + void Foam::regionModels::regionModel::info() const { // do nothing diff --git a/src/regionModels/regionModel/regionModel/regionModel.H b/src/regionModels/regionModel/regionModel/regionModel.H index 6fbad3d3720465d69cba391df69e7f67dba61a2e..7b2b2bef289a38a903ae8aff4b1402942ce260f8 100644 --- a/src/regionModels/regionModel/regionModel/regionModel.H +++ b/src/regionModels/regionModel/regionModel/regionModel.H @@ -256,14 +256,17 @@ public: // Evolution + //- Main driver routing to evolve the region - calls other evolves + virtual void evolve(); + //- Pre-evolve region virtual void preEvolveRegion(); //- Evolve the region virtual void evolveRegion(); - //- Evolve the region - virtual void evolve(); + //- Post-evolve region + virtual void postEvolveRegion(); // I-O