From b9c15b8585c59a62b2ea9a788bd6aa12e049086d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 8 Nov 2022 17:13:46 +0100
Subject: [PATCH] COMP: missing linkage for ensightToFoam (ldd linker)
---
.../mesh/conversion/ensightToFoam/Make/options | 6 +++++-
.../mesh/conversion/ensightToFoam/ensightMeshReader.C | 2 +-
.../mesh/conversion/ensightToFoam/ensightMeshReader.H | 11 ++++++-----
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/applications/utilities/mesh/conversion/ensightToFoam/Make/options b/applications/utilities/mesh/conversion/ensightToFoam/Make/options
index b5a412d0688..85cfbb962f1 100644
--- a/applications/utilities/mesh/conversion/ensightToFoam/Make/options
+++ b/applications/utilities/mesh/conversion/ensightToFoam/Make/options
@@ -1,7 +1,11 @@
EXE_INC = \
- -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/fileFormats/lnInclude \
+ -I$(LIB_SRC)/surfMesh/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/conversion/lnInclude
EXE_LIBS = \
+ -lfileFormats \
+ -lsurfMesh \
+ -lmeshTools \
-lconversion
diff --git a/applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.C b/applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.C
index 54bb7a56cd7..ab672e57217 100644
--- a/applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.C
+++ b/applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.C
@@ -207,7 +207,7 @@ bool Foam::fileFormats::ensightMeshReader::readGoldPart
// Work
- DynamicList<label> verts;
+ DynamicList<label> verts;
string line;
while (is.good())
diff --git a/applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.H b/applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.H
index 5e3d4cc7163..e69b3d6dc94 100644
--- a/applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.H
+++ b/applications/utilities/mesh/conversion/ensightToFoam/ensightMeshReader.H
@@ -35,8 +35,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef ensightMeshReader_H
-#define ensightMeshReader_H
+#ifndef Foam_ensightMeshReader_H
+#define Foam_ensightMeshReader_H
#include "meshReader.H"
//#include "ensightReadFile.H"
@@ -46,6 +46,7 @@ SourceFiles
namespace Foam
{
+// Forward Declarations
class ensightReadFile;
namespace fileFormats
@@ -59,7 +60,7 @@ class ensightMeshReader
:
public meshReader
{
- // Private data
+ // Private Data
//- Merge distance
const scalar mergeTol_;
@@ -168,13 +169,13 @@ public:
// Access
//- Original node id (if supplied) or -1
- inline const labelList& nodeIds() const
+ const labelList& nodeIds() const noexcept
{
return nodeIds_;
}
//- Original element id (if supplied) or -1
- inline const labelList& elementIds() const
+ const labelList& elementIds() const noexcept
{
return elementIds_;
}
--
GitLab