From 4413212d9996324427dd515c46c8331cc414f492 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 12 Nov 2013 10:13:43 +0000
Subject: [PATCH] ENH: regionModel - AMI list now mutable to allow const access
---
.../regionModel/regionModel/regionModel.C | 2 +-
.../regionModel/regionModel/regionModel.H | 13 +++++++------
.../regionModel/regionModel/regionModelTemplates.C | 8 ++++----
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/regionModels/regionModel/regionModel/regionModel.C b/src/regionModels/regionModel/regionModel/regionModel.C
index 388559c18b8..5bf29514515 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.C
+++ b/src/regionModels/regionModel/regionModel/regionModel.C
@@ -197,7 +197,7 @@ Foam::regionModels::regionModel::interRegionAMI
const label regionPatchI,
const label nbrPatchI,
const bool flip
-)
+) const
{
label nbrRegionID = findIndex(interRegionAMINames_, nbrRegion.name());
diff --git a/src/regionModels/regionModel/regionModel/regionModel.H b/src/regionModels/regionModel/regionModel/regionModel.H
index 1b8fecababc..83afc6898be 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.H
+++ b/src/regionModels/regionModel/regionModel/regionModel.H
@@ -125,10 +125,11 @@ protected:
// Inter-region AMI interpolation caching
//- List of region names this region is coupled to
- wordList interRegionAMINames_;
+ mutable wordList interRegionAMINames_;
//- List of AMI objects per coupled region
- PtrList<PtrList<AMIPatchToPatchInterpolation> > interRegionAMI_;
+ mutable PtrList<PtrList<AMIPatchToPatchInterpolation> >
+ interRegionAMI_;
// Protected member functions
@@ -146,7 +147,7 @@ protected:
const label regionPatchI,
const label nbrPatchI,
const bool flip
- );
+ ) const;
public:
@@ -257,7 +258,7 @@ public:
const label nbrPatchI,
const Field<Type>& nbrField,
const bool flip = false
- );
+ ) const;
//- Map patch field from another region model to local patch
template<class Type>
@@ -267,7 +268,7 @@ public:
const word& fieldName,
const label regionPatchI,
const bool flip = false
- );
+ ) const;
//- Map patch internal field from another region model to local
// patch
@@ -278,7 +279,7 @@ public:
const word& fieldName,
const label regionPatchI,
const bool flip = false
- );
+ ) const;
//- Convert a local region field to the primary region
template<class Type>
diff --git a/src/regionModels/regionModel/regionModel/regionModelTemplates.C b/src/regionModels/regionModel/regionModel/regionModelTemplates.C
index 5855ee59061..dad46878ab2 100644
--- a/src/regionModels/regionModel/regionModel/regionModelTemplates.C
+++ b/src/regionModels/regionModel/regionModel/regionModelTemplates.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -32,7 +32,7 @@ Foam::regionModels::regionModel::mapRegionPatchField
const label nbrPatchI,
const Field<Type>& nbrField,
const bool flip
-)
+) const
{
int oldTag = UPstream::msgType();
UPstream::msgType() = oldTag + 1;
@@ -56,7 +56,7 @@ Foam::regionModels::regionModel::mapRegionPatchField
const word& fieldName,
const label regionPatchI,
const bool flip
-)
+) const
{
typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
@@ -108,7 +108,7 @@ Foam::regionModels::regionModel::mapRegionPatchInternalField
const word& fieldName,
const label regionPatchI,
const bool flip
-)
+) const
{
typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
--
GitLab