From 4c0c6b8227bcedeb3e79004f4d0cef06fb4131aa Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Tue, 26 Mar 2013 20:02:56 +0000
Subject: [PATCH] ENH: refinementFeatures: reading according to filename
---
.../refinementFeatures/refinementFeatures.C | 38 +++++++++++--------
1 file changed, 23 insertions(+), 15 deletions(-)
diff --git a/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.C b/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.C
index e72f13d7266..9c8f08630f1 100644
--- a/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.C
+++ b/src/mesh/autoMesh/autoHexMesh/refinementFeatures/refinementFeatures.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
@@ -41,23 +41,31 @@ void Foam::refinementFeatures::read
fileName featFileName(dict.lookup("file"));
- set
- (
- featI,
- new featureEdgeMesh
+ {
+ IOobject featObj
(
- IOobject
+ featFileName, // name
+ io.time().constant(), // instance
+ "triSurface", // local
+ io.time(), // registry
+ IOobject::MUST_READ,
+ IOobject::NO_WRITE,
+ false
+ );
+
+ autoPtr<edgeMesh> eMeshPtr = edgeMesh::New(featObj.filePath());
+
+ set
+ (
+ featI,
+ new featureEdgeMesh
(
- featFileName, // name
- io.time().constant(), // instance
- "triSurface", // local
- io.time(), // registry
- IOobject::MUST_READ,
- IOobject::NO_WRITE,
- false
+ featObj,
+ eMeshPtr->points(),
+ eMeshPtr->edges()
)
- )
- );
+ );
+ }
const featureEdgeMesh& eMesh = operator[](featI);
--
GitLab