From 8a1f667067e48562878a8f568e5227e9d842e15d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 5 Jul 2021 13:28:20 +0200
Subject: [PATCH] COMP: cannot resolve read in UnsortedMeshedSurface
constructor
- fix linkage for cellModeller compat methods
---
.../test/surfaceMeshConvert/Test-surfaceMeshConvert.C | 2 +-
src/OpenFOAM/meshes/meshShapes/cellModel/cellModeller.H | 6 +++---
src/mesh/blockMesh/PDRblockMesh/PDRblockBlockMesh.C | 1 -
src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C b/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C
index dd023517104..4f5f0cfb396 100644
--- a/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C
+++ b/applications/test/surfaceMeshConvert/Test-surfaceMeshConvert.C
@@ -258,7 +258,7 @@ int main(int argc, char *argv[])
// UnsortedMeshedSurface<face> surf2;
// is >> surf2;
- // surf2.read(is); // FAIL: private method
+ // surf2.readIstream(is); // FAIL: private method
}
if (args.found("orient"))
diff --git a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModeller.H b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModeller.H
index 32976c6f077..96401e02d71 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModeller.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModeller.H
@@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
- Copyright (C) 2017-2020 OpenCFD Ltd.
+ Copyright (C) 2017-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM, distributed under GPL-3.0-or-later.
@@ -38,7 +38,7 @@ struct cellModeller
//- Deprecated(2017-11) equivalent to cellModel::ptr static method.
// \deprecated(2017-11) use cellModel::ptr instead
FOAM_DEPRECATED_FOR(2017-11, "cellModel::ptr() static method")
- const cellModel* lookup(const word& modelName)
+ static const cellModel* lookup(const word& modelName)
{
return cellModel::ptr(modelName);
}
@@ -46,7 +46,7 @@ struct cellModeller
//- Deprecated(2017-11) equivalent to cellModel::ptr static method.
// \deprecated(2017-11) use cellModel::ptr instead
FOAM_DEPRECATED_FOR(2017-11, "cellModel::ptr() static method")
- const cellModel* lookup(const label modelIndex)
+ static const cellModel* lookup(const label modelIndex)
{
return cellModel::ptr(modelIndex);
}
diff --git a/src/mesh/blockMesh/PDRblockMesh/PDRblockBlockMesh.C b/src/mesh/blockMesh/PDRblockMesh/PDRblockBlockMesh.C
index fc95266b0a1..818aa4746e9 100644
--- a/src/mesh/blockMesh/PDRblockMesh/PDRblockBlockMesh.C
+++ b/src/mesh/blockMesh/PDRblockMesh/PDRblockBlockMesh.C
@@ -27,7 +27,6 @@ License
#include "PDRblock.H"
#include "ListOps.H"
-#include "cellModeller.H"
#include "gradingDescriptors.H"
#include "objectRegistry.H"
#include "Time.H"
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
index 37b5216ccfc..d82c263250c 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
@@ -280,7 +280,7 @@ Foam::UnsortedMeshedSurface<Face>::UnsortedMeshedSurface
:
UnsortedMeshedSurface<Face>()
{
- read(is);
+ readIstream(is);
}
--
GitLab