zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into splitCyclic

Browse Source 
Conflicts:
	src/OpenFOAM/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C
	src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C
	src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H
	src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
	src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C
	src/parallel/decompose/scotchDecomp/scotchDecomp.C
	src/parallel/parMetisDecomp/parMetisDecomp.C
	src/sampling/sampledSurface/isoSurface/isoSurfaceCell.C
This commit is contained in:
mattijs
2010-03-25 13:54:12 +00:00
parent 50160baa9c 52fc076b47
commit 89c7523c72
538 changed files with 15929 additions and 5466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/OpenFOAM/Make/files
View File

@ -237,9 +237,7 @@ $(lduMatrix)/preconditioners/diagonalPreconditioner/diagonalPreconditioner.C
$(lduMatrix)/preconditioners/DICPreconditioner/DICPreconditioner.C
$(lduMatrix)/preconditioners/FDICPreconditioner/FDICPreconditioner.C
$(lduMatrix)/preconditioners/DILUPreconditioner/DILUPreconditioner.C
/*
$(lduMatrix)/preconditioners/GAMGPreconditioner/GAMGPreconditioner.C
*/
lduAddressing = $(lduMatrix)/lduAddressing
$(lduAddressing)/lduAddressing.C
@ -253,17 +251,17 @@ $(lduInterfaceFields)/processorLduInterfaceField/processorLduInterfaceField.C
$(lduInterfaceFields)/cyclicLduInterfaceField/cyclicLduInterfaceField.C
GAMG = $(lduMatrix)/solvers/GAMG
/*
*/
$(GAMG)/GAMGSolver.C
$(GAMG)/GAMGSolverAgglomerateMatrix.C
$(GAMG)/GAMGSolverScalingFactor.C
$(GAMG)/GAMGSolverSolve.C
GAMGInterfaces = $(GAMG)/interfaces
$(GAMGInterfaces)/GAMGInterface/GAMGInterface.C
$(GAMGInterfaces)/GAMGInterface/newGAMGInterface.C
$(GAMGInterfaces)/processorGAMGInterface/processorGAMGInterface.C
$(GAMGInterfaces)/cyclicGAMGInterface/cyclicGAMGInterface.C
GAMGInterfaceFields = $(GAMG)/interfaceFields
$(GAMGInterfaceFields)/GAMGInterfaceField/GAMGInterfaceField.C
$(GAMGInterfaceFields)/GAMGInterfaceField/newGAMGInterfaceField.C