From e3b05494f7f654d19b63852bfab92af4c162420a Mon Sep 17 00:00:00 2001 From: sergio Date: Fri, 20 Sep 2019 14:06:30 -0700 Subject: [PATCH] COMP: relocate regionProperties to meshTools --- applications/test/checkDecomposePar/Make/options | 10 +++++----- applications/test/decomposePar/Make/options | 10 +++++----- .../miscellaneous/foamListRegions/Make/options | 4 ++-- .../parallelProcessing/decomposePar/Make/options | 2 -- .../parallelProcessing/reconstructPar/Make/options | 6 ++---- .../parallelProcessing/redistributePar/Make/options | 2 -- .../dataConversion/foamToVTK/Make/options | 4 +--- .../preProcessing/createZeroDirectory/Make/options | 6 ++---- src/meshTools/Make/files | 2 ++ .../regionModel/regionProperties/regionProperties.C | 0 .../regionModel/regionProperties/regionProperties.H | 0 src/regionModels/regionModel/Make/files | 2 -- 12 files changed, 19 insertions(+), 29 deletions(-) rename src/{regionModels => meshTools}/regionModel/regionProperties/regionProperties.C (100%) rename src/{regionModels => meshTools}/regionModel/regionProperties/regionProperties.H (100%) diff --git a/applications/test/checkDecomposePar/Make/options b/applications/test/checkDecomposePar/Make/options index 7032381823..ff824c8ad9 100644 --- a/applications/test/checkDecomposePar/Make/options +++ b/applications/test/checkDecomposePar/Make/options @@ -1,11 +1,11 @@ EXE_INC = \ - -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \ - -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/regionModels/regionModel/lnInclude + -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \ + -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude EXE_LIBS = \ + -lfiniteVolume \ + -lmeshTools \ -ldecompose \ - -ldecompositionMethods \ - -lregionModels + -ldecompositionMethods diff --git a/applications/test/decomposePar/Make/options b/applications/test/decomposePar/Make/options index a81cfd44fc..25f37cdfad 100644 --- a/applications/test/decomposePar/Make/options +++ b/applications/test/decomposePar/Make/options @@ -1,13 +1,13 @@ EXE_INC = \ - -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \ - -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/regionModels/regionModel/lnInclude + -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \ + -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude EXE_LIBS = \ + -lfiniteVolume \ + -lmeshTools \ -ldecompose \ -ldecompositionMethods \ -L$(FOAM_LIBBIN)/dummy \ - -lkahipDecomp -lmetisDecomp -lscotchDecomp \ - -lregionModels + -lkahipDecomp -lmetisDecomp -lscotchDecomp diff --git a/applications/utilities/miscellaneous/foamListRegions/Make/options b/applications/utilities/miscellaneous/foamListRegions/Make/options index 4cf2f664c9..54c035b8f5 100644 --- a/applications/utilities/miscellaneous/foamListRegions/Make/options +++ b/applications/utilities/miscellaneous/foamListRegions/Make/options @@ -1,5 +1,5 @@ EXE_INC = \ - -I$(LIB_SRC)/regionModels/regionModel/lnInclude + -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -lregionModels + -lmeshTools diff --git a/applications/utilities/parallelProcessing/decomposePar/Make/options b/applications/utilities/parallelProcessing/decomposePar/Make/options index 0340a9d941..efe085933a 100644 --- a/applications/utilities/parallelProcessing/decomposePar/Make/options +++ b/applications/utilities/parallelProcessing/decomposePar/Make/options @@ -4,7 +4,6 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ - -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude @@ -14,7 +13,6 @@ EXE_LIBS = \ -lmeshTools \ -llagrangian \ -ldynamicMesh \ - -lregionModels \ -lgenericPatchFields \ -ldecompose \ -ldecompositionMethods \ diff --git a/applications/utilities/parallelProcessing/reconstructPar/Make/options b/applications/utilities/parallelProcessing/reconstructPar/Make/options index 447a3e3208..75f62d1729 100644 --- a/applications/utilities/parallelProcessing/reconstructPar/Make/options +++ b/applications/utilities/parallelProcessing/reconstructPar/Make/options @@ -4,8 +4,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ - -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \ - -I$(LIB_SRC)/regionModels/regionModel/lnInclude + -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude EXE_LIBS = \ -lfiniteArea \ @@ -14,5 +13,4 @@ EXE_LIBS = \ -llagrangian \ -lgenericPatchFields \ -ldynamicMesh \ - -lreconstruct \ - -lregionModels + -lreconstruct diff --git a/applications/utilities/parallelProcessing/redistributePar/Make/options b/applications/utilities/parallelProcessing/redistributePar/Make/options index 6ca9819a3e..d400986ff5 100644 --- a/applications/utilities/parallelProcessing/redistributePar/Make/options +++ b/applications/utilities/parallelProcessing/redistributePar/Make/options @@ -5,7 +5,6 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \ - -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \ @@ -15,7 +14,6 @@ EXE_LIBS = \ -llagrangian \ -ldynamicMesh \ -lsnappyHexMesh \ - -lregionModels \ -lgenericPatchFields \ -ldecompose \ -ldecompositionMethods \ diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/options b/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/options index 3875bcdf5a..f62d46529f 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/options +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/Make/options @@ -6,8 +6,7 @@ EXE_INC = \ -I$(LIB_SRC)/conversion/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ - -I$(LIB_SRC)/regionModels/regionModel/lnInclude + -I$(LIB_SRC)/lagrangian/intermediate/lnInclude EXE_LIBS = \ -lfiniteArea \ @@ -17,5 +16,4 @@ EXE_LIBS = \ -lconversion \ -ldynamicMesh \ -llagrangianIntermediate \ - -lregionModels \ -lgenericPatchFields diff --git a/applications/utilities/preProcessing/createZeroDirectory/Make/options b/applications/utilities/preProcessing/createZeroDirectory/Make/options index 5b44326e23..792a51bf7f 100644 --- a/applications/utilities/preProcessing/createZeroDirectory/Make/options +++ b/applications/utilities/preProcessing/createZeroDirectory/Make/options @@ -1,11 +1,9 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/dynamicMesh/lnInclude \ - -I$(LIB_SRC)/regionModels/regionModel/lnInclude + -I$(LIB_SRC)/dynamicMesh/lnInclude EXE_LIBS = \ -lfiniteVolume \ -lmeshTools \ - -ldynamicMesh \ - -lregionModels + -ldynamicMesh diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files index 09f00280dc..6a780352d8 100644 --- a/src/meshTools/Make/files +++ b/src/meshTools/Make/files @@ -306,6 +306,8 @@ output/foamVtkWriteFaceSet.C output/foamVtkWritePointSet.C output/foamVtkWriteCellSetFaces.C +regionModel/regionProperties/regionProperties.C + regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C regionCoupled/patches/regionCoupledPolyPatch/regionCoupledPolyPatch.C regionCoupled/patches/regionCoupledPolyPatch/regionCoupledWallPolyPatch.C diff --git a/src/regionModels/regionModel/regionProperties/regionProperties.C b/src/meshTools/regionModel/regionProperties/regionProperties.C similarity index 100% rename from src/regionModels/regionModel/regionProperties/regionProperties.C rename to src/meshTools/regionModel/regionProperties/regionProperties.C diff --git a/src/regionModels/regionModel/regionProperties/regionProperties.H b/src/meshTools/regionModel/regionProperties/regionProperties.H similarity index 100% rename from src/regionModels/regionModel/regionProperties/regionProperties.H rename to src/meshTools/regionModel/regionProperties/regionProperties.H diff --git a/src/regionModels/regionModel/Make/files b/src/regionModels/regionModel/Make/files index 11002e0a29..48dfefa2dd 100644 --- a/src/regionModels/regionModel/Make/files +++ b/src/regionModels/regionModel/Make/files @@ -6,8 +6,6 @@ regionModel1D/regionModel1D.C /* Boundary conditions */ derivedFvPatches/mappedVariableThicknessWall/mappedVariableThicknessWallFvPatch.C -regionProperties/regionProperties.C - regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObject.C regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectNew.C regionModelFunctionObject/regionModelFunctionObject/regionModelFunctionObjectList.C