From bb0ace809d0abc1209f6c076051acbcc78989f76 Mon Sep 17 00:00:00 2001 From: mattijs Date: Mon, 12 Aug 2013 12:39:38 +0100 Subject: [PATCH] COMP: localPointRegion: moved to meshTools to break circular dep --- src/dynamicMesh/Make/files | 1 - src/meshTools/Make/files | 1 + .../polyTopoChange => meshTools/regionSplit}/localPointRegion.C | 2 +- .../polyTopoChange => meshTools/regionSplit}/localPointRegion.H | 2 +- src/parallel/decompose/decompositionMethods/Make/options | 2 -- 5 files changed, 3 insertions(+), 5 deletions(-) rename src/{dynamicMesh/polyTopoChange/polyTopoChange => meshTools/regionSplit}/localPointRegion.C (99%) rename src/{dynamicMesh/polyTopoChange/polyTopoChange => meshTools/regionSplit}/localPointRegion.H (98%) diff --git a/src/dynamicMesh/Make/files b/src/dynamicMesh/Make/files index 4bc6aa0c52..6429d3b4a5 100644 --- a/src/dynamicMesh/Make/files +++ b/src/dynamicMesh/Make/files @@ -36,7 +36,6 @@ polyTopoChange/polyTopoChange/refinementDistanceData.C polyTopoChange/polyTopoChange/refinementHistory.C polyTopoChange/polyTopoChange/removePoints.C polyTopoChange/polyTopoChange/combineFaces.C -polyTopoChange/polyTopoChange/localPointRegion.C polyTopoChange/polyTopoChange/duplicatePoints.C polyTopoChange/polyTopoChange/tetDecomposer.C diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files index ab78000ffc..6b52b27068 100644 --- a/src/meshTools/Make/files +++ b/src/meshTools/Make/files @@ -53,6 +53,7 @@ $(meshWave)/FaceCellWaveName.C regionSplit/regionSplit.C +regionSplit/localPointRegion.C indexedOctree/treeDataEdge.C indexedOctree/treeDataFace.C diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/localPointRegion.C b/src/meshTools/regionSplit/localPointRegion.C similarity index 99% rename from src/dynamicMesh/polyTopoChange/polyTopoChange/localPointRegion.C rename to src/meshTools/regionSplit/localPointRegion.C index 9100ca7185..ddaa684987 100644 --- a/src/dynamicMesh/polyTopoChange/polyTopoChange/localPointRegion.C +++ b/src/meshTools/regionSplit/localPointRegion.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-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/localPointRegion.H b/src/meshTools/regionSplit/localPointRegion.H similarity index 98% rename from src/dynamicMesh/polyTopoChange/polyTopoChange/localPointRegion.H rename to src/meshTools/regionSplit/localPointRegion.H index 57c5b68785..946a402498 100644 --- a/src/dynamicMesh/polyTopoChange/polyTopoChange/localPointRegion.H +++ b/src/meshTools/regionSplit/localPointRegion.H @@ -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-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/parallel/decompose/decompositionMethods/Make/options b/src/parallel/decompose/decompositionMethods/Make/options index 45133caabb..f3070a731e 100644 --- a/src/parallel/decompose/decompositionMethods/Make/options +++ b/src/parallel/decompose/decompositionMethods/Make/options @@ -1,9 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude LIB_LIBS = \ -lmeshTools \ - -ldynamicMesh \ -lfiniteVolume