exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge in

Browse source 
--HG--
branch : bgschaid/minorAdditionsBranch
This commit is contained in:
Bernhard F.W. Gschaider 2013-08-22 12:01:19 +02:00
commit 91ae72c445
387 changed files with 1869 additions and 11084 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ThirdParty/AllMake.stage3 vendored
View file

@ -68,7 +68,8 @@ fi
# ParMGridGen
if [ -z "$PARMGRIDGEN_SYSTEM" ]
then
( rpm_make -p ParMGridGen-1.0 -s ParMGridGen-1.0.spec -u http://www.mgnet.org/mgnet/Codes/parmgridgen/ParMGridGen-1.0.tar.gz )
#( rpm_make -p ParMGridGen-1.0 -s ParMGridGen-1.0.spec -u http://www.mgnet.org/mgnet/Codes/parmgridgen/ParMGridGen-1.0.tar.gz )
( rpm_make -p ParMGridGen-1.0 -s ParMGridGen-1.0.spec -u ftp://ftp.proxad.net/.mirrors1/ftp.freebsd.org/ports/distfiles/ParMGridGen-1.0.tar.gz )
else
echo "Using system installed ParMGridGen"
echo ""

18
ThirdParty/LocalDev/Hydro-Quebec/PyFoam/ChangeMixingPlaneBoundary.py vendored
View file

@ -33,6 +33,11 @@ Change MixingPlane boundary condition parameters
dest="shadowPatch",
default=None,
help='Name of the shadowPatch')
self.parser.add_option("--zone",
action="store",
dest="zone",
default=None,
help='Name of the zone for mixingPlanePatch')
self.parser.add_option("--coordinateSystemName",
action="store",
dest="coordinateSystemName",
@ -68,11 +73,11 @@ Change MixingPlane boundary condition parameters
dest="ribbonPatchStackAxis",
default=None,
help='ribbonPatch stackAxis (X|Y|Z|R|Theta')
self.parser.add_option("--ribbonPatchDiscretization",
self.parser.add_option("--ribbonPatchDiscretisation",
action="store",
dest="ribbonPatchDiscretization",
dest="ribbonPatchDiscretisation",
default=None,
help='ribbonPatch discretization (masterPatch|slavePatch|bothPatches|uniform|userDefined)')
help='ribbonPatch discretisation (masterPatch|slavePatch|bothPatches|uniform|userDefined)')
self.parser.add_option("--test",
action="store_true",
@ -102,6 +107,9 @@ Change MixingPlane boundary condition parameters
if self.parser.getOptions().shadowPatch!=None:
val["shadowPatch"]=self.parser.getOptions().shadowPatch
if self.parser.getOptions().zone!=None:
val["zone"]=self.parser.getOptions().zone
if val.has_key("coordinateSystem")==False:
val["coordinateSystem"]={}
@ -129,8 +137,8 @@ Change MixingPlane boundary condition parameters
if self.parser.getOptions().ribbonPatchStackAxis!=None:
val["ribbonPatch"]["stackAxis"]=self.parser.getOptions().ribbonPatchStackAxis
if self.parser.getOptions().ribbonPatchDiscretization!=None:
val["ribbonPatch"]["discretization"]=self.parser.getOptions().ribbonPatchDiscretization
if self.parser.getOptions().ribbonPatchDiscretisation!=None:
val["ribbonPatch"]["discretisation"]=self.parser.getOptions().ribbonPatchDiscretisation
break

13
ThirdParty/LocalDev/Hydro-Quebec/PyFoam/ConvertMixingPlaneBoundaryToNewSyntax.py vendored
View file

@ -118,21 +118,24 @@ Change MixingPlane boundary condition parameters
if bnd[indexDefPatch].has_key("ribbonPatch")==False:
bnd[indexDefPatch]["ribbonPatch"]={}
if bnd[indexDefPatch].has_key("zone")==False:
bnd[indexDefPatch]["zone"]=bnd[index] + "Zone"
if oldAssembly != "":
# Converting "assembly" to ribbonPatch/discretization
# Converting "assembly" to ribbonPatch/discretisation
for case in switch(oldAssembly):
if case('master'):
bnd[indexDefPatch]["ribbonPatch"]["discretization"]="masterPatch"
bnd[indexDefPatch]["ribbonPatch"]["discretisation"]="masterPatch"
break
if case('slave'):
bnd[indexDefPatch]["ribbonPatch"]["discretization"]="slavePatch"
bnd[indexDefPatch]["ribbonPatch"]["discretisation"]="slavePatch"
break
if case('both'):
bnd[indexDefPatch]["ribbonPatch"]["discretization"]="bothPatches"
bnd[indexDefPatch]["ribbonPatch"]["discretisation"]="bothPatches"
break
if case('userdefined'):
bnd[indexDefPatch]["ribbonPatch"]["discretization"]="userDefined"
bnd[indexDefPatch]["ribbonPatch"]["discretisation"]="userDefined"
break
if case(): # default
print "Unsupported assembly type: ", oldAssembly

12
ThirdParty/LocalDev/Hydro-Quebec/PyFoam/InitMixingPlaneInterface.py vendored
View file

@ -72,11 +72,11 @@ Init MixingPlane boundary condition parameters
dest="ribbonPatchStackAxis",
default=None,
help='ribbonPatch stackAxis (X|Y|Z|R|Theta')
self.parser.add_option("--ribbonPatchDiscretization",
self.parser.add_option("--ribbonPatchDiscretisation",
action="store",
dest="ribbonPatchDiscretization",
dest="ribbonPatchDiscretisation",
default=None,
help='ribbonPatch discretization (masterPatch|slavePatch|bothPatches|uniform|userDefined)')
help='ribbonPatch discretisation (masterPatch|slavePatch|bothPatches|uniform|userDefined)')
self.parser.add_option("--timeDirs",
action="store",
@ -111,7 +111,7 @@ the current definition
'ribbonPatch' : {
'sweepAxis' : 'Theta',
'stackAxis' : 'Z',
'discretization' : 'bothPatches',
'discretisation' : 'bothPatches',
}
}
return newPatch
@ -151,8 +151,8 @@ Modify the definition of a mixingPlane patch
if self.parser.getOptions().ribbonPatchStackAxis!=None:
patch["ribbonPatch"]["stackAxis"]=self.parser.getOptions().ribbonPatchStackAxis
if self.parser.getOptions().ribbonPatchDiscretization!=None:
patch["ribbonPatch"]["discretization"]=self.parser.getOptions().ribbonPatchDiscretization
if self.parser.getOptions().ribbonPatchDiscretisation!=None:
patch["ribbonPatch"]["discretisation"]=self.parser.getOptions().ribbonPatchDiscretisation

3
applications/solvers/engine/icoDyMEngineFoam/Make/options
View file

@ -13,6 +13,7 @@ EXE_LIBS = \
-ltopoChangerFvMesh \
-lmeshTools \
-lfiniteVolume \
$(WM_DECOMP_LIBS) \
-ltetFiniteElement \
-ltetMotionSolver \
-llduSolvers \
-L$(MESQUITE_LIB_DIR) -lmesquite

3
applications/solvers/engine/sonicTurbDyMEngineFoam/Make/options
View file

@ -19,6 +19,7 @@ EXE_LIBS = \
-lbasicThermophysicalModels \
-lspecie \
-lmeshTools \
$(WM_DECOMP_LIBS) \
-ltetFiniteElement \
-ltetMotionSolver \
-llduSolvers \
-L$(MESQUITE_LIB_DIR) -lmesquite

3
applications/solvers/engine/turbDyMEngineFoam/Make/options
View file

@ -20,6 +20,7 @@ EXE_LIBS = \
-lincompressibleLESModels \
-lincompressibleTransportModels \
-lfiniteVolume \
$(WM_DECOMP_LIBS) \
-ltetFiniteElement \
-ltetMotionSolver \
-llduSolvers \
-L$(MESQUITE_LIB_DIR) -lmesquite

1
applications/solvers/multiSolver/multiSolverDemo/Make/options
View file

@ -5,5 +5,4 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-L$(FOAM_USER_LIBBIN) \
-lmultiSolver

2
applications/solvers/solidMechanics/elasticContactIncrSolidFoam/Make/options
View file

@ -6,7 +6,7 @@ EXE_INC = \
-I$(FOAM_SRC)/VectorN/lnInclude
EXE_LIBS = \
-L$(FOAM_USER_LIBBIN) -lsolidModels \
-lsolidModels \
-lfiniteVolume \
-llduSolvers \
-lmeshTools \

2
applications/solvers/solidMechanics/elasticContactNonLinULSolidFoam/Make/options
View file

@ -6,7 +6,7 @@ EXE_INC = \
-I$(FOAM_SRC)/VectorN/lnInclude
EXE_LIBS = \
-L$(FOAM_USER_LIBBIN) -lsolidModels \
-lsolidModels \
-lfiniteVolume \
-llduSolvers \
-lmeshTools \

4
applications/solvers/solidMechanics/elasticContactSolidFoam/Make/options
View file

@ -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 \

2
applications/solvers/solidMechanics/elasticGravitySolidFoam/Make/options
View file

@ -5,7 +5,7 @@ EXE_INC = \
-I../solidModels/lnInclude
EXE_LIBS = \
-L$(FOAM_USER_LIBBIN) -lsolidModels \
-lsolidModels \
-lfiniteVolume \
-llduSolvers \
-lmeshTools \

2
applications/solvers/solidMechanics/elasticIncrSolidFoam/Make/options
View file

@ -6,7 +6,7 @@ EXE_INC = \
-I$(FOAM_SRC)/VectorN/lnInclude
EXE_LIBS = \
-L$(FOAM_USER_LIBBIN) -lsolidModels \
-lsolidModels \
-lfiniteVolume \
-llduSolvers \
-lmeshTools \

2
applications/solvers/solidMechanics/elasticNonLinTLSolidFoam/Make/options
View file

@ -6,7 +6,7 @@ EXE_INC = \
-I$(FOAM_SRC)/VectorN/lnInclude
EXE_LIBS = \
-L$(FOAM_USER_LIBBIN) -lsolidModels \
-lsolidModels \
-lfiniteVolume \
-llduSolvers \
-lmeshTools \

2
applications/solvers/solidMechanics/elasticNonLinULSolidFoam/Make/options
View file

@ -10,4 +10,4 @@ EXE_LIBS = \
-lfiniteVolume \
-llduSolvers \
-llagrangian \
-L$(FOAM_USER_LIBBIN) -lsolidModels
-lsolidModels

2
applications/solvers/solidMechanics/elasticPlasticNonLinULSolidFoam/Make/options
View file

@ -9,4 +9,4 @@ EXE_LIBS = \
-llduSolvers \
-lmeshTools \
-llagrangian \
-L$(FOAM_USER_LIBBIN) -lsolidModels
-lsolidModels

2
applications/solvers/solidMechanics/elasticPlasticSolidFoam/Make/options
View file

@ -5,4 +5,4 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-llduSolvers \
-L$(FOAM_USER_LIBBIN) -lsolidModels
-lsolidModels

2
applications/solvers/solidMechanics/elasticSolidFoam/Make/options
View file

@ -5,7 +5,7 @@ EXE_INC = \
-I../solidModels/lnInclude
EXE_LIBS = \
-L$(FOAM_USER_LIBBIN) -lsolidModels \
-lsolidModels \
-lfiniteVolume \
-llduSolvers \
-lmeshTools \

2
applications/solvers/solidMechanics/elasticThermalSolidFoam/Make/options
View file

@ -5,7 +5,7 @@ EXE_INC = \
-I../solidModels/lnInclude
EXE_LIBS = \
-L$(FOAM_USER_LIBBIN) -lsolidModels \
-lsolidModels \
-lfiniteVolume \
-llduSolvers \
-lmeshTools \

10
applications/solvers/solidMechanics/icoFsiElasticNonLinULSolidFoam/Make/options
View file

@ -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) \
-L$(FOAM_USER_LIBBIN) -lsolidModels \
-ltetFiniteElement \
-ltetMotionSolver \
-lsolidModels \
-lVectorN

2
applications/solvers/solidMechanics/solidModels/Make/files
View file

@ -56,4 +56,4 @@ interpolation/leastSquaresVolPointInterpolation/leastSquaresVolPointInterpolatio
solidInterface/solidInterface.C
LIB = $(FOAM_USER_LIBBIN)/libsolidModels
LIB = $(FOAM_LIBBIN)/libsolidModels

7
applications/solvers/solidMechanics/viscoElasticSolidFoam/Make/options
View file

@ -1,10 +1,9 @@
EXE_INC = \
-I../solidModels/lnInclude \
-I$(LIB_SRC)/finiteArea/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(WM_PROJECT_USER_DIR)/src/finiteVolume/lnInclude \
-I../solidModels/lnInclude
-I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \
-L$(FOAM_USER_LIBBIN) -lsolidModels \
-lsolidModels \
-lfiniteArea \
-lfiniteVolume

9
applications/solvers/stressAnalysis/icoFsiFoam/Make/options
View file

@ -2,15 +2,14 @@ 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

5
applications/solvers/stressAnalysis/stressFemFoam/Make/options
View file

@ -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

10
applications/solvers/surfaceTracking/freeSurface/Make/options
View file

@ -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

8
applications/solvers/surfaceTracking/utilities/setFluidIndicator/Make/options
View file

@ -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

4
applications/utilities/mesh/manipulation/deformedTetFemGeom/Make/options
View file

@ -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

6
applications/utilities/mesh/manipulation/moveDyMEngineMesh/Make/options
View file

@ -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

5
applications/utilities/mesh/manipulation/tetDecomposition/Make/options
View file

@ -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

3
applications/utilities/miscellaneous/foamDebugSwitches/Make/options
View file

@ -12,7 +12,8 @@ EXE_LIBS = \
-lerrorEstimation \
-lfiniteVolume \
-lfiniteArea \
$(WM_DECOMP_LIBS) \
-ltetFiniteElement \
-ltetMotionSolver \
-lforces \
-lfvMotionSolver \
-lincompressibleLESModels \

5
applications/utilities/parallelProcessing/decomposePar/Make/options
View file

@ -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

5
applications/utilities/parallelProcessing/reconstructPar/Make/options
View file

@ -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

5
applications/utilities/parallelProcessing/reconstructParMesh/Make/options
View file

@ -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

1
applications/utilities/postProcessing/multiSolver/Make/options
View file

@ -5,6 +5,5 @@ EXE_INC = \
EXE_LIBS = \
-lfiniteVolume \
-L$(FOAM_USER_LIBBIN) \
-lmultiSolver

5
etc/settings.csh
View file

@ -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

5
etc/settings.sh
View file

@ -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

6
src/Allwmake
View file

@ -22,8 +22,6 @@ Pstream/Allwmake
wmake libo OSspecific/$WM_OSTYPE
wmake libso OpenFOAM
wmake libso multiSolver
# Decomposition methods needed by meshTools
decompositionMethods/AllwmakeLnInclude
decompositionMethods/Allwmake
@ -41,7 +39,7 @@ wmake libso finiteArea
wmake libso lduSolvers
wmake libso VectorN
(cd tetDecompositionFiniteElement ; ./Allwmake)
wmake libso tetFiniteElement
# Make dynamicMesh tools
dynamicMesh/AllwmakeLnInclude
@ -68,4 +66,6 @@ fvAgglomerationMethods/Allwmake
wmake libso engine
wmake libso multiSolver
# ----------------------------------------------------------------- end-of-file

4
src/OpenFOAM/containers/Lists/UList/UListI.H
View file

@ -162,7 +162,7 @@ namespace Foam
// Template specialization for bool
template<>
inline const bool& Foam::UList<bool>::operator[](const label i) const
inline const bool& UList<bool>::operator[](const label i) const
{
// lazy evaluation - return false for out-of-range
if (i < size_)
@ -171,7 +171,7 @@ namespace Foam
}
else
{
return Foam::pTraits<bool>::zero;
return pTraits<bool>::zero;
}
}

2
src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C
View file

@ -78,7 +78,7 @@ void Foam::UPtrList<T>::setSize(const label newSize)
ptrs_.setSize(newSize);
// set new elements to NULL
for (register label i=oldSize; i<newSize; i++)
for (register label i = oldSize; i < newSize; i++)
{
ptrs_[i] = NULL;
}

69
src/OpenFOAM/matrices/blockLduMatrix/BlockLduMatrix/BlockLduMatrixATmul.C
View file

@ -64,44 +64,15 @@ void Foam::BlockLduMatrix<Type>::AmulCore
const unallocLabelList& u = lduAddr().upperAddr();
const unallocLabelList& l = lduAddr().lowerAddr();
const TypeCoeffField& Diag = this->diag();
const TypeCoeffField& Upper = this->upper();
// Diagonal multiplication, no indirection
multiply(Ax, Diag, x);
// Create multiplication function object
typename BlockCoeff<Type>::multiply mult;
// AmulCore must be additive to account for initialisation step
// in ldu interfaces. HJ, 6/Nov/2007
// Fixed by IC 19/Oct/2011
if (Diag.activeType() == blockCoeffBase::SCALAR)
{
const scalarTypeField& activeDiag = Diag.asScalar();
for (register label cellI = 0; cellI < activeDiag.size(); cellI++)
{
Ax[cellI] += mult(activeDiag[cellI], x[cellI]);
}
}
else if (Diag.activeType() == blockCoeffBase::LINEAR)
{
const linearTypeField& activeDiag = Diag.asLinear();
for (register label cellI = 0; cellI < activeDiag.size(); cellI++)
{
Ax[cellI] += mult(activeDiag[cellI], x[cellI]);
}
}
else if (Diag.activeType() == blockCoeffBase::SQUARE)
{
const squareTypeField& activeDiag = Diag.asSquare();
for (register label cellI = 0; cellI < activeDiag.size(); cellI++)
{
Ax[cellI] += mult(activeDiag[cellI], x[cellI]);
}
}
// Lower multiplication
if (symmetric())
@ -238,40 +209,12 @@ void Foam::BlockLduMatrix<Type>::TmulCore
const TypeCoeffField& Diag = this->diag();
const TypeCoeffField& Upper = this->upper();
// Diagonal multiplication, no indirection
multiply(Tx, Diag, x);
// Create multiplication function object
typename BlockCoeff<Type>::multiply mult;
// AmulCore must be additive to account for initialisation step
// in ldu interfaces. HJ, 6/Nov/2007
// Fixed by IC 19/Oct/2011
if (Diag.activeType() == blockCoeffBase::SCALAR)
{
const scalarTypeField& activeDiag = Diag.asScalar();
for (register label cellI = 0; cellI < activeDiag.size(); cellI++)
{
Tx[cellI] += mult(activeDiag[cellI], x[cellI]);
}
}
else if (Diag.activeType() == blockCoeffBase::LINEAR)
{
const linearTypeField& activeDiag = Diag.asLinear();
for (register label cellI = 0; cellI < activeDiag.size(); cellI++)
{
Tx[cellI] += mult(activeDiag[cellI], x[cellI]);
}
}
else if (Diag.activeType() == blockCoeffBase::SQUARE)
{
const squareTypeField& activeDiag = Diag.asSquare();
for (register label cellI = 0; cellI < activeDiag.size(); cellI++)
{
Tx[cellI] += mult(activeDiag[cellI].T(), x[cellI]);
}
}
// Upper multiplication
if (Upper.activeType() == blockCoeffBase::SCALAR)

116
src/OpenFOAM/primitives/Tensor/tensor/tensor.C
View file

@ -252,7 +252,24 @@ vector eigenVector(const tensor& t, const scalar lambda)
}
else
{
return vector::zero;
// Double identical eigen-value
if (mag(A.xx()) > SMALL)
{
return vector(0, 1, 0);
}
else if (mag(A.yy()) > SMALL)
{
return vector(0, 0, 1);
}
else if (mag(A.zz()) > SMALL)
{
return vector(1, 0, 0);
}
else
{
// Everything is zero. Return arbitrary vector
return vector(1, 0, 0);
}
}
}
@ -264,15 +281,6 @@ tensor eigenVectors(const tensor& t)
// Modification for strict-aliasing compliance.
// Sandeep Menon, 01/Dec/2010
// Test for null eigen values to return a not null eigen vector
// Jovani Favero, 18/Nov/2009
tensor evs
(
(mag(evals.x()) < SMALL) ? vector(0, 0, 1) : eigenVector(t, evals.x()),
(mag(evals.y()) < SMALL) ? vector(0, 1, 0) : eigenVector(t, evals.y()),
(mag(evals.z()) < SMALL) ? vector(1, 0, 0) : eigenVector(t, evals.z())
);
// Test for null eigen values to return a not null eigen vector.
// Jovani Favero, 18/Nov/2009. Adjusted by HJ, to correct for multiple zero
// entries in eigenvalues
@ -281,7 +289,7 @@ tensor eigenVectors(const tensor& t)
// and xyz tensor is returned
if (mag(evals.z()) < SMALL)
{
return evs;
return I;
}
// One valid eigen-vector. Manufacture second and third direction
@ -289,7 +297,7 @@ tensor eigenVectors(const tensor& t)
if (mag(evals.y()) < SMALL)
{
// Take the z eigenvector and find a non-zero component
vector zVec = evs.z();
vector zVec = eigenVector(t, evals.z());
vector yVec;
@ -311,22 +319,31 @@ tensor eigenVectors(const tensor& t)
vector xVec = yVec ^ zVec;
// Note different return
return tensor(xVec, yVec, zVec);
}
if (mag(evals.x()) < SMALL)
{
// Calculate the third eigen-vector as the cross-product of the others
vector xCross = evs.y() ^ evs.z();
xCross /= mag(xCross);
vector xVec = eigenVector(t, evals.x());
vector yVec = eigenVector(t, evals.y());
vector zVec = eigenVector(t, evals.z());
evs.xx() = xCross.x();
evs.xy() = xCross.y();
evs.xz() = xCross.z();
// If second and third eigen value is the same, the two vectors
// will be identical. Fix this
if (mag(evals.z() - evals.y()) < SMALL)
{
zVec = xVec ^ yVec;
}
return tensor(xVec, yVec, zVec);
}
return evs;
return tensor
(
eigenVector(t, evals.x()),
eigenVector(t, evals.y()),
eigenVector(t, evals.z())
);
}
@ -442,12 +459,6 @@ vector eigenValues(const symmTensor& t)
vector eigenVector(const symmTensor& t, const scalar lambda)
{
// HJ, I think this is wrong. HJ, 9/Jul/2010
// if (mag(lambda) < SMALL)
// {
// return vector::zero;
// }
// Construct the matrix for the eigenvector problem
symmTensor A(t - lambda*I);
@ -499,7 +510,24 @@ vector eigenVector(const symmTensor& t, const scalar lambda)
}
else
{
return vector::zero;
// Double identical eigen-value
if (mag(A.xx()) > SMALL)
{
return vector(0, 1, 0);
}
else if (mag(A.yy()) > SMALL)
{
return vector(0, 0, 1);
}
else if (mag(A.zz()) > SMALL)
{
return vector(1, 0, 0);
}
else
{
// Everything is zero. Return arbitrary vector
return vector(1, 0, 0);
}
}
}
@ -513,18 +541,12 @@ tensor eigenVectors(const symmTensor& t)
// Test for null eigen values to return a not null eigen vector
// Jovani Favero, 18/Nov/2009
tensor evs
(
(mag(evals.x()) < SMALL) ? vector(0, 0, 1) : eigenVector(t, evals.x()),
(mag(evals.y()) < SMALL) ? vector(0, 1, 0) : eigenVector(t, evals.y()),
(mag(evals.z()) < SMALL) ? vector(1, 0, 0) : eigenVector(t, evals.z())
);
// Start with largest eigen-value: if this is zero, all are zero
// and original tensor is returned
if (mag(evals.z()) < SMALL)
{
return evs;
return I;
}
// One valid eigen-vector. Manufacture second and third direction
@ -532,7 +554,7 @@ tensor eigenVectors(const symmTensor& t)
if (mag(evals.y()) < SMALL)
{
// Take the z eigenvector and find a non-zero component
vector zVec = evs.z();
vector zVec = eigenVector(t, evals.z());
vector yVec;
@ -560,16 +582,26 @@ tensor eigenVectors(const symmTensor& t)
if (mag(evals.x()) < SMALL)
{
// Calculate the third eigen-vector as the cross-product of the others
vector xCross = evs.y() ^ evs.z();
xCross /= mag(xCross);
vector xVec = eigenVector(t, evals.x());
vector yVec = eigenVector(t, evals.y());
vector zVec = eigenVector(t, evals.z());
evs.xx() = xCross.x();
evs.xy() = xCross.y();
evs.xz() = xCross.z();
// If second and third eigen value is the same, the two vectors
// will be identical. Fix this
if (mag(evals.z() - evals.y()) < SMALL)
{
zVec = xVec ^ yVec;
}
return tensor(xVec, yVec, zVec);
}
return evs;
return tensor
(
eigenVector(t, evals.x()),
eigenVector(t, evals.y()),
eigenVector(t, evals.z())
);
}

2
src/dynamicMesh/Allwmake
View file

@ -2,8 +2,6 @@
cd ${0%/*} || exit 1 # run from this directory
set -x
wmakeLnInclude dynamicMesh
wmake libso dynamicMesh
# Make meshMotion solvers

8
src/dynamicMesh/dynamicFvMesh/Make/options
View file

@ -4,9 +4,8 @@ EXE_INC = \
-I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \
-I$(LIB_SRC)/finiteVolume/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)/dynamicMesh/meshMotion/tetMotionSolver/lnInclude \
-I$(LIB_SRC)/tetFiniteElement/lnInclude \
-I$(LIB_SRC)/dynamicMesh/meshMotion/fvMotionSolver/lnInclude \
-I$(LIB_SRC)/dynamicMesh/meshMotion/RBFMotionSolver/lnInclude \
-I$(LIB_SRC)/dynamicMesh/meshMotion/mesquiteMotionSolver/lnInclude
@ -17,7 +16,8 @@ LIB_LIBS = \
-ldynamicMesh \
-lfiniteVolume \
-lsolidBodyMotion \
$(WM_DECOMP_LIBS) \
-ltetFiniteElement \
-ltetMotionSolver \
-lfvMotionSolver \
-lRBFMotionSolver \
-lmesquiteMotionSolver

12
src/dynamicMesh/dynamicFvMesh/dynamicBodyFvMesh/dynamicBodyFvMesh.C
View file

@ -29,8 +29,8 @@ License
#include "motionSolver.H"
#include "volFields.H"
#include "mathematicalConstants.H"
#include "tetDecompositionMotionSolver.H"
#include "laplaceTetDecompositionMotionSolver.H"
#include "tetMotionSolver.H"
#include "laplaceTetMotionSolver.H"
#include "fixedValueTetPolyPatchFields.H"
#include "transformField.H"
@ -131,11 +131,11 @@ bool Foam::dynamicBodyFvMesh::update()
if
(
motionPtr_->type()
== laplaceTetDecompositionMotionSolver::typeName
== laplaceTetMotionSolver::typeName
)
{
tetDecompositionMotionSolver& mSolver =
dynamic_cast<tetDecompositionMotionSolver&>
tetMotionSolver& mSolver =
dynamic_cast<tetMotionSolver&>
(
motionPtr_()
);
@ -216,7 +216,7 @@ bool Foam::dynamicBodyFvMesh::update()
<< "Selected mesh motion solver is "
<< motionPtr_->type()
<< ", instead "
<< tetDecompositionMotionSolver::typeName
<< tetMotionSolver::typeName
<< exit(FatalError);
}

14
src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/eMesh/eMeshDemandDrivenData.C
View file

@ -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;
}
}

2
src/dynamicMesh/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFvMesh.H
View file

@ -48,7 +48,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class solidBodyMotionFvMesh Declaration
Class solidBodyMotionFvMesh Declaration
\*---------------------------------------------------------------------------*/
class solidBodyMotionFvMesh

3
src/dynamicMesh/meshMotion/Allwmake
View file

@ -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

21
src/dynamicMesh/meshMotion/solidBodyMotion/Make/options
View file

@ -1,21 +1,4 @@
EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude \
-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)/dynamicMesh/meshMotion/fvMotionSolver/lnInclude \
-I$(LIB_SRC)/dynamicMesh/meshMotion/RBFMotionSolver/lnInclude \
-I$(LIB_SRC)/dynamicMesh/meshMotion/mesquiteMotionSolver/lnInclude
-I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude
LIB_LIBS = \
-ltriSurface \
-lmeshTools \
-ldynamicMesh \
-lfiniteVolume \
$(WM_DECOMP_LIBS) \
-lfvMotionSolver \
-lRBFMotionSolver \
-lmesquiteMotionSolver
LIB_LIBS =

4
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/Allwmake
View file

@ -1,4 +0,0 @@
#!/bin/sh
wmake libso . Make.cellDecomp
wmake libso . Make.faceDecomp

11
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/Make.cellDecomp/options
View file

@ -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

17
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/Make.faceDecomp/files
View file

@ -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

8
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/Make.cellDecomp/files → src/dynamicMesh/meshMotion/tetMotionSolver/Make/files
View file

@ -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

5
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/Make.faceDecomp/options → src/dynamicMesh/meshMotion/tetMotionSolver/Make/options
View file

@ -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

0
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/cellQuality/cellQuality.C → src/dynamicMesh/meshMotion/tetMotionSolver/cellQuality/cellQuality.C
View file

0
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/cellQuality/cellQuality.H → src/dynamicMesh/meshMotion/tetMotionSolver/cellQuality/cellQuality.H
View file

2
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/deformationEnergy/deformationEnergyDiff.C → src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/deformationEnergy/deformationEnergyDiff.C
View file

@ -46,7 +46,7 @@ namespace Foam
// Construct from components
Foam::deformationEnergyDiff::deformationEnergyDiff
(
const tetDecompositionMotionSolver& mSolver
const tetMotionSolver& mSolver
)
:
motionDiff(mSolver),

2
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/deformationEnergy/deformationEnergyDiff.H → src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/deformationEnergy/deformationEnergyDiff.H
View file

@ -85,7 +85,7 @@ public:
//- Construct from components
deformationEnergyDiff
(
const tetDecompositionMotionSolver& mSolver
const tetMotionSolver& mSolver
);

2
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/distortionEnergy/distortionEnergyDiff.C → src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/distortionEnergy/distortionEnergyDiff.C
View file

@ -46,7 +46,7 @@ namespace Foam
// Construct from components
Foam::distortionEnergyDiff::distortionEnergyDiff
(
const tetDecompositionMotionSolver& mSolver
const tetMotionSolver& mSolver
)
:
motionDiff(mSolver),

2
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/distortionEnergy/distortionEnergyDiff.H → src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/distortionEnergy/distortionEnergyDiff.H
View file

@ -89,7 +89,7 @@ public:
//- Construct from components
distortionEnergyDiff
(
const tetDecompositionMotionSolver& mSolver
const tetMotionSolver& mSolver
);

2
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/exponential/exponentialDiff.C → src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/exponential/exponentialDiff.C
View file

@ -45,7 +45,7 @@ namespace Foam
// Construct from components
Foam::exponentialDiff::exponentialDiff
(
const tetDecompositionMotionSolver& mSolver
const tetMotionSolver& mSolver
)
:
linearDiff(mSolver)

2
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/exponential/exponentialDiff.H → src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/exponential/exponentialDiff.H
View file

@ -71,7 +71,7 @@ public:
//- Construct from components
exponentialDiff
(
const tetDecompositionMotionSolver& mSolver
const tetMotionSolver& mSolver
);

2
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/file/fileDiff.C → src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/file/fileDiff.C
View file

@ -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_

2
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/file/fileDiff.H → src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/file/fileDiff.H
View file

@ -76,7 +76,7 @@ public:
// Constructors
//- Construct from components
fileDiff(const tetDecompositionMotionSolver& mSolver);
fileDiff(const tetMotionSolver& mSolver);
// Destructor

2
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/linear/linearDiff.C → src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/linear/linearDiff.C
View file

@ -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")),

2
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/linear/linearDiff.H → src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/linear/linearDiff.H
View file

@ -91,7 +91,7 @@ public:
//- Construct from components
linearDiff
(
const tetDecompositionMotionSolver& mSolver
const tetMotionSolver& mSolver
);

2
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/motionDiff/motionDiff.C → src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/motionDiff/motionDiff.C
View file

@ -42,7 +42,7 @@ namespace Foam
Foam::autoPtr<Foam::motionDiff> Foam::motionDiff::New
(
const tetDecompositionMotionSolver& mSolver
const tetMotionSolver& mSolver
)
{
const dictionary& dict = mSolver;

12
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/motionDiff/motionDiff.H → src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/motionDiff/motionDiff.H
View file

@ -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<motionDiff> 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_;
}

2
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/patchEnhanced/patchEnhancedDiff.C → src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/patchEnhanced/patchEnhancedDiff.C
View file

@ -45,7 +45,7 @@ namespace Foam
// Construct from components
Foam::patchEnhancedDiff::patchEnhancedDiff
(
const tetDecompositionMotionSolver& mSolver
const tetMotionSolver& mSolver
)
:
motionDiff(mSolver),

2
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/patchEnhanced/patchEnhancedDiff.H → src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/patchEnhanced/patchEnhancedDiff.H
View file

@ -81,7 +81,7 @@ public:
//- Construct from components
patchEnhancedDiff
(
const tetDecompositionMotionSolver& mSolver
const tetMotionSolver& mSolver
);

2
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/quadratic/quadraticDiff.C → src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/quadratic/quadraticDiff.C
View file

@ -45,7 +45,7 @@ namespace Foam
// Construct from components
Foam::quadraticDiff::quadraticDiff
(
const tetDecompositionMotionSolver& mSolver
const tetMotionSolver& mSolver
)
:
linearDiff(mSolver)

2
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/quadratic/quadraticDiff.H → src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/quadratic/quadraticDiff.H
View file

@ -71,7 +71,7 @@ public:
//- Construct from components
quadraticDiff
(
const tetDecompositionMotionSolver& mSolver
const tetMotionSolver& mSolver
);

2
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/uniform/uniformDiff.C → src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/uniform/uniformDiff.C
View file

@ -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_

2
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/motionDiffs/uniform/uniformDiff.H → src/dynamicMesh/meshMotion/tetMotionSolver/motionDiffs/uniform/uniformDiff.H
View file

@ -80,7 +80,7 @@ public:
//- Construct from components
uniformDiff
(
const tetDecompositionMotionSolver& mSolver
const tetMotionSolver& mSolver
);

22
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/tetDecompositionMotionSolver/laplace/laplaceTetDecompositionMotionSolver.C → src/dynamicMesh/meshMotion/tetMotionSolver/tetMotionSolver/laplace/laplaceTetMotionSolver.C
View file

@ -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);
}

34
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/tetDecompositionMotionSolver/laplace/laplaceTetDecompositionMotionSolver.H → src/dynamicMesh/meshMotion/tetMotionSolver/tetMotionSolver/laplace/laplaceTetMotionSolver.H
View file

@ -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

20
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/tetDecompositionMotionSolver/pseudoSolid/pseudoSolidTetDecompositionMotionSolver.C → src/dynamicMesh/meshMotion/tetMotionSolver/tetMotionSolver/pseudoSolid/pseudoSolidTetMotionSolver.C
View file

@ -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

34
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/tetDecompositionMotionSolver/pseudoSolid/pseudoSolidTetDecompositionMotionSolver.H → src/dynamicMesh/meshMotion/tetMotionSolver/tetMotionSolver/pseudoSolid/pseudoSolidTetMotionSolver.H
View file

@ -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

32
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/tetDecompositionMotionSolver/tetDecompositionMotionSolver.C → src/dynamicMesh/meshMotion/tetMotionSolver/tetMotionSolver/tetMotionSolver.C
View file

@ -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::pointField>
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::elementScalarField>
Foam::tetDecompositionMotionSolver::distortionEnergy() const
Foam::tetMotionSolver::distortionEnergy() const
{
tmp<elementScalarField> tUd
(
@ -184,7 +184,7 @@ Foam::tetDecompositionMotionSolver::distortionEnergy() const
Foam::tmp<Foam::elementScalarField>
Foam::tetDecompositionMotionSolver::deformationEnergy() const
Foam::tetMotionSolver::deformationEnergy() const
{
tmp<elementScalarField> tUd
(
@ -219,7 +219,7 @@ Foam::tetDecompositionMotionSolver::deformationEnergy() const
Foam::tmp<Foam::elementScalarField>
Foam::tetDecompositionMotionSolver::totDistortionEnergy() const
Foam::tetMotionSolver::totDistortionEnergy() const
{
tmp<elementScalarField> 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::elementScalarField>
Foam::tetDecompositionMotionSolver::totDeformationEnergy() const
Foam::tetMotionSolver::totDeformationEnergy() const
{
tmp<elementScalarField> tUd
(
@ -286,7 +286,7 @@ Foam::tetDecompositionMotionSolver::totDeformationEnergy() const
{
FatalErrorIn
(
"tetDecompositionMotionSolver::totDistortionEnergy()"
"tetMotionSolver::totDistortionEnergy()"
) << "Total displacement field is not stored." << endl
<< exit(FatalError);
}

25
src/dynamicMesh/meshMotion/tetDecompositionMotionSolver/tetDecompositionMotionSolver/tetDecompositionMotionSolver.H → src/dynamicMesh/meshMotion/tetMotionSolver/tetMotionSolver/tetMotionSolver.H
View file

@ -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

8
src/dynamicMesh/topoChangerFvMesh/Make/options
View file

@ -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

7
src/engine/Make/options
View file

@ -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

2
src/engine/engineTopoChangerMesh/accordionEngineMesh/accordionEngineMesh.C
View file

@ -37,7 +37,7 @@ License
#include "fvPatchField.H"
#include "Switch.H"
#include "symmetryFvPatch.H"
#include "tetDecompositionMotionSolver.H"
#include "tetMotionSolver.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

6
src/engine/engineTopoChangerMesh/accordionEngineMesh/accordionEngineMeshMove.C
View file

@ -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<tetDecompositionMotionSolver>(msPtr_());
tetMotionSolver& mSolver =
refCast<tetMotionSolver>(msPtr_());
scalar deltaZ = engTime().pistonDisplacement().value();

2
src/engine/engineTopoChangerMesh/accordionEngineMesh/addAccordionEngineMeshZones.C
View file

@ -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"

2
src/engine/engineTopoChangerMesh/deformingEngineMesh/addDeformingEngineMeshZones.C
View file

@ -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"

2
src/engine/engineTopoChangerMesh/deformingEngineMesh/deformingEngineMesh.C
View file

@ -36,7 +36,7 @@ License
#include "fvPatchField.H"
#include "Switch.H"
#include "symmetryFvPatch.H"
#include "tetDecompositionMotionSolver.H"
#include "tetMotionSolver.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

6
src/engine/engineTopoChangerMesh/deformingEngineMesh/deformingEngineMeshMove.C
View file

@ -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<tetDecompositionMotionSolver>(msPtr_());
tetMotionSolver& mSolver =
refCast<tetMotionSolver>(msPtr_());
scalar deltaZ = engTime().pistonDisplacement().value();

2
src/engine/engineTopoChangerMesh/engineValveSliding/engineValveSliding.C
View file

@ -41,7 +41,7 @@ Class
#include "fvPatchField.H"
#include "Switch.H"
#include "symmetryFvPatch.H"
#include "tetDecompositionMotionSolver.H"
#include "tetMotionSolver.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

6
src/engine/engineTopoChangerMesh/engineValveSliding/engineValveSlidingMove.C
View file

@ -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<tetDecompositionMotionSolver>(msPtr_());
tetMotionSolver& mSolver =
refCast<tetMotionSolver>(msPtr_());
// Detaching the interfacethobois2DSlidingDeform
if (attached())

6
src/engine/engineTopoChangerMesh/layerSmooth/layerSmoothMove.C
View file

@ -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<tetDecompositionMotionSolver>(msPtr_());
tetMotionSolver& mSolver =
refCast<tetMotionSolver>(msPtr_());
tetPointVectorField& motionU = mSolver.motionU();

2
src/engine/engineTopoChangerMesh/pistonSliding/pistonSliding.C
View file

@ -41,7 +41,7 @@ Class
#include "fvPatchField.H"
#include "Switch.H"
#include "symmetryFvPatch.H"
#include "tetDecompositionMotionSolver.H"
#include "tetMotionSolver.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

6
src/engine/engineTopoChangerMesh/pistonSliding/pistonSlidingMove.C
View file

@ -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<tetDecompositionMotionSolver>(msPtr_());
tetMotionSolver& mSolver =
refCast<tetMotionSolver>(msPtr_());
// Detaching the interfacethobois2DSlidingDeform
if (attached())

2
src/engine/engineTopoChangerMesh/thoboisMesh/thoboisMesh.C
View file

@ -38,7 +38,7 @@ License
#include "fvPatchField.H"
#include "Switch.H"
#include "symmetryFvPatch.H"
#include "tetDecompositionMotionSolver.H"
#include "tetMotionSolver.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

6
src/engine/engineTopoChangerMesh/thoboisMesh/thoboisMeshMove.C
View file

@ -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<tetDecompositionMotionSolver>(msPtr_());
tetMotionSolver& mSolver =
refCast<tetMotionSolver>(msPtr_());
tetPointVectorField& motionU = mSolver.motionU();

2
src/engine/engineTopoChangerMesh/thoboisSliding/thoboisSliding.C
View file

@ -41,7 +41,7 @@ Class
#include "fvPatchField.H"
#include "Switch.H"
#include "symmetryFvPatch.H"
#include "tetDecompositionMotionSolver.H"
#include "tetMotionSolver.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

6
src/engine/engineTopoChangerMesh/thoboisSliding/thoboisSlidingMove.C
View file

@ -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<tetDecompositionMotionSolver>(msPtr_());
tetMotionSolver& mSolver =
refCast<tetMotionSolver>(msPtr_());
// Detaching the interfacethobois2DSlidingDeform
if (attached())

6
src/engine/engineTopoChangerMesh/verticalValves/verticalValvesMove.C
View file

@ -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<tetDecompositionMotionSolver>(msPtr_());
tetMotionSolver& mSolver =
refCast<tetMotionSolver>(msPtr_());
// Detaching the interface
if (attached())

14
src/engine/simpleEngineTopoFvMesh/simpleEngineTopoFvMesh.C
View file

@ -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<tetDecompositionMotionSolver>(msPtr_());
tetMotionSolver& mSolver =
refCast<tetMotionSolver>(msPtr_());
tetPointVectorField& motionU = mSolver.motionU();
@ -390,8 +390,8 @@ void Foam::simpleEngineTopoFvMesh::setBoundaryPosition()
Info << "Setting boundary position" << endl;
}
tetDecompositionMotionSolver& mSolver =
refCast<tetDecompositionMotionSolver>(msPtr_());
tetMotionSolver& mSolver =
refCast<tetMotionSolver>(msPtr_());
tetPointVectorField& motionU = mSolver.motionU();
@ -477,8 +477,8 @@ Foam::simpleEngineTopoFvMesh::simpleEngineTopoFvMesh
bool Foam::simpleEngineTopoFvMesh::update()
{
tetDecompositionMotionSolver& mSolver =
refCast<tetDecompositionMotionSolver>(msPtr_());
tetMotionSolver& mSolver =
refCast<tetMotionSolver>(msPtr_());
// Detaching the interface
if (attached())

6
src/finiteVolume/fields/fvPatchFields/basic/coupled/coupledFvPatchField.C
View file

@ -154,7 +154,7 @@ tmp<Field<Type> > coupledFvPatchField<Type>::valueInternalCoeffs
const tmp<scalarField>& w
) const
{
return Type(pTraits<Type>::one)*w;
return pTraits<Type>::one*w;
}
@ -164,14 +164,14 @@ tmp<Field<Type> > coupledFvPatchField<Type>::valueBoundaryCoeffs
const tmp<scalarField>& w
) const
{
return Type(pTraits<Type>::one)*(1.0 - w);
return pTraits<Type>::one*(1.0 - w);
}
template<class Type>
tmp<Field<Type> > coupledFvPatchField<Type>::gradientInternalCoeffs() const
{
return -Type(pTraits<Type>::one)*this->patch().deltaCoeffs();
return -pTraits<Type>::one*this->patch().deltaCoeffs();
}

4
src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C
View file

@ -180,7 +180,7 @@ tmp<Field<Type> > mixedFvPatchField<Type>::valueInternalCoeffs
const tmp<scalarField>&
) const
{
return Type(pTraits<Type>::one)*(1.0 - valueFraction_);
return pTraits<Type>::one*(1.0 - valueFraction_);
}
@ -200,7 +200,7 @@ tmp<Field<Type> > mixedFvPatchField<Type>::valueBoundaryCoeffs
template<class Type>
tmp<Field<Type> > mixedFvPatchField<Type>::gradientInternalCoeffs() const
{
return -Type(pTraits<Type>::one)*valueFraction_*this->patch().deltaCoeffs();
return -pTraits<Type>::one*valueFraction_*this->patch().deltaCoeffs();
}

Some files were not shown because too many files have changed in this diff Show more