diff --git a/applications/solvers/engine/icoDyMEngineFoam/Make/options b/applications/solvers/engine/icoDyMEngineFoam/Make/options index ab1a74a54..0e1c47d5a 100644 --- a/applications/solvers/engine/icoDyMEngineFoam/Make/options +++ b/applications/solvers/engine/icoDyMEngineFoam/Make/options @@ -13,6 +13,7 @@ EXE_LIBS = \ -ltopoChangerFvMesh \ -lmeshTools \ -lfiniteVolume \ - $(WM_DECOMP_LIBS) \ + -ltetFiniteElement \ + -ltetMotionSolver \ -llduSolvers \ -L$(MESQUITE_LIB_DIR) -lmesquite diff --git a/applications/solvers/engine/sonicTurbDyMEngineFoam/Make/options b/applications/solvers/engine/sonicTurbDyMEngineFoam/Make/options index 9131658fa..ff37f4dd6 100644 --- a/applications/solvers/engine/sonicTurbDyMEngineFoam/Make/options +++ b/applications/solvers/engine/sonicTurbDyMEngineFoam/Make/options @@ -19,6 +19,7 @@ EXE_LIBS = \ -lbasicThermophysicalModels \ -lspecie \ -lmeshTools \ - $(WM_DECOMP_LIBS) \ + -ltetFiniteElement \ + -ltetMotionSolver \ -llduSolvers \ -L$(MESQUITE_LIB_DIR) -lmesquite diff --git a/applications/solvers/engine/turbDyMEngineFoam/Make/options b/applications/solvers/engine/turbDyMEngineFoam/Make/options index b8d142547..f02a201b5 100644 --- a/applications/solvers/engine/turbDyMEngineFoam/Make/options +++ b/applications/solvers/engine/turbDyMEngineFoam/Make/options @@ -20,6 +20,7 @@ EXE_LIBS = \ -lincompressibleLESModels \ -lincompressibleTransportModels \ -lfiniteVolume \ - $(WM_DECOMP_LIBS) \ + -ltetFiniteElement \ + -ltetMotionSolver \ -llduSolvers \ -L$(MESQUITE_LIB_DIR) -lmesquite diff --git a/applications/solvers/multiSolver/multiSolverDemo/Make/options b/applications/solvers/multiSolver/multiSolverDemo/Make/options index 19bacb224..685f625d6 100644 --- a/applications/solvers/multiSolver/multiSolverDemo/Make/options +++ b/applications/solvers/multiSolver/multiSolverDemo/Make/options @@ -5,5 +5,4 @@ EXE_INC = \ EXE_LIBS = \ -lfiniteVolume \ - -L$(FOAM_USER_LIBBIN) \ -lmultiSolver diff --git a/applications/solvers/solidMechanics/elasticContactSolidFoam/Make/options b/applications/solvers/solidMechanics/elasticContactSolidFoam/Make/options index c82bc1851..25624daab 100644 --- a/applications/solvers/solidMechanics/elasticContactSolidFoam/Make/options +++ b/applications/solvers/solidMechanics/elasticContactSolidFoam/Make/options @@ -1,12 +1,12 @@ EXE_INC = \ + -I../solidModels/lnInclude \ -I$(FOAM_SRC)/finiteVolume/lnInclude \ -I$(FOAM_SRC)/meshTools/lnInclude \ -I$(FOAM_SRC)/lagrangian/basic/lnInclude \ - -I../solidModels/lnInclude \ -I$(FOAM_SRC)/VectorN/lnInclude EXE_LIBS = \ - -L$(FOAM_USER_LIBBIN) -lsolidModels \ + -lsolidModels \ -lfiniteVolume \ -llduSolvers \ -lmeshTools \ diff --git a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/Make/options b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/Make/options index a4b8b5119..0902de825 100644 --- a/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/Make/options +++ b/applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/Make/options @@ -10,9 +10,8 @@ EXE_INC = \ -I$(LIB_SRC)/turbulenceModels \ -I$(LIB_SRC)/LESmodels \ -I$(LIB_SRC)/LESmodels/LESdeltas/lnInclude \ - $(WM_DECOMP_INC) \ - -I$(LIB_SRC)/tetDecompositionFiniteElement/lnInclude \ - -I$(LIB_SRC)/tetDecompositionMotionSolver/lnInclude \ + -I$(LIB_SRC)/tetFiniteElement/lnInclude \ + -I$(LIB_SRC)/tetMotionSolver/lnInclude \ -I../solidModels/lnInclude \ -I$(FOAM_SRC)/VectorN/lnInclude @@ -22,6 +21,7 @@ EXE_LIBS = \ -ldynamicFvMesh \ -ldynamicMesh \ -llduSolvers \ - $(WM_DECOMP_LIBS) \ + -ltetFiniteElement \ + -ltetMotionSolver \ -L$(FOAM_USER_LIBBIN) -lsolidModels \ -lVectorN diff --git a/applications/solvers/solidMechanics/solidModels/Make/files b/applications/solvers/solidMechanics/solidModels/Make/files index 33af8ea43..1379ce0db 100644 --- a/applications/solvers/solidMechanics/solidModels/Make/files +++ b/applications/solvers/solidMechanics/solidModels/Make/files @@ -56,4 +56,4 @@ interpolation/leastSquaresVolPointInterpolation/leastSquaresVolPointInterpolatio solidInterface/solidInterface.C -LIB = $(FOAM_USER_LIBBIN)/libsolidModels +LIB = $(FOAM_LIBBIN)/libsolidModels diff --git a/applications/solvers/stressAnalysis/icoFsiFoam/Make/options b/applications/solvers/stressAnalysis/icoFsiFoam/Make/options index 529d90deb..4faa33525 100644 --- a/applications/solvers/stressAnalysis/icoFsiFoam/Make/options +++ b/applications/solvers/stressAnalysis/icoFsiFoam/Make/options @@ -2,15 +2,15 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/dynamicMesh/dynamicFvMesh/lnInclude \ -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \ - $(WM_DECOMP_INC) \ - -I$(LIB_SRC)/tetDecompositionFiniteElement/lnInclude \ - -I$(LIB_SRC)/dynamicMesh/meshMotion/tetDecompositionMotionSolver/lnInclude \ + -I$(LIB_SRC)/tetFiniteElement/lnInclude \ + -I$(LIB_SRC)/dynamicMesh/meshMotion/tetMotionSolver/lnInclude \ EXE_LIBS = \ -lfiniteVolume \ -ldynamicFvMesh \ -ldynamicMesh \ - $(WM_DECOMP_LIBS) \ + -ltetFiniteElement \ + -ltetMotionSolver \ -llduSolvers \ -L$(MESQUITE_LIB_DIR) -lmesquite diff --git a/applications/solvers/stressAnalysis/stressFemFoam/Make/options b/applications/solvers/stressAnalysis/stressFemFoam/Make/options index 0bc602d56..dfa028ad2 100644 --- a/applications/solvers/stressAnalysis/stressFemFoam/Make/options +++ b/applications/solvers/stressAnalysis/stressFemFoam/Make/options @@ -1,10 +1,9 @@ EXE_INC = \ -IfemStress/Traction \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/tetDecompositionFiniteElement/lnInclude \ - $(WM_DECOMP_INC) + -I$(LIB_SRC)/tetFiniteElement/lnInclude EXE_LIBS = \ -lfiniteVolume \ - $(WM_DECOMP_LIBS) \ + -ltetFiniteElement \ -llduSolvers diff --git a/applications/solvers/surfaceTracking/freeSurface/Make/options b/applications/solvers/surfaceTracking/freeSurface/Make/options index 688a9d492..0bb8794df 100644 --- a/applications/solvers/surfaceTracking/freeSurface/Make/options +++ b/applications/solvers/surfaceTracking/freeSurface/Make/options @@ -3,14 +3,14 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \ - -I$(LIB_SRC)/dynamicMesh/dynamicFvMesh/lnInclude \ - -I$(LIB_SRC)/dynamicMesh/meshMotion/tetDecompositionMotionSolver/lnInclude \ - -I$(LIB_SRC)/tetDecompositionFiniteElement/lnInclude \ - $(WM_DECOMP_INC) + -I$(LIB_SRC)/dynamicMesh/dynamicFvMesh/lnInclude\ + -I$(LIB_SRC)/tetFiniteElement/lnInclude \ + -I$(LIB_SRC)/dynamicMesh/meshMotion/tetMotionSolver/lnInclude EXE_LIBS = \ -lfiniteArea \ -lfiniteVolume \ -lmeshTools \ -ldynamicMesh \ - $(WM_DECOMP_LIBS) + -ltetFiniteElement \ + -ltetMotionSolver diff --git a/applications/solvers/surfaceTracking/utilities/setFluidIndicator/Make/options b/applications/solvers/surfaceTracking/utilities/setFluidIndicator/Make/options index 7e1d03cd9..c68cfc352 100644 --- a/applications/solvers/surfaceTracking/utilities/setFluidIndicator/Make/options +++ b/applications/solvers/surfaceTracking/utilities/setFluidIndicator/Make/options @@ -5,9 +5,8 @@ EXE_INC = \ -I$(LIB_SRC)/finiteArea/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/dynamicFvMesh/lnInclude \ - $(WM_DECOMP_INC) \ - -I$(LIB_SRC)/tetDecompositionFiniteElement/lnInclude \ - -I$(LIB_SRC)/tetDecompositionMotionSolver/lnInclude + -I$(LIB_SRC)/tetFiniteElement/lnInclude \ + -I$(LIB_SRC)/tetMotionSolver/lnInclude EXE_LIBS = \ -lfreeSurface \ @@ -16,4 +15,5 @@ EXE_LIBS = \ -ldynamicFvMesh \ -ldynamicMesh \ -lmeshTools \ - $(WM_DECOMP_LIBS) + -ltetFiniteElement \ + -ltetMotionSolver diff --git a/applications/utilities/mesh/manipulation/deformedTetFemGeom/Make/options b/applications/utilities/mesh/manipulation/deformedTetFemGeom/Make/options index 0192e4f3e..b3137cdaf 100644 --- a/applications/utilities/mesh/manipulation/deformedTetFemGeom/Make/options +++ b/applications/utilities/mesh/manipulation/deformedTetFemGeom/Make/options @@ -1,7 +1,5 @@ EXE_INC = \ - -I$(LIB_SRC)/tetDecompositionFiniteElement/lnInclude \ - $(WM_DECOMP_INC) \ -I$(LIB_SRC)/tetFiniteElement/lnInclude EXE_LIBS = \ - $(WM_DECOMP_LIBS) + -ltetFiniteElement diff --git a/applications/utilities/mesh/manipulation/moveDyMEngineMesh/Make/options b/applications/utilities/mesh/manipulation/moveDyMEngineMesh/Make/options index 89f27a15d..a953d5766 100644 --- a/applications/utilities/mesh/manipulation/moveDyMEngineMesh/Make/options +++ b/applications/utilities/mesh/manipulation/moveDyMEngineMesh/Make/options @@ -3,8 +3,7 @@ EXE_INC = \ -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \ -I$(LIB_SRC)/dynamicMesh/dynamicFvMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/engine/lnInclude \ - $(WM_DECOMP_INC) + -I$(LIB_SRC)/engine/lnInclude EXE_LIBS = \ -lfiniteVolume \ @@ -13,6 +12,7 @@ EXE_LIBS = \ -lmeshTools \ -lengine \ -lmeshTools \ - $(WM_DECOMP_LIBS) \ + -ltetFiniteElement \ + -ltetMotionSolver \ -llduSolvers \ -L$(MESQUITE_LIB_DIR) -lmesquite diff --git a/applications/utilities/mesh/manipulation/tetDecomposition/Make/options b/applications/utilities/mesh/manipulation/tetDecomposition/Make/options index 92b0a75f0..18fe80690 100644 --- a/applications/utilities/mesh/manipulation/tetDecomposition/Make/options +++ b/applications/utilities/mesh/manipulation/tetDecomposition/Make/options @@ -1,8 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/tetDecompositionFiniteElement/lnInclude \ - $(WM_DECOMP_INC) + -I$(LIB_SRC)/tetFiniteElement/lnInclude EXE_LIBS = \ -lfiniteVolume \ - $(WM_DECOMP_LIBS) + -ltetFiniteElement diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options index f58367582..49f7990f5 100644 --- a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options +++ b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options @@ -12,7 +12,8 @@ EXE_LIBS = \ -lerrorEstimation \ -lfiniteVolume \ -lfiniteArea \ - $(WM_DECOMP_LIBS) \ + -ltetFiniteElement \ + -ltetMotionSolver \ -lforces \ -lfvMotionSolver \ -lincompressibleLESModels \ diff --git a/applications/utilities/parallelProcessing/decomposePar/Make/options b/applications/utilities/parallelProcessing/decomposePar/Make/options index e9060bd07..682187cd5 100644 --- a/applications/utilities/parallelProcessing/decomposePar/Make/options +++ b/applications/utilities/parallelProcessing/decomposePar/Make/options @@ -4,8 +4,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteArea/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/tetDecompositionFiniteElement/lnInclude \ - $(WM_DECOMP_INC) + -I$(LIB_SRC)/tetFiniteElement/lnInclude EXE_LIBS = \ -ldecompositionMethods \ @@ -13,4 +12,4 @@ EXE_LIBS = \ -lfiniteVolume \ -lfiniteArea \ -llagrangian \ - $(WM_DECOMP_LIBS) + -ltetFiniteElement diff --git a/applications/utilities/parallelProcessing/reconstructPar/Make/options b/applications/utilities/parallelProcessing/reconstructPar/Make/options index de622143c..5ed1bebe5 100644 --- a/applications/utilities/parallelProcessing/reconstructPar/Make/options +++ b/applications/utilities/parallelProcessing/reconstructPar/Make/options @@ -2,12 +2,11 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteArea/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/tetDecompositionFiniteElement/lnInclude \ - $(WM_DECOMP_INC) + -I$(LIB_SRC)/tetFiniteElement/lnInclude EXE_LIBS = \ -lfiniteVolume \ -lfiniteArea \ -llagrangian \ -lmeshTools \ - $(WM_DECOMP_LIBS) + -ltetFiniteElement diff --git a/applications/utilities/parallelProcessing/reconstructParMesh/Make/options b/applications/utilities/parallelProcessing/reconstructParMesh/Make/options index de622143c..5ed1bebe5 100644 --- a/applications/utilities/parallelProcessing/reconstructParMesh/Make/options +++ b/applications/utilities/parallelProcessing/reconstructParMesh/Make/options @@ -2,12 +2,11 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteArea/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/tetDecompositionFiniteElement/lnInclude \ - $(WM_DECOMP_INC) + -I$(LIB_SRC)/tetFiniteElement/lnInclude EXE_LIBS = \ -lfiniteVolume \ -lfiniteArea \ -llagrangian \ -lmeshTools \ - $(WM_DECOMP_LIBS) + -ltetFiniteElement diff --git a/etc/settings.csh b/etc/settings.csh index f0d3b90d2..6443408f2 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -45,11 +45,6 @@ setenv WM_LINK_LANGUAGE c++ setenv WM_OPTIONS $WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_COMPILE_OPTION set path=($WM_DIR $path) -#setenv WM_DECOMP_INC -DCELL_DECOMP -#setenv WM_DECOMP_LIBS "-lcellDecompFiniteElement -lcellDecompositionMotionSolver" -setenv WM_DECOMP_INC -DFACE_DECOMP -setenv WM_DECOMP_LIBS "-lfaceDecompFiniteElement -lfaceDecompositionMotionSolver" - # base configuration setenv FOAM_APP $WM_PROJECT_DIR/applications setenv FOAM_APPBIN $WM_PROJECT_DIR/applications/bin/$WM_OPTIONS diff --git a/etc/settings.sh b/etc/settings.sh index 2e79f7c5c..ccf8459c9 100644 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -82,11 +82,6 @@ export WM_LINK_LANGUAGE=c++ export WM_OPTIONS=$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_COMPILE_OPTION export PATH=$WM_DIR:$PATH -#export WM_DECOMP_INC=-DCELL_DECOMP -#export WM_DECOMP_LIBS="-lcellDecompFiniteElement -lcellDecompositionMotionSolver" -export WM_DECOMP_INC=-DFACE_DECOMP -export WM_DECOMP_LIBS="-lfaceDecompFiniteElement -lfaceDecompositionMotionSolver" - # base configuration export FOAM_APP=$WM_PROJECT_DIR/applications export FOAM_APPBIN=$WM_PROJECT_DIR/applications/bin/$WM_OPTIONS diff --git a/src/Allwmake b/src/Allwmake index e2e483751..e4983114a 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -41,7 +41,7 @@ wmake libso finiteArea wmake libso lduSolvers wmake libso VectorN -(cd tetDecompositionFiniteElement ; ./Allwmake) +wmake libso tetFiniteElement # Make dynamicMesh tools dynamicMesh/AllwmakeLnInclude diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C index 3db9fcb22..31126d887 100644 --- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C +++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C @@ -78,7 +78,7 @@ void Foam::UPtrList::setSize(const label newSize) ptrs_.setSize(newSize); // set new elements to NULL - for (register label i=oldSize; itype() - == laplaceTetDecompositionMotionSolver::typeName + == laplaceTetMotionSolver::typeName ) { - tetDecompositionMotionSolver& mSolver = - dynamic_cast + tetMotionSolver& mSolver = + dynamic_cast ( motionPtr_() ); @@ -216,7 +216,7 @@ bool Foam::dynamicBodyFvMesh::update() << "Selected mesh motion solver is " << motionPtr_->type() << ", instead " - << tetDecompositionMotionSolver::typeName + << tetMotionSolver::typeName << exit(FatalError); } diff --git a/src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/eMesh/eMeshDemandDrivenData.C b/src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/eMesh/eMeshDemandDrivenData.C index 939239b4e..90fa060b4 100644 --- a/src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/eMesh/eMeshDemandDrivenData.C +++ b/src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/eMesh/eMeshDemandDrivenData.C @@ -180,7 +180,7 @@ void eMesh::calcEdgePoints() const // NOTE: Will work only on tetrahedral meshes! bool found; - label faceIndex = -1 + label faceIndex = -1; label cellIndex = -1; const labelList& owner = mesh_.faceOwner(); const labelList& neighbour = mesh_.faceNeighbour(); @@ -259,7 +259,8 @@ void eMesh::calcEdgePoints() const ) { faceIndex = cellToCheck[0]; - found = true; break; + found = true; + break; } if @@ -269,7 +270,8 @@ void eMesh::calcEdgePoints() const ) { faceIndex = cellToCheck[1]; - found = true; break; + found = true; + break; } if @@ -279,7 +281,8 @@ void eMesh::calcEdgePoints() const ) { faceIndex = cellToCheck[2]; - found = true; break; + found = true; + break; } if @@ -289,7 +292,8 @@ void eMesh::calcEdgePoints() const ) { faceIndex = cellToCheck[3]; - found = true; break; + found = true; + break; } } diff --git a/src/dynamicMesh/meshMotion/Allwmake b/src/dynamicMesh/meshMotion/Allwmake index 2c32daba6..beeef85bf 100755 --- a/src/dynamicMesh/meshMotion/Allwmake +++ b/src/dynamicMesh/meshMotion/Allwmake @@ -7,7 +7,6 @@ wmake libso solidBodyMotion wmake libso fvMotionSolver wmake libso RBFMotionSolver wmake libso mesquiteMotionSolver -(cd tetDecompositionMotionSolver ; ./Allwmake) -wmake libso solidBodyMotion +wmake libso tetMotionSolver # ----------------------------------------------------------------- end-of-file diff --git a/src/dynamicMesh/meshMotion/solidBodyMotion/Make/options b/src/dynamicMesh/meshMotion/solidBodyMotion/Make/options index b1a1bbb54..d8d211768 100644 --- a/src/dynamicMesh/meshMotion/solidBodyMotion/Make/options +++ b/src/dynamicMesh/meshMotion/solidBodyMotion/Make/options @@ -3,9 +3,8 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/dynamicMesh/meshMotion/tetDecompositionMotionSolver/lnInclude \ - -I$(LIB_SRC)/tetDecompositionFiniteElement/lnInclude \ - $(WM_DECOMP_INC) \ + -I$(LIB_SRC)/tetFiniteElement/lnInclude \ + -I$(LIB_SRC)/dynamicMesh/meshMotion/tetMotionSolver/lnInclude \ -I$(LIB_SRC)/dynamicMesh/meshMotion/fvMotionSolver/lnInclude \ -I$(LIB_SRC)/dynamicMesh/meshMotion/RBFMotionSolver/lnInclude \ -I$(LIB_SRC)/dynamicMesh/meshMotion/mesquiteMotionSolver/lnInclude @@ -15,7 +14,8 @@ LIB_LIBS = \ -lmeshTools \ -ldynamicMesh \ -lfiniteVolume \ - $(WM_DECOMP_LIBS) \ + -ltetFiniteElement \ + -ltetMotionSolver \ -lfvMotionSolver \ -lRBFMotionSolver \ -lmesquiteMotionSolver diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/Allwmake b/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/Allwmake deleted file mode 100755 index 934db0c1d..000000000 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/Allwmake +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -wmake libso . Make.cellDecomp -wmake libso . Make.faceDecomp diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/Make.cellDecomp/options b/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/Make.cellDecomp/options deleted file mode 100644 index dfa698de7..000000000 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/Make.cellDecomp/options +++ /dev/null @@ -1,11 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/tetDecompositionFiniteElement/lnInclude \ - -DCELL_DECOMP - -LIB_LIBS = \ - -ldynamicMesh \ - -lmeshTools \ - -lcellDecompFiniteElement diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/Make.faceDecomp/files b/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/Make.faceDecomp/files deleted file mode 100644 index cf6162ba4..000000000 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/Make.faceDecomp/files +++ /dev/null @@ -1,17 +0,0 @@ -tetDecompositionMotionSolver/tetDecompositionMotionSolver.C -tetDecompositionMotionSolver/laplace/laplaceTetDecompositionMotionSolver.C -tetDecompositionMotionSolver/pseudoSolid/pseudoSolidTetDecompositionMotionSolver.C - -cellQuality/cellQuality.C - -motionDiffs/motionDiff/motionDiff.C -motionDiffs/uniform/uniformDiff.C -motionDiffs/deformationEnergy/deformationEnergyDiff.C -motionDiffs/distortionEnergy/distortionEnergyDiff.C -motionDiffs/linear/linearDiff.C -motionDiffs/quadratic/quadraticDiff.C -motionDiffs/exponential/exponentialDiff.C -motionDiffs/patchEnhanced/patchEnhancedDiff.C -motionDiffs/file/fileDiff.C - -LIB = $(FOAM_LIBBIN)/libfaceDecompositionMotionSolver diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/Make.cellDecomp/files b/src/dynamicMesh/meshMotion/tetMotionSolver/Make/files similarity index 58% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/Make.cellDecomp/files rename to src/dynamicMesh/meshMotion/tetMotionSolver/Make/files index 8a2bfc8c5..4b221d8c4 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/Make.cellDecomp/files +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/Make/files @@ -1,6 +1,6 @@ -tetDecompositionMotionSolver/tetDecompositionMotionSolver.C -tetDecompositionMotionSolver/laplace/laplaceTetDecompositionMotionSolver.C -tetDecompositionMotionSolver/pseudoSolid/pseudoSolidTetDecompositionMotionSolver.C +tetMotionSolver/tetMotionSolver.C +tetMotionSolver/laplace/laplaceTetMotionSolver.C +tetMotionSolver/pseudoSolid/pseudoSolidTetMotionSolver.C cellQuality/cellQuality.C @@ -14,4 +14,4 @@ motionDiffs/exponential/exponentialDiff.C motionDiffs/patchEnhanced/patchEnhancedDiff.C motionDiffs/file/fileDiff.C -LIB = $(FOAM_LIBBIN)/libcellDecompositionMotionSolver +LIB = $(FOAM_LIBBIN)/libtetMotionSolver diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/Make.faceDecomp/options b/src/dynamicMesh/meshMotion/tetMotionSolver/Make/options similarity index 64% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/Make.faceDecomp/options rename to src/dynamicMesh/meshMotion/tetMotionSolver/Make/options index 99c890660..5e8f4c45f 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/Make.faceDecomp/options +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/Make/options @@ -2,10 +2,9 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/tetDecompositionFiniteElement/lnInclude \ - -DFACE_DECOMP + -I$(LIB_SRC)/tetFiniteElement/lnInclude LIB_LIBS = \ -ldynamicMesh \ -lmeshTools \ - -lfaceDecompFiniteElement + -ltetFiniteElement diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/cellQuality/cellQuality.C b/src/dynamicMesh/meshMotion/tetMotionSolver/cellQuality/cellQuality.C similarity index 100% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/cellQuality/cellQuality.C rename to src/dynamicMesh/meshMotion/tetMotionSolver/cellQuality/cellQuality.C diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/cellQuality/cellQuality.H b/src/dynamicMesh/meshMotion/tetMotionSolver/cellQuality/cellQuality.H similarity index 100% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/cellQuality/cellQuality.H rename to src/dynamicMesh/meshMotion/tetMotionSolver/cellQuality/cellQuality.H diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/deformationEnergy/deformationEnergyDiff.C b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/deformationEnergy/deformationEnergyDiff.C similarity index 98% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/deformationEnergy/deformationEnergyDiff.C rename to src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/deformationEnergy/deformationEnergyDiff.C index bfe3d5996..e138320f0 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/deformationEnergy/deformationEnergyDiff.C +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/deformationEnergy/deformationEnergyDiff.C @@ -46,7 +46,7 @@ namespace Foam // Construct from components Foam::deformationEnergyDiff::deformationEnergyDiff ( - const tetDecompositionMotionSolver& mSolver + const tetMotionSolver& mSolver ) : motionDiff(mSolver), diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/deformationEnergy/deformationEnergyDiff.H b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/deformationEnergy/deformationEnergyDiff.H similarity index 98% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/deformationEnergy/deformationEnergyDiff.H rename to src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/deformationEnergy/deformationEnergyDiff.H index a17de4397..78168bd20 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/deformationEnergy/deformationEnergyDiff.H +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/deformationEnergy/deformationEnergyDiff.H @@ -85,7 +85,7 @@ public: //- Construct from components deformationEnergyDiff ( - const tetDecompositionMotionSolver& mSolver + const tetMotionSolver& mSolver ); diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/distortionEnergy/distortionEnergyDiff.C b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/distortionEnergy/distortionEnergyDiff.C similarity index 98% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/distortionEnergy/distortionEnergyDiff.C rename to src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/distortionEnergy/distortionEnergyDiff.C index 217a4336a..e800b1cd7 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/distortionEnergy/distortionEnergyDiff.C +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/distortionEnergy/distortionEnergyDiff.C @@ -46,7 +46,7 @@ namespace Foam // Construct from components Foam::distortionEnergyDiff::distortionEnergyDiff ( - const tetDecompositionMotionSolver& mSolver + const tetMotionSolver& mSolver ) : motionDiff(mSolver), diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/distortionEnergy/distortionEnergyDiff.H b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/distortionEnergy/distortionEnergyDiff.H similarity index 98% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/distortionEnergy/distortionEnergyDiff.H rename to src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/distortionEnergy/distortionEnergyDiff.H index b9db6605c..caa993d3c 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/distortionEnergy/distortionEnergyDiff.H +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/distortionEnergy/distortionEnergyDiff.H @@ -89,7 +89,7 @@ public: //- Construct from components distortionEnergyDiff ( - const tetDecompositionMotionSolver& mSolver + const tetMotionSolver& mSolver ); diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/exponential/exponentialDiff.C b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/exponential/exponentialDiff.C similarity index 97% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/exponential/exponentialDiff.C rename to src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/exponential/exponentialDiff.C index 1e7b4569f..f43f5e31d 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/exponential/exponentialDiff.C +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/exponential/exponentialDiff.C @@ -45,7 +45,7 @@ namespace Foam // Construct from components Foam::exponentialDiff::exponentialDiff ( - const tetDecompositionMotionSolver& mSolver + const tetMotionSolver& mSolver ) : linearDiff(mSolver) diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/exponential/exponentialDiff.H b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/exponential/exponentialDiff.H similarity index 97% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/exponential/exponentialDiff.H rename to src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/exponential/exponentialDiff.H index 005179142..4455734b9 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/exponential/exponentialDiff.H +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/exponential/exponentialDiff.H @@ -71,7 +71,7 @@ public: //- Construct from components exponentialDiff ( - const tetDecompositionMotionSolver& mSolver + const tetMotionSolver& mSolver ); diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/file/fileDiff.C b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/file/fileDiff.C similarity index 96% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/file/fileDiff.C rename to src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/file/fileDiff.C index d46a1c723..30b48669d 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/file/fileDiff.C +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/file/fileDiff.C @@ -46,7 +46,7 @@ namespace Foam // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // Construct from components -Foam::fileDiff::fileDiff(const tetDecompositionMotionSolver& mSolver) +Foam::fileDiff::fileDiff(const tetMotionSolver& mSolver) : motionDiff(mSolver), motionGamma_ diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/file/fileDiff.H b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/file/fileDiff.H similarity index 97% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/file/fileDiff.H rename to src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/file/fileDiff.H index b2dd12ad6..ad4531c19 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/file/fileDiff.H +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/file/fileDiff.H @@ -76,7 +76,7 @@ public: // Constructors //- Construct from components - fileDiff(const tetDecompositionMotionSolver& mSolver); + fileDiff(const tetMotionSolver& mSolver); // Destructor diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/linear/linearDiff.C b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/linear/linearDiff.C similarity index 97% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/linear/linearDiff.C rename to src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/linear/linearDiff.C index 821bee76a..c30c031ac 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/linear/linearDiff.C +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/linear/linearDiff.C @@ -45,7 +45,7 @@ namespace Foam // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // Construct from components -Foam::linearDiff::linearDiff(const tetDecompositionMotionSolver& mSolver) +Foam::linearDiff::linearDiff(const tetMotionSolver& mSolver) : motionDiff(mSolver), patchNames_(mSolver.lookup("distancePatches")), diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/linear/linearDiff.H b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/linear/linearDiff.H similarity index 98% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/linear/linearDiff.H rename to src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/linear/linearDiff.H index afa3ed231..71b4c2c29 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/linear/linearDiff.H +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/linear/linearDiff.H @@ -91,7 +91,7 @@ public: //- Construct from components linearDiff ( - const tetDecompositionMotionSolver& mSolver + const tetMotionSolver& mSolver ); diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/motionDiff/motionDiff.C b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/motionDiff/motionDiff.C similarity index 98% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/motionDiff/motionDiff.C rename to src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/motionDiff/motionDiff.C index bc0ec404c..9baa56c10 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/motionDiff/motionDiff.C +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/motionDiff/motionDiff.C @@ -42,7 +42,7 @@ namespace Foam Foam::autoPtr Foam::motionDiff::New ( - const tetDecompositionMotionSolver& mSolver + const tetMotionSolver& mSolver ) { const dictionary& dict = mSolver; diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/motionDiff/motionDiff.H b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/motionDiff/motionDiff.H similarity index 90% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/motionDiff/motionDiff.H rename to src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/motionDiff/motionDiff.H index 2c24cfbb9..20bf514a4 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/motionDiff/motionDiff.H +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/motionDiff/motionDiff.H @@ -38,7 +38,7 @@ SourceFiles #include "tetPolyMesh.H" #include "elementFieldsFwd.H" -#include "tetDecompositionMotionSolver.H" +#include "tetMotionSolver.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -56,7 +56,7 @@ private: // Private data //- Mesh reference - const tetDecompositionMotionSolver& mSolver_; + const tetMotionSolver& mSolver_; public: @@ -73,7 +73,7 @@ public: motionDiff, dictionary, ( - const tetDecompositionMotionSolver& mSolver + const tetMotionSolver& mSolver ), (mSolver) ); @@ -84,14 +84,14 @@ public: //- Select null constructed static autoPtr New ( - const tetDecompositionMotionSolver& mSolver + const tetMotionSolver& mSolver ); // Constructors //- Construct from components - motionDiff(const tetDecompositionMotionSolver& mSolver) + motionDiff(const tetMotionSolver& mSolver) : mSolver_(mSolver) {} @@ -105,7 +105,7 @@ public: // Member Functions //- Return reference to mesh - const tetDecompositionMotionSolver& mSolver() const + const tetMotionSolver& mSolver() const { return mSolver_; } diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/patchEnhanced/patchEnhancedDiff.C b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/patchEnhanced/patchEnhancedDiff.C similarity index 98% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/patchEnhanced/patchEnhancedDiff.C rename to src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/patchEnhanced/patchEnhancedDiff.C index a66661fbb..1532c1fe8 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/patchEnhanced/patchEnhancedDiff.C +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/patchEnhanced/patchEnhancedDiff.C @@ -45,7 +45,7 @@ namespace Foam // Construct from components Foam::patchEnhancedDiff::patchEnhancedDiff ( - const tetDecompositionMotionSolver& mSolver + const tetMotionSolver& mSolver ) : motionDiff(mSolver), diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/patchEnhanced/patchEnhancedDiff.H b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/patchEnhanced/patchEnhancedDiff.H similarity index 98% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/patchEnhanced/patchEnhancedDiff.H rename to src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/patchEnhanced/patchEnhancedDiff.H index 979bd92a0..7f4fa8591 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/patchEnhanced/patchEnhancedDiff.H +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/patchEnhanced/patchEnhancedDiff.H @@ -81,7 +81,7 @@ public: //- Construct from components patchEnhancedDiff ( - const tetDecompositionMotionSolver& mSolver + const tetMotionSolver& mSolver ); diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/quadratic/quadraticDiff.C b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/quadratic/quadraticDiff.C similarity index 97% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/quadratic/quadraticDiff.C rename to src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/quadratic/quadraticDiff.C index 9c02a419e..ccd3e6559 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/quadratic/quadraticDiff.C +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/quadratic/quadraticDiff.C @@ -45,7 +45,7 @@ namespace Foam // Construct from components Foam::quadraticDiff::quadraticDiff ( - const tetDecompositionMotionSolver& mSolver + const tetMotionSolver& mSolver ) : linearDiff(mSolver) diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/quadratic/quadraticDiff.H b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/quadratic/quadraticDiff.H similarity index 97% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/quadratic/quadraticDiff.H rename to src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/quadratic/quadraticDiff.H index 83b8a3f4d..4690a95a2 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/quadratic/quadraticDiff.H +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/quadratic/quadraticDiff.H @@ -71,7 +71,7 @@ public: //- Construct from components quadraticDiff ( - const tetDecompositionMotionSolver& mSolver + const tetMotionSolver& mSolver ); diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/uniform/uniformDiff.C b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/uniform/uniformDiff.C similarity index 96% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/uniform/uniformDiff.C rename to src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/uniform/uniformDiff.C index 105e4e6fe..82c66119b 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/uniform/uniformDiff.C +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/uniform/uniformDiff.C @@ -46,7 +46,7 @@ namespace Foam // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // Construct from components -Foam::uniformDiff::uniformDiff(const tetDecompositionMotionSolver& mSolver) +Foam::uniformDiff::uniformDiff(const tetMotionSolver& mSolver) : motionDiff(mSolver), motionGamma_ diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/uniform/uniformDiff.H b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/uniform/uniformDiff.H similarity index 98% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/uniform/uniformDiff.H rename to src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/uniform/uniformDiff.H index 6deb42c43..bd3321493 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/uniform/uniformDiff.H +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/uniform/uniformDiff.H @@ -80,7 +80,7 @@ public: //- Construct from components uniformDiff ( - const tetDecompositionMotionSolver& mSolver + const tetMotionSolver& mSolver ); diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/tetDecompositionMotionSolver/laplace/laplaceTetDecompositionMotionSolver.C b/src/dynamicMesh/meshMotion/tetMotionSolver/tetMotionSolver/laplace/laplaceTetMotionSolver.C similarity index 85% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/tetDecompositionMotionSolver/laplace/laplaceTetDecompositionMotionSolver.C rename to src/dynamicMesh/meshMotion/tetMotionSolver/tetMotionSolver/laplace/laplaceTetMotionSolver.C index dddf9bb23..51bc5a809 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/tetDecompositionMotionSolver/laplace/laplaceTetDecompositionMotionSolver.C +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/tetMotionSolver/laplace/laplaceTetMotionSolver.C @@ -29,7 +29,7 @@ Description \*---------------------------------------------------------------------------*/ -#include "laplaceTetDecompositionMotionSolver.H" +#include "laplaceTetMotionSolver.H" #include "motionDiff.H" #include "addToRunTimeSelectionTable.H" #include "tetFem.H" @@ -40,11 +40,11 @@ Description namespace Foam { - defineTypeNameAndDebug(laplaceTetDecompositionMotionSolver, 0); + defineTypeNameAndDebug(laplaceTetMotionSolver, 0); addToRunTimeSelectionTable ( - tetDecompositionMotionSolver, - laplaceTetDecompositionMotionSolver, + tetMotionSolver, + laplaceTetMotionSolver, dictionary ); } @@ -52,13 +52,13 @@ namespace Foam // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // Construct from components -Foam::laplaceTetDecompositionMotionSolver::laplaceTetDecompositionMotionSolver +Foam::laplaceTetMotionSolver::laplaceTetMotionSolver ( const polyMesh& mesh, Istream& ) : - tetDecompositionMotionSolver(mesh), + tetMotionSolver(mesh), diffusionPtr_(motionDiff::New(*this).ptr()), firstMotion_(true), solverPerf_() @@ -69,8 +69,8 @@ Foam::laplaceTetDecompositionMotionSolver::laplaceTetDecompositionMotionSolver // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::laplaceTetDecompositionMotionSolver:: -~laplaceTetDecompositionMotionSolver() +Foam::laplaceTetMotionSolver:: +~laplaceTetMotionSolver() { deleteDemandDrivenData(diffusionPtr_); } @@ -78,7 +78,7 @@ Foam::laplaceTetDecompositionMotionSolver:: // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void Foam::laplaceTetDecompositionMotionSolver::solve() +void Foam::laplaceTetMotionSolver::solve() { // Solve for mesh motion @@ -126,13 +126,13 @@ void Foam::laplaceTetDecompositionMotionSolver::solve() } -void Foam::laplaceTetDecompositionMotionSolver::updateMesh +void Foam::laplaceTetMotionSolver::updateMesh ( const mapPolyMesh& mpm ) { firstMotion_ = true; - tetDecompositionMotionSolver::updateMesh(mpm); + tetMotionSolver::updateMesh(mpm); } diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/tetDecompositionMotionSolver/laplace/laplaceTetDecompositionMotionSolver.H b/src/dynamicMesh/meshMotion/tetMotionSolver/tetMotionSolver/laplace/laplaceTetMotionSolver.H similarity index 80% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/tetDecompositionMotionSolver/laplace/laplaceTetDecompositionMotionSolver.H rename to src/dynamicMesh/meshMotion/tetMotionSolver/tetMotionSolver/laplace/laplaceTetMotionSolver.H index f79df053b..d5d27420f 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/tetDecompositionMotionSolver/laplace/laplaceTetDecompositionMotionSolver.H +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/tetMotionSolver/laplace/laplaceTetMotionSolver.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - laplaceTetDecompositionMotionSolver + laplaceTetMotionSolver Description Mesh motion solver for a polyMesh. Based on solving the @@ -31,14 +31,14 @@ Description boundary condition on the motion velocity variable motionU. SourceFiles - laplaceTetDecompositionMotionSolver.C + laplaceTetMotionSolver.C \*---------------------------------------------------------------------------*/ -#ifndef laplaceTetDecompositionMotionSolver_H -#define laplaceTetDecompositionMotionSolver_H +#ifndef laplaceTetMotionSolver_H +#define laplaceTetMotionSolver_H -#include "tetDecompositionMotionSolver.H" +#include "tetMotionSolver.H" #include "tetPolyMesh.H" #include "tetPointFields.H" #include "elementFields.H" @@ -54,12 +54,12 @@ namespace Foam class motionDiff; /*---------------------------------------------------------------------------*\ - Class laplaceTetDecompositionMotionSolver Declaration + Class laplaceTetMotionSolver Declaration \*---------------------------------------------------------------------------*/ -class laplaceTetDecompositionMotionSolver +class laplaceTetMotionSolver : - public tetDecompositionMotionSolver + public tetMotionSolver { // Private data @@ -67,13 +67,13 @@ class laplaceTetDecompositionMotionSolver // Private Member Functions //- Disallow default bitwise copy construct - laplaceTetDecompositionMotionSolver + laplaceTetMotionSolver ( - const laplaceTetDecompositionMotionSolver& + const laplaceTetMotionSolver& ); //- Disallow default bitwise assignment - void operator=(const laplaceTetDecompositionMotionSolver&); + void operator=(const laplaceTetMotionSolver&); protected: @@ -100,18 +100,12 @@ protected: public: //- Runtime type information -#ifdef CELL_DECOMP - TypeName("laplaceCellDecomposition"); -#elif defined(FACE_DECOMP) - TypeName("laplaceFaceDecomposition"); -#else -#error Undefined: cell or face decomposition -#endif + TypeName("laplace"); // Constructors - laplaceTetDecompositionMotionSolver + laplaceTetMotionSolver ( const polyMesh& mesh, Istream& msData @@ -120,7 +114,7 @@ public: // Destructor - virtual ~laplaceTetDecompositionMotionSolver(); + virtual ~laplaceTetMotionSolver(); // Member Functions diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/tetDecompositionMotionSolver/pseudoSolid/pseudoSolidTetDecompositionMotionSolver.C b/src/dynamicMesh/meshMotion/tetMotionSolver/tetMotionSolver/pseudoSolid/pseudoSolidTetMotionSolver.C similarity index 87% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/tetDecompositionMotionSolver/pseudoSolid/pseudoSolidTetDecompositionMotionSolver.C rename to src/dynamicMesh/meshMotion/tetMotionSolver/tetMotionSolver/pseudoSolid/pseudoSolidTetMotionSolver.C index a8df39f31..ca61f0b45 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/tetDecompositionMotionSolver/pseudoSolid/pseudoSolidTetDecompositionMotionSolver.C +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/tetMotionSolver/pseudoSolid/pseudoSolidTetMotionSolver.C @@ -29,7 +29,7 @@ Description \*---------------------------------------------------------------------------*/ -#include "pseudoSolidTetDecompositionMotionSolver.H" +#include "pseudoSolidTetMotionSolver.H" #include "motionDiff.H" #include "addToRunTimeSelectionTable.H" #include "tetFem.H" @@ -38,11 +38,11 @@ Description namespace Foam { - defineTypeNameAndDebug(pseudoSolidTetDecompositionMotionSolver, 0); + defineTypeNameAndDebug(pseudoSolidTetMotionSolver, 0); addToRunTimeSelectionTable ( - tetDecompositionMotionSolver, - pseudoSolidTetDecompositionMotionSolver, + tetMotionSolver, + pseudoSolidTetMotionSolver, dictionary ); } @@ -51,14 +51,14 @@ namespace Foam // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // Construct from components -Foam::pseudoSolidTetDecompositionMotionSolver:: -pseudoSolidTetDecompositionMotionSolver +Foam::pseudoSolidTetMotionSolver:: +pseudoSolidTetMotionSolver ( const polyMesh& mesh, Istream& msData ) : - laplaceTetDecompositionMotionSolver(mesh, msData) + laplaceTetMotionSolver(mesh, msData) { const dictionary& pseudoSolidDic = subDict("pseudoSolid"); @@ -74,14 +74,14 @@ pseudoSolidTetDecompositionMotionSolver // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::pseudoSolidTetDecompositionMotionSolver:: -~pseudoSolidTetDecompositionMotionSolver() +Foam::pseudoSolidTetMotionSolver:: +~pseudoSolidTetMotionSolver() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void Foam::pseudoSolidTetDecompositionMotionSolver::solve() +void Foam::pseudoSolidTetMotionSolver::solve() { // Solve for mesh motion diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/tetDecompositionMotionSolver/pseudoSolid/pseudoSolidTetDecompositionMotionSolver.H b/src/dynamicMesh/meshMotion/tetMotionSolver/tetMotionSolver/pseudoSolid/pseudoSolidTetMotionSolver.H similarity index 76% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/tetDecompositionMotionSolver/pseudoSolid/pseudoSolidTetDecompositionMotionSolver.H rename to src/dynamicMesh/meshMotion/tetMotionSolver/tetMotionSolver/pseudoSolid/pseudoSolidTetMotionSolver.H index d33f24b4c..2cacb3548 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/tetDecompositionMotionSolver/pseudoSolid/pseudoSolidTetDecompositionMotionSolver.H +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/tetMotionSolver/pseudoSolid/pseudoSolidTetMotionSolver.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - pseudoSolidTetDecompositionMotionSolver + pseudoSolidTetMotionSolver Description Mesh motion solver for a polyMesh. Based on solving the @@ -34,14 +34,14 @@ Description as Lame's constant \mu SourceFiles - pseudoSolidTetDecompositionMotionSolver.C + pseudoSolidTetMotionSolver.C \*---------------------------------------------------------------------------*/ -#ifndef pseudoSolidTetDecompositionMotionSolver_H -#define pseudoSolidTetDecompositionMotionSolver_H +#ifndef pseudoSolidTetMotionSolver_H +#define pseudoSolidTetMotionSolver_H -#include "laplaceTetDecompositionMotionSolver.H" +#include "laplaceTetMotionSolver.H" #include "tetPolyMesh.H" #include "tetPointFields.H" @@ -53,12 +53,12 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class pseudoSolidTetDecompositionMotionSolver Declaration + Class pseudoSolidTetMotionSolver Declaration \*---------------------------------------------------------------------------*/ -class pseudoSolidTetDecompositionMotionSolver +class pseudoSolidTetMotionSolver : - public laplaceTetDecompositionMotionSolver + public laplaceTetMotionSolver { // Private data @@ -75,30 +75,24 @@ class pseudoSolidTetDecompositionMotionSolver // Private Member Functions //- Disallow default bitwise copy construct - pseudoSolidTetDecompositionMotionSolver + pseudoSolidTetMotionSolver ( - const pseudoSolidTetDecompositionMotionSolver& + const pseudoSolidTetMotionSolver& ); //- Disallow default bitwise assignment - void operator=(const pseudoSolidTetDecompositionMotionSolver&); + void operator=(const pseudoSolidTetMotionSolver&); public: //- Runtime type information -#ifdef CELL_DECOMP - TypeName("pseudoSolidCellDecomposition"); -#elif defined(FACE_DECOMP) - TypeName("pseudoSolidFaceDecomposition"); -#else -#error Undefined: cell or face decomposition -#endif + TypeName("pseudoSolid"); // Constructors - pseudoSolidTetDecompositionMotionSolver + pseudoSolidTetMotionSolver ( const polyMesh& mesh, Istream& msData @@ -107,7 +101,7 @@ public: // Destructor - virtual ~pseudoSolidTetDecompositionMotionSolver(); + virtual ~pseudoSolidTetMotionSolver(); // Member Functions diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/tetDecompositionMotionSolver/tetDecompositionMotionSolver.C b/src/dynamicMesh/meshMotion/tetMotionSolver/tetMotionSolver/tetMotionSolver.C similarity index 87% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/tetDecompositionMotionSolver/tetDecompositionMotionSolver.C rename to src/dynamicMesh/meshMotion/tetMotionSolver/tetMotionSolver/tetMotionSolver.C index 6ed7b9700..c195d623f 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/tetDecompositionMotionSolver/tetDecompositionMotionSolver.C +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/tetMotionSolver/tetMotionSolver.C @@ -27,19 +27,19 @@ Description \*---------------------------------------------------------------------------*/ -#include "tetDecompositionMotionSolver.H" +#include "tetMotionSolver.H" #include "tetFec.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - defineTypeNameAndDebug(tetDecompositionMotionSolver, 0); + defineTypeNameAndDebug(tetMotionSolver, 0); } // * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * // -void Foam::tetDecompositionMotionSolver::applyConstraints +void Foam::tetMotionSolver::applyConstraints ( tetFemVectorMatrix& matrix ) @@ -53,7 +53,7 @@ void Foam::tetDecompositionMotionSolver::applyConstraints // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::tetDecompositionMotionSolver::tetDecompositionMotionSolver +Foam::tetMotionSolver::tetMotionSolver ( const polyMesh& mesh ) @@ -80,7 +80,7 @@ Foam::tetDecompositionMotionSolver::tetDecompositionMotionSolver // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::tetDecompositionMotionSolver::~tetDecompositionMotionSolver() +Foam::tetMotionSolver::~tetMotionSolver() { deleteDemandDrivenData(totDisplacementPtr_); } @@ -89,7 +89,7 @@ Foam::tetDecompositionMotionSolver::~tetDecompositionMotionSolver() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // Foam::tmp -Foam::tetDecompositionMotionSolver::curPoints() const +Foam::tetMotionSolver::curPoints() const { // Process current point positions @@ -120,7 +120,7 @@ Foam::tetDecompositionMotionSolver::curPoints() const } -void Foam::tetDecompositionMotionSolver::setConstraint +void Foam::tetMotionSolver::setConstraint ( const label pointID, const vector& fixedVel @@ -132,14 +132,14 @@ void Foam::tetDecompositionMotionSolver::setConstraint } -void Foam::tetDecompositionMotionSolver::clearConstraints() +void Foam::tetMotionSolver::clearConstraints() { fixedPoints_.clear(); fixedVelocity_.clear(); } -void Foam::tetDecompositionMotionSolver::updateMesh(const mapPolyMesh& mpm) +void Foam::tetMotionSolver::updateMesh(const mapPolyMesh& mpm) { tetPolyMeshMapper mapper(tetMesh_, mpm); tetMesh_.updateMesh(mapper); @@ -152,7 +152,7 @@ void Foam::tetDecompositionMotionSolver::updateMesh(const mapPolyMesh& mpm) Foam::tmp -Foam::tetDecompositionMotionSolver::distortionEnergy() const +Foam::tetMotionSolver::distortionEnergy() const { tmp tUd ( @@ -184,7 +184,7 @@ Foam::tetDecompositionMotionSolver::distortionEnergy() const Foam::tmp -Foam::tetDecompositionMotionSolver::deformationEnergy() const +Foam::tetMotionSolver::deformationEnergy() const { tmp tUd ( @@ -219,7 +219,7 @@ Foam::tetDecompositionMotionSolver::deformationEnergy() const Foam::tmp -Foam::tetDecompositionMotionSolver::totDistortionEnergy() const +Foam::tetMotionSolver::totDistortionEnergy() const { tmp tUd ( @@ -244,9 +244,9 @@ Foam::tetDecompositionMotionSolver::totDistortionEnergy() const { FatalErrorIn ( - "tetDecompositionMotionSolver::totDeformationEnergy()" + "tetMotionSolver::totDeformationEnergy()" ) << "Total displacement field is not stored " - << "in tetDecompositionMotionSolver object." << endl + << "in tetMotionSolver object." << endl << exit(FatalError); } @@ -261,7 +261,7 @@ Foam::tetDecompositionMotionSolver::totDistortionEnergy() const Foam::tmp -Foam::tetDecompositionMotionSolver::totDeformationEnergy() const +Foam::tetMotionSolver::totDeformationEnergy() const { tmp tUd ( @@ -286,7 +286,7 @@ Foam::tetDecompositionMotionSolver::totDeformationEnergy() const { FatalErrorIn ( - "tetDecompositionMotionSolver::totDistortionEnergy()" + "tetMotionSolver::totDistortionEnergy()" ) << "Total displacement field is not stored." << endl << exit(FatalError); } diff --git a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/tetDecompositionMotionSolver/tetDecompositionMotionSolver.H b/src/dynamicMesh/meshMotion/tetMotionSolver/tetMotionSolver/tetMotionSolver.H similarity index 91% rename from src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/tetDecompositionMotionSolver/tetDecompositionMotionSolver.H rename to src/dynamicMesh/meshMotion/tetMotionSolver/tetMotionSolver/tetMotionSolver.H index fef59477c..937228f0b 100644 --- a/src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/tetDecompositionMotionSolver/tetDecompositionMotionSolver.H +++ b/src/dynamicMesh/meshMotion/tetMotionSolver/tetMotionSolver/tetMotionSolver.H @@ -23,18 +23,18 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - tetDecompositionMotionSolver + tetMotionSolver Description Virtual base class for tetDecomposition mesh motion solvers. SourceFiles - tetDecompositionMotionSolver.C + tetMotionSolver.C \*---------------------------------------------------------------------------*/ -#ifndef tetDecompositionMotionSolver_H -#define tetDecompositionMotionSolver_H +#ifndef tetMotionSolver_H +#define tetMotionSolver_H #include "motionSolver.H" #include "polyMesh.H" @@ -51,10 +51,10 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class tetDecompositionMotionSolver Declaration + Class tetMotionSolver Declaration \*---------------------------------------------------------------------------*/ -class tetDecompositionMotionSolver +class tetMotionSolver : public motionSolver { @@ -87,23 +87,18 @@ protected: public: //- Runtime type information -#ifdef CELL_DECOMP - TypeName("cellDecompositionMotionSolver"); -#elif defined(FACE_DECOMP) - TypeName("faceDecompositionMotionSolver"); -#else -#error Undefined: cell or face decomposition -#endif + TypeName("tetMotionSolver"); + // Constructors //- Construct from components - tetDecompositionMotionSolver(const polyMesh& mesh); + tetMotionSolver(const polyMesh& mesh); // Destructor - virtual ~tetDecompositionMotionSolver(); + virtual ~tetMotionSolver(); // Member Functions diff --git a/src/dynamicMesh/topoChangerFvMesh/Make/options b/src/dynamicMesh/topoChangerFvMesh/Make/options index 0b21616b7..f5388862a 100644 --- a/src/dynamicMesh/topoChangerFvMesh/Make/options +++ b/src/dynamicMesh/topoChangerFvMesh/Make/options @@ -4,9 +4,8 @@ EXE_INC = \ -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/meshMotion/solidBodyMotion/lnInclude \ - -I$(LIB_SRC)/dynamicMesh/meshMotion/tetDecompositionMotionSolver/lnInclude \ - -I$(LIB_SRC)/tetDecompositionFiniteElement/lnInclude \ - $(WM_DECOMP_INC) + -I$(LIB_SRC)/tetFiniteElement/lnInclude \ + -I$(LIB_SRC)/dynamicMesh/meshMotion/tetMotionSolver/lnInclude LIB_LIBS = \ -lfiniteVolume \ @@ -14,4 +13,5 @@ LIB_LIBS = \ -ldynamicMesh \ -lmeshTools \ -lsolidBodyMotion \ - $(WM_DECOMP_LIBS) + -ltetFiniteElement \ + -ltetMotionSolver diff --git a/src/engine/Make/options b/src/engine/Make/options index a2d5c5eec..8de3b34ab 100644 --- a/src/engine/Make/options +++ b/src/engine/Make/options @@ -6,9 +6,8 @@ EXE_INC = \ -I$(LIB_SRC)/dynamicMesh/dynamicFvMesh/lnInclude \ -I$(LIB_SRC)/dynamicMesh/topoChangerFvMesh/lnInclude \ -I$(LIB_SRC)/dynamicMesh/meshMotion/fvMotionSolver/lnInclude \ - -I$(LIB_SRC)/tetDecompositionFiniteElement/lnInclude \ - -I$(LIB_SRC)/dynamicMesh/meshMotion/tetDecompositionMotionSolver/lnInclude \ - $(WM_DECOMP_INC) + -I$(LIB_SRC)/tetFiniteElement/lnInclude \ + -I$(LIB_SRC)/dynamicMesh/meshMotion/tetMotionSolver/lnInclude LIB_LIBS = \ -lfiniteVolume \ @@ -18,4 +17,4 @@ LIB_LIBS = \ -ldynamicFvMesh \ -ltopoChangerFvMesh \ -lfvMotionSolver \ - $(WM_DECOMP_LIBS) + -ltetFiniteElement -ltetMotionSolver diff --git a/src/engine/engineTopoChangerMesh/accordionEngineMesh/accordionEngineMesh.C b/src/engine/engineTopoChangerMesh/accordionEngineMesh/accordionEngineMesh.C index 6ab39bd14..c6936a28e 100644 --- a/src/engine/engineTopoChangerMesh/accordionEngineMesh/accordionEngineMesh.C +++ b/src/engine/engineTopoChangerMesh/accordionEngineMesh/accordionEngineMesh.C @@ -37,7 +37,7 @@ License #include "fvPatchField.H" #include "Switch.H" #include "symmetryFvPatch.H" -#include "tetDecompositionMotionSolver.H" +#include "tetMotionSolver.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/engine/engineTopoChangerMesh/accordionEngineMesh/accordionEngineMeshMove.C b/src/engine/engineTopoChangerMesh/accordionEngineMesh/accordionEngineMeshMove.C index 2847481eb..1d4b163e6 100644 --- a/src/engine/engineTopoChangerMesh/accordionEngineMesh/accordionEngineMeshMove.C +++ b/src/engine/engineTopoChangerMesh/accordionEngineMesh/accordionEngineMeshMove.C @@ -43,7 +43,7 @@ License #include "wedgeFvPatch.H" #include "emptyFvPatch.H" #include "zeroGradientTetPolyPatchFields.H" -#include "tetDecompositionMotionSolver.H" +#include "tetMotionSolver.H" #include "fixedValueTetPolyPatchFields.H" #include "mixedTetPolyPatchFields.H" @@ -57,8 +57,8 @@ License bool Foam::accordionEngineMesh::update() { - tetDecompositionMotionSolver& mSolver = - refCast(msPtr_()); + tetMotionSolver& mSolver = + refCast(msPtr_()); scalar deltaZ = engTime().pistonDisplacement().value(); diff --git a/src/engine/engineTopoChangerMesh/accordionEngineMesh/addAccordionEngineMeshZones.C b/src/engine/engineTopoChangerMesh/accordionEngineMesh/addAccordionEngineMeshZones.C index fde0b9f58..d3a174f4e 100644 --- a/src/engine/engineTopoChangerMesh/accordionEngineMesh/addAccordionEngineMeshZones.C +++ b/src/engine/engineTopoChangerMesh/accordionEngineMesh/addAccordionEngineMeshZones.C @@ -31,7 +31,7 @@ License #include "attachDetachFunctions.H" #include "directTopoChange.H" #include "zeroGradientTetPolyPatchFields.H" -#include "tetDecompositionMotionSolver.H" +#include "tetMotionSolver.H" #include "fixedValueTetPolyPatchFields.H" #include "mixedTetPolyPatchFields.H" diff --git a/src/engine/engineTopoChangerMesh/deformingEngineMesh/addDeformingEngineMeshZones.C b/src/engine/engineTopoChangerMesh/deformingEngineMesh/addDeformingEngineMeshZones.C index 3b1d94b48..61ac376b5 100644 --- a/src/engine/engineTopoChangerMesh/deformingEngineMesh/addDeformingEngineMeshZones.C +++ b/src/engine/engineTopoChangerMesh/deformingEngineMesh/addDeformingEngineMeshZones.C @@ -29,7 +29,7 @@ License #include "regionSplit.H" #include "directTopoChange.H" #include "zeroGradientTetPolyPatchFields.H" -#include "tetDecompositionMotionSolver.H" +#include "tetMotionSolver.H" #include "fixedValueTetPolyPatchFields.H" #include "mixedTetPolyPatchFields.H" diff --git a/src/engine/engineTopoChangerMesh/deformingEngineMesh/deformingEngineMesh.C b/src/engine/engineTopoChangerMesh/deformingEngineMesh/deformingEngineMesh.C index 4cbb70adc..a65202078 100644 --- a/src/engine/engineTopoChangerMesh/deformingEngineMesh/deformingEngineMesh.C +++ b/src/engine/engineTopoChangerMesh/deformingEngineMesh/deformingEngineMesh.C @@ -36,7 +36,7 @@ License #include "fvPatchField.H" #include "Switch.H" #include "symmetryFvPatch.H" -#include "tetDecompositionMotionSolver.H" +#include "tetMotionSolver.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/engine/engineTopoChangerMesh/deformingEngineMesh/deformingEngineMeshMove.C b/src/engine/engineTopoChangerMesh/deformingEngineMesh/deformingEngineMeshMove.C index 18f40af77..dd18b8594 100644 --- a/src/engine/engineTopoChangerMesh/deformingEngineMesh/deformingEngineMeshMove.C +++ b/src/engine/engineTopoChangerMesh/deformingEngineMesh/deformingEngineMeshMove.C @@ -43,7 +43,7 @@ License #include "wedgeFvPatch.H" #include "emptyFvPatch.H" #include "zeroGradientTetPolyPatchFields.H" -#include "tetDecompositionMotionSolver.H" +#include "tetMotionSolver.H" #include "fixedValueTetPolyPatchFields.H" #include "mixedTetPolyPatchFields.H" @@ -54,8 +54,8 @@ License bool Foam::deformingEngineMesh::update() { - tetDecompositionMotionSolver& mSolver = - refCast(msPtr_()); + tetMotionSolver& mSolver = + refCast(msPtr_()); scalar deltaZ = engTime().pistonDisplacement().value(); diff --git a/src/engine/engineTopoChangerMesh/engineValveSliding/engineValveSliding.C b/src/engine/engineTopoChangerMesh/engineValveSliding/engineValveSliding.C index bf31cc7ef..ef7f95720 100644 --- a/src/engine/engineTopoChangerMesh/engineValveSliding/engineValveSliding.C +++ b/src/engine/engineTopoChangerMesh/engineValveSliding/engineValveSliding.C @@ -41,7 +41,7 @@ Class #include "fvPatchField.H" #include "Switch.H" #include "symmetryFvPatch.H" -#include "tetDecompositionMotionSolver.H" +#include "tetMotionSolver.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/engine/engineTopoChangerMesh/engineValveSliding/engineValveSlidingMove.C b/src/engine/engineTopoChangerMesh/engineValveSliding/engineValveSlidingMove.C index 6ac1f72aa..bd8f39ec2 100644 --- a/src/engine/engineTopoChangerMesh/engineValveSliding/engineValveSlidingMove.C +++ b/src/engine/engineTopoChangerMesh/engineValveSliding/engineValveSlidingMove.C @@ -48,7 +48,7 @@ Class #include "wedgeFvPatch.H" #include "emptyFvPatch.H" #include "zeroGradientTetPolyPatchFields.H" -#include "tetDecompositionMotionSolver.H" +#include "tetMotionSolver.H" #include "fixedValueTetPolyPatchFields.H" #include "mixedTetPolyPatchFields.H" @@ -316,8 +316,8 @@ void Foam::engineValveSliding::prepareValveDetach() bool Foam::engineValveSliding::update() { - tetDecompositionMotionSolver& mSolver = - refCast(msPtr_()); + tetMotionSolver& mSolver = + refCast(msPtr_()); // Detaching the interfacethobois2DSlidingDeform if (attached()) diff --git a/src/engine/engineTopoChangerMesh/layerSmooth/layerSmoothMove.C b/src/engine/engineTopoChangerMesh/layerSmooth/layerSmoothMove.C index 75d801893..b8f4297b6 100644 --- a/src/engine/engineTopoChangerMesh/layerSmooth/layerSmoothMove.C +++ b/src/engine/engineTopoChangerMesh/layerSmooth/layerSmoothMove.C @@ -45,7 +45,7 @@ License #include "wedgeFvPatch.H" #include "emptyFvPatch.H" #include "zeroGradientTetPolyPatchFields.H" -#include "tetDecompositionMotionSolver.H" +#include "tetMotionSolver.H" #include "fixedValueTetPolyPatchFields.H" #include "mixedTetPolyPatchFields.H" @@ -243,8 +243,8 @@ bool Foam::layerSmooth::update() Info << "bool Foam::layerSmooth::update()" << endl; - tetDecompositionMotionSolver& mSolver = - refCast(msPtr_()); + tetMotionSolver& mSolver = + refCast(msPtr_()); tetPointVectorField& motionU = mSolver.motionU(); diff --git a/src/engine/engineTopoChangerMesh/pistonSliding/pistonSliding.C b/src/engine/engineTopoChangerMesh/pistonSliding/pistonSliding.C index 0e6715897..ed9b26aa4 100644 --- a/src/engine/engineTopoChangerMesh/pistonSliding/pistonSliding.C +++ b/src/engine/engineTopoChangerMesh/pistonSliding/pistonSliding.C @@ -41,7 +41,7 @@ Class #include "fvPatchField.H" #include "Switch.H" #include "symmetryFvPatch.H" -#include "tetDecompositionMotionSolver.H" +#include "tetMotionSolver.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/engine/engineTopoChangerMesh/pistonSliding/pistonSlidingMove.C b/src/engine/engineTopoChangerMesh/pistonSliding/pistonSlidingMove.C index 5aa152ba6..813b34b2c 100644 --- a/src/engine/engineTopoChangerMesh/pistonSliding/pistonSlidingMove.C +++ b/src/engine/engineTopoChangerMesh/pistonSliding/pistonSlidingMove.C @@ -48,7 +48,7 @@ Class #include "wedgeFvPatch.H" #include "emptyFvPatch.H" #include "zeroGradientTetPolyPatchFields.H" -#include "tetDecompositionMotionSolver.H" +#include "tetMotionSolver.H" #include "fixedValueTetPolyPatchFields.H" #include "mixedTetPolyPatchFields.H" @@ -316,8 +316,8 @@ void Foam::pistonSliding::prepareValveDetach() bool Foam::pistonSliding::update() { - tetDecompositionMotionSolver& mSolver = - refCast(msPtr_()); + tetMotionSolver& mSolver = + refCast(msPtr_()); // Detaching the interfacethobois2DSlidingDeform if (attached()) diff --git a/src/engine/engineTopoChangerMesh/thoboisMesh/thoboisMesh.C b/src/engine/engineTopoChangerMesh/thoboisMesh/thoboisMesh.C index 9730e7c5f..16c7b8a25 100644 --- a/src/engine/engineTopoChangerMesh/thoboisMesh/thoboisMesh.C +++ b/src/engine/engineTopoChangerMesh/thoboisMesh/thoboisMesh.C @@ -38,7 +38,7 @@ License #include "fvPatchField.H" #include "Switch.H" #include "symmetryFvPatch.H" -#include "tetDecompositionMotionSolver.H" +#include "tetMotionSolver.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/engine/engineTopoChangerMesh/thoboisMesh/thoboisMeshMove.C b/src/engine/engineTopoChangerMesh/thoboisMesh/thoboisMeshMove.C index a5eea6374..142fdc128 100644 --- a/src/engine/engineTopoChangerMesh/thoboisMesh/thoboisMeshMove.C +++ b/src/engine/engineTopoChangerMesh/thoboisMesh/thoboisMeshMove.C @@ -46,7 +46,7 @@ License #include "wedgeFvPatch.H" #include "emptyFvPatch.H" #include "zeroGradientTetPolyPatchFields.H" -#include "tetDecompositionMotionSolver.H" +#include "tetMotionSolver.H" #include "fixedValueTetPolyPatchFields.H" #include "mixedTetPolyPatchFields.H" @@ -249,8 +249,8 @@ void Foam::thoboisMesh::prepareValveDetach() bool Foam::thoboisMesh::update() { Info << "bool Foam::layerSmooth::update()" << endl; - tetDecompositionMotionSolver& mSolver = - refCast(msPtr_()); + tetMotionSolver& mSolver = + refCast(msPtr_()); tetPointVectorField& motionU = mSolver.motionU(); diff --git a/src/engine/engineTopoChangerMesh/thoboisSliding/thoboisSliding.C b/src/engine/engineTopoChangerMesh/thoboisSliding/thoboisSliding.C index 771ff9f8a..6c46fef24 100644 --- a/src/engine/engineTopoChangerMesh/thoboisSliding/thoboisSliding.C +++ b/src/engine/engineTopoChangerMesh/thoboisSliding/thoboisSliding.C @@ -41,7 +41,7 @@ Class #include "fvPatchField.H" #include "Switch.H" #include "symmetryFvPatch.H" -#include "tetDecompositionMotionSolver.H" +#include "tetMotionSolver.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // diff --git a/src/engine/engineTopoChangerMesh/thoboisSliding/thoboisSlidingMove.C b/src/engine/engineTopoChangerMesh/thoboisSliding/thoboisSlidingMove.C index 495baf03c..96ba7b770 100644 --- a/src/engine/engineTopoChangerMesh/thoboisSliding/thoboisSlidingMove.C +++ b/src/engine/engineTopoChangerMesh/thoboisSliding/thoboisSlidingMove.C @@ -48,7 +48,7 @@ Class #include "wedgeFvPatch.H" #include "emptyFvPatch.H" #include "zeroGradientTetPolyPatchFields.H" -#include "tetDecompositionMotionSolver.H" +#include "tetMotionSolver.H" #include "fixedValueTetPolyPatchFields.H" #include "mixedTetPolyPatchFields.H" @@ -316,8 +316,8 @@ void Foam::thoboisSliding::prepareValveDetach() bool Foam::thoboisSliding::update() { - tetDecompositionMotionSolver& mSolver = - refCast(msPtr_()); + tetMotionSolver& mSolver = + refCast(msPtr_()); // Detaching the interfacethobois2DSlidingDeform if (attached()) diff --git a/src/engine/engineTopoChangerMesh/verticalValves/verticalValvesMove.C b/src/engine/engineTopoChangerMesh/verticalValves/verticalValvesMove.C index 918183ad3..132c6e235 100644 --- a/src/engine/engineTopoChangerMesh/verticalValves/verticalValvesMove.C +++ b/src/engine/engineTopoChangerMesh/verticalValves/verticalValvesMove.C @@ -48,7 +48,7 @@ Class #include "wedgeFvPatch.H" #include "emptyFvPatch.H" #include "zeroGradientTetPolyPatchFields.H" -#include "tetDecompositionMotionSolver.H" +#include "tetMotionSolver.H" #include "fixedValueTetPolyPatchFields.H" #include "mixedTetPolyPatchFields.H" @@ -317,8 +317,8 @@ void Foam::verticalValves::prepareValveDetach() bool Foam::verticalValves::update() { - tetDecompositionMotionSolver& mSolver = - refCast(msPtr_()); + tetMotionSolver& mSolver = + refCast(msPtr_()); // Detaching the interface if (attached()) diff --git a/src/engine/simpleEngineTopoFvMesh/simpleEngineTopoFvMesh.C b/src/engine/simpleEngineTopoFvMesh/simpleEngineTopoFvMesh.C index 7deb0c485..1cdf4dc08 100644 --- a/src/engine/simpleEngineTopoFvMesh/simpleEngineTopoFvMesh.C +++ b/src/engine/simpleEngineTopoFvMesh/simpleEngineTopoFvMesh.C @@ -31,7 +31,7 @@ License #include "componentMixedTetPolyPatchVectorField.H" #include "mapPolyMesh.H" #include "polyTopoChange.H" -#include "tetDecompositionMotionSolver.H" +#include "tetMotionSolver.H" #include "volMesh.H" #include "addToRunTimeSelectionTable.H" @@ -252,8 +252,8 @@ void Foam::simpleEngineTopoFvMesh::setBoundaryMotion() Info << "Setting boundary motion" << endl; } - tetDecompositionMotionSolver& mSolver = - refCast(msPtr_()); + tetMotionSolver& mSolver = + refCast(msPtr_()); tetPointVectorField& motionU = mSolver.motionU(); @@ -390,8 +390,8 @@ void Foam::simpleEngineTopoFvMesh::setBoundaryPosition() Info << "Setting boundary position" << endl; } - tetDecompositionMotionSolver& mSolver = - refCast(msPtr_()); + tetMotionSolver& mSolver = + refCast(msPtr_()); tetPointVectorField& motionU = mSolver.motionU(); @@ -477,8 +477,8 @@ Foam::simpleEngineTopoFvMesh::simpleEngineTopoFvMesh bool Foam::simpleEngineTopoFvMesh::update() { - tetDecompositionMotionSolver& mSolver = - refCast(msPtr_()); + tetMotionSolver& mSolver = + refCast(msPtr_()); // Detaching the interface if (attached()) diff --git a/src/tetDecompositionFiniteElement/Allwmake b/src/tetDecompositionFiniteElement/Allwmake deleted file mode 100755 index 934db0c1d..000000000 --- a/src/tetDecompositionFiniteElement/Allwmake +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -wmake libso . Make.cellDecomp -wmake libso . Make.faceDecomp diff --git a/src/tetDecompositionFiniteElement/Make.cellDecomp/files b/src/tetDecompositionFiniteElement/Make.cellDecomp/files deleted file mode 100644 index 0c4fa1449..000000000 --- a/src/tetDecompositionFiniteElement/Make.cellDecomp/files +++ /dev/null @@ -1,152 +0,0 @@ -tetPolyMeshFaceDecomp = tetPolyMeshFaceDecomp -tetPolyBoundaryMeshFaceDecomp = $(tetPolyMeshFaceDecomp)/tetPolyBoundaryMesh -tetPolyPatchesFaceDecomp = $(tetPolyMeshFaceDecomp)/tetPolyPatches -tetPolyPatchFaceDecomp = $(tetPolyPatchesFaceDecomp)/tetPolyPatch -faceTetPolyPatchFaceDecomp = $(tetPolyPatchesFaceDecomp)/faceTetPolyPatch -basicTetPolyPatchesFaceDecomp = $(tetPolyPatchesFaceDecomp)/basic -constraintTetPolyPatchesFaceDecomp = $(tetPolyPatchesFaceDecomp)/constraint -derivedTetPolyPatchesFaceDecomp = $(tetPolyPatchesFaceDecomp)/derived -coupledTetPolyPatchFaceDecomp = $(basicTetPolyPatchesFaceDecomp)/coupled -coupledFaceTetPolyPatchFaceDecomp = $(basicTetPolyPatchesFaceDecomp)/coupledFace -emptyTetPolyPatchFaceDecomp = $(constraintTetPolyPatchesFaceDecomp)/empty -symmetryTetPolyPatchFaceDecomp = $(constraintTetPolyPatchesFaceDecomp)/symmetry -wedgeTetPolyPatchFaceDecomp = $(constraintTetPolyPatchesFaceDecomp)/wedge -processorTetPolyPatchFaceDecomp = $(constraintTetPolyPatchesFaceDecomp)/processor -globalTetPolyPatchFaceDecomp = $(constraintTetPolyPatchesFaceDecomp)/global -wallTetPolyPatchFaceDecomp = $(derivedTetPolyPatchesFaceDecomp)/wall -ggiTetPolyPatchFaceDecomp = $(derivedTetPolyPatchesFaceDecomp)/ggi - -MapTetFemFieldsFaceDecomp = $(tetPolyMeshFaceDecomp)/MapTetFemFieldsFaceDecomp - -tetPolyMeshCellDecomp = tetPolyMeshCellDecomp -tetPolyBoundaryMeshCellDecomp = $(tetPolyMeshCellDecomp)/tetPolyBoundaryMesh -tetPolyPatchesCellDecomp = $(tetPolyMeshCellDecomp)/tetPolyPatches -tetPolyPatchCellDecomp = $(tetPolyPatchesCellDecomp)/tetPolyPatch -faceTetPolyPatchCellDecomp = $(tetPolyPatchesCellDecomp)/faceTetPolyPatch -basicTetPolyPatchesCellDecomp = $(tetPolyPatchesCellDecomp)/basic -constraintTetPolyPatchesCellDecomp = $(tetPolyPatchesCellDecomp)/constraint -derivedTetPolyPatchesCellDecomp = $(tetPolyPatchesCellDecomp)/derived -coupledTetPolyPatchCellDecomp = $(basicTetPolyPatchesCellDecomp)/coupled -coupledFaceTetPolyPatchCellDecomp = $(basicTetPolyPatchesCellDecomp)/coupledFace -emptyTetPolyPatchCellDecomp = $(constraintTetPolyPatchesCellDecomp)/empty -symmetryTetPolyPatchCellDecomp = $(constraintTetPolyPatchesCellDecomp)/symmetry -wedgeTetPolyPatchCellDecomp = $(constraintTetPolyPatchesCellDecomp)/wedge -processorTetPolyPatchCellDecomp = $(constraintTetPolyPatchesCellDecomp)/processor -globalTetPolyPatchCellDecomp = $(constraintTetPolyPatchesCellDecomp)/global -wallTetPolyPatchCellDecomp = $(derivedTetPolyPatchesCellDecomp)/wall -ggiTetPolyPatchCellDecomp = $(derivedTetPolyPatchesCellDecomp)/ggi - -MapTetFemFieldsCellDecomp = $(tetPolyMeshCellDecomp)/MapTetFemFieldsCellDecomp - -tetPolyPatchInterpolation = tetPolyPatchInterpolation -tetPolyPatchInterpolationFaceDecomp = $(tetPolyPatchInterpolation)/tetPolyPatchInterpolationFaceDecomp -tetPolyPatchInterpolationCellDecomp = $(tetPolyPatchInterpolation)/tetPolyPatchInterpolationCellDecomp - - -/* Face decomposition mesh -$(tetPolyPatchFaceDecomp)/tetPolyPatchFaceDecomp.C -$(faceTetPolyPatchFaceDecomp)/faceTetPolyPatchFaceDecomp.C -$(faceTetPolyPatchFaceDecomp)/newFaceTetPolyPatchFaceDecomp.C -$(coupledTetPolyPatchFaceDecomp)/coupledTetPolyPatchFaceDecomp.C -$(emptyTetPolyPatchFaceDecomp)/emptyTetPolyPatchFaceDecomp.C -$(symmetryTetPolyPatchFaceDecomp)/symmetryTetPolyPatchFaceDecomp.C -$(wedgeTetPolyPatchFaceDecomp)/wedgeTetPolyPatchFaceDecomp.C -$(coupledFaceTetPolyPatchFaceDecomp)/coupledFaceTetPolyPatchFaceDecomp.C -$(processorTetPolyPatchFaceDecomp)/processorTetPolyPatchFaceDecompM.C -$(processorTetPolyPatchFaceDecomp)/calcProcessorTetPolyPatchFaceDecompAddr.C -$(processorTetPolyPatchFaceDecomp)/calcProcessorTetPolyPatchFaceDecompPointAddr.C -$(globalTetPolyPatchFaceDecomp)/globalTetPolyPatchFaceDecomp.C -$(globalTetPolyPatchFaceDecomp)/calcGlobalTetPolyPatchFaceDecompAddr.C -$(wallTetPolyPatchFaceDecomp)/wallTetPolyPatchFaceDecomp.C -$(ggiTetPolyPatchFaceDecomp)/ggiTetPolyPatchFaceDecomp.C -$(tetPolyBoundaryMeshFaceDecomp)/tetPolyBoundaryMeshFaceDecomp.C -$(tetPolyMeshFaceDecomp)/tetPolyMeshLduAddressingFaceDecomp.C -$(tetPolyMeshFaceDecomp)/tetPolyMeshFaceDecomp.C -$(tetPolyMeshFaceDecomp)/calcTetPolyMeshFaceDecompGeometry.C -$(tetPolyMeshFaceDecomp)/calcTetPolyMeshFaceDecompAddressing.C -$(tetPolyMeshFaceDecomp)/addParallelPointPatchFaceDecomp.C -$(tetPolyMeshFaceDecomp)/calcTetPolyMeshFaceDecompParPointData.C - -$(MapTetFemFieldsFaceDecomp)/tetPointMapperFaceDecomp.C -$(MapTetFemFieldsFaceDecomp)/tetPolyPatchMapperFaceDecomp.C -$(tetPolyPatchInterpolationFaceDecomp)/tetPolyPatchInterpolationFaceDecomp.C -*/ - -$(tetPolyPatchCellDecomp)/tetPolyPatchCellDecomp.C -$(faceTetPolyPatchCellDecomp)/faceTetPolyPatchCellDecomp.C -$(faceTetPolyPatchCellDecomp)/newFaceTetPolyPatchCellDecomp.C -$(coupledTetPolyPatchCellDecomp)/coupledTetPolyPatchCellDecomp.C -$(emptyTetPolyPatchCellDecomp)/emptyTetPolyPatchCellDecomp.C -$(symmetryTetPolyPatchCellDecomp)/symmetryTetPolyPatchCellDecomp.C -$(wedgeTetPolyPatchCellDecomp)/wedgeTetPolyPatchCellDecomp.C -$(coupledFaceTetPolyPatchCellDecomp)/coupledFaceTetPolyPatchCellDecomp.C -$(processorTetPolyPatchCellDecomp)/processorTetPolyPatchCellDecompM.C -$(processorTetPolyPatchCellDecomp)/calcProcessorTetPolyPatchCellDecompAddr.C -$(processorTetPolyPatchCellDecomp)/calcProcessorTetPolyPatchCellDecompPointAddr.C -$(globalTetPolyPatchCellDecomp)/globalTetPolyPatchCellDecomp.C -$(globalTetPolyPatchCellDecomp)/calcGlobalTetPolyPatchCellDecompAddr.C -$(wallTetPolyPatchCellDecomp)/wallTetPolyPatchCellDecomp.C -$(ggiTetPolyPatchCellDecomp)/ggiTetPolyPatchCellDecomp.C -$(tetPolyBoundaryMeshCellDecomp)/tetPolyBoundaryMeshCellDecomp.C -$(tetPolyMeshCellDecomp)/tetPolyMeshLduAddressingCellDecomp.C -$(tetPolyMeshCellDecomp)/tetPolyMeshCellDecomp.C -$(tetPolyMeshCellDecomp)/calcTetPolyMeshCellDecompGeometry.C -$(tetPolyMeshCellDecomp)/calcTetPolyMeshCellDecompAddressing.C -$(tetPolyMeshCellDecomp)/addParallelPointPatchCellDecomp.C -$(tetPolyMeshCellDecomp)/calcTetPolyMeshCellDecompParPointData.C - -$(MapTetFemFieldsCellDecomp)/tetPointMapperCellDecomp.C -$(MapTetFemFieldsCellDecomp)/tetPolyPatchMapperCellDecomp.C -$(tetPolyPatchInterpolationCellDecomp)/tetPolyPatchInterpolationCellDecomp.C - - -tetPolyPatchFields = fields/tetPolyPatchFields -$(tetPolyPatchFields)/tetPolyPatchField/tetPolyPatchFields.C - -basicTetPolyPatchFields = $(tetPolyPatchFields)/basic -$(basicTetPolyPatchFields)/calculated/calculatedTetPolyPatchFields.C -$(basicTetPolyPatchFields)/coupled/coupledTetPolyPatchFields.C -$(basicTetPolyPatchFields)/coupledFace/coupledFaceTetPolyPatchFields.C -$(basicTetPolyPatchFields)/generic/genericTetPolyPatchFields.C -$(basicTetPolyPatchFields)/value/valueTetPolyPatchFields.C -$(basicTetPolyPatchFields)/fixedValue/fixedValueTetPolyPatchFields.C -$(basicTetPolyPatchFields)/mixed/mixedTetPolyPatchFields.C -$(basicTetPolyPatchFields)/zeroGradient/zeroGradientTetPolyPatchFields.C - -constraintTetPolyPatchFields = $(tetPolyPatchFields)/constraint -$(constraintTetPolyPatchFields)/empty/emptyTetPolyPatchFields.C -$(constraintTetPolyPatchFields)/wedge/wedgeTetPolyPatchFields.C -$(constraintTetPolyPatchFields)/symmetry/symmetryTetPolyPatchFields.C -$(constraintTetPolyPatchFields)/processor/processorTetPolyPatchFields.C - -derivedTetPolyPatchFields = $(tetPolyPatchFields)/derived -$(derivedTetPolyPatchFields)/global/globalTetPolyPatchFields.C -$(derivedTetPolyPatchFields)/componentMixed/componentMixedTetPolyPatchVectorField.C -$(derivedTetPolyPatchFields)/oscillatingFixedValue/oscillatingFixedValueTetPolyPatchFields.C -$(derivedTetPolyPatchFields)/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueTetPolyPatchFields.C -$(derivedTetPolyPatchFields)/slip/slipTetPolyPatchFields.C - -elementPatchFields = fields/elementPatchFields -$(elementPatchFields)/elementPatchField/elementPatchFields.C - -basicElementPatchFields = $(elementPatchFields)/basic -$(basicElementPatchFields)/calculated/calculatedElementPatchFields.C -$(basicElementPatchFields)/coupled/coupledElementPatchFields.C -$(basicElementPatchFields)/coupledFace/coupledFaceElementPatchFields.C -$(basicElementPatchFields)/value/valueElementPatchFields.C - -constraintElementPatchFields = $(elementPatchFields)/constraint -$(constraintElementPatchFields)/empty/emptyElementPatchFields.C -$(constraintElementPatchFields)/wedge/wedgeElementPatchFields.C -$(constraintElementPatchFields)/symmetry/symmetryElementPatchFields.C -$(constraintElementPatchFields)/processor/processorElementPatchFields.C -$(constraintElementPatchFields)/global/globalElementPatchFields.C - - -fields/tetPointFields/tetPointFields.C -fields/elementFields/elementFields.C - -tetFemMatrix/tetFemScalarMatrix.C -tetFemMatrix/tetFemMatrices.C - -LIB = $(FOAM_LIBBIN)/libcellDecompFiniteElement diff --git a/src/tetDecompositionFiniteElement/Make.cellDecomp/options b/src/tetDecompositionFiniteElement/Make.cellDecomp/options deleted file mode 100644 index dcebd6096..000000000 --- a/src/tetDecompositionFiniteElement/Make.cellDecomp/options +++ /dev/null @@ -1,6 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -DCELL_DECOMP - -EXE_LIBS = \ - -lmeshTools diff --git a/src/tetDecompositionFiniteElement/Make.faceDecomp/files b/src/tetDecompositionFiniteElement/Make.faceDecomp/files deleted file mode 100644 index 6c50411b6..000000000 --- a/src/tetDecompositionFiniteElement/Make.faceDecomp/files +++ /dev/null @@ -1,152 +0,0 @@ -tetPolyMeshFaceDecomp = tetPolyMeshFaceDecomp -tetPolyBoundaryMeshFaceDecomp = $(tetPolyMeshFaceDecomp)/tetPolyBoundaryMesh -tetPolyPatchesFaceDecomp = $(tetPolyMeshFaceDecomp)/tetPolyPatches -tetPolyPatchFaceDecomp = $(tetPolyPatchesFaceDecomp)/tetPolyPatch -faceTetPolyPatchFaceDecomp = $(tetPolyPatchesFaceDecomp)/faceTetPolyPatch -basicTetPolyPatchesFaceDecomp = $(tetPolyPatchesFaceDecomp)/basic -constraintTetPolyPatchesFaceDecomp = $(tetPolyPatchesFaceDecomp)/constraint -derivedTetPolyPatchesFaceDecomp = $(tetPolyPatchesFaceDecomp)/derived -coupledTetPolyPatchFaceDecomp = $(basicTetPolyPatchesFaceDecomp)/coupled -coupledFaceTetPolyPatchFaceDecomp = $(basicTetPolyPatchesFaceDecomp)/coupledFace -emptyTetPolyPatchFaceDecomp = $(constraintTetPolyPatchesFaceDecomp)/empty -symmetryTetPolyPatchFaceDecomp = $(constraintTetPolyPatchesFaceDecomp)/symmetry -wedgeTetPolyPatchFaceDecomp = $(constraintTetPolyPatchesFaceDecomp)/wedge -processorTetPolyPatchFaceDecomp = $(constraintTetPolyPatchesFaceDecomp)/processor -globalTetPolyPatchFaceDecomp = $(constraintTetPolyPatchesFaceDecomp)/global -wallTetPolyPatchFaceDecomp = $(derivedTetPolyPatchesFaceDecomp)/wall -ggiTetPolyPatchFaceDecomp = $(derivedTetPolyPatchesFaceDecomp)/ggi - -MapTetFemFieldsFaceDecomp = $(tetPolyMeshFaceDecomp)/MapTetFemFieldsFaceDecomp - -tetPolyMeshCellDecomp = tetPolyMeshCellDecomp -tetPolyBoundaryMeshCellDecomp = $(tetPolyMeshCellDecomp)/tetPolyBoundaryMesh -tetPolyPatchesCellDecomp = $(tetPolyMeshCellDecomp)/tetPolyPatches -tetPolyPatchCellDecomp = $(tetPolyPatchesCellDecomp)/tetPolyPatch -faceTetPolyPatchCellDecomp = $(tetPolyPatchesCellDecomp)/faceTetPolyPatch -basicTetPolyPatchesCellDecomp = $(tetPolyPatchesCellDecomp)/basic -constraintTetPolyPatchesCellDecomp = $(tetPolyPatchesCellDecomp)/constraint -derivedTetPolyPatchesCellDecomp = $(tetPolyPatchesCellDecomp)/derived -coupledTetPolyPatchCellDecomp = $(basicTetPolyPatchesCellDecomp)/coupled -coupledFaceTetPolyPatchCellDecomp = $(basicTetPolyPatchesCellDecomp)/coupledFace -emptyTetPolyPatchCellDecomp = $(constraintTetPolyPatchesCellDecomp)/empty -symmetryTetPolyPatchCellDecomp = $(constraintTetPolyPatchesCellDecomp)/symmetry -wedgeTetPolyPatchCellDecomp = $(constraintTetPolyPatchesCellDecomp)/wedge -processorTetPolyPatchCellDecomp = $(constraintTetPolyPatchesCellDecomp)/processor -globalTetPolyPatchCellDecomp = $(constraintTetPolyPatchesCellDecomp)/global -wallTetPolyPatchCellDecomp = $(derivedTetPolyPatchesCellDecomp)/wall -ggiTetPolyPatchCellDecomp = $(derivedTetPolyPatchesCellDecomp)/ggi - -MapTetFemFieldsCellDecomp = $(tetPolyMeshCellDecomp)/MapTetFemFieldsCellDecomp - -tetPolyPatchInterpolation = tetPolyPatchInterpolation -tetPolyPatchInterpolationFaceDecomp = $(tetPolyPatchInterpolation)/tetPolyPatchInterpolationFaceDecomp -tetPolyPatchInterpolationCellDecomp = $(tetPolyPatchInterpolation)/tetPolyPatchInterpolationCellDecomp - - -$(tetPolyPatchFaceDecomp)/tetPolyPatchFaceDecomp.C -$(faceTetPolyPatchFaceDecomp)/faceTetPolyPatchFaceDecomp.C -$(faceTetPolyPatchFaceDecomp)/newFaceTetPolyPatchFaceDecomp.C -$(coupledTetPolyPatchFaceDecomp)/coupledTetPolyPatchFaceDecomp.C -$(emptyTetPolyPatchFaceDecomp)/emptyTetPolyPatchFaceDecomp.C -$(symmetryTetPolyPatchFaceDecomp)/symmetryTetPolyPatchFaceDecomp.C -$(wedgeTetPolyPatchFaceDecomp)/wedgeTetPolyPatchFaceDecomp.C -$(coupledFaceTetPolyPatchFaceDecomp)/coupledFaceTetPolyPatchFaceDecomp.C -$(processorTetPolyPatchFaceDecomp)/processorTetPolyPatchFaceDecompM.C -$(processorTetPolyPatchFaceDecomp)/calcProcessorTetPolyPatchFaceDecompAddr.C -$(processorTetPolyPatchFaceDecomp)/calcProcessorTetPolyPatchFaceDecompPointAddr.C -$(globalTetPolyPatchFaceDecomp)/globalTetPolyPatchFaceDecomp.C -$(globalTetPolyPatchFaceDecomp)/calcGlobalTetPolyPatchFaceDecompAddr.C -$(wallTetPolyPatchFaceDecomp)/wallTetPolyPatchFaceDecomp.C -$(ggiTetPolyPatchFaceDecomp)/ggiTetPolyPatchFaceDecomp.C -$(tetPolyBoundaryMeshFaceDecomp)/tetPolyBoundaryMeshFaceDecomp.C -$(tetPolyMeshFaceDecomp)/tetPolyMeshLduAddressingFaceDecomp.C -$(tetPolyMeshFaceDecomp)/tetPolyMeshFaceDecomp.C -$(tetPolyMeshFaceDecomp)/calcTetPolyMeshFaceDecompGeometry.C -$(tetPolyMeshFaceDecomp)/calcTetPolyMeshFaceDecompAddressing.C -$(tetPolyMeshFaceDecomp)/addParallelPointPatchFaceDecomp.C -$(tetPolyMeshFaceDecomp)/calcTetPolyMeshFaceDecompParPointData.C - -$(MapTetFemFieldsFaceDecomp)/tetPointMapperFaceDecomp.C -$(MapTetFemFieldsFaceDecomp)/tetPolyPatchMapperFaceDecomp.C -$(tetPolyPatchInterpolationFaceDecomp)/tetPolyPatchInterpolationFaceDecomp.C - -/* Cell decomposition mesh -$(tetPolyPatchCellDecomp)/tetPolyPatchCellDecomp.C -$(faceTetPolyPatchCellDecomp)/faceTetPolyPatchCellDecomp.C -$(faceTetPolyPatchCellDecomp)/newFaceTetPolyPatchCellDecomp.C -$(coupledTetPolyPatchCellDecomp)/coupledTetPolyPatchCellDecomp.C -$(emptyTetPolyPatchCellDecomp)/emptyTetPolyPatchCellDecomp.C -$(symmetryTetPolyPatchCellDecomp)/symmetryTetPolyPatchCellDecomp.C -$(wedgeTetPolyPatchCellDecomp)/wedgeTetPolyPatchCellDecomp.C -$(coupledFaceTetPolyPatchCellDecomp)/coupledFaceTetPolyPatchCellDecomp.C -$(processorTetPolyPatchCellDecomp)/processorTetPolyPatchCellDecompM.C -$(processorTetPolyPatchCellDecomp)/calcProcessorTetPolyPatchCellDecompAddr.C -$(processorTetPolyPatchCellDecomp)/calcProcessorTetPolyPatchCellDecompPointAddr.C -$(globalTetPolyPatchCellDecomp)/globalTetPolyPatchCellDecomp.C -$(globalTetPolyPatchCellDecomp)/calcGlobalTetPolyPatchCellDecompAddr.C -$(wallTetPolyPatchCellDecomp)/wallTetPolyPatchCellDecomp.C -$(ggiTetPolyPatchCellDecomp)/ggiTetPolyPatchCellDecomp.C -$(tetPolyBoundaryMeshCellDecomp)/tetPolyBoundaryMeshCellDecomp.C -$(tetPolyMeshCellDecomp)/tetPolyMeshLduAddressingCellDecomp.C -$(tetPolyMeshCellDecomp)/tetPolyMeshCellDecomp.C -$(tetPolyMeshCellDecomp)/calcTetPolyMeshCellDecompGeometry.C -$(tetPolyMeshCellDecomp)/calcTetPolyMeshCellDecompAddressing.C -$(tetPolyMeshCellDecomp)/addParallelPointPatchCellDecomp.C -$(tetPolyMeshCellDecomp)/calcTetPolyMeshCellDecompParPointData.C - -$(MapTetFemFieldsCellDecomp)/tetPointMapperCellDecomp.C -$(MapTetFemFieldsCellDecomp)/tetPolyPatchMapperCellDecomp.C -$(tetPolyPatchInterpolationCellDecomp)/tetPolyPatchInterpolationCellDecomp.C -*/ - - -tetPolyPatchFields = fields/tetPolyPatchFields -$(tetPolyPatchFields)/tetPolyPatchField/tetPolyPatchFields.C - -basicTetPolyPatchFields = $(tetPolyPatchFields)/basic -$(basicTetPolyPatchFields)/calculated/calculatedTetPolyPatchFields.C -$(basicTetPolyPatchFields)/coupled/coupledTetPolyPatchFields.C -$(basicTetPolyPatchFields)/coupledFace/coupledFaceTetPolyPatchFields.C -$(basicTetPolyPatchFields)/generic/genericTetPolyPatchFields.C -$(basicTetPolyPatchFields)/value/valueTetPolyPatchFields.C -$(basicTetPolyPatchFields)/fixedValue/fixedValueTetPolyPatchFields.C -$(basicTetPolyPatchFields)/mixed/mixedTetPolyPatchFields.C -$(basicTetPolyPatchFields)/zeroGradient/zeroGradientTetPolyPatchFields.C - -constraintTetPolyPatchFields = $(tetPolyPatchFields)/constraint -$(constraintTetPolyPatchFields)/empty/emptyTetPolyPatchFields.C -$(constraintTetPolyPatchFields)/wedge/wedgeTetPolyPatchFields.C -$(constraintTetPolyPatchFields)/symmetry/symmetryTetPolyPatchFields.C -$(constraintTetPolyPatchFields)/processor/processorTetPolyPatchFields.C - -derivedTetPolyPatchFields = $(tetPolyPatchFields)/derived -$(derivedTetPolyPatchFields)/global/globalTetPolyPatchFields.C -$(derivedTetPolyPatchFields)/componentMixed/componentMixedTetPolyPatchVectorField.C -$(derivedTetPolyPatchFields)/oscillatingFixedValue/oscillatingFixedValueTetPolyPatchFields.C -$(derivedTetPolyPatchFields)/timeVaryingUniformFixedValue/timeVaryingUniformFixedValueTetPolyPatchFields.C -$(derivedTetPolyPatchFields)/slip/slipTetPolyPatchFields.C - -elementPatchFields = fields/elementPatchFields -$(elementPatchFields)/elementPatchField/elementPatchFields.C - -basicElementPatchFields = $(elementPatchFields)/basic -$(basicElementPatchFields)/calculated/calculatedElementPatchFields.C -$(basicElementPatchFields)/coupled/coupledElementPatchFields.C -$(basicElementPatchFields)/coupledFace/coupledFaceElementPatchFields.C -$(basicElementPatchFields)/value/valueElementPatchFields.C - -constraintElementPatchFields = $(elementPatchFields)/constraint -$(constraintElementPatchFields)/empty/emptyElementPatchFields.C -$(constraintElementPatchFields)/wedge/wedgeElementPatchFields.C -$(constraintElementPatchFields)/symmetry/symmetryElementPatchFields.C -$(constraintElementPatchFields)/processor/processorElementPatchFields.C -$(constraintElementPatchFields)/global/globalElementPatchFields.C - - -fields/tetPointFields/tetPointFields.C -fields/elementFields/elementFields.C - -tetFemMatrix/tetFemScalarMatrix.C -tetFemMatrix/tetFemMatrices.C - -LIB = $(FOAM_LIBBIN)/libfaceDecompFiniteElement diff --git a/src/tetDecompositionFiniteElement/tetPolyMesh/coupledFaceTetPolyPatch.H b/src/tetDecompositionFiniteElement/tetPolyMesh/coupledFaceTetPolyPatch.H deleted file mode 100644 index e143dcb50..000000000 --- a/src/tetDecompositionFiniteElement/tetPolyMesh/coupledFaceTetPolyPatch.H +++ /dev/null @@ -1,60 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - coupledFaceTetPolyPatch - -Description - - -\*---------------------------------------------------------------------------*/ - -#ifndef coupledFaceTetPolyPatch_H -#define coupledFaceTetPolyPatch_H - -#include "coupledFaceTetPolyPatchFaceDecomp.H" -#include "coupledFaceTetPolyPatchCellDecomp.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -#ifdef CELL_DECOMP - typedef coupledFaceTetPolyPatchCellDecomp coupledFaceTetPolyPatch; -#elif defined(FACE_DECOMP) - typedef coupledFaceTetPolyPatchFaceDecomp coupledFaceTetPolyPatch; -#else -#error Undefined: cell or face decomposition -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/tetDecompositionFiniteElement/tetPolyMesh/coupledTetPolyPatch.H b/src/tetDecompositionFiniteElement/tetPolyMesh/coupledTetPolyPatch.H deleted file mode 100644 index 47622089b..000000000 --- a/src/tetDecompositionFiniteElement/tetPolyMesh/coupledTetPolyPatch.H +++ /dev/null @@ -1,60 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - coupledTetPolyPatch - -Description - - -\*---------------------------------------------------------------------------*/ - -#ifndef coupledTetPolyPatch_H -#define coupledTetPolyPatch_H - -#include "coupledTetPolyPatchFaceDecomp.H" -#include "coupledTetPolyPatchCellDecomp.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -#ifdef CELL_DECOMP - typedef coupledTetPolyPatchCellDecomp coupledTetPolyPatch; -#elif defined(FACE_DECOMP) - typedef coupledTetPolyPatchFaceDecomp coupledTetPolyPatch; -#else -#error Undefined: cell or face decomposition -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/tetDecompositionFiniteElement/tetPolyMesh/emptyTetPolyPatch.H b/src/tetDecompositionFiniteElement/tetPolyMesh/emptyTetPolyPatch.H deleted file mode 100644 index b3397d057..000000000 --- a/src/tetDecompositionFiniteElement/tetPolyMesh/emptyTetPolyPatch.H +++ /dev/null @@ -1,60 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - emptyTetPolyPatch - -Description - - -\*---------------------------------------------------------------------------*/ - -#ifndef emptyTetPolyPatch_H -#define emptyTetPolyPatch_H - -#include "emptyTetPolyPatchFaceDecomp.H" -#include "emptyTetPolyPatchCellDecomp.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -#ifdef CELL_DECOMP - typedef emptyTetPolyPatchCellDecomp emptyTetPolyPatch; -#elif defined(FACE_DECOMP) - typedef emptyTetPolyPatchFaceDecomp emptyTetPolyPatch; -#else -#error Undefined: cell or face decomposition -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/tetDecompositionFiniteElement/tetPolyMesh/faceTetPolyPatch.H b/src/tetDecompositionFiniteElement/tetPolyMesh/faceTetPolyPatch.H deleted file mode 100644 index 28be030df..000000000 --- a/src/tetDecompositionFiniteElement/tetPolyMesh/faceTetPolyPatch.H +++ /dev/null @@ -1,60 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - faceTetPolyPatch - -Description - - -\*---------------------------------------------------------------------------*/ - -#ifndef faceTetPolyPatch_H -#define faceTetPolyPatch_H - -#include "faceTetPolyPatchFaceDecomp.H" -#include "faceTetPolyPatchCellDecomp.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -#ifdef CELL_DECOMP - typedef faceTetPolyPatchCellDecomp faceTetPolyPatch; -#elif defined(FACE_DECOMP) - typedef faceTetPolyPatchFaceDecomp faceTetPolyPatch; -#else -#error Undefined: cell or face decomposition -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/tetDecompositionFiniteElement/tetPolyMesh/globalTetPolyPatch.H b/src/tetDecompositionFiniteElement/tetPolyMesh/globalTetPolyPatch.H deleted file mode 100644 index b4481a8b1..000000000 --- a/src/tetDecompositionFiniteElement/tetPolyMesh/globalTetPolyPatch.H +++ /dev/null @@ -1,60 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - globalTetPolyPatch - -Description - - -\*---------------------------------------------------------------------------*/ - -#ifndef globalTetPolyPatch_H -#define globalTetPolyPatch_H - -#include "globalTetPolyPatchFaceDecomp.H" -#include "globalTetPolyPatchCellDecomp.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -#ifdef CELL_DECOMP - typedef globalTetPolyPatchCellDecomp globalTetPolyPatch; -#elif defined(FACE_DECOMP) - typedef globalTetPolyPatchFaceDecomp globalTetPolyPatch; -#else -#error Undefined: cell or face decomposition -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/tetDecompositionFiniteElement/tetPolyMesh/processorTetPolyPatch.H b/src/tetDecompositionFiniteElement/tetPolyMesh/processorTetPolyPatch.H deleted file mode 100644 index c1c4e7a47..000000000 --- a/src/tetDecompositionFiniteElement/tetPolyMesh/processorTetPolyPatch.H +++ /dev/null @@ -1,60 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - processorTetPolyPatch - -Description - - -\*---------------------------------------------------------------------------*/ - -#ifndef processorTetPolyPatch_H -#define processorTetPolyPatch_H - -#include "processorTetPolyPatchFaceDecomp.H" -#include "processorTetPolyPatchCellDecomp.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -#ifdef CELL_DECOMP - typedef processorTetPolyPatchCellDecomp processorTetPolyPatch; -#elif defined(FACE_DECOMP) - typedef processorTetPolyPatchFaceDecomp processorTetPolyPatch; -#else -#error Undefined: cell or face decomposition -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/tetDecompositionFiniteElement/tetPolyMesh/symmetryTetPolyPatch.H b/src/tetDecompositionFiniteElement/tetPolyMesh/symmetryTetPolyPatch.H deleted file mode 100644 index 55da192b8..000000000 --- a/src/tetDecompositionFiniteElement/tetPolyMesh/symmetryTetPolyPatch.H +++ /dev/null @@ -1,60 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - symmetryTetPolyPatch - -Description - - -\*---------------------------------------------------------------------------*/ - -#ifndef symmetryTetPolyPatch_H -#define symmetryTetPolyPatch_H - -#include "symmetryTetPolyPatchFaceDecomp.H" -#include "symmetryTetPolyPatchCellDecomp.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -#ifdef CELL_DECOMP - typedef symmetryTetPolyPatchCellDecomp symmetryTetPolyPatch; -#elif defined(FACE_DECOMP) - typedef symmetryTetPolyPatchFaceDecomp symmetryTetPolyPatch; -#else -#error Undefined: cell or face decomposition -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/tetDecompositionFiniteElement/tetPolyMesh/tetPolyBoundaryMesh.H b/src/tetDecompositionFiniteElement/tetPolyMesh/tetPolyBoundaryMesh.H deleted file mode 100644 index 20f0a6d4f..000000000 --- a/src/tetDecompositionFiniteElement/tetPolyMesh/tetPolyBoundaryMesh.H +++ /dev/null @@ -1,60 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - tetPolyBoundaryMesh - -Description - - -\*---------------------------------------------------------------------------*/ - -#ifndef tetPolyBoundaryMesh_H -#define tetPolyBoundaryMesh_H - -#include "tetPolyBoundaryMeshFaceDecomp.H" -#include "tetPolyBoundaryMeshCellDecomp.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -#ifdef CELL_DECOMP - typedef tetPolyBoundaryMeshCellDecomp tetPolyBoundaryMesh; -#elif defined(FACE_DECOMP) - typedef tetPolyBoundaryMeshFaceDecomp tetPolyBoundaryMesh; -#else -#error Undefined: cell or face decomposition -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/tetDecompositionFiniteElement/tetPolyMesh/tetPolyMesh.H b/src/tetDecompositionFiniteElement/tetPolyMesh/tetPolyMesh.H deleted file mode 100644 index f34e6a97d..000000000 --- a/src/tetDecompositionFiniteElement/tetPolyMesh/tetPolyMesh.H +++ /dev/null @@ -1,60 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - tetPolyMesh - -Description - - -\*---------------------------------------------------------------------------*/ - -#ifndef tetPolyMesh_H -#define tetPolyMesh_H - -#include "tetPolyMeshFaceDecomp.H" -#include "tetPolyMeshCellDecomp.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -#ifdef CELL_DECOMP - typedef tetPolyMeshCellDecomp tetPolyMesh; -#elif defined(FACE_DECOMP) - typedef tetPolyMeshFaceDecomp tetPolyMesh; -#else -#error Undefined: cell or face decomposition -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/tetDecompositionFiniteElement/tetPolyMesh/tetPolyMeshMapper.H b/src/tetDecompositionFiniteElement/tetPolyMesh/tetPolyMeshMapper.H deleted file mode 100644 index 5c008f189..000000000 --- a/src/tetDecompositionFiniteElement/tetPolyMesh/tetPolyMeshMapper.H +++ /dev/null @@ -1,60 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - tetPolyMeshMapper - -Description - - -\*---------------------------------------------------------------------------*/ - -#ifndef tetPolyMeshMapper_H -#define tetPolyMeshMapper_H - -#include "tetPolyMeshMapperFaceDecomp.H" -#include "tetPolyMeshMapperCellDecomp.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -#ifdef CELL_DECOMP - typedef tetPolyMeshMapperCellDecomp tetPolyMeshMapper; -#elif defined(FACE_DECOMP) - typedef tetPolyMeshMapperFaceDecomp tetPolyMeshMapper; -#else -#error Undefined: cell or face decomposition -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/tetDecompositionFiniteElement/tetPolyMesh/tetPolyPatch.H b/src/tetDecompositionFiniteElement/tetPolyMesh/tetPolyPatch.H deleted file mode 100644 index 89ea28938..000000000 --- a/src/tetDecompositionFiniteElement/tetPolyMesh/tetPolyPatch.H +++ /dev/null @@ -1,60 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - tetPolyPatch - -Description - - -\*---------------------------------------------------------------------------*/ - -#ifndef tetPolyPatch_H -#define tetPolyPatch_H - -#include "tetPolyPatchFaceDecomp.H" -#include "tetPolyPatchCellDecomp.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -#ifdef CELL_DECOMP - typedef tetPolyPatchCellDecomp tetPolyPatch; -#elif defined(FACE_DECOMP) - typedef tetPolyPatchFaceDecomp tetPolyPatch; -#else -#error Undefined: cell or face decomposition -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/tetDecompositionFiniteElement/tetPolyMesh/wallTetPolyPatch.H b/src/tetDecompositionFiniteElement/tetPolyMesh/wallTetPolyPatch.H deleted file mode 100644 index e2f805620..000000000 --- a/src/tetDecompositionFiniteElement/tetPolyMesh/wallTetPolyPatch.H +++ /dev/null @@ -1,60 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - wallTetPolyPatch - -Description - - -\*---------------------------------------------------------------------------*/ - -#ifndef wallTetPolyPatch_H -#define wallTetPolyPatch_H - -#include "wallTetPolyPatchFaceDecomp.H" -#include "wallTetPolyPatchCellDecomp.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -#ifdef CELL_DECOMP - typedef wallTetPolyPatchCellDecomp wallTetPolyPatch; -#elif defined(FACE_DECOMP) - typedef wallTetPolyPatchFaceDecomp wallTetPolyPatch; -#else -#error Undefined: cell or face decomposition -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/tetDecompositionFiniteElement/tetPolyMesh/wedgeTetPolyPatch.H b/src/tetDecompositionFiniteElement/tetPolyMesh/wedgeTetPolyPatch.H deleted file mode 100644 index be21a6cb8..000000000 --- a/src/tetDecompositionFiniteElement/tetPolyMesh/wedgeTetPolyPatch.H +++ /dev/null @@ -1,60 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - wedgeTetPolyPatch - -Description - - -\*---------------------------------------------------------------------------*/ - -#ifndef wedgeTetPolyPatch_H -#define wedgeTetPolyPatch_H - -#include "wedgeTetPolyPatchFaceDecomp.H" -#include "wedgeTetPolyPatchCellDecomp.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -#ifdef CELL_DECOMP - typedef wedgeTetPolyPatchCellDecomp wedgeTetPolyPatch; -#elif defined(FACE_DECOMP) - typedef wedgeTetPolyPatchFaceDecomp wedgeTetPolyPatch; -#else -#error Undefined: cell or face decomposition -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/MapTetFemFieldsCellDecomp/tetPointMapperCellDecomp.C b/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/MapTetFemFieldsCellDecomp/tetPointMapperCellDecomp.C deleted file mode 100644 index a7758c03d..000000000 --- a/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/MapTetFemFieldsCellDecomp/tetPointMapperCellDecomp.C +++ /dev/null @@ -1,385 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Description - Point mapper for the face tetFem decomposition - -\*---------------------------------------------------------------------------*/ - -#include "tetPointMapperCellDecomp.H" -#include "tetPolyMeshCellDecomp.H" -#include "mapPolyMesh.H" -#include "pointMapper.H" -#include "faceMapper.H" -#include "cellMapper.H" -#include "tetPointMesh.H" - -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // - -void Foam::tetPointMapperCellDecomp::calcAddressing() const -{ - if (tetPolyMeshCellDecomp::debug) - { - Info<< "void tetPointMapperCellDecomp::calcAddressing() const : " - << "Calculating addressing: "; - } - - if - ( - directPtr_ - || directAddrPtr_ - || interpolationAddrPtr_ - || weightsPtr_ - || insertedObjectsPtr_ - || insertedObjectLabelsPtr_ - ) - { - FatalErrorIn("void tetPointMapperCellDecomp::calcAddressing() const)") - << "Addressing already calculated" - << abort(FatalError); - } - - const label oldCellOffset = mpm_.nOldPoints(); - - // Mapping - - // Calculate direct (if all are direct) - directPtr_ = - new bool - ( - pointMap_.direct() - && cellMap_.direct() - ); - - // Assemble the maps - if (*directPtr_) - { - // Direct mapping - if (tetPolyMeshCellDecomp::debug) - { - Info<< " direct" << endl; - } - - const labelList& mappedPoints = pointMap_.directAddressing(); - const labelList& mappedCells = cellMap_.directAddressing(); - - directAddrPtr_ = new labelList(size()); - labelList& addr = *directAddrPtr_; - label nAddr = 0; - - forAll (mappedPoints, pointI) - { - addr[nAddr] = mappedPoints[pointI]; - nAddr++; - } - - forAll (mappedCells, cellI) - { - addr[nAddr] = mappedCells[cellI] + oldCellOffset; - nAddr++; - } - } - else - { - // Interpolative mapping - if (tetPolyMeshCellDecomp::debug) - { - Info<< " interpolative" << endl; - } - - interpolationAddrPtr_ = new labelListList(size()); - labelListList& addr = *interpolationAddrPtr_; - - weightsPtr_ = new scalarListList(size()); - scalarListList& w = *weightsPtr_; - - label nAdded = 0; - - // Insert points - const labelList& mappedPoints = pointMap_.directAddressing(); - - forAll (mappedPoints, pointI) - { - addr[nAdded] = labelList(1, mappedPoints[pointI]); - w[nAdded] = scalarList(1, 1.0); - nAdded++; - } - - // Do cell addressing, direct or interpolative - if (cellMap_.direct()) - { - // Direct for cells - const labelList& mappedCells = cellMap_.directAddressing(); - - // Insert cells - forAll (mappedCells, cellI) - { - addr[nAdded] = - labelList(1, mappedCells[cellI] + oldCellOffset); - w[nAdded] = scalarList(1, 1.0); - nAdded++; - } - } - else - { - // Interpolative for cells - const labelListList& mappedCells = cellMap_.addressing(); - const scalarListList& cellWeights = cellMap_.weights(); - - // Do cell addressing, - - // Insert cells - forAll (mappedCells, cellI) - { - labelList& curAddr = addr[nAdded]; - - const labelList& curMc = mappedCells[cellI]; - curAddr.setSize(curMc.size()); - - forAll (curAddr, cI) - { - curAddr[cI] = curMc[cI] + oldCellOffset; - } - - // Weights remain the same - w[nAdded] = cellWeights[cellI]; - nAdded++; - } - } - } - - // Inserted objects - - // Are there inserted objects presents - insertedObjectsPtr_ = - new bool - ( - pointMap_.insertedObjects() - || cellMap_.insertedObjects() - ); - - // If there are, assemble the labels - if (*insertedObjectsPtr_) - { - const labelList& insPoints = pointMap_.insertedObjectLabels(); - const labelList& insCells = cellMap_.insertedObjectLabels(); - - insertedObjectLabelsPtr_ = - new labelList(insPoints.size() + insCells.size()); - labelList& ins = *insertedObjectLabelsPtr_; - - label nIns = 0; - - forAll (insPoints, pointI) - { - ins[nIns] = insPoints[pointI]; - nIns++; - } - - forAll (insCells, cellI) - { - ins[nIns] = insCells[cellI] + oldCellOffset; - nIns++; - } - } - else - { - // No inserted objects - insertedObjectLabelsPtr_ = new labelList(0); - } - - if (tetPolyMeshCellDecomp::debug) - { - Info<< "void tetPointMapperCellDecomp::calcAddressing() const : " - << "Finished calculating addressing." - << endl; - } -} - - -void Foam::tetPointMapperCellDecomp::clearOut() -{ - deleteDemandDrivenData(directPtr_); - deleteDemandDrivenData(directAddrPtr_); - deleteDemandDrivenData(interpolationAddrPtr_); - deleteDemandDrivenData(weightsPtr_); - - deleteDemandDrivenData(insertedObjectsPtr_); - deleteDemandDrivenData(insertedObjectLabelsPtr_); -} - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -// Construct from components -Foam::tetPointMapperCellDecomp::tetPointMapperCellDecomp -( - const tetPolyMeshCellDecomp& mesh, - const mapPolyMesh& meshMap, - const pointMapper& pMapper, - const cellMapper& cMapper -) -: - mesh_(mesh), - mpm_(meshMap), - pointMap_(pMapper), - cellMap_(cMapper), - size_(mesh().nPoints() + mesh().nCells()), - directPtr_(NULL), - directAddrPtr_(NULL), - interpolationAddrPtr_(NULL), - weightsPtr_(NULL), - insertedObjectsPtr_(NULL), - insertedObjectLabelsPtr_(NULL) -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::tetPointMapperCellDecomp::~tetPointMapperCellDecomp() -{ - clearOut(); -} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -Foam::label Foam::tetPointMapperCellDecomp::size() const -{ - return size_; -} - - -Foam::label Foam::tetPointMapperCellDecomp::sizeBeforeMapping() const -{ - return mpm_.nOldPoints() + mpm_.nOldCells(); -} - - -bool Foam::tetPointMapperCellDecomp::direct() const -{ - if (!directPtr_) - { - calcAddressing(); - } - - return *directPtr_; -} - - -const Foam::unallocLabelList& -Foam::tetPointMapperCellDecomp::directAddressing() const -{ - if (!direct()) - { - FatalErrorIn - ( - "const unallocLabelList& tetPointMapperCellDecomp::" - "directAddressing() const" - ) << "Requested direct addressing for an interpolative mapper." - << abort(FatalError); - } - - if (!directAddrPtr_) - { - calcAddressing(); - } - - return *directAddrPtr_; -} - - -const Foam::labelListList& Foam::tetPointMapperCellDecomp::addressing() const -{ - if (direct()) - { - FatalErrorIn - ( - "const labelListList& tetPointMapperCellDecomp::addressing() const" - ) << "Requested interpolative addressing for a direct mapper." - << abort(FatalError); - } - - if (!interpolationAddrPtr_) - { - calcAddressing(); - } - - return *interpolationAddrPtr_; -} - - -const Foam::scalarListList& Foam::tetPointMapperCellDecomp::weights() const -{ - if (direct()) - { - FatalErrorIn - ( - "const scalarListList& tetPointMapperCellDecomp::weights() const" - ) << "Requested interpolative weights for a direct mapper." - << abort(FatalError); - } - - if (!weightsPtr_) - { - calcAddressing(); - } - - return *weightsPtr_; -} - - -bool Foam::tetPointMapperCellDecomp::insertedObjects() const -{ - if (!insertedObjectsPtr_) - { - calcAddressing(); - } - - return *insertedObjectsPtr_; -} - - -const Foam::labelList& -Foam::tetPointMapperCellDecomp::insertedObjectLabels() const -{ - if (!insertedObjectLabelsPtr_) - { - calcAddressing(); - } - - return *insertedObjectLabelsPtr_; -} - - -// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // - - -// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * // - - -// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // - - -// ************************************************************************* // diff --git a/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/MapTetFemFieldsCellDecomp/tetPointMapperCellDecomp.H b/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/MapTetFemFieldsCellDecomp/tetPointMapperCellDecomp.H deleted file mode 100644 index bc131fd4a..000000000 --- a/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/MapTetFemFieldsCellDecomp/tetPointMapperCellDecomp.H +++ /dev/null @@ -1,172 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - tetPointMapperCellDecomp - -Description - Point mapper for the face tetFem decomposition - -SourceFiles - tetPointMapperCellDecomp.C - -\*---------------------------------------------------------------------------*/ - -#ifndef tetPointMapperCellDecomp_H -#define tetPointMapperCellDecomp_H - -#include "morphFieldMapper.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// Class forward declarations -class tetPolyMeshCellDecomp; -class mapPolyMesh; -class pointMapper; -class cellMapper; - -/*---------------------------------------------------------------------------*\ - Class tetPointMapperCellDecomp Declaration -\*---------------------------------------------------------------------------*/ - -class tetPointMapperCellDecomp -: - public morphFieldMapper -{ - // Private data - - //- Reference to mesh - const tetPolyMeshCellDecomp& mesh_; - - //- Reference to mapPolyMesh - const mapPolyMesh& mpm_; - - //- Reference to point mapper - const pointMapper& pointMap_; - - //- Reference to face mapper - const cellMapper& cellMap_; - - - //- Size of target object - const label size_; - - - // Demand-driven private data - - //- Is the mapping direct - mutable bool* directPtr_; - - //- Direct addressing (only one for of addressing is used) - mutable labelList* directAddrPtr_; - - //- Interpolated addressing (only one for of addressing is used) - mutable labelListList* interpolationAddrPtr_; - - //- Interpolation weights - mutable scalarListList* weightsPtr_; - - //- Are there any inserted (unmapped) objects - mutable bool* insertedObjectsPtr_; - - //- Inserted faces - mutable labelList* insertedObjectLabelsPtr_; - - - - // Private Member Functions - - //- Disallow default bitwise copy construct - tetPointMapperCellDecomp(const tetPointMapperCellDecomp&); - - //- Disallow default bitwise assignment - void operator=(const tetPointMapperCellDecomp&); - - - //- Calculate addressing - void calcAddressing() const; - - //- Clear out local storage - void clearOut(); - - -public: - - // Constructors - - //- Construct from components - tetPointMapperCellDecomp - ( - const tetPolyMeshCellDecomp& mesh, - const mapPolyMesh& meshMap, - const pointMapper& pMapper, - const cellMapper& cMapper - ); - - - // Destructor - - virtual ~tetPointMapperCellDecomp(); - - - // Member Functions - - //- Return size - virtual label size() const; - - //- Return size of field before mapping - virtual label sizeBeforeMapping() const; - - //- Is the mapping direct - virtual bool direct() const; - - //- Return direct addressing - virtual const unallocLabelList& directAddressing() const; - - //- Return interpolated addressing - virtual const labelListList& addressing() const; - - //- Return interpolation weights - virtual const scalarListList& weights() const; - - //- Are there any inserted faces - bool insertedObjects() const; - - //- Return list of inserted faces - const labelList& insertedObjectLabels() const; -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/MapTetFemFieldsCellDecomp/tetPolyBoundaryMapperCellDecomp.H b/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/MapTetFemFieldsCellDecomp/tetPolyBoundaryMapperCellDecomp.H deleted file mode 100644 index 9354e7921..000000000 --- a/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/MapTetFemFieldsCellDecomp/tetPolyBoundaryMapperCellDecomp.H +++ /dev/null @@ -1,108 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - tetPolyBoundaryMapperCellDecomp - -Description - -SourceFiles - tetPolyBoundaryMapperCellDecomp.C - -\*---------------------------------------------------------------------------*/ - -#ifndef tetPolyBoundaryMapperCellDecomp_H -#define tetPolyBoundaryMapperCellDecomp_H - -#include "PtrList.H" -#include "tetPolyPatchMapperCellDecomp.H" -#include "pointMapper.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// Class forward declarations - -/*---------------------------------------------------------------------------*\ - Class tetPolyBoundaryMapperCellDecomp Declaration -\*---------------------------------------------------------------------------*/ - -class tetPolyBoundaryMapperCellDecomp -: - public PtrList -{ - // Private Member Functions - - //- Disallow default bitwise copy construct - tetPolyBoundaryMapperCellDecomp(const tetPolyBoundaryMapperCellDecomp&); - - //- Disallow default bitwise assignment - void operator=(const tetPolyBoundaryMapperCellDecomp&); - - -public: - - // Constructors - - //- Construct from components - tetPolyBoundaryMapperCellDecomp - ( - const tetPolyMeshCellDecomp& mesh, - const mapPolyMesh& meshMap - ) - : - PtrList(mesh.boundary().size()) - { - const tetPolyBoundaryMeshCellDecomp& patches = mesh.boundary(); - - forAll (patches, patchI) - { - this->set - ( - patchI, - new tetPolyPatchMapperCellDecomp - ( - patches[patchI], - meshMap - ) - ); - } - } - - // Destructor - default - -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/MapTetFemFieldsCellDecomp/tetPolyMeshMapperCellDecomp.H b/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/MapTetFemFieldsCellDecomp/tetPolyMeshMapperCellDecomp.H deleted file mode 100644 index ae926b60a..000000000 --- a/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/MapTetFemFieldsCellDecomp/tetPolyMeshMapperCellDecomp.H +++ /dev/null @@ -1,148 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - tetPolyMeshMapperCellDecomp - -Description - Class holds all the necessary information for mapping fields associated - with tetPolyMeshCellDecomp. -SourceFiles - tetPolyMeshMapperCellDecomp.C - -\*---------------------------------------------------------------------------*/ - -#ifndef tetPolyMeshMapperCellDecomp_H -#define tetPolyMeshMapperCellDecomp_H - -#include "tetPointMapperCellDecomp.H" -#include "pointMapper.H" -#include "cellMapper.H" -#include "tetPolyBoundaryMapperCellDecomp.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// Class forward declarations -class tetPolyMeshCellDecomp; -class mapPolyMesh; - -/*---------------------------------------------------------------------------*\ - Class tetPolyMeshMapperCellDecomp Declaration -\*---------------------------------------------------------------------------*/ - -class tetPolyMeshMapperCellDecomp -{ - // Private data - - //- Reference to mesh - const tetPolyMeshCellDecomp& mesh_; - - //- Point mapper - pointMapper pointMap_; - - //- Cell mapper - cellMapper cellMap_; - - //- Point mapper (needs to be re-done to insert cells) - tetPointMapperCellDecomp tetPointMap_; - - //- Boundary mapper - tetPolyBoundaryMapperCellDecomp boundaryMap_; - - - // Private Member Functions - - //- Disallow default bitwise copy construct - tetPolyMeshMapperCellDecomp(const tetPolyMeshMapperCellDecomp&); - - //- Disallow default bitwise assignment - void operator=(const tetPolyMeshMapperCellDecomp&); - - -public: - - // Constructors - - //- Construct from components - tetPolyMeshMapperCellDecomp - ( - const tetPolyMeshCellDecomp& mesh, - const mapPolyMesh& meshMap - ) - : - mesh_(mesh), - pointMap_(meshMap), - cellMap_(meshMap), - tetPointMap_(mesh, meshMap, pointMap_, cellMap_), - boundaryMap_(mesh, meshMap) - {} - - - // Member Functions - - //- Return mesh - const tetPolyMeshCellDecomp& mesh() const - { - return mesh_; - } - - //- Return reference to objectRegistry storing fields - // Needed in mappers. HJ, 16/Oct/2008 - const objectRegistry& thisDb() const - { - return mesh_.thisDb(); - } - - //- Return point mapper - const morphFieldMapper& pointMap() const - { - return tetPointMap_; - } - - //- Return element mapper - const morphFieldMapper& elementMap() const - { - return cellMap_; - } - - //- Return boundary mapper - const tetPolyBoundaryMapperCellDecomp& boundaryMap() const - { - return boundaryMap_; - } -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/MapTetFemFieldsCellDecomp/tetPolyPatchMapperCellDecomp.C b/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/MapTetFemFieldsCellDecomp/tetPolyPatchMapperCellDecomp.C deleted file mode 100644 index 15c60bcd6..000000000 --- a/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/MapTetFemFieldsCellDecomp/tetPolyPatchMapperCellDecomp.C +++ /dev/null @@ -1,142 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Description - PolyPatch mapper for the cell tetFem decomposition - -\*---------------------------------------------------------------------------*/ - -#include "tetPolyPatchMapperCellDecomp.H" -#include "tetPolyPatchCellDecomp.H" -#include "tetPolyBoundaryMeshCellDecomp.H" -#include "tetPolyMeshCellDecomp.H" -#include "tetFemMatrices.H" -#include "mapPolyMesh.H" -#include "pointMapper.H" -#include "faceTetPolyPatchCellDecomp.H" - -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // - -void Foam::tetPolyPatchMapperCellDecomp::calcAddressing() const -{ - if (directAddrPtr_) - { - FatalErrorIn - ( - "void tetPolyPatchMapperCellDecomp::calcAddressing() const)" - ) << "Addressing already calculated" - << abort(FatalError); - } - - // Mapping - - const labelList& curPatchPointMap = mpm_.patchPointMap()[patch_.index()]; - - // Assemble the map (direct mapping) - directAddrPtr_ = new labelList(size()); - labelList& addr = *directAddrPtr_; - label nAddr = 0; - - forAll (curPatchPointMap, pointI) - { - if (curPatchPointMap[pointI] > -1) - { - addr[nAddr] = curPatchPointMap[pointI]; - } - else - { - addr[nAddr] = 0; - } - nAddr++; - } -} - - -void Foam::tetPolyPatchMapperCellDecomp::clearOut() -{ - deleteDemandDrivenData(directPtr_); - deleteDemandDrivenData(directAddrPtr_); -} - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -// Construct from components -Foam::tetPolyPatchMapperCellDecomp::tetPolyPatchMapperCellDecomp -( - const tetPolyPatchCellDecomp& patch, - const mapPolyMesh& meshMap -) -: - patch_(patch), - mpm_(meshMap), - directPtr_(NULL), - directAddrPtr_(NULL) -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::tetPolyPatchMapperCellDecomp::~tetPolyPatchMapperCellDecomp() -{ - clearOut(); -} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -Foam::label Foam::tetPolyPatchMapperCellDecomp::size() const -{ - return patch_.size(); -} - - -Foam::label Foam::tetPolyPatchMapperCellDecomp::sizeBeforeMapping() const -{ - return mpm_.oldPatchNMeshPoints()[patch_.index()]; -} - - -const Foam::unallocLabelList& -Foam::tetPolyPatchMapperCellDecomp::directAddressing() const -{ - if (!directAddrPtr_) - { - calcAddressing(); - } - - return *directAddrPtr_; -} - - -// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // - - -// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * // - - -// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // - - -// ************************************************************************* // diff --git a/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/MapTetFemFieldsCellDecomp/tetPolyPatchMapperCellDecomp.H b/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/MapTetFemFieldsCellDecomp/tetPolyPatchMapperCellDecomp.H deleted file mode 100644 index 40a5a9bf8..000000000 --- a/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/MapTetFemFieldsCellDecomp/tetPolyPatchMapperCellDecomp.H +++ /dev/null @@ -1,142 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Class - tetPolyPatchMapperCellDecomp - -Description - Mapping class for a tetPolyPatchFieldCellDecomp - -SourceFiles - tetPolyPatchMapperCellDecomp.C - -\*---------------------------------------------------------------------------*/ - -#ifndef tetPolyPatchMapperCellDecomp_H -#define tetPolyPatchMapperCellDecomp_H - -#include "PointPatchFieldMapper.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// Class forward declarations -class tetPolyPatchCellDecomp; -class mapPolyMesh; - -/*---------------------------------------------------------------------------*\ - Class tetPolyPatchMapperCellDecomp Declaration -\*---------------------------------------------------------------------------*/ - -class tetPolyPatchMapperCellDecomp -: - public PointPatchFieldMapper -{ - // Private data - - //- Reference to patch - const tetPolyPatchCellDecomp& patch_; - - //- Reference to mapPolyMesh - const mapPolyMesh& mpm_; - - - // Demand-driven private data - - //- Is the mapping direct - mutable bool* directPtr_; - - //- Direct addressing (only one for of addressing is used) - mutable labelList* directAddrPtr_; - - - // Private Member Functions - - //- Disallow default bitwise copy construct - tetPolyPatchMapperCellDecomp - ( - const tetPolyPatchMapperCellDecomp& - ); - - //- Disallow default bitwise assignment - void operator=(const tetPolyPatchMapperCellDecomp&); - - - //- Calculate addressing for mapping with inserted cells - void calcAddressing() const; - - //- Clear out local storage - void clearOut(); - - -public: - - // Static data members - - // Constructors - - //- Construct from mappers - tetPolyPatchMapperCellDecomp - ( - const tetPolyPatchCellDecomp& patch, - const mapPolyMesh& meshMap - ); - - - // Destructor - - virtual ~tetPolyPatchMapperCellDecomp(); - - - // Member Functions - - //- Return size - virtual label size() const; - - //- Return size of field before mapping - virtual label sizeBeforeMapping() const; - - //- Is the mapping direct - virtual bool direct() const - { - return true; - } - - //- Return direct addressing - virtual const unallocLabelList& directAddressing() const; - -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/addParallelPointPatchCellDecomp.C b/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/addParallelPointPatchCellDecomp.C deleted file mode 100644 index 04464a5f4..000000000 --- a/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/addParallelPointPatchCellDecomp.C +++ /dev/null @@ -1,463 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Description - -\*---------------------------------------------------------------------------*/ - -#include "tetPolyMeshCellDecomp.H" -#include "Time.H" -#include "PstreamCombineReduceOps.H" -#include "processorTetPolyPatchCellDecomp.H" -#include "globalTetPolyPatchCellDecomp.H" -#include "Pstream.H" -#include "labelIOList.H" -#include "globalMeshData.H" - -using namespace Foam; - -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // - -// Thing label combination class -template -class globalPatchCombine -{ -public: - - void operator() - ( - SLList& globalObjects, - const SLList& myObjects - ) const - { - // For each of my points check whether it exists in the global - // points list; if not, add it to the global points - - for - ( - typename SLList::const_iterator myObjectsIter = - myObjects.begin(); - myObjectsIter != myObjects.end(); - ++myObjectsIter - ) - { - const Type& curMyType = myObjectsIter(); - - bool found = false; - - for - ( - typename SLList::iterator globalObjectsIter = - globalObjects.begin(); - globalObjectsIter != globalObjects.end(); - ++globalObjectsIter - ) - { - if (globalObjectsIter() == curMyType) - { - found = true; - break; - } - } - - if (!found) - { - globalObjects.append(curMyType); - } - } - } -}; - - -void Foam::tetPolyMeshCellDecomp::addParallelPointPatch() -{ - // Note: - // The processor point patch will be added if processor boundaries - // exist in the case. If the mesh with processor boundaries is - // not created during a parallel run (e.g. decomposePar), the - // addressing will be dummy. HJ, 19/Mar/2002 - - if (mesh_.globalData().parallel()) - { - // This cannot be done if I do not know global point/face/cell mapping; - // at the very least I need it on all parallel patches. Having in mind - // the added expense of reading/writing of this data, the global - // mapping files will still be used. I can do the globally - // shared points because they carry their own global labels, - // but not for cut edges shared by several processors. - // HJ, 21/Apr/2003 - - if (debug) - { - Info<< "void tetPolyMeshCellDecomp::addParallelPointPatch() : " - << "Reading pointProcAddressing." << endl; - } - - labelIOList pointProcAddressing - ( - IOobject - ( - "pointProcAddressing", - mesh_.time().findInstance(operator()().meshDir(), "faces"), - mesh_.meshSubDir, - mesh_, - IOobject::MUST_READ, - IOobject::NO_WRITE - ) - ); - - if (debug) - { - Info<< "void tetPolyMeshCellDecomp::addParallelPointPatch() : " - << "Reading cellProcAddressing." << endl; - } - - labelIOList cellProcAddressing - ( - IOobject - ( - "cellProcAddressing", - mesh_.time().findInstance(operator()().meshDir(), "faces"), - mesh_.meshSubDir, - mesh_, - IOobject::MUST_READ, - IOobject::NO_WRITE - ) - ); - - const label globalCellOffset = mesh_.globalData().nTotalPoints(); - - // Add the cell centres to the lookup list - - // Bug fix: only live points included. HJ, 24/Aug/2012 - const label oldPointSize = mesh_.nPoints(); - const label oldCellSize = mesh_.nCells(); - pointProcAddressing.setSize(oldPointSize + oldCellSize); - - label oldSize = oldPointSize; - - for (label cellI = 0; cellI < oldCellSize; cellI++) - { - pointProcAddressing[oldSize + cellI] = - cellProcAddressing[cellI] + globalCellOffset; - } - - // Get the list of local parallel processor points, their addressing - // and global labels - const labelList& localParPoints = - mesh_.globalData().sharedPointLabels(); - - // Do parallel edges - - // Get the list of local parallel processor edges - const edgeList& localParEdges = parallelEdges(); - - // Extract global numbers for each of the parallel edges - SLList globalParEdges; - - forAll (localParEdges, edgeI) - { - globalParEdges.append - ( - edge - ( - pointProcAddressing[localParEdges[edgeI].start()], - pointProcAddressing[localParEdges[edgeI].end()] - ) - ); - } - - // Create the local-to-global edge mapping - labelList localEdgeMapping(localParEdges.size(), -1); - - if (Pstream::parRun()) - { - // Create a global list of edges by reduction from all processors - combineReduce(globalParEdges, globalPatchCombine()); - - // Find out which of the parallel edges are local. For - // easier search indexing make a plain list out ot the - // singly linked list of global edges - edgeList ge(globalParEdges); - - forAll (localParEdges, edgeI) - { - edge curGlobal = - edge - ( - pointProcAddressing[localParEdges[edgeI].start()], - pointProcAddressing[localParEdges[edgeI].end()] - ); - - forAll (ge, geI) - { - if (curGlobal == ge[geI]) - { - localEdgeMapping[edgeI] = geI; - break; - } - } - } - } - - // Debug check - if (debug) - { - if (localEdgeMapping.size() > 0) - { - if (min(localEdgeMapping) < 0) - { - FatalErrorIn - ( - "void Foam::tetPolyMeshCellDecomp::" - "addParallelPointPatch()" - ) << "Error in parallel points patch: edges" - << abort(FatalError); - } - } - } - - // Do parallel cut edges - - // Algorithm - // Parallel cut edges come in two flavours: the ones local to - // the processor and the ones shared between several - // processors. The first lot cause no trouble, but for the - // second we need to make sure that only one processor - // multiplies out the global sum part of the matrix. - // At the same time, the local part of the product needs to be - // done on every processor seprately. This is catered for by - // two mechanisms: - // 1) Local edges will be calculated here for every patch. - // The list needs to be complete. - // 2) As the lists are calculated, a global list of cut edges - // is assembled. The first time the edge is added into the - // global list, it is accepted for global sum multiplication. - // If the same global edge is found, the contribution to the - // global sum is blocked. - - // Count the maximum number of edges coming from the patch - label maxEdgesOnPatch = 0; - - // For every local point get a list of edges - forAll (localParPoints, pointI) - { - maxEdgesOnPatch += nEdgesForPoint(localParPoints[pointI]); - } - - edgeList localCutEdges(maxEdgesOnPatch); - label nCutEdges = 0; - - // Go through all the local points and get all the edges coming - // from that point. Check if the edge is local, if not, it is cut - - const unallocLabelList& L = lduAddr().lowerAddr(); - const unallocLabelList& U = lduAddr().upperAddr(); - - forAll (localParPoints, pointI) - { - const label curPoint = localParPoints[pointI]; - - labelList curEdges = edgesForPoint(curPoint); - - forAll (curEdges, edgeI) - { - edge e(L[curEdges[edgeI]], U[curEdges[edgeI]]); - label otherEnd = -1; - - if (e.start() == curPoint) - { - otherEnd = e.end(); - } - else - { - otherEnd = e.start(); - } - - // If the other end is not a local point, this is a cut edge - bool found = false; - - forAll (localParPoints, compI) - { - if (localParPoints[compI] == otherEnd) - { - found = true; - break; - } - } - - if (!found) - { - // This is a cut edge. Add it to the list - localCutEdges[nCutEdges] = e; - nCutEdges++; - } - } - } - - // Reset the size of the local cut edge list - localCutEdges.setSize(nCutEdges); - - // Create a masking array. For the edges that do not contribute - // to the global product, the mask will be set to zero - scalarField localCutEdgeMask(localCutEdges.size(), 1); - - if (Pstream::parRun()) - { - // Creating the mask - // Every processor goes through all of its edges and creates the - // global version of the edge. If such an edge does not - // already exist, it is added to the list, if it does, its - // mask is set to zero (somebody is already doing the - // multiplication) - if (Pstream::master()) - { - // Master's mask is always one. Add all edges to the list - SLList globalCutEdges; - - forAll (localCutEdges, edgeI) - { - globalCutEdges.append - ( - edge - ( - pointProcAddressing[localCutEdges[edgeI].start()], - pointProcAddressing[localCutEdges[edgeI].end()] - ) - ); - } - - // Send the list to the first slave - OPstream toFirstSlave(Pstream::blocking, Pstream::firstSlave()); - toFirstSlave << globalCutEdges; - } - else - { - // Slave. Read the list from the previous slave, do - // local processing and send it to the next slave - for - ( - int slave = Pstream::firstSlave(); - slave <= Pstream::lastSlave(); - slave++ - ) - { - if (Pstream::myProcNo() == slave) - { - // My turn. - int receiveFrom = slave - 1; - int sendTo = slave + 1; - - if (Pstream::myProcNo() == Pstream::firstSlave()) - { - // Receive from master - receiveFrom = Pstream::masterNo(); - } - - IPstream rf(Pstream::blocking, receiveFrom); - SLList globalCutEdges(rf); - - // Check local cut edges against the list - forAll (localCutEdges, edgeI) - { - edge e - ( - pointProcAddressing - [localCutEdges[edgeI].start()], - pointProcAddressing[localCutEdges[edgeI].end()] - ); - - bool found = false; - - for - ( - SLList::iterator gEdgeIter = - globalCutEdges.begin(); - gEdgeIter != globalCutEdges.end(); - ++gEdgeIter - ) - { - if (gEdgeIter() == e) - { - found = true; - break; - } - } - - if (found) - { - // Edge already exists. Set mask to zero - localCutEdgeMask[edgeI] = 0; - } - else - { - // Edge not found. Add it to the list - globalCutEdges.append(e); - } - } - - // Re-transmit the list to the next processor - if (slave < Pstream::lastSlave()) - { - OPstream passOnEdges(Pstream::blocking, sendTo); - passOnEdges << globalCutEdges; - } - } - } - } - } - - if (debug) - { - Info<< "void tetPolyMeshCellDecomp::addParallelPointPatch() : " - << "Adding globalTetPolyPatchCellDecomp." - << " nGlobalPoints: " - << mesh_.globalData().nGlobalPoints() << endl; - } - - // Add the processor point patch - boundary_.setSize(boundary_.size() + 1); - - boundary_.set - ( - boundary_.size() - 1, - new globalTetPolyPatchCellDecomp - ( - mesh_.globalData().nGlobalPoints(), - localParPoints, - mesh_.globalData().sharedPointAddr(), - globalParEdges.size(), - localParEdges, - localEdgeMapping, - localCutEdges, - localCutEdgeMask, - boundary_, - boundary_.size() - 1 - ) - ); - } -} - - -// ************************************************************************* // diff --git a/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/calcTetPolyMeshCellDecompAddressing.C b/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/calcTetPolyMeshCellDecompAddressing.C deleted file mode 100644 index 20efe78c8..000000000 --- a/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/calcTetPolyMeshCellDecompAddressing.C +++ /dev/null @@ -1,152 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Description - The insertion of edges in the edge list is dictated by the upper - triangular ordering. The current decomposition of a polyhedral cell into - tetrahedra requires insertion of cell centres. The points - are ordered in the following way: - 1) points of the polyMesh (supporting polyhedral cells) - 2) cell centres - - The algorithm for owner-neighbour insertion first adds all the - points the owner point shares the edge with (only the ones with - the higher label than the owner point), followed by the - pointCells. This is because the the cell centres are - guaranteed to have a higher index than the internal vertices. - - Note: - It is assumed that the edges are constructed such that the start - label is lower than the end label and that the pointCells list are - ordered. - -\*---------------------------------------------------------------------------*/ - -#include "tetPolyMeshCellDecomp.H" -#include "tetPolyMeshLduAddressingCellDecomp.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -const lduAddressing& tetPolyMeshCellDecomp::lduAddr() const -{ - if (!lduPtr_) - { - lduPtr_ = new tetPolyMeshLduAddressingCellDecomp(*this);; - } - - return *lduPtr_; -} - - -label tetPolyMeshCellDecomp::maxNPointsForCell() const -{ - if (maxNPointsForCell_ < 0) - { - const faceList& faces = mesh_.faces(); - const cellList& polyCells = mesh_.cells(); - - forAll (polyCells, cellI) - { - maxNPointsForCell_ = - max - ( - maxNPointsForCell_, - polyCells[cellI].labels(faces).size() + 1 - ); - } - } - - return maxNPointsForCell_; -} - - -// Fill buffer with addressing for the cell -label tetPolyMeshCellDecomp::addressing -( - const label cellID, - labelList& localToGlobalBuffer, - labelList& globalToLocalBuffer -) const -{ - const unallocFaceList& meshFaces = mesh_.faces(); - - const labelList& cellFaces = mesh_.cells()[cellID]; - - label nextLocal = 0; - - forAll (cellFaces, faceI) - { - const face& curFace = meshFaces[cellFaces[faceI]]; - - forAll (curFace, pointI) - { - // If the point has not been already inserted into the local - // buffer, add it - if (globalToLocalBuffer[curFace[pointI]] == -1) - { - localToGlobalBuffer[nextLocal] = curFace[pointI]; - globalToLocalBuffer[curFace[pointI]] = nextLocal; - nextLocal++; - } - } - } - - // Mark up the cell centre - localToGlobalBuffer[nextLocal] = cellOffset() + cellID; - globalToLocalBuffer[cellOffset() + cellID] = nextLocal; - nextLocal++; - - // Return size of addressing - return nextLocal; -} - - -// Clear global to local addressing -void tetPolyMeshCellDecomp::clearAddressing -( - const label cellID, - const label nCellPoints, - labelList& localToGlobalBuffer, - labelList& globalToLocalBuffer -) const -{ - // Only clear the places that have been used. The rest of the buffer - // is already initiated to -1 - for (label localI = 0; localI < nCellPoints; localI++) - { - globalToLocalBuffer[localToGlobalBuffer[localI]] = -1; - } -} - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/calcTetPolyMeshCellDecompGeometry.C b/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/calcTetPolyMeshCellDecompGeometry.C deleted file mode 100644 index 226d20308..000000000 --- a/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/calcTetPolyMeshCellDecompGeometry.C +++ /dev/null @@ -1,459 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -\*---------------------------------------------------------------------------*/ - -#include "tetPolyMeshCellDecomp.H" -#include "tetPointRef.H" -#include "SquareMatrix.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -label tetPolyMeshCellDecomp::nPoints() const -{ - if (nPoints_ < 0) - { - nPoints_ = mesh_.nPoints() + mesh_.nCells(); - } - - return nPoints_; -} - - -label tetPolyMeshCellDecomp::nEdges() const -{ - if (nEdges_ < 0) - { - nEdges_ = mesh_.nEdges(); - - // add edges going across the face - const faceList& f = mesh_.faces(); - - forAll (f, fI) - { - nEdges_ += f[fI].size() - 3; - } - - // add point-to-cell edges - const labelListList& pc = mesh_.pointCells(); - - forAll (pc, pointI) - { - nEdges_ += pc[pointI].size(); - } - } - - return nEdges_; -} - - -label tetPolyMeshCellDecomp::nTets() const -{ - if (nTets_ < 0) - { - // Count the cells - nTets_ = 0; - - const cellList& polyCells = mesh_.cells(); - - forAll (polyCells, cellI) - { - nTets_ += nTetsForCell(cellI); - } - } - - return nTets_; -} - - -tmp tetPolyMeshCellDecomp::points() const -{ - tmp ttetPoints(new pointField(nPoints())); - pointField& tetPoints = ttetPoints(); - - const pointField& points = mesh_.points(); - - const pointField& cellCentres = mesh_.cellCentres(); - - label tetPointI = 0; - - forAll (points, pointI) - { - tetPoints[tetPointI] = points[pointI]; - tetPointI++; - } - - forAll (cellCentres, cellI) - { - tetPoints[tetPointI] = cellCentres[cellI]; - tetPointI++; - } - - return ttetPoints; -} - - -cellShapeList tetPolyMeshCellDecomp::tetCells() const -{ - cellShapeList t(nTets()); - - const cellList& polyCells = mesh_.cells(); - - label nTetCells = 0; - - forAll (polyCells, cellI) - { - tetCellList cellTets = tets(cellI); - - forAll (cellTets, tetI) - { - t[nTetCells] = cellTets[tetI].tetCellShape(); - nTetCells++; - } - } - - return t; -} - - -// Return tetrahedral decomposition for cell -tetCellList tetPolyMeshCellDecomp::tets(const label cellID) const -{ - const unallocFaceList& meshFaces = mesh_.faces(); - - const unallocLabelList& owner = mesh_.faceOwner(); - - // Initialise the size of the return - tetCellList t(nTetsForCell(cellID)); - - label nTetras = 0; - - const labelList& cellFaces = mesh_.cells()[cellID]; - - forAll (cellFaces, faceI) - { - const label curFaceID = cellFaces[faceI]; - - face f = meshFaces[curFaceID]; - - // Take care of owner/neighbour face reversal - if (cellID == owner[curFaceID]) - { - f = f.reverseFace(); - } - - // Grab the point zero of the face and create triangles by grabbing the - // labels around the perimeter - label pointZeroID = f[0]; - - for (label i = 1; i < f.size() - 1; i++) - { - // Face is assumed to be inward-pointing - t[nTetras] = - tetCell - ( - pointZeroID, - f[i], - f[i + 1], - cellID + cellOffset_ - ); - - nTetras++; - } - } - - return t; -} - - -void tetPolyMeshCellDecomp::gradNiDotGradNj -( - const label cellID, - SquareMatrix& denseMatrix, - const labelList& globalToLocalBuffer -) const -{ - const unallocFaceList& meshFaces = mesh_.faces(); - const unallocLabelList& owner = mesh_.faceOwner(); - const labelList& cellFaces = mesh_.cells()[cellID]; - - const pointField& points = mesh_.points(); - const pointField& cellCentres = mesh_.cellCentres(); - - scalarField tetBuffer(tetPointRef::nEdges); - - // For optimisation, point allocation is taken out of the loop - label vertexI, edgeI, localI, localJ; - edge curEdge; - - forAll (cellFaces, faceI) - { - const label curFaceID = cellFaces[faceI]; - - face f = meshFaces[curFaceID]; - - if (cellID == owner[curFaceID]) - { - f = f.reverseFace(); - } - - label pointZeroID = f[0]; - - for (label i = 1; i < f.size() - 1; i++) - { - tetCell curTet - ( - pointZeroID, - f[i], - f[i + 1], - cellOffset() + cellID - ); - - tetPointRef tpr - ( - points[pointZeroID], - points[f[i]], - points[f[i + 1]], - cellCentres[cellID] - ); - - // Calculate the diagonal and insert into local matrix - tpr.gradNiSquared(tetBuffer); - - for - ( - vertexI = 0; - vertexI < tetPointRef::nVertices; - vertexI++ - ) - { - localI = globalToLocalBuffer[curTet[vertexI]]; - - denseMatrix[localI][localI] += tetBuffer[vertexI]; - } - - // Note: the coefficient is symmetric, i.e. equal in the upper and - // lower triangle - tpr.gradNiDotGradNj(tetBuffer); - - for (edgeI = 0; edgeI < tetPointRef::nEdges; edgeI++) - { - edge curEdge = curTet.tetEdge(edgeI); - - localI = globalToLocalBuffer[curEdge.start()]; - localJ = globalToLocalBuffer[curEdge.end()]; - - // Insert the coefficient into upper and lower triangle - // HJ, 4/Dec/2006 - denseMatrix[localI][localJ] += tetBuffer[edgeI]; - denseMatrix[localJ][localI] += tetBuffer[edgeI]; - } - } - } -} - - -void tetPolyMeshCellDecomp::gradNiGradNj -( - const label cellID, - SquareMatrix& denseMatrix, - const labelList& globalToLocalBuffer -) const -{ - const unallocFaceList& meshFaces = mesh_.faces(); - const unallocLabelList& owner = mesh_.faceOwner(); - const labelList& cellFaces = mesh_.cells()[cellID]; - - const pointField& points = mesh_.points(); - const pointField& cellCentres = mesh_.cellCentres(); - - tensorField tetBuffer(tetPointRef::nEdges); - - // For optimisation, point allocation is taken out of the loop - label vertexI, edgeI, localI, localJ, minIJ, maxIJ; - edge curEdge; - - forAll (cellFaces, faceI) - { - const label curFaceID = cellFaces[faceI]; - - face f = meshFaces[curFaceID]; - - if (cellID == owner[curFaceID]) - { - f = f.reverseFace(); - } - - label pointZeroID = f[0]; - - for (label i = 1; i < f.size() - 1; i++) - { - tetCell curTet - ( - pointZeroID, - f[i], - f[i + 1], - cellOffset() + cellID - ); - - tetPointRef tpr - ( - points[pointZeroID], - points[f[i]], - points[f[i + 1]], - cellCentres[cellID] - ); - - // Calculate the diagonal and insert into local matrix - tpr.gradNiGradNi(tetBuffer); - - for - ( - vertexI = 0; - vertexI < tetPointRef::nVertices; - vertexI++ - ) - { - localI = globalToLocalBuffer[curTet[vertexI]]; - - denseMatrix[localI][localI] += tetBuffer[vertexI]; - } - - tpr.gradNiGradNj(tetBuffer); - - for (edgeI = 0; edgeI < tetPointRef::nEdges; edgeI++) - { - curEdge = curTet.tetEdge(edgeI); - - localI = globalToLocalBuffer[curEdge.start()]; - localJ = globalToLocalBuffer[curEdge.end()]; - - // Accumulate the off-diagonal; folding the matrix. - // It is unknown if the localI or localJ is lower: - // that depends on how the local points have been - // selected. Therefore, the matrix (which is - // symmetric!) needs to be "folded" - - minIJ = min(localI, localJ); - maxIJ = max(localI, localJ); - - // Take care of the directionality of the edge - if (curEdge.start() < curEdge.end()) - { - denseMatrix[minIJ][maxIJ] += tetBuffer[edgeI]; - } - else - { - denseMatrix[minIJ][maxIJ] += tetBuffer[edgeI].T(); - } - } - } - } -} - - -// Fill buffer with the volume integral distributed into vertices -void tetPolyMeshCellDecomp::volIntegral -( - const label cellID, - scalarField& buffer, - const labelList& globalToLocalBuffer -) const -{ - // The addressing and volume distribution has been done tet-by-tet - // and the combination is done later for the whole cell. - - const unallocFaceList& meshFaces = mesh_.faces(); - const unallocLabelList& owner = mesh_.faceOwner(); - const labelList& cellFaces = mesh_.cells()[cellID]; - - const pointField& points = mesh_.points(); - const pointField& cellCentres = mesh_.cellCentres(); - - label vertexI, localI; - - forAll (cellFaces, faceI) - { - const label curFaceID = cellFaces[faceI]; - - face f = meshFaces[curFaceID]; - - // Take care of owner/neighbour face reversal - if (cellID == owner[curFaceID]) - { - f = f.reverseFace(); - } - - // Grab the point zero of the face and create triangles by grabbing the - // labels around the perimeter - label pointZeroID = f[0]; - - for (label i = 1; i < f.size() - 1; i++) - { - // Face is assumed to be inward-pointing - tetCell curTet - ( - pointZeroID, - f[i], - f[i + 1], - cellOffset() + cellID - ); - - scalar quarterVolume = - 0.25* - tetPointRef - ( - points[pointZeroID], - points[f[i]], - points[f[i + 1]], - cellCentres[cellID] - ).mag(); - - for - ( - vertexI = 0; - vertexI < tetPointRef::nVertices; - vertexI++ - ) - { - localI = globalToLocalBuffer[curTet[vertexI]]; - - // Accumulate the diagonal - buffer[localI] += quarterVolume; - } - } - } -} - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/calcTetPolyMeshCellDecompParPointData.C b/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/calcTetPolyMeshCellDecompParPointData.C deleted file mode 100644 index 380daf856..000000000 --- a/src/tetDecompositionFiniteElement/tetPolyMeshCellDecomp/calcTetPolyMeshCellDecompParPointData.C +++ /dev/null @@ -1,177 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright held by original author - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Description - -\*---------------------------------------------------------------------------*/ - -#include "tetPolyMeshCellDecomp.H" -#include "processorPolyPatch.H" -#include "demandDrivenData.H" - -using namespace Foam; - -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // - -void Foam::tetPolyMeshCellDecomp::calcParPointData() const -{ - if (!Pstream::parRun()) - { - parPointsPtr_ = new labelList(0); - parEdgesPtr_ = new edgeList(0); - - return; - } - else - { - // Make a global point markup list and find out which vertices - // belong to more than one patch. - - // Create a local check list for all vertices - - labelList multiProcVertices(mesh_.nPoints(), 0); - - forAll (mesh_.boundaryMesh(), patchI) - { - if - ( - isA(mesh_.boundaryMesh()[patchI]) - ) - { - const labelList& p = mesh_.boundaryMesh()[patchI].meshPoints(); - - forAll (p, pointI) - { - multiProcVertices[p[pointI]]++; - } - } - } - - SLList