From 4706995f5fc94ceab07dc8e3f37e320a2eb7695a Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Sat, 2 May 2015 09:57:47 -0400 Subject: [PATCH] controlSwitches: updating after code merge. Minor correction for DimensionedConstants sigmaSB. Adapting foamDebugSwitches --- ListOfContributors | 2 + ThirdParty/AllMake.stage1 | 33 +- ThirdParty/AllMake.stage3 | 3 +- ThirdParty/AllMake.stage4 | 10 +- ThirdParty/AllMake.stage5 | 4 +- .../LocalDev/Hydro-Quebec/PyFoam/AllMake | 39 +- .../Hydro-Quebec/PyFoam/ChangeGGIBoundary.py | 18 +- .../PyFoam/ChangeMixingPlaneBoundary.py | 16 +- .../ConvertMixingPlaneBoundaryToNewSyntax.py | 24 +- .../Hydro-Quebec/PyFoam/InitGgiInterface.py | 30 +- .../PyFoam/InitMixingPlaneInterface.py | 22 +- .../PyFoam/pyFoamChangeGGIBoundary.py | 2 +- .../PyFoam/pyFoamChangeMixingPlaneBoundary.py | 2 +- ...amConvertMixingPlaneBoundaryToNewSyntax.py | 2 +- .../PyFoam/pyFoamInitGgiInterface.py | 2 +- .../PyFoam/pyFoamInitMixingPlaneInterface.py | 2 +- ThirdParty/PyFoamSiteScripts/bin/.gitStandin | 0 ThirdParty/PyFoamSiteScripts/etc/.gitStandin | 0 ThirdParty/PyFoamSiteScripts/lib/.gitStandin | 0 .../SOURCES/ParaView-4.2.0.patch_darwin | 12 + ThirdParty/rpmBuild/SPECS/ParaView-4.2.0.spec | 274 + ThirdParty/rpmBuild/SPECS/ParaView-4.3.1.spec | 274 + ThirdParty/rpmBuild/SPECS/PyFoam-0.6.4.spec | 201 + ThirdParty/rpmBuild/SPECS/gcc-4.7.4.spec | 174 + ThirdParty/rpmBuild/SPECS/gcc-4.9.2.spec | 174 + ThirdParty/rpmBuild/SPECS/gmp-4.3.2.spec | 155 + ThirdParty/rpmBuild/SPECS/mpfr-2.4.2.spec | 157 + .../qt-everywhere-opensource-src-4.8.6.spec | 183 + .../basic/potentialDyMFoam/potentialDyMFoam.C | 62 +- .../compressible/sonicDyMFoam/Make/files | 3 + .../compressible/sonicDyMFoam/Make/options | 21 + .../solvers/compressible/sonicDyMFoam/UEqn.H | 24 + .../compressibleContinuityErrs.H | 0 .../compressible/sonicDyMFoam/createFields.H | 65 + .../solvers/compressible/sonicDyMFoam/eEqn.H | 43 + .../compressible/sonicDyMFoam/limitU.H | 17 + .../solvers/compressible/sonicDyMFoam/pEqn.H | 69 + .../compressible/sonicDyMFoam/readControls.H | 14 + .../sonicDyMFoam/readFieldBounds.H | 20 + .../readTransportProperties.H | 0 .../sonicDyMFoam.C} | 151 +- .../solvers/compressible/sonicFoam/UEqn.H | 4 +- .../sonicFoamAutoMotion/Make/files | 3 - .../sonicFoamAutoMotion/Make/options | 10 - .../sonicFoamAutoMotion/createFields.H | 103 - .../readThermodynamicProperties.H | 23 - .../steadyCompressibleFoam/readFieldBounds.H | 14 +- .../readFieldBounds.H | 14 +- .../readFieldBounds.H | 15 +- .../solvers/coupled/pUCoupledFoam/UEqn.H | 3 +- .../solvers/coupled/pUCoupledFoam/boundPU.H | 32 + .../coupled/pUCoupledFoam/convergenceCheck.H | 8 + .../coupled/pUCoupledFoam/createFields.H | 2 +- .../pUCoupledFoam/initConvergenceCheck.H | 4 + .../coupled/pUCoupledFoam/pUCoupledFoam.C | 11 +- .../pUCoupledFoam/readBlockSolverControls.H | 18 +- .../coupled/pUCoupledFoam/readFieldBounds.H | 14 + .../solvers/multiphase/bubbleFoam/UEqns.H | 4 +- .../surfaceTracking/freeSurface/freeSurface.C | 6 +- .../mesh/cfMesh/FMSToSurface/FMSToSurface.C | 166 + .../mesh/cfMesh/FMSToSurface/Make/files | 3 + .../mesh/cfMesh/FMSToSurface/Make/options | 9 + .../utilities/mesh/cfMesh/FMSToVTK/FMSToVTK.C | 545 + .../utilities/mesh/cfMesh/FMSToVTK/Make/files | 3 + .../mesh/cfMesh/FMSToVTK/Make/options | 9 + .../utilities/mesh/cfMesh/FMSToVTK/xmlTag.H | 297 + .../cfMesh/importSurfaceAsSubset/Make/files | 3 + .../cfMesh/importSurfaceAsSubset/Make/options | 9 + .../importSurfaceAsSubset.C | 84 + .../cfMesh/improveSymmetryPlanes/Make/files | 3 + .../cfMesh/improveSymmetryPlanes/Make/options | 7 + .../improveSymmetryPlanes.C | 57 + .../cfMesh/mergeSurfacePatches/Make/files | 3 + .../cfMesh/mergeSurfacePatches/Make/options | 9 + .../mergeSurfacePatches/mergeSurfacePatches.C | 403 + .../python/Salome/extractFeatureEdges.py | 131 + .../cfMesh/python/Salome/salomeTriSurf.py | 363 + .../mesh/cfMesh/surfaceToFMS/Make/files | 3 + .../mesh/cfMesh/surfaceToFMS/Make/options | 9 + .../mesh/cfMesh/surfaceToFMS/surfaceToFMS.C | 63 + .../fluentMeshToFoam/fluentMeshToFoam.L | 2 +- .../manipulation/createPatch/createPatchDict | 2 +- .../moveDyMEngineMesh/moveDyMEngineMesh.C | 1 + .../moveDynamicMesh/moveDynamicMesh.C | 17 + .../mesh/manipulation/refineMesh/refineMesh.C | 42 +- .../foamDebugSwitches/foamDebugSwitches.C | 104 +- .../stressField/solidStress/solidStress.C | 7 +- .../postProcessing/velocityField/Mach/Mach.C | 3 +- bin/foamAddAndRemoveFromRelease.py | 101 - bin/foamBuildTarball.py | 46 - bin/foamEditProperties.py | 94 - doc/cfMesh/User Guide - cfMesh v1.0.1.pdf | Bin 0 -> 1728882 bytes doc/cfMesh/User Guide - cfMesh v1.0.pdf | Bin 689483 -> 0 bytes etc/aliases.csh | 4 +- etc/aliases.sh | 4 +- etc/apps/ensight/bashrc | 2 +- etc/apps/ensight/cshrc | 4 +- etc/apps/paraview3/bashrc | 2 +- etc/apps/paraview3/cshrc | 2 +- etc/bashrc | 6 +- etc/controlDict | 4 +- etc/cshrc | 2 +- etc/prefs.csh-EXAMPLE | 13 +- etc/prefs.sh-EXAMPLE | 13 +- etc/settings.csh | 69 +- etc/settings.sh | 81 +- extend-bazaar/Allwmake | 8 +- .../sixDOF/finiteRotation/finiteRotation.C | 13 +- .../sixDOF/finiteRotation/finiteRotation.H | 9 +- .../sixDOF/quaternions/HamiltonRodriguezRot.H | 18 +- src/ODE/sixDOF/sixDOFbodies/sixDOFbodies.C | 2 +- src/ODE/sixDOF/sixDOFqODE/sixDOFqODE.C | 79 +- src/ODE/sixDOF/sixDOFqODE/sixDOFqODE.H | 40 +- src/ODE/sixDOF/sixDOFqODE/sixDOFqODEI.H | 44 +- .../coupledLduMatrix/coupledLduMatrix.C | 114 +- src/dbns/multigrid/mgMeshLevel/mgMeshLevel.C | 14 +- src/dbns/multigrid/mgMeshLevel/mgMeshLevel.H | 4 +- src/dynamicMesh/Allwmake | 4 +- src/dynamicMesh/dynamicFvMesh/Allwclean | 12 + src/dynamicMesh/dynamicFvMesh/Allwmake | 9 + src/dynamicMesh/dynamicFvMesh/Make/files | 38 - .../dynamicBodyFvMesh/dynamicBodyFvMesh.C | 2 +- .../dynamicFvMesh/dynamicFvMesh.H | 2 +- .../dynamicTopoFvMesh/Make/files | 39 + .../dynamicTopoFvMesh/Make/options | 13 + .../convexSetAlgorithm/convexSetAlgorithm.C | 1 - .../dynamicTopoFvMesh/coupledInfo.C | 647 - .../{ => coupledMesh}/coupleMap.C | 91 +- .../{ => coupledMesh}/coupleMap.H | 100 +- .../{ => coupledMesh}/coupleMapI.H | 22 +- .../coupledMesh/coupledInfo.C | 747 + .../{ => coupledMesh}/coupledInfo.H | 149 +- .../dynamicTopoFvMeshCoupled.C | 1959 +- .../coupledMesh/subMeshLduAddressing.H | 155 + .../coupledMesh/subMeshProcessorFvPatch.C | 72 + .../coupledMesh/subMeshProcessorFvPatch.H | 110 + .../coupledMesh/subMeshProcessorPolyPatch.C | 92 + .../coupledMesh/subMeshProcessorPolyPatch.H | 100 + .../dynamicTopoFvMesh/dynamicTopoFvMesh.C | 302 +- .../dynamicTopoFvMesh/dynamicTopoFvMesh.H | 99 +- .../dynamicTopoFvMeshCheck.C | 64 +- .../dynamicTopoFvMesh/dynamicTopoFvMeshI.H | 61 +- .../dynamicTopoFvMeshMapping.C | 7 +- .../dynamicTopoFvMeshReOrder.C | 49 +- .../dynamicTopoFvMesh/eMesh/eMesh.C | 26 - .../dynamicTopoFvMesh/eMesh/eMesh.H | 20 - .../eMesh/eMeshDemandDrivenData.C | 195 - .../eMesh/ePatches/ePatch/ePatch.C | 12 + .../eMesh/ePatches/ePatch/ePatch.H | 12 +- .../eMesh/ePatches/ePatch/newEPatch.C | 4 +- .../dynamicTopoFvMesh/edgeBisect.C | 2015 +- .../dynamicTopoFvMesh/edgeCollapse.C | 699 +- .../dynamicTopoFvMesh/edgeSwap.C | 49 +- .../fieldMapping/conservativeMapFields.H | 4 +- .../fieldMapping/fluxCorrector.C | 2 +- .../fieldMapping/topoMapper.C | 174 +- .../fieldMapping/topoMapper.H | 32 +- .../fieldMapping/topoMapperTemplates.C | 90 +- .../fieldMapping/topoPatchMapper.C | 9 +- .../fieldMapping/topoPatchMapper.H | 12 +- .../fieldMapping/topoPatchMapperTemplates.C | 38 +- .../lengthScaleEstimator.C | 234 +- .../lengthScaleEstimator.H | 20 + .../dynamicFvMesh/dynamicTopoFvMesh/meshOps.C | 48 +- .../dynamicFvMesh/dynamicTopoFvMesh/meshOps.H | 37 +- .../dynamicTopoFvMesh/meshOpsI.H | 153 +- .../dynamicTopoFvMesh/meshOpsTemplates.C | 195 - .../slidingInterfaceProjectPoints.C | 5 +- .../mesquiteMotionSolver.C | 1072 +- .../mesquiteMotionSolver.H | 35 +- .../linearValveFvMesh/linearValveFvMesh.C | 17 +- .../linearValveFvMesh/linearValveFvMesh.H | 8 +- .../mixerFvMesh/mixerFvMesh.C | 2 +- .../faMesh/faPatches/faPatch/faPatch.C | 24 +- .../fixedGradient/fixedGradientFaPatchField.H | 2 +- .../basic/mixed/mixedFaPatchField.H | 2 +- .../zeroGradient/zeroGradientFaPatchField.H | 2 +- .../faPatchFields/faPatchField/faPatchField.H | 4 +- src/finiteVolume/Make/files | 6 +- .../basicSymmetry/basicSymmetryFvPatchField.C | 59 +- .../basicSymmetry/basicSymmetryFvPatchField.H | 28 +- .../basicSymmetryFvPatchScalarField.C | 256 +- .../directionMixedFvPatchField.H | 2 +- .../fixedGradient/fixedGradientFvPatchField.H | 2 +- .../basic/mixed/mixedFvPatchField.H | 2 +- .../basic/sliced/slicedFvPatchField.H | 4 +- .../zeroGradient/zeroGradientFvPatchField.H | 2 +- .../constraint/wedge/wedgeFvPatchField.H | 2 +- .../derived/advective/advectiveFvPatchField.C | 6 +- .../derived/advective/advectiveFvPatchField.H | 2 +- .../fixedNormalSlipFvPatchField.H | 2 +- .../fluxCorrectedVelocityFvPatchVectorField.H | 2 +- ...ureInletOutletVelocityFvPatchVectorField.C | 2 +- ...ranslatingWallVelocityFvPatchVectorField.C | 3 +- ...ranslatingWallVelocityFvPatchVectorField.H | 2 +- .../fvPatchField/newFvPatchField.C | 14 +- .../symmetry/symmetryFvsPatchField.C | 11 + .../symmetry/symmetryFvsPatchField.H | 6 + .../constraint/wedge/wedgeFvsPatchField.C | 11 + .../constraint/wedge/wedgeFvsPatchField.H | 6 + .../fvsPatchField/fvsPatchField.H | 4 +- .../CrankNicolsonDdtScheme.C} | 73 +- .../CrankNicolsonDdtScheme.H} | 32 +- .../CrankNicolsonDdtSchemes.C} | 4 +- .../finiteVolume/fvc/fvcMeshPhi.C | 4 + .../gradSchemes/gaussGrad/gaussGrad.H | 2 + .../scalarGaussGrad.C | 18 +- .../scalarGaussGrad.H | 0 .../leastSquaresGrad/leastSquaresGrad.H | 2 + .../leastSquaresGrad/leastSquaresVectors.C | 257 +- .../leastSquaresGrad/leastSquaresVectors.H | 7 + .../scalarLeastSquaresGrad.C | 14 +- .../scalarLeastSquaresGrad.H | 0 .../cellLimitedGrad/cellLimitedGrads.C | 25 +- .../faceLimitedGrad/faceLimitedGrads.C | 14 +- .../scalarGaussGrad/.scalarGaussGrad.C.swp | Bin 16384 -> 0 bytes src/finiteVolume/fvMesh/fvMesh.C | 6 +- .../coordinateRotation/coordinateRotation.H | 1 + src/foam/db/IOstreams/Pstreams/Pstream.C | 9 +- src/foam/db/Time/Time.C | 16 +- src/foam/db/Time/Time.H | 16 +- .../OutputFilterFunctionObject.C | 1 + .../processor/ProcessorPointPatchField.C | 14 + .../ComponentMixedPointPatchVectorField.H | 2 +- src/foam/global/argList/argList.C | 10 +- src/foam/global/debug/debug.C | 12 +- src/foam/global/debug/debug.H | 2 +- .../GGIInterpolationPolygonIntersection.C | 2 +- .../GGIInterpolationQuickRejectTests.C | 2 +- .../BlockMatrixAgglomeration.C | 63 +- .../BlockMatrixAgglomeration.H | 6 +- .../BlockMatrixCoarsening.H | 3 +- .../BlockAmg/coarseBlockAmgLevel.C | 90 +- .../BlockAmg/coarseBlockAmgLevel.H | 6 + .../BlockAmg/fineBlockAmgLevel.C | 83 +- .../BlockAmg/fineBlockAmgLevel.H | 7 +- .../BlockGMRES/BlockGMRESSolver.C | 3 - .../lduMatrix/lduMatrix/lduMatrixOperations.C | 2 +- .../polyMesh/globalMeshData/globalMeshData.H | 7 +- .../polyBoundaryMesh/polyBoundaryMesh.C | 6 +- .../polyBoundaryMesh/polyBoundaryMesh.H | 16 +- .../polyPatches/constraint/ggi/ggiPolyPatch.C | 11 + .../polyPatches/constraint/ggi/ggiPolyPatch.H | 7 +- .../constraint/ggi/ggiPolyPatchTemplates.C | 33 +- .../BlockCoeffMaxNorm/BlockCoeffMaxNorm.H | 8 +- src/foam/primitives/Lists/labelPairList.H | 51 + src/foam/primitives/Tuple2/Tuple2.H | 2 +- src/foam/primitives/ints/ulong/ulongIO.C | 1 + src/lduSolvers/amg/amgPolicy/pamgPolicy.C | 78 +- src/lduSolvers/amg/amgPolicy/pamgPolicy.H | 5 +- src/lduSolvers/amg/coarseAmgLevel.C | 6 + src/lduSolvers/amg/fineAmgLevel.C | 4 +- .../deflationSolver/deflationSolver.C | 7 +- src/mesh/blockMesh/block/blockCreate.C | 16 +- src/mesh/blockMesh/blockMesh/blockMesh.H | 2 +- .../blockMesh/blockMesh/blockMeshCreate.C | 23 +- src/mesh/blockMesh/blockMesh/blockMeshMerge.C | 2 +- src/mesh/cfMesh/meshLibrary/Make/files | 18 + .../cartesian2DMeshGenerator.C | 45 +- .../cartesianMeshGenerator.C | 54 +- .../tetMeshExtractorOctree.C | 2 - .../tetMeshGenerator/tetMeshGenerator.C | 39 +- .../boundaryLayers/boundaryLayerCells.C | 17 +- .../utilities/boundaryLayers/boundaryLayers.C | 118 +- .../utilities/boundaryLayers/boundaryLayers.H | 3 + .../boundaryLayersCreateVertices.C | 86 +- .../boundaryLayers/boundaryLayersI.H | 52 +- .../boundaryLayers/refineBoundaryLayers.C | 31 +- .../utilities/checkMeshDict/checkMeshDict.C | 263 +- .../utilities/checkMeshDict/checkMeshDict.H | 6 + .../helperFunctionsGeometryQueries.H | 16 +- .../helperFunctionsGeometryQueriesI.H | 133 +- .../meshes/partTriMesh/partTriMesh.C | 9 + .../partTriMeshParallelAddressing.C | 232 +- .../polyMeshGen/boundaryPatch/boundaryPatch.C | 9 +- .../meshes/polyMeshGen/polyMeshGenFaces.C | 142 +- .../meshes/polyMeshGen/polyMeshGenFaces.H | 61 +- .../utilities/meshes/triSurf/triSurfFacets.C | 30 + .../utilities/meshes/triSurf/triSurfFacets.H | 7 + .../meshOctreeAddressingCreation.C | 42 +- .../meshOctreeAutomaticRefinement.H | 2 +- .../meshOctreeCreator/meshOctreeCreator.C | 9 +- .../meshOctreeCreator/meshOctreeCreator.H | 16 +- .../meshOctreeCreatorAdjustOctreeToSurface.C | 338 +- .../meshOctreeCreatorCreateOctreeBoxes.C | 60 +- .../meshOctreeCube/meshOctreeCube.H | 6 +- .../meshOctreeCube/meshOctreeCubeI.H | 10 + .../meshOctreeCubeRecursiveFunctions.C | 11 +- .../meshOctreeFindNearestSurfacePoint.C | 15 +- .../meshOctreeModifier/meshOctreeModifier.H | 10 + .../meshOctreeModifierRefineSelectedBoxes.C | 200 + .../objectRefinement/objectRefinement.C | 105 +- .../objectRefinement/objectRefinement.H | 15 + .../geometry/meshOptimizer/meshOptimizer.C | 13 +- .../geometry/meshOptimizer/meshOptimizer.H | 58 +- .../meshOptimizerOptimizeSurface.C | 9 +- .../geometry/meshOptimizer/optimizeMeshFV.C | 31 + .../symmetryPlaneOptimisation.C | 251 + .../symmetryPlaneOptimisation.H | 99 + .../meshSurfaceOptimizer.C | 14 +- .../meshSurfaceOptimizer.H | 30 +- .../meshSurfaceOptimizerI.H | 146 +- ...eshSurfaceOptimizerOptimizePointParallel.C | 79 - .../meshSurfaceOptimizerOptimizeSurface.C | 43 +- .../edgeExtractor/edgeExtractor.C | 15 +- .../edgeExtractor/edgeExtractorCorners.C | 6 +- .../meshSurfaceMapper/meshSurfaceMapper.H | 40 +- .../meshSurfaceMapperCornersAndEdges.C | 77 +- .../meshSurfaceMapperMapVertices.C | 20 +- .../meshSurfaceMapper2DMapVertices.C | 4 +- .../renameBoundaryPatches.C | 69 +- .../triSurface2DCheck/triSurface2DCheck.C | 171 + .../triSurface2DCheck/triSurface2DCheck.H | 98 + .../triSurfaceCleanupDuplicateTriangles.C | 56 + .../triSurfaceCleanupDuplicateTriangles.H | 98 + ...urfaceCleanupDuplicateTrianglesFunctions.C | 100 + .../triSurfaceCurvatureEstimatorCalculate.C | 135 +- .../triSurfaceImportSurfaceAsSubset.C | 240 + .../triSurfaceImportSurfaceAsSubset.H | 103 + .../functionObjects/forces/forces/forces.H | 2 +- src/sampling/probes/probes.C | 1 + .../constitutiveModel/constitutiveModel.H | 4 +- .../fixedDisplacementFvPatchVectorField.C | 6 +- .../fixedDisplacementFvPatchVectorField.H | 8 +- .../tetFemMatrix/tetFemMatrix.C | 8 - .../fixedEnthalpyFvPatchScalarField.C | 7 +- .../gradientEnthalpyFvPatchScalarField.C | 17 +- .../mixedEnthalpyFvPatchScalarField.C | 27 +- .../basic/psiThermo/ePsiThermo/ePsiThermo.C | 6 +- .../basic/psiThermo/hPsiThermo/hPsiThermo.C | 6 +- src/thermophysicalModels/radiation/Make/files | 1 + ...iffusiveRadiationMixedFvPatchScalarField.C | 217 +- ...iffusiveRadiationMixedFvPatchScalarField.H | 16 +- ...iffusiveRadiationMixedFvPatchScalarField.C | 194 +- ...iffusiveRadiationMixedFvPatchScalarField.H | 16 +- ...SpecularRadiationMixedFvPatchScalarField.C | 416 + ...SpecularRadiationMixedFvPatchScalarField.H | 162 + .../radiationConstants/radiationConstants.C | 13 +- .../radiation/radiationModel/P1/P1.C | 86 +- .../radiation/radiationModel/P1/P1.H | 2 + .../blackBodyEmission/blackBodyEmission.C | 40 +- .../radiationModel/fvDOM/fvDOM/fvDOM.C | 538 +- .../radiationModel/fvDOM/fvDOM/fvDOM.H | 64 +- .../radiationModel/fvDOM/fvDOM/fvDOMI.H | 36 + .../radiativeIntensityRay.C | 60 +- .../radiativeIntensityRay.H | 22 +- .../radiativeIntensityRayI.H | 23 +- .../radiationModel/noRadiation/noRadiation.C | 18 +- .../radiationModel/noRadiation/noRadiation.H | 3 + .../radiationModel/newRadiationModel.C | 47 +- .../radiationModel/radiationModel.C | 63 +- .../radiationModel/radiationModel.H | 75 +- .../hhuCombustionThermo/hhuCombustionThermo.H | 2 +- .../veryInhomogeneousMixture.H | 7 +- .../thermo/specieThermo/specieThermoI.H | 4 +- .../compressible/RAS/LRR/LRR.C | 3 + .../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C | 3 + .../RAS/LaunderSharmaKE/LaunderSharmaKE.C | 3 + .../compressible/RAS/RASModel/RASModel.C | 8 +- .../RAS/RNGkEpsilon/RNGkEpsilon.C | 3 + ...thDissipationRateInletFvPatchScalarField.C | 3 +- ...thDissipationRateInletFvPatchScalarField.H | 2 +- .../epsilonWallFunctionFvPatchScalarField.C | 2 +- .../omegaWallFunctionFvPatchScalarField.C | 2 +- .../compressible/RAS/kEpsilon/kEpsilon.C | 3 + .../compressible/RAS/kOmegaSST/kOmegaSST.C | 3 + .../RAS/realizableKE/realizableKE.C | 3 + .../incompressible/RAS/LRR/LRR.C | 2 + .../RAS/LamBremhorstKE/LamBremhorstKE.C | 2 + .../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C | 2 + .../RAS/LaunderSharmaKE/LaunderSharmaKE.C | 2 + .../RAS/LienCubicKELowRe/LienCubicKELowRe.C | 3 + .../LienLeschzinerLowRe/LienLeschzinerLowRe.C | 3 + .../incompressible/RAS/RASModel/RASModel.C | 8 +- .../RAS/RNGkEpsilon/RNGkEpsilon.C | 2 + .../RAS/SpalartAllmaras/SpalartAllmaras.C | 1 + .../epsilonWallFunctionFvPatchScalarField.C | 2 +- .../omegaWallFunctionFvPatchScalarField.C | 2 +- .../incompressible/RAS/kEpsilon/kEpsilon.C | 2 + .../incompressible/RAS/kOmega/kOmega.C | 2 + .../incompressible/RAS/kOmegaSST/kOmegaSST.C | 1 + .../incompressible/RAS/qZeta/qZeta.C | 2 + .../RAS/realizableKE/realizableKE.C | 2 + .../dbnsTurbFoam/naca0012/Allclean | 1 + .../compressible/dbnsTurbFoam/naca0012/Allrun | 1 + .../dbnsTurbFoam/naca0012/naca0012.cas | 25998 -- .../dbnsTurbFoam/naca0012/naca0012.cas.gz | Bin 0 -> 209482 bytes .../dbnsTurbFoam/naca0012/system/fvSchemes | 3 + .../hotRadiationRoomFvDOMSpecularCeiling/0/G | 56 + .../0/IDefault | 39 + .../hotRadiationRoomFvDOMSpecularCeiling/0/T | 47 + .../hotRadiationRoomFvDOMSpecularCeiling/0/U | 48 + .../0/alphat | 50 + .../0/epsilon | 58 + .../hotRadiationRoomFvDOMSpecularCeiling/0/k | 46 + .../0/mut | 58 + .../hotRadiationRoomFvDOMSpecularCeiling/0/p | 48 + .../constant/RASProperties | 24 + .../constant/g | 21 + .../constant/polyMesh/blockMeshDict | 186 + .../constant/radiationProperties | 58 + .../constant/thermophysicalProperties | 24 + .../system/controlDict | 48 + .../system/fvSchemes | 69 + .../system/fvSolution | 91 + .../system/fvSolution | 10 +- .../system/fvSolution | 10 +- .../pUCoupledFoam/cavity/system/fvSolution | 8 + .../t-junction/constant/polyMesh/boundary | 2 +- .../squareBump/system/fvSchemes | 2 +- .../simpleFoam/pitzDaily/0/epsilon | 7 +- .../incompressible/simpleFoam/pitzDaily/0/k | 1 + .../simpleFoam/pitzDaily/system/controlDict | 2 +- .../cartesianMesh/elbow_90degree/0/.ignore | 0 .../cartesianMesh/elbow_90degree/Allclean | 12 + .../cartesianMesh/elbow_90degree/Allrun | 6 + .../elbow_90degree/constant/.ignore | 0 .../elbow_90degree/elbow_90degree.stl | 36068 ++ .../cartesianMesh/elbow_90degree/readme.txt | 28 + .../elbow_90degree/system/controlDict | 53 + .../elbow_90degree/system/fvSchemes | 59 + .../elbow_90degree/system/fvSolution | 45 + .../elbow_90degree/system/meshDict | 71 + .../cartesianMesh/multipleOrifices/0/.ignore | 0 .../cartesianMesh/multipleOrifices/Allclean | 12 + .../cartesianMesh/multipleOrifices/Allrun | 6 + .../multipleOrifices/constant/.ignore | 0 .../multipleOrifices/multipleOrifices.stl | 83296 +++++ .../cartesianMesh/multipleOrifices/readme.txt | 56 + .../multipleOrifices/system/controlDict | 53 + .../multipleOrifices/system/fvSchemes | 59 + .../multipleOrifices/system/fvSolution | 45 + .../multipleOrifices/system/meshDict | 113 + .../cartesianMesh/ship5415Octree/0/.gitignore | 0 .../ship5415Octree/5415Joined1.stl | 253892 ++++++++++++++ .../ship5415Octree/5415Joined2.stl | 253976 +++++++++++++++ .../cartesianMesh/ship5415Octree/Allclean | 12 + .../cartesianMesh/ship5415Octree/Allrun | 8 + .../cartesianMesh/ship5415Octree/README | 1 + .../ship5415Octree/constant/.gitignore | 0 .../ship5415Octree/ship5415Octree.foam | 0 .../ship5415Octree/system/controlDict | 52 + .../ship5415Octree/system/fvSchemes | 66 + .../ship5415Octree/system/fvSolution | 49 + .../ship5415Octree/system/meshDict | 37 + .../cartesianMesh/singleOrifice/0/.ignore | 0 .../cartesianMesh/singleOrifice/Allclean | 12 + .../cfMesh/cartesianMesh/singleOrifice/Allrun | 6 + .../singleOrifice/constant/.ignore | 0 .../cartesianMesh/singleOrifice/readme.txt | 27 + .../singleOrifice/singleOrifice.stl | 19646 ++ .../singleOrifice/system/controlDict | 53 + .../singleOrifice/system/fvSchemes | 59 + .../singleOrifice/system/fvSolution | 45 + .../singleOrifice/system/meshDict | 98 + .../circCylinder3d/constant/dynamicMeshDict | 3 + vagrantSandbox/README | 10 +- vagrantSandbox/Vagrantfile | 30 +- vagrantSandbox/initArchlinuxScript.sh | 46 + vagrantSandbox/initCentOSRHELScript.sh | 19 +- vagrantSandbox/initFreeBSDScript.sh | 5 + vagrantSandbox/initGeneralScript.sh | 12 +- vagrantSandbox/skel/bootstrapFoam.sh | 4 + wmake/rules/linux64Gcc47/ARCHITECTURE_TESTED | 2 + wmake/rules/linux64Gcc47/X | 3 + wmake/rules/linux64Gcc47/c | 16 + wmake/rules/linux64Gcc47/c++ | 21 + wmake/rules/linux64Gcc47/c++Debug | 2 + wmake/rules/linux64Gcc47/c++Opt | 4 + wmake/rules/linux64Gcc47/c++Prof | 2 + wmake/rules/linux64Gcc47/cDebug | 2 + wmake/rules/linux64Gcc47/cOpt | 2 + wmake/rules/linux64Gcc47/cProf | 2 + wmake/rules/linux64Gcc47/general | 11 + wmake/rules/linux64Gcc47/mplib | 3 + wmake/rules/linux64Gcc47/mplibGAMMA | 3 + wmake/rules/linux64Gcc47/mplibHPMPI | 3 + wmake/rules/linux64Gcc47/mplibMPICH | 3 + wmake/rules/linux64Gcc47/mplibMPICH-GM | 3 + wmake/rules/linux64Gcc47/mplibMVAPICH2 | 0 wmake/rules/linux64Gcc47/mplibOPENMPI | 3 + wmake/rules/linux64Gcc47/mplibQSMPI | 4 + wmake/rules/linux64Gcc47/mplibSYSTEMOPENMPI | 1 + wmake/rules/linux64Gcc47/nvcc | 17 + wmake/rules/linux64Gcc49/ARCHITECTURE_TESTED | 2 + wmake/rules/linux64Gcc49/X | 3 + wmake/rules/linux64Gcc49/c | 16 + wmake/rules/linux64Gcc49/c++ | 21 + wmake/rules/linux64Gcc49/c++Debug | 2 + wmake/rules/linux64Gcc49/c++Opt | 4 + wmake/rules/linux64Gcc49/c++Prof | 2 + wmake/rules/linux64Gcc49/cDebug | 2 + wmake/rules/linux64Gcc49/cOpt | 2 + wmake/rules/linux64Gcc49/cProf | 2 + wmake/rules/linux64Gcc49/general | 11 + wmake/rules/linux64Gcc49/mplib | 3 + wmake/rules/linux64Gcc49/mplibGAMMA | 3 + wmake/rules/linux64Gcc49/mplibHPMPI | 3 + wmake/rules/linux64Gcc49/mplibMPICH | 3 + wmake/rules/linux64Gcc49/mplibMPICH-GM | 3 + wmake/rules/linux64Gcc49/mplibMVAPICH2 | 0 wmake/rules/linux64Gcc49/mplibOPENMPI | 3 + wmake/rules/linux64Gcc49/mplibQSMPI | 4 + wmake/rules/linux64Gcc49/mplibSYSTEMOPENMPI | 1 + wmake/rules/linux64Gcc49/nvcc | 17 + 505 files changed, 666459 insertions(+), 32898 deletions(-) create mode 100644 ThirdParty/PyFoamSiteScripts/bin/.gitStandin create mode 100644 ThirdParty/PyFoamSiteScripts/etc/.gitStandin create mode 100644 ThirdParty/PyFoamSiteScripts/lib/.gitStandin create mode 100644 ThirdParty/rpmBuild/SOURCES/ParaView-4.2.0.patch_darwin create mode 100644 ThirdParty/rpmBuild/SPECS/ParaView-4.2.0.spec create mode 100644 ThirdParty/rpmBuild/SPECS/ParaView-4.3.1.spec create mode 100644 ThirdParty/rpmBuild/SPECS/PyFoam-0.6.4.spec create mode 100644 ThirdParty/rpmBuild/SPECS/gcc-4.7.4.spec create mode 100644 ThirdParty/rpmBuild/SPECS/gcc-4.9.2.spec create mode 100644 ThirdParty/rpmBuild/SPECS/gmp-4.3.2.spec create mode 100644 ThirdParty/rpmBuild/SPECS/mpfr-2.4.2.spec create mode 100644 ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.8.6.spec create mode 100644 applications/solvers/compressible/sonicDyMFoam/Make/files create mode 100644 applications/solvers/compressible/sonicDyMFoam/Make/options create mode 100644 applications/solvers/compressible/sonicDyMFoam/UEqn.H rename applications/solvers/compressible/{sonicFoamAutoMotion => sonicDyMFoam}/compressibleContinuityErrs.H (100%) create mode 100644 applications/solvers/compressible/sonicDyMFoam/createFields.H create mode 100644 applications/solvers/compressible/sonicDyMFoam/eEqn.H create mode 100644 applications/solvers/compressible/sonicDyMFoam/limitU.H create mode 100644 applications/solvers/compressible/sonicDyMFoam/pEqn.H create mode 100644 applications/solvers/compressible/sonicDyMFoam/readControls.H create mode 100644 applications/solvers/compressible/sonicDyMFoam/readFieldBounds.H rename applications/solvers/compressible/{sonicFoamAutoMotion => sonicDyMFoam}/readTransportProperties.H (100%) rename applications/solvers/compressible/{sonicFoamAutoMotion/sonicFoamAutoMotion.C => sonicDyMFoam/sonicDyMFoam.C} (52%) delete mode 100644 applications/solvers/compressible/sonicFoamAutoMotion/Make/files delete mode 100644 applications/solvers/compressible/sonicFoamAutoMotion/Make/options delete mode 100644 applications/solvers/compressible/sonicFoamAutoMotion/createFields.H delete mode 100644 applications/solvers/compressible/sonicFoamAutoMotion/readThermodynamicProperties.H create mode 100644 applications/solvers/coupled/pUCoupledFoam/boundPU.H create mode 100644 applications/solvers/coupled/pUCoupledFoam/convergenceCheck.H create mode 100644 applications/solvers/coupled/pUCoupledFoam/initConvergenceCheck.H create mode 100644 applications/solvers/coupled/pUCoupledFoam/readFieldBounds.H create mode 100644 applications/utilities/mesh/cfMesh/FMSToSurface/FMSToSurface.C create mode 100644 applications/utilities/mesh/cfMesh/FMSToSurface/Make/files create mode 100644 applications/utilities/mesh/cfMesh/FMSToSurface/Make/options create mode 100644 applications/utilities/mesh/cfMesh/FMSToVTK/FMSToVTK.C create mode 100644 applications/utilities/mesh/cfMesh/FMSToVTK/Make/files create mode 100644 applications/utilities/mesh/cfMesh/FMSToVTK/Make/options create mode 100644 applications/utilities/mesh/cfMesh/FMSToVTK/xmlTag.H create mode 100644 applications/utilities/mesh/cfMesh/importSurfaceAsSubset/Make/files create mode 100644 applications/utilities/mesh/cfMesh/importSurfaceAsSubset/Make/options create mode 100644 applications/utilities/mesh/cfMesh/importSurfaceAsSubset/importSurfaceAsSubset.C create mode 100644 applications/utilities/mesh/cfMesh/improveSymmetryPlanes/Make/files create mode 100644 applications/utilities/mesh/cfMesh/improveSymmetryPlanes/Make/options create mode 100644 applications/utilities/mesh/cfMesh/improveSymmetryPlanes/improveSymmetryPlanes.C create mode 100644 applications/utilities/mesh/cfMesh/mergeSurfacePatches/Make/files create mode 100644 applications/utilities/mesh/cfMesh/mergeSurfacePatches/Make/options create mode 100644 applications/utilities/mesh/cfMesh/mergeSurfacePatches/mergeSurfacePatches.C create mode 100644 applications/utilities/mesh/cfMesh/python/Salome/extractFeatureEdges.py create mode 100644 applications/utilities/mesh/cfMesh/python/Salome/salomeTriSurf.py create mode 100644 applications/utilities/mesh/cfMesh/surfaceToFMS/Make/files create mode 100644 applications/utilities/mesh/cfMesh/surfaceToFMS/Make/options create mode 100644 applications/utilities/mesh/cfMesh/surfaceToFMS/surfaceToFMS.C delete mode 100755 bin/foamAddAndRemoveFromRelease.py delete mode 100755 bin/foamBuildTarball.py delete mode 100755 bin/foamEditProperties.py create mode 100644 doc/cfMesh/User Guide - cfMesh v1.0.1.pdf delete mode 100644 doc/cfMesh/User Guide - cfMesh v1.0.pdf mode change 100755 => 100644 etc/settings.sh create mode 100755 src/dynamicMesh/dynamicFvMesh/Allwclean create mode 100755 src/dynamicMesh/dynamicFvMesh/Allwmake create mode 100644 src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/Make/files create mode 100644 src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/Make/options delete mode 100644 src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/coupledInfo.C rename src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/{ => coupledMesh}/coupleMap.C (86%) rename src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/{ => coupledMesh}/coupleMap.H (79%) rename src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/{ => coupledMesh}/coupleMapI.H (93%) create mode 100644 src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/coupledMesh/coupledInfo.C rename src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/{ => coupledMesh}/coupledInfo.H (68%) rename src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/{ => coupledMesh}/dynamicTopoFvMeshCoupled.C (86%) create mode 100644 src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/coupledMesh/subMeshLduAddressing.H create mode 100644 src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/coupledMesh/subMeshProcessorFvPatch.C create mode 100644 src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/coupledMesh/subMeshProcessorFvPatch.H create mode 100644 src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/coupledMesh/subMeshProcessorPolyPatch.C create mode 100644 src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/coupledMesh/subMeshProcessorPolyPatch.H delete mode 100644 src/dynamicMesh/dynamicFvMesh/dynamicTopoFvMesh/meshOpsTemplates.C rename src/finiteVolume/finiteVolume/ddtSchemes/{CrankNicholsonDdtScheme/CrankNicholsonDdtScheme.C => CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C} (94%) rename src/finiteVolume/finiteVolume/ddtSchemes/{CrankNicholsonDdtScheme/CrankNicholsonDdtScheme.H => CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H} (90%) rename src/finiteVolume/finiteVolume/ddtSchemes/{CrankNicholsonDdtScheme/CrankNicholsonDdtSchemes.C => CrankNicolsonDdtScheme/CrankNicolsonDdtSchemes.C} (94%) rename src/finiteVolume/finiteVolume/gradSchemes/{scalarGaussGrad => gaussGrad}/scalarGaussGrad.C (90%) rename src/finiteVolume/finiteVolume/gradSchemes/{scalarGaussGrad => gaussGrad}/scalarGaussGrad.H (100%) rename src/finiteVolume/finiteVolume/gradSchemes/{scalarLeastSquaresGrad => leastSquaresGrad}/scalarLeastSquaresGrad.C (95%) rename src/finiteVolume/finiteVolume/gradSchemes/{scalarLeastSquaresGrad => leastSquaresGrad}/scalarLeastSquaresGrad.H (100%) delete mode 100644 src/finiteVolume/finiteVolume/gradSchemes/scalarGaussGrad/.scalarGaussGrad.C.swp create mode 100644 src/foam/primitives/Lists/labelPairList.H create mode 100644 src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/symmetryPlaneOptimisation/symmetryPlaneOptimisation.C create mode 100644 src/mesh/cfMesh/meshLibrary/utilities/smoothers/geometry/meshOptimizer/symmetryPlaneOptimisation/symmetryPlaneOptimisation.H create mode 100644 src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurface2DCheck/triSurface2DCheck.C create mode 100644 src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurface2DCheck/triSurface2DCheck.H create mode 100644 src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceCleanupDuplicateTriangles/triSurfaceCleanupDuplicateTriangles.C create mode 100644 src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceCleanupDuplicateTriangles/triSurfaceCleanupDuplicateTriangles.H create mode 100644 src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceCleanupDuplicateTriangles/triSurfaceCleanupDuplicateTrianglesFunctions.C create mode 100644 src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceImportSurfaceAsSubset/triSurfaceImportSurfaceAsSubset.C create mode 100644 src/mesh/cfMesh/meshLibrary/utilities/triSurfaceTools/triSurfaceImportSurfaceAsSubset/triSurfaceImportSurfaceAsSubset.H create mode 100644 src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandSpecularRadiation/wideBandSpecularRadiationMixedFvPatchScalarField.C create mode 100644 src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandSpecularRadiation/wideBandSpecularRadiationMixedFvPatchScalarField.H delete mode 100644 tutorials/compressible/dbnsTurbFoam/naca0012/naca0012.cas create mode 100644 tutorials/compressible/dbnsTurbFoam/naca0012/naca0012.cas.gz create mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/0/G create mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/0/IDefault create mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/0/T create mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/0/U create mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/0/alphat create mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/0/epsilon create mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/0/k create mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/0/mut create mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/0/p create mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/constant/RASProperties create mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/constant/g create mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/constant/polyMesh/blockMeshDict create mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/constant/radiationProperties create mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/constant/thermophysicalProperties create mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/system/controlDict create mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/system/fvSchemes create mode 100644 tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOMSpecularCeiling/system/fvSolution create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/elbow_90degree/0/.ignore create mode 100755 tutorials/mesh/cfMesh/cartesianMesh/elbow_90degree/Allclean create mode 100755 tutorials/mesh/cfMesh/cartesianMesh/elbow_90degree/Allrun create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/elbow_90degree/constant/.ignore create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/elbow_90degree/elbow_90degree.stl create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/elbow_90degree/readme.txt create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/elbow_90degree/system/controlDict create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/elbow_90degree/system/fvSchemes create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/elbow_90degree/system/fvSolution create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/elbow_90degree/system/meshDict create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/multipleOrifices/0/.ignore create mode 100755 tutorials/mesh/cfMesh/cartesianMesh/multipleOrifices/Allclean create mode 100755 tutorials/mesh/cfMesh/cartesianMesh/multipleOrifices/Allrun create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/multipleOrifices/constant/.ignore create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/multipleOrifices/multipleOrifices.stl create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/multipleOrifices/readme.txt create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/multipleOrifices/system/controlDict create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/multipleOrifices/system/fvSchemes create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/multipleOrifices/system/fvSolution create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/multipleOrifices/system/meshDict create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/ship5415Octree/0/.gitignore create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/ship5415Octree/5415Joined1.stl create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/ship5415Octree/5415Joined2.stl create mode 100755 tutorials/mesh/cfMesh/cartesianMesh/ship5415Octree/Allclean create mode 100755 tutorials/mesh/cfMesh/cartesianMesh/ship5415Octree/Allrun create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/ship5415Octree/README create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/ship5415Octree/constant/.gitignore create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/ship5415Octree/ship5415Octree.foam create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/ship5415Octree/system/controlDict create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/ship5415Octree/system/fvSchemes create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/ship5415Octree/system/fvSolution create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/ship5415Octree/system/meshDict create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/singleOrifice/0/.ignore create mode 100755 tutorials/mesh/cfMesh/cartesianMesh/singleOrifice/Allclean create mode 100755 tutorials/mesh/cfMesh/cartesianMesh/singleOrifice/Allrun create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/singleOrifice/constant/.ignore create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/singleOrifice/readme.txt create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/singleOrifice/singleOrifice.stl create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/singleOrifice/system/controlDict create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/singleOrifice/system/fvSchemes create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/singleOrifice/system/fvSolution create mode 100644 tutorials/mesh/cfMesh/cartesianMesh/singleOrifice/system/meshDict create mode 100755 vagrantSandbox/initArchlinuxScript.sh create mode 100644 wmake/rules/linux64Gcc47/ARCHITECTURE_TESTED create mode 100644 wmake/rules/linux64Gcc47/X create mode 100644 wmake/rules/linux64Gcc47/c create mode 100644 wmake/rules/linux64Gcc47/c++ create mode 100644 wmake/rules/linux64Gcc47/c++Debug create mode 100644 wmake/rules/linux64Gcc47/c++Opt create mode 100644 wmake/rules/linux64Gcc47/c++Prof create mode 100644 wmake/rules/linux64Gcc47/cDebug create mode 100644 wmake/rules/linux64Gcc47/cOpt create mode 100644 wmake/rules/linux64Gcc47/cProf create mode 100644 wmake/rules/linux64Gcc47/general create mode 100644 wmake/rules/linux64Gcc47/mplib create mode 100644 wmake/rules/linux64Gcc47/mplibGAMMA create mode 100644 wmake/rules/linux64Gcc47/mplibHPMPI create mode 100644 wmake/rules/linux64Gcc47/mplibMPICH create mode 100644 wmake/rules/linux64Gcc47/mplibMPICH-GM create mode 100644 wmake/rules/linux64Gcc47/mplibMVAPICH2 create mode 100644 wmake/rules/linux64Gcc47/mplibOPENMPI create mode 100644 wmake/rules/linux64Gcc47/mplibQSMPI create mode 100644 wmake/rules/linux64Gcc47/mplibSYSTEMOPENMPI create mode 100644 wmake/rules/linux64Gcc47/nvcc create mode 100644 wmake/rules/linux64Gcc49/ARCHITECTURE_TESTED create mode 100644 wmake/rules/linux64Gcc49/X create mode 100644 wmake/rules/linux64Gcc49/c create mode 100644 wmake/rules/linux64Gcc49/c++ create mode 100644 wmake/rules/linux64Gcc49/c++Debug create mode 100644 wmake/rules/linux64Gcc49/c++Opt create mode 100644 wmake/rules/linux64Gcc49/c++Prof create mode 100644 wmake/rules/linux64Gcc49/cDebug create mode 100644 wmake/rules/linux64Gcc49/cOpt create mode 100644 wmake/rules/linux64Gcc49/cProf create mode 100644 wmake/rules/linux64Gcc49/general create mode 100644 wmake/rules/linux64Gcc49/mplib create mode 100644 wmake/rules/linux64Gcc49/mplibGAMMA create mode 100644 wmake/rules/linux64Gcc49/mplibHPMPI create mode 100644 wmake/rules/linux64Gcc49/mplibMPICH create mode 100644 wmake/rules/linux64Gcc49/mplibMPICH-GM create mode 100644 wmake/rules/linux64Gcc49/mplibMVAPICH2 create mode 100644 wmake/rules/linux64Gcc49/mplibOPENMPI create mode 100644 wmake/rules/linux64Gcc49/mplibQSMPI create mode 100644 wmake/rules/linux64Gcc49/mplibSYSTEMOPENMPI create mode 100644 wmake/rules/linux64Gcc49/nvcc diff --git a/ListOfContributors b/ListOfContributors index 69bfe384c..36b201f73 100644 --- a/ListOfContributors +++ b/ListOfContributors @@ -80,3 +80,5 @@ Contents: Tian Tang Zeljko Tukovic Niklas Wikstrom + Vanja Skuric + Alexander Vakhrushev diff --git a/ThirdParty/AllMake.stage1 b/ThirdParty/AllMake.stage1 index c17f636ef..2acd5e86b 100755 --- a/ThirdParty/AllMake.stage1 +++ b/ThirdParty/AllMake.stage1 @@ -62,22 +62,35 @@ echo # Gcc and companion libraries # -# Uncomment the following 3 lines for gcc-4.4.5. You need gmp and mpfr for gcc-4.4.5 -#( rpm_make -p gmp-5.0.1 -s gmp-5.0.1.spec -u ftp://ftp.gnu.org/gnu/gmp/gmp-5.0.1.tar.gz ) -#( rpm_make -p mpfr-3.0.1 -s mpfr-3.0.1.spec -u ftp://ftp.gnu.org/gnu/mpfr/mpfr-3.0.1.tar.gz ) -#( rpm_make -p gcc-4.4.5 -s gcc-4.4.5.spec -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.4.5/gcc-4.4.5.tar.gz ) +# Uncomment the following 4 lines for gcc-4.9.2. You need gmp, mpfr and mpc for gcc-4.9.2 +#( rpm_make -p gmp-5.1.2 -s gmp-5.1.2.spec -u ftp://ftp.gnu.org/gnu/gmp/gmp-5.1.2.tar.bz2 ) +#( rpm_make -p mpfr-3.1.2 -s mpfr-3.1.2.spec -u ftp://ftp.gnu.org/gnu/mpfr/mpfr-3.1.2.tar.gz ) +#( rpm_make -p mpc-1.0.1 -s mpc-1.0.1.spec -u http://www.multiprecision.org/mpc/download/mpc-1.0.1.tar.gz ) +#( rpm_make -p gcc-4.9.2 -s gcc-4.9.2.spec -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.9.2/gcc-4.9.2.tar.gz ) +# +# Uncomment the following 4 lines for gcc-4.7.4. You need gmp, mpfr and mpc for gcc-4.7.4 +#( rpm_make -p gmp-5.1.2 -s gmp-5.1.2.spec -u ftp://ftp.gnu.org/gnu/gmp/gmp-5.1.2.tar.bz2 ) +#( rpm_make -p mpfr-3.1.2 -s mpfr-3.1.2.spec -u ftp://ftp.gnu.org/gnu/mpfr/mpfr-3.1.2.tar.gz ) +#( rpm_make -p mpc-1.0.1 -s mpc-1.0.1.spec -u http://www.multiprecision.org/mpc/download/mpc-1.0.1.tar.gz ) +#( rpm_make -p gcc-4.7.4 -s gcc-4.7.4.spec -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.gz ) +# +# Uncomment the following 4 lines for gcc-4.6.4. You need gmp, mpfr and mpc for gcc-4.6.4 +#( rpm_make -p gmp-5.1.2 -s gmp-5.1.2.spec -u ftp://ftp.gnu.org/gnu/gmp/gmp-5.1.2.tar.bz2 ) +#( rpm_make -p mpfr-3.1.2 -s mpfr-3.1.2.spec -u ftp://ftp.gnu.org/gnu/mpfr/mpfr-3.1.2.tar.gz ) +#( rpm_make -p mpc-1.0.1 -s mpc-1.0.1.spec -u http://www.multiprecision.org/mpc/download/mpc-1.0.1.tar.gz ) +#( rpm_make -p gcc-4.6.4 -s gcc-4.6.4.spec -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.gz ) # # Uncomment the following 4 lines for gcc-4.5.1. You need gmp, mpfr and mpc for gcc-4.5.1 #( rpm_make -p gmp-5.0.1 -s gmp-5.0.1.spec -u ftp://ftp.gnu.org/gnu/gmp/gmp-5.0.1.tar.gz ) #( rpm_make -p mpfr-3.0.1 -s mpfr-3.0.1.spec -u ftp://ftp.gnu.org/gnu/mpfr/mpfr-3.0.1.tar.gz ) #( rpm_make -p mpc-0.8.2 -s mpc-0.8.2.spec -u http://www.multiprecision.org/mpc/download/mpc-0.8.2.tar.gz ) #( rpm_make -p gcc-4.5.1 -s gcc-4.5.1.spec -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.5.1/gcc-4.5.1.tar.gz ) - -# Uncomment the following 4 lines for gcc-4.6.3. You need gmp, mpfr and mpc for gcc-4.6.3 -#( rpm_make -p gmp-5.0.5 -s gmp-5.0.5.spec -u ftp://ftp.gnu.org/gnu/gmp/gmp-5.0.5.tar.bz2 ) -#( rpm_make -p mpfr-3.1.0 -s mpfr-3.1.0.spec -u ftp://ftp.gnu.org/gnu/mpfr/mpfr-3.1.0.tar.gz ) -#( rpm_make -p mpc-0.9 -s mpc-0.9.spec -u http://www.multiprecision.org/mpc/download/mpc-0.9.tar.gz ) -#( rpm_make -p gcc-4.6.3 -s gcc-4.6.3.spec -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.6.3/gcc-4.6.3.tar.gz ) +# +# Uncomment the following 3 lines for gcc-4.4.5. You need gmp and mpfr for gcc-4.4.5 +#( rpm_make -p gmp-5.0.1 -s gmp-5.0.1.spec -u ftp://ftp.gnu.org/gnu/gmp/gmp-5.0.1.tar.gz ) +#( rpm_make -p mpfr-3.0.1 -s mpfr-3.0.1.spec -u ftp://ftp.gnu.org/gnu/mpfr/mpfr-3.0.1.tar.gz ) +#( rpm_make -p gcc-4.4.5 -s gcc-4.4.5.spec -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.4.5/gcc-4.4.5.tar.gz ) +# # Python #( rpm_make -p Python-2.7 -s Python-2.7.spec -u http://www.python.org/ftp/python/2.7/Python-2.7.tgz ) diff --git a/ThirdParty/AllMake.stage3 b/ThirdParty/AllMake.stage3 index 2823998c5..3f724ad65 100755 --- a/ThirdParty/AllMake.stage3 +++ b/ThirdParty/AllMake.stage3 @@ -133,7 +133,8 @@ then # ( rpm_make -p PyFoam-0.5.7 -s PyFoam-0.5.7.spec -u http://openfoamwiki.net/images/d/dc/PyFoam-0.5.7.tar.gz -n PyFoam-0.5.7-1.noarch -a noarch) # ( rpm_make -p PyFoam-0.6.1 -s PyFoam-0.6.1.spec -u http://openfoamwiki.net/images/3/33/PyFoam-0.6.1.tar.gz -n PyFoam-0.6.1-1.noarch -a noarch) # ( rpm_make -p PyFoam-0.6.2 -s PyFoam-0.6.2.spec -u http://openfoamwiki.net/images/8/89/PyFoam-0.6.2.tar.gz -n PyFoam-0.6.2-1.noarch -a noarch) - ( rpm_make -p PyFoam-0.6.3 -s PyFoam-0.6.3.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/PyFoam-0.6.1.tar.gz ) +# ( rpm_make -p PyFoam-0.6.3 -s PyFoam-0.6.3.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/PyFoam-0.6.1.tar.gz ) + ( rpm_make -p PyFoam-0.6.4 -s PyFoam-0.6.4.spec -u http://openfoamwiki.net/images/3/3b/PyFoam-0.6.4.tar.gz -n PyFoam-0.6.4-1.noarch -a noarch ) else echo "Using system installed PyFoam" echo "" diff --git a/ThirdParty/AllMake.stage4 b/ThirdParty/AllMake.stage4 index 6a3409bd7..2d0e77a37 100755 --- a/ThirdParty/AllMake.stage4 +++ b/ThirdParty/AllMake.stage4 @@ -56,10 +56,10 @@ echo Starting ThirdParty AllMake: Stage4 echo ======================================== echo -# qt-everywhere-opensource-src-4.8.5 +# qt-everywhere-opensource-src-4.8.6 if [ ! -z "$QT_THIRD_PARTY" ] then - ( rpm_make -p qt-everywhere-opensource-src-4.8.5 -s qt-everywhere-opensource-src-4.8.5.spec -u http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz ) + ( rpm_make -p qt-everywhere-opensource-src-4.8.6 -s qt-everywhere-opensource-src-4.8.6.spec -u http://download.qt-project.org/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz ) else echo "Using system installed QT" echo "" @@ -75,10 +75,14 @@ then then ( rpm_make -p ParaView-4.0.1 -s ParaView-4.0.1.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/ParaView-v4.0.1-source.tgz \ -f --define='_qmakePath $QT_BIN_DIR/qmake' +# ( rpm_make -p ParaView-4.2.0 -s ParaView-4.2.0.spec -u http://www.paraview.org/files/v4.2/ParaView-v4.2.0-source.tar.gz \ +# -f --define='_qmakePath $QT_BIN_DIR/qmake' +# ( rpm_make -p ParaView-4.2.0 -s ParaView-4.2.0.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/ParaView-v4.2.0-source.tgz \ +# -f --define='_qmakePath $QT_BIN_DIR/qmake' ) else echo "WARNING: " - echo "WARNING: Skipping the installation of ParaView-4.0.1." + echo "WARNING: Skipping the installation of ParaView-4.2.0." echo "WARNING: Please make sure the QT_BIN_DIR environment variable properly" echo "WARNING: initialized in the file prefs.sh or prefs.csh" echo "WARNING: The command \$QT_BIN_DIR/qmake needs to be valid" diff --git a/ThirdParty/AllMake.stage5 b/ThirdParty/AllMake.stage5 index e7284071d..ac52d67b6 100755 --- a/ThirdParty/AllMake.stage5 +++ b/ThirdParty/AllMake.stage5 @@ -55,12 +55,12 @@ echo "Starting ThirdParty AllMake: Stage5 " echo "========================================" echo -# swak4Foam - Version 0.3.1 +# swak4Foam - Version 0.3.2 # In fact, we are basically tracking the head branch from the Mercurial repository # which is also replicated under the Breeder_2.0 section of the Subversion repository # -SWAK_RELEASE_VERSION=0.3.1 +SWAK_RELEASE_VERSION=0.3.2 if [ -z "$SWAK4FOAM_SYSTEM" ] then diff --git a/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/AllMake b/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/AllMake index c2b91b106..05f727c63 100755 --- a/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/AllMake +++ b/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/AllMake @@ -36,43 +36,46 @@ command -v python -V >/dev/null if [ ! $? -eq 0 ]; then - echo "Error: You need to install python in order to run these PyFoam scripts" + echo "Error: You need to install python in order to run these PyFoam scripts" exit -1 fi -if [ -z "$PYFOAM_DIR" ] +if [ -z "$PYFOAM_SITE_DIR" ] then - echo "Error: Missing environment variable \$PYFOAM_DIR." - echo " Please execute the script ThirdParty/AllMake.stage5 to install PyFoam." + echo "Error: Missing environment variable \$PYFOAM_SITE_DIR." + echo " Please execute the script ThirdParty/AllMake.stage5 to install PyFoam." echo " Then, make sure to freshen your foam-extend environment by sourcing your main" echo " foam-extend configuration file." exit -1 fi -pythonVersion=$(python -V 2>&1 | awk -F ' ' {'print $2'} | awk -F \. {'print $1 "." $2'}) - -set -x +if [ ! -d $PYFOAM_SITE_DIR/lib -o ! -d $PYFOAM_SITE_DIR/bin ] +then + echo "Directory $PYFOAM_SITE_DIR/lib or $PYFOAM_SITE_DIR/bin missing" + exit -1 +fi +set -x # pyFoamChangeMixingPlaneBoundary.py -cp pyFoamChangeMixingPlaneBoundary.py $PYFOAM_DIR/bin -cp ChangeMixingPlaneBoundary.py $PYFOAM_DIR/lib/python$pythonVersion/site-packages/PyFoam/Applications +cp pyFoamChangeMixingPlaneBoundary.py $PYFOAM_SITE_DIR/bin +cp ChangeMixingPlaneBoundary.py $PYFOAM_SITE_DIR/lib # pyFoamChangeGGIBoundary.py # Same as pyFoamModifyGGIBoundary.py. We just harmonize the name with rest of PyFoam -cp pyFoamChangeGGIBoundary.py $PYFOAM_DIR/bin -cp ChangeGGIBoundary.py $PYFOAM_DIR/lib/python$pythonVersion/site-packages/PyFoam/Applications +cp pyFoamChangeGGIBoundary.py $PYFOAM_SITE_DIR/bin +cp ChangeGGIBoundary.py $PYFOAM_SITE_DIR/lib # pyFoamInitializeMixingPlane.py -cp pyFoamInitMixingPlaneInterface.py $PYFOAM_DIR/bin -cp InitMixingPlaneInterface.py $PYFOAM_DIR/lib/python$pythonVersion/site-packages/PyFoam/Applications +cp pyFoamInitMixingPlaneInterface.py $PYFOAM_SITE_DIR/bin +cp InitMixingPlaneInterface.py $PYFOAM_SITE_DIR/lib # pyFoamInitializeGGI.py -cp pyFoamInitGgiInterface.py $PYFOAM_DIR/bin -cp InitGgiInterface.py $PYFOAM_DIR/lib/python$pythonVersion/site-packages/PyFoam/Applications +cp pyFoamInitGgiInterface.py $PYFOAM_SITE_DIR/bin +cp InitGgiInterface.py $PYFOAM_SITE_DIR/lib # pyFoamConvertMixingPlaneBoundaryToNewSyntax.py -cp pyFoamConvertMixingPlaneBoundaryToNewSyntax.py $PYFOAM_DIR/bin -cp ConvertMixingPlaneBoundaryToNewSyntax.py $PYFOAM_DIR/lib/python$pythonVersion/site-packages/PyFoam/Applications +cp pyFoamConvertMixingPlaneBoundaryToNewSyntax.py $PYFOAM_SITE_DIR/bin +cp ConvertMixingPlaneBoundaryToNewSyntax.py $PYFOAM_SITE_DIR/lib set +x echo ======================================== @@ -81,5 +84,3 @@ echo ======================================== echo # ----------------------------------------------------------------- end-of-file - - diff --git a/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/ChangeGGIBoundary.py b/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/ChangeGGIBoundary.py index be875eb35..21480399c 100644 --- a/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/ChangeGGIBoundary.py +++ b/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/ChangeGGIBoundary.py @@ -9,8 +9,9 @@ Author: """ -from PyFoamApplication import PyFoamApplication +from PyFoam.Applications.PyFoamApplication import PyFoamApplication from PyFoam.RunDictionary.ParsedParameterFile import ParsedParameterFile +from PyFoam.ThirdParty.six import print_ from os import path import sys import re @@ -74,7 +75,7 @@ Change GGI boundary condition parameters dest="separationOffset", default=None, help='separation offset for cyclicGgi') - + self.parser.add_option("--test", action="store_true", default=False, @@ -84,7 +85,7 @@ Change GGI boundary condition parameters def run(self): fName=self.parser.getArgs()[0] bName=self.parser.getArgs()[1] - + boundary=ParsedParameterFile(path.join(".",fName,"constant","polyMesh","boundary"),debug=False,boundaryDict=True) bnd=boundary.content @@ -123,7 +124,7 @@ Change GGI boundary condition parameters val["separationOffset"]=self.parser.getOptions().separationOffset - # Deprecated + # Deprecated if self.parser.getOptions().shadowName!=None: self.warning("\n PatchName:",bName,": Option --shadowName is deprecated. Use --shadowPatch instead\n") shadowName=self.parser.getOptions().shadowName @@ -131,26 +132,25 @@ Change GGI boundary condition parameters if shadowName not in bnd: self.error("\n Option --shadowName for patch:",bName,": there is no patch called",shadowName,"\n") - # Deprecated + # Deprecated if self.parser.getOptions().patchZoneName!=None: self.warning("\n PatchName:",bName,": Option --patchZoneName is deprecated. Use --zone instead\n") val["zone"]=self.parser.getOptions().patchZoneName - # Deprecated + # Deprecated if self.parser.getOptions().bridgeOverlapFlag!=None: self.warning("\n PatchName:",bName,": Option --bridgeOverlapFlag is deprecated. Use --bridgeOverlap instead\n") val["bridgeOverlap"]=self.parser.getOptions().bridgeOverlapFlag else: - print "Unsupported GGI type '",bcType,"' for patch",bName + print_("Unsupported GGI type '",bcType,"' for patch",bName) break if not found: self.error("Boundary",bName,"not found in",bnd[::2]) if self.parser.getOptions().test: - print boundary + print_(boundary) else: boundary.writeFile() - diff --git a/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/ChangeMixingPlaneBoundary.py b/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/ChangeMixingPlaneBoundary.py index 128c75122..2212d5af7 100644 --- a/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/ChangeMixingPlaneBoundary.py +++ b/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/ChangeMixingPlaneBoundary.py @@ -9,8 +9,9 @@ Author: """ -from PyFoamApplication import PyFoamApplication +from PyFoam.Applications.PyFoamApplication import PyFoamApplication from PyFoam.RunDictionary.ParsedParameterFile import ParsedParameterFile +from PyFoam.ThirdParty.six import print_ from os import path import sys @@ -37,7 +38,7 @@ Change MixingPlane boundary condition parameters action="store", dest="zone", default=None, - help='Name of the zone for mixingPlanePatch') + help='Name of the zone for mixingPlanePatch') self.parser.add_option("--coordinateSystemName", action="store", dest="coordinateSystemName", @@ -78,7 +79,7 @@ Change MixingPlane boundary condition parameters dest="ribbonPatchDiscretisation", default=None, help='ribbonPatch discretisation (masterPatch|slavePatch|bothPatches|uniform|userDefined)') - + self.parser.add_option("--test", action="store_true", default=False, @@ -88,13 +89,13 @@ Change MixingPlane boundary condition parameters def run(self): fName=self.parser.getArgs()[0] bName=self.parser.getArgs()[1] - + boundary=ParsedParameterFile(path.join(".",fName,"constant","polyMesh","boundary"),debug=False,boundaryDict=True) bnd=boundary.content if type(bnd)!=list: - print "Problem with boundary file (not a list)" + print_("Problem with boundary file (not a list)") sys.exit(-1) found=False @@ -143,11 +144,10 @@ Change MixingPlane boundary condition parameters break if not found: - print "Boundary",bName,"not found in",bnd[::2] + print_("Boundary",bName,"not found in",bnd[::2]) sys.exit(-1) if self.parser.getOptions().test: - print boundary + print_(boundary) else: boundary.writeFile() - diff --git a/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/ConvertMixingPlaneBoundaryToNewSyntax.py b/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/ConvertMixingPlaneBoundaryToNewSyntax.py index c73c9f609..4a5e62512 100644 --- a/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/ConvertMixingPlaneBoundaryToNewSyntax.py +++ b/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/ConvertMixingPlaneBoundaryToNewSyntax.py @@ -9,8 +9,9 @@ Author: """ -from PyFoamApplication import PyFoamApplication +from PyFoam.Applications.PyFoamApplication import PyFoamApplication from PyFoam.RunDictionary.ParsedParameterFile import ParsedParameterFile +from PyFoam.ThirdParty.six import print_ from os import path import sys @@ -46,7 +47,7 @@ class switch(object): """Return the match method once, then stop""" yield self.match raise StopIteration - + def match(self, *args): """Indicate whether or not to enter a case suite""" if self.fall or not args: @@ -87,13 +88,13 @@ Change MixingPlane boundary condition parameters def run(self): fName=self.parser.getArgs()[0] - + boundary=ParsedParameterFile(path.join(".",fName,"constant","polyMesh","boundary"),debug=False,boundaryDict=True) bnd=boundary.content if type(bnd)!=list: - print "Problem with boundary file (not a list)" + print_("Problem with boundary file (not a list)") sys.exit(-1) found=False @@ -107,23 +108,23 @@ Change MixingPlane boundary condition parameters if bnd[indexDefPatch]["type"]=="mixingPlane": if bnd[indexDefPatch].has_key("assembly"): - print " Replacing the parameter 'assembly' for patch", bnd[index] + print_(" Replacing the parameter 'assembly' for patch", bnd[index]) oldAssembly=bnd[indexDefPatch]["assembly"] del bnd[indexDefPatch]["assembly"] if bnd[indexDefPatch].has_key("orientation"): - print " Replacing the parameter 'orientation' for patch", bnd[index] + print_(" Replacing the parameter 'orientation' for patch", bnd[index]) oldOrientation=bnd[indexDefPatch]["orientation"] del bnd[indexDefPatch]["orientation"] 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/discretisation + # Converting "assembly" to ribbonPatch/discretisation for case in switch(oldAssembly): if case('master'): bnd[indexDefPatch]["ribbonPatch"]["discretisation"]="masterPatch" @@ -138,7 +139,7 @@ Change MixingPlane boundary condition parameters bnd[indexDefPatch]["ribbonPatch"]["discretisation"]="userDefined" break if case(): # default - print "Unsupported assembly type: ", oldAssembly + print_("Unsupported assembly type: ", oldAssembly) if oldOrientation != "": # Converting "orientation" to ribbonPatch/ribbonPatchSweepAxis and @@ -194,10 +195,9 @@ Change MixingPlane boundary condition parameters bnd[indexDefPatch]["ribbonPatch"]["sweepAxis"]="R" break if case(): # default - print "Unsupported orientation type: ", oldOrientation + print_("Unsupported orientation type: ", oldOrientation) if self.parser.getOptions().test: - print boundary + print_(boundary) else: boundary.writeFile() - diff --git a/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/InitGgiInterface.py b/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/InitGgiInterface.py index 8120d9076..7a73bcfed 100644 --- a/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/InitGgiInterface.py +++ b/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/InitGgiInterface.py @@ -19,15 +19,16 @@ import sys, fnmatch, re from os import path, listdir, chmod from stat import * -from PyFoamApplication import PyFoamApplication +from PyFoam.Applications.PyFoamApplication import PyFoamApplication from PyFoam.RunDictionary.ParsedParameterFile import ParsedParameterFile +from PyFoam.ThirdParty.six import print_ from PyFoam.RunDictionary.TimeDirectory import TimeDirectory from PyFoam.Basics.BasicFile import BasicFile class InitGgiInterface(PyFoamApplication): def __init__(self,args=None): description=""" -Init GGI boundary condition parameters in boundary file. +Init GGI boundary condition parameters in boundary file. Init GGI boundary fields in time directories. Generate faceSet scripts for ggi zones. Modify GGI zones information in decomposeParDict file. @@ -105,7 +106,7 @@ Modify GGI zones information in decomposeParDict file. Create a default definition for a ggi patch, and replace the current definition """ - print "Replacing definition of patch: ", patchName, ":", patch + print_("Replacing definition of patch: ", patchName, ":", patch) newPatch={ 'type' : ggiType, 'nFaces' : patch["nFaces"], @@ -123,7 +124,7 @@ the current definition description="""\ Modify the definition of a ggi patch """ - print " Modifying ggi boundary definition in constant/polyMesh/boundary for patch", patchName + print_(" Modifying ggi boundary definition in constant/polyMesh/boundary for patch", patchName) patch["type"]=ggiType @@ -167,12 +168,12 @@ Modify the definition of a ggi patch in the time directories for timeDir in listdir(caseDir): if reobj.match(timeDir): - print " Modifying ggi boundaryFields in timeDir", timeDir, "for patch", patchName + print_(" Modifying ggi boundaryFields in timeDir", timeDir, "for patch", patchName) td=TimeDirectory(caseDir, timeDir, yieldParsedFiles=True) for f in td: - print " Modifying field", f.name + print_(" Modifying field", f.name) f["boundaryField"][patchName]["type"]=ggiType f.writeFile() @@ -183,10 +184,10 @@ Generate a setSet batch file based on the zone info specified in the ggi interfa Generate a bash file for invoking setSet and setsToZones Update GGI zone infoprmation in decomposeParDict """ - # Default file: genFaceSetForGgiZones.setSet + # Default file: genFaceSetForGgiZones.setSet bfGenFaceSets = BasicFile(path.join(caseDir, self.parser.getOptions().genFaceSetForGgiZonesScriptName)) - print " Updating file ", bfGenFaceSets.name, " for generating GGI zones faceSet using the setSet command" + print_(" Updating file ", bfGenFaceSets.name, " for generating GGI zones faceSet using the setSet command") bnd=boundary.content @@ -209,8 +210,8 @@ Update GGI zone infoprmation in decomposeParDict # Default file: initGgiZones.sh bfInitGgiZones = BasicFile(path.join(caseDir, self.parser.getOptions().initGgiZonesScriptName)) - print " Updating file ", bfInitGgiZones.name, " for inititalizing GGI zones" - + print_(" Updating file ", bfInitGgiZones.name, " for inititalizing GGI zones") + bfInitGgiZones.writeLine([ "#!/bin/bash" ]) bfInitGgiZones.writeLine([ "setSet -batch " + self.parser.getOptions().genFaceSetForGgiZonesScriptName ]) bfInitGgiZones.writeLine([ "setsToZones -noFlipMap" ]) @@ -222,7 +223,7 @@ Update GGI zone infoprmation in decomposeParDict # DecomposeParDict decomposeParDictPath=path.join(caseDir,"system","decomposeParDict") if path.exists(decomposeParDictPath): - print " Updating file ", decomposeParDictPath, " for GGI zones" + print_(" Updating file ", decomposeParDictPath, " for GGI zones") decomposeParDict=ParsedParameterFile(decomposeParDictPath,debug=False,backup=True) dcp=decomposeParDict.content dcp["globalFaceZones"]="(\n " + '\n '.join(list(listOfGgiZones)) + "\n)" @@ -232,7 +233,7 @@ Update GGI zone infoprmation in decomposeParDict caseDir=self.parser.getArgs()[0] masterbName=self.parser.getArgs()[1] shadowbName=self.parser.getArgs()[2] - + boundary=ParsedParameterFile(path.join(".",caseDir,"constant","polyMesh","boundary"),debug=False,boundaryDict=True,backup=True) bnd=boundary.content @@ -249,7 +250,7 @@ Update GGI zone infoprmation in decomposeParDict timeDirs=self.parser.getOptions().timeDirs updateTimeDirs=True - ggiType=self.parser.getOptions().ggiType + ggiType=self.parser.getOptions().ggiType rotationAngle=0.0 if self.parser.getOptions().rotationAngle!=None: @@ -287,10 +288,9 @@ Update GGI zone infoprmation in decomposeParDict self.error("Boundary patch",shadowbName,"not found in",bnd[::2]) if self.parser.getOptions().test: - print boundary + print_(boundary) else: boundary.writeFile() # Write companion files self.generateCompanionFiles(caseDir, boundary) - diff --git a/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/InitMixingPlaneInterface.py b/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/InitMixingPlaneInterface.py index f35e20073..a20deb3b1 100644 --- a/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/InitMixingPlaneInterface.py +++ b/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/InitMixingPlaneInterface.py @@ -11,9 +11,10 @@ Author: """ -from PyFoamApplication import PyFoamApplication +from PyFoam.Applications.PyFoamApplication import PyFoamApplication from PyFoam.RunDictionary.ParsedParameterFile import ParsedParameterFile from PyFoam.RunDictionary.TimeDirectory import TimeDirectory +from PyFoam.ThirdParty.six import print_ from os import path, listdir import sys, fnmatch, re @@ -95,7 +96,7 @@ Init MixingPlane boundary condition parameters Create a default definition for a mixingPlane patch, and replace the current definition """ - print "Replacing definition of patch: ", patchName, ":", patch + print_("Replacing definition of patch: ", patchName, ":", patch) newPatch={ 'type' : "mixingPlane", 'nFaces' : patch["nFaces"], @@ -120,7 +121,7 @@ the current definition description="""\ Modify the definition of a mixingPlane patch """ - print " Modifying mixingPlane boundary definition in constant/polyMesh/boundary for patch", patchName + print_(" Modifying mixingPlane boundary definition in constant/polyMesh/boundary for patch", patchName) patch["shadowPatch"]=shadowName @@ -166,12 +167,12 @@ Modify the definition of a mixingPlane patch in the time directories for timeDir in listdir(caseDir): if reobj.match(timeDir): - print " Modifying mixingPlane boundaryFields in timeDir", timeDir, "for patch", patchName + print_(" Modifying mixingPlane boundaryFields in timeDir", timeDir, "for patch", patchName) td=TimeDirectory(caseDir, timeDir, yieldParsedFiles=True) for f in td: - print " Modifying field", f.name + print_(" Modifying field", f.name) f["boundaryField"][patchName]["type"]='mixingPlane' f.writeFile() @@ -179,13 +180,13 @@ Modify the definition of a mixingPlane patch in the time directories fName=self.parser.getArgs()[0] masterbName=self.parser.getArgs()[1] shadowbName=self.parser.getArgs()[2] - + boundary=ParsedParameterFile(path.join(".",fName,"constant","polyMesh","boundary"),debug=False,boundaryDict=True,backup=True) bnd=boundary.content if type(bnd)!=list: - print "Problem with boundary file (not a list)" + print_("Problem with boundary file (not a list)") sys.exit(-1) masterFound=False @@ -197,7 +198,7 @@ Modify the definition of a mixingPlane patch in the time directories timeDirs=self.parser.getOptions().timeDirs updateTimeDirs=True - print "UpdateTimeDirs: ", updateTimeDirs + print_("UpdateTimeDirs: ", updateTimeDirs) for index in range(len(bnd)): @@ -233,9 +234,6 @@ Modify the definition of a mixingPlane patch in the time directories self.error("Boundary patch",shadowbName,"not found in",bnd[::2]) if self.parser.getOptions().test: - print boundary + print_(boundary) else: boundary.writeFile() - - - diff --git a/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/pyFoamChangeGGIBoundary.py b/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/pyFoamChangeGGIBoundary.py index 947cf69f9..32c753004 100755 --- a/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/pyFoamChangeGGIBoundary.py +++ b/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/pyFoamChangeGGIBoundary.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from PyFoam.Applications.ChangeGGIBoundary import ChangeGGIBoundary +from PyFoam.Site.ChangeGGIBoundary import ChangeGGIBoundary ChangeGGIBoundary() diff --git a/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/pyFoamChangeMixingPlaneBoundary.py b/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/pyFoamChangeMixingPlaneBoundary.py index f8ba07c1b..2aa0190a6 100755 --- a/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/pyFoamChangeMixingPlaneBoundary.py +++ b/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/pyFoamChangeMixingPlaneBoundary.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from PyFoam.Applications.ChangeMixingPlaneBoundary import ChangeMixingPlaneBoundary +from PyFoam.Site.ChangeMixingPlaneBoundary import ChangeMixingPlaneBoundary ChangeMixingPlaneBoundary() diff --git a/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/pyFoamConvertMixingPlaneBoundaryToNewSyntax.py b/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/pyFoamConvertMixingPlaneBoundaryToNewSyntax.py index bbad29034..5d6540e35 100755 --- a/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/pyFoamConvertMixingPlaneBoundaryToNewSyntax.py +++ b/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/pyFoamConvertMixingPlaneBoundaryToNewSyntax.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from PyFoam.Applications.ConvertMixingPlaneBoundaryToNewSyntax import ConvertMixingPlaneBoundaryToNewSyntax +from PyFoam.Site.ConvertMixingPlaneBoundaryToNewSyntax import ConvertMixingPlaneBoundaryToNewSyntax ConvertMixingPlaneBoundaryToNewSyntax() diff --git a/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/pyFoamInitGgiInterface.py b/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/pyFoamInitGgiInterface.py index 29ebd2830..5a55e886c 100755 --- a/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/pyFoamInitGgiInterface.py +++ b/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/pyFoamInitGgiInterface.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from PyFoam.Applications.InitGgiInterface import InitGgiInterface +from PyFoam.Site.InitGgiInterface import InitGgiInterface InitGgiInterface() diff --git a/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/pyFoamInitMixingPlaneInterface.py b/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/pyFoamInitMixingPlaneInterface.py index e822fe16e..211d83bea 100755 --- a/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/pyFoamInitMixingPlaneInterface.py +++ b/ThirdParty/LocalDev/Hydro-Quebec/PyFoam/pyFoamInitMixingPlaneInterface.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -from PyFoam.Applications.InitMixingPlaneInterface import InitMixingPlaneInterface +from PyFoam.Site.InitMixingPlaneInterface import InitMixingPlaneInterface InitMixingPlaneInterface() diff --git a/ThirdParty/PyFoamSiteScripts/bin/.gitStandin b/ThirdParty/PyFoamSiteScripts/bin/.gitStandin new file mode 100644 index 000000000..e69de29bb diff --git a/ThirdParty/PyFoamSiteScripts/etc/.gitStandin b/ThirdParty/PyFoamSiteScripts/etc/.gitStandin new file mode 100644 index 000000000..e69de29bb diff --git a/ThirdParty/PyFoamSiteScripts/lib/.gitStandin b/ThirdParty/PyFoamSiteScripts/lib/.gitStandin new file mode 100644 index 000000000..e69de29bb diff --git a/ThirdParty/rpmBuild/SOURCES/ParaView-4.2.0.patch_darwin b/ThirdParty/rpmBuild/SOURCES/ParaView-4.2.0.patch_darwin new file mode 100644 index 000000000..86ebab700 --- /dev/null +++ b/ThirdParty/rpmBuild/SOURCES/ParaView-4.2.0.patch_darwin @@ -0,0 +1,12 @@ +diff -ruN ParaView-4.2.0_orig/Applications/ParaView-4.2.0_extra_install_Darwin.cmake ParaView-4.2.0/Applications/ParaView-4.2.0_extra_install_Darwin.cmake +--- ParaView-4.2.0_orig/Applications/ParaView-4.2.0_extra_install_Darwin.cmake 1969-12-31 19:00:00.000000000 -0500 ++++ ParaView-4.2.0/Applications/ParaView-4.2.0_extra_install_Darwin.cmake 2013-10-02 19:00:00.000000000 -0400 +@@ -0,0 +1,8 @@ ++# ++# Additional install rules for Mac OS X platforms ++# ++INSTALL (DIRECTORY ../../buildObj/bin/paraview.app ++ DESTINATION ${PV_INSTALL_BIN_DIR} ++ USE_SOURCE_PERMISSIONS ++ COMPONENT Runtime) ++ diff --git a/ThirdParty/rpmBuild/SPECS/ParaView-4.2.0.spec b/ThirdParty/rpmBuild/SPECS/ParaView-4.2.0.spec new file mode 100644 index 000000000..05ccbaaa7 --- /dev/null +++ b/ThirdParty/rpmBuild/SPECS/ParaView-4.2.0.spec @@ -0,0 +1,274 @@ +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | foam-extend: Open Source CFD +# \\ / O peration | +# \\ / A nd | For copyright notice see file Copyright +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of foam-extend. +# +# foam-extend 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 3 of the License, or (at your +# option) any later version. +# +# foam-extend 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 foam-extend. If not, see . +# +# Script +# RPM spec file for ParaView-4.2.0 +# +# Description +# RPM spec file for creating a relocatable RPM +# +# Authors: +# Martin Beaudoin, Hydro-Quebec, (2010) +# Andreas Feymark, Chalmers University of Technology, (2013) +# +#------------------------------------------------------------------------------ + +# We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable +%{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)} +%{expand:%%define _WM_OPTIONS %(echo $WM_OPTIONS)} + +# Disable the generation of debuginfo packages +%define debug_package %{nil} + +# The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory +%define _topdir %{_WM_THIRD_PARTY_DIR}/rpmBuild +%define _tmppath %{_topdir}/tmp + +# Will install the package directly $WM_THIRD_PARTY_DIR +# Some comments about package relocation: +# By using this prefix for the Prefix: parameter in this file, you will make this +# package relocatable. +# +# This is fine, as long as your software is itself relocatable. +# +# Simply take note that libraries built with libtool are not relocatable because the +# prefix we specify will be hard-coded in the library .la files. +# Ref: http://sourceware.org/autobook/autobook/autobook_80.html +# +# In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will +# not be able to reutilize this RPM, even though it is relocatable. You will need to +# regenerate the RPM. +# +%define _prefix %{_WM_THIRD_PARTY_DIR} + +%define name ParaView +%define release %{_WM_OPTIONS} +%define version 4.2.0 + +%define buildroot %{_topdir}/BUILD/%{name}-%{version}-root + +BuildRoot: %{buildroot} +Summary: ParaView +License: Unkown +Name: %{name} +Version: %{version} +Release: %{release} +URL: http://www.paraview.org/files/v4.2/ +Source: %url/%{name}-v%{version}-source.tar.gz +Prefix: %{_prefix} +Group: Development/Tools +Patch0: paraview-4.2.0.patch_darwin + +%define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS} + +#-------------------------------------------------------------------------- +# +# Here, we define default compiling options for cmake +# +# One can override the option on the commande line : --define='MACRO EXPR' +# +%{!?_withVerbose: %define _withVerbose false} +%{!?_withMesa: %define _withMesa false} +%{!?_withMPI: %define _withMPI false} +%{!?_withPython: %define _withPython false} +%{!?_withQt: %define _withQt true} +%{!?_qmakePath: %define _qmakePath Undefined} +%{!?_mesaIncludePath: %define _mesaIncludePath Undefined} +%{!?_mesaLibPath: %define _mesaLibPath Undefined} +%{!?_pythonLibPath: %define _pythonLibPath Undefined} + +#-------------------------------------------------------------------------- + +%description +%{summary} + +%prep +%setup -q -n %{name}-v%{version}-source + +%ifos darwin +%patch0 -p1 +%endif + +%build +# +# set CMake cache variables +# + addCMakeVariable() + { + while [ -n "$1" ] + do + CMAKE_VARIABLES="$CMAKE_VARIABLES -D$1" + shift + done + } + + # export WM settings in a form that GNU configure recognizes + [ -n "$WM_CC" ] && export CC="$WM_CC" + [ -n "$WM_CXX" ] && export CXX="$WM_CXX" + [ -n "$WM_CFLAGS" ] && export CFLAGS="$WM_CFLAGS" + [ -n "$WM_CXXFLAGS" ] && export CXXFLAGS="$WM_CXXFLAGS" + [ -n "$WM_LDFLAGS" ] && export LDFLAGS="$WM_LDFLAGS" + + set +x + echo "" + echo "Compilation options:" + echo " _withVerbose : %{_withVerbose}" + echo " _withMesa : %{_withMesa}" + echo " _withMPI : %{_withMPI}" + echo " _withPython : %{_withPython}" + echo " _withQt : %{_withQt}" + echo " _qmakePath : %{_qmakePath}" + echo " _mesaIncludePath : %{_mesaIncludePath}" + echo " _mesaLibPath : %{_mesaLibPath}" + echo " _pythonLibPath : %{_pythonLibPath}" + echo "" + set -x + + # start with these general settings + addCMakeVariable VTK_USE_TK:BOOL=OFF + addCMakeVariable BUILD_SHARED_LIBS:BOOL=ON VTK_USE_RPATH:BOOL=OFF + addCMakeVariable CMAKE_BUILD_TYPE:STRING=Release + + # include development files in "make install" + addCMakeVariable PARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON + + # new alternative to "make HTMLDocumentation" + addCMakeVariable PARAVIEW_GENERATE_PROXY_DOCUMENTATION:BOOL=ON + + %ifos darwin + # Additional installation rules for Mac OS X + addCMakeVariable PARAVIEW_EXTRA_INSTALL_RULES_FILE:FILEPATH=%{_topdir}/BUILD/%{name}-%{version}/Applications/ParaView-3.8.1_extra_install_Darwin.cmake +%endif + + # Add the value of _qmakePath for QT_QMAKE_EXECUTABLE + addCMakeVariable QT_QMAKE_EXECUTABLE:FILEPATH=%{_qmakePath} + + echo "CMAKE_VARIABLES: $CMAKE_VARIABLES" + + mkdir -p ./buildObj + cd ./buildObj + + cmake \ + -DCMAKE_INSTALL_PREFIX:PATH=%{_installPrefix} \ + $CMAKE_VARIABLES \ + .. + + [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1 + make -j $WM_NCOMPPROCS + +%install + # On OpenSUSE, rpmbuild, will choke when detecting unreferenced symlinks + # created during installation. + # Qt version 4.6.3 will generate some unreferenced symlinks when + # ParaView is compiled and installed. By enabling the following + # environment variable, the command brp-symlink will still complain + # about missing link targets, but it won't stop rpmbuild from generating + # the final rpm. + # For all other Unix distros, this is a no-op. + export NO_BRP_STALE_LINK_ERROR=yes + + cd buildObj + make install DESTDIR=$RPM_BUILD_ROOT + + # Creation of foam-extend specific .csh and .sh files" + + echo "" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" + echo "" + # + # Generate package specific .sh file for foam-extend + # +mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc +cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export PARAVIEW_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS +export PARAVIEW_BIN_DIR=\$PARAVIEW_DIR/bin +export PARAVIEW_LIB_DIR=\$PARAVIEW_DIR/lib +export PARAVIEW_INCLUDE_DIR=\$PARAVIEW_DIR/include/paraview-4.2 + +export PARAVIEW_VERSION=%{version} + +# NB: It is important to set the PV_PLUGIN_PATH location to a directory containing only the ParaView plugins. +# Otherwise, paraview will try to automatically autoload each and every dynamic library it can find in the +# specified directory to see if a given library is a paraview plugin. +# In the case of \$FOAM_LIBBIN, with over 80 libraries, this is a total waste of time that will slow down the +# startup of paraview or even make paraview crash on startup. +export PV_PLUGIN_PATH=\$FOAM_LIBBIN/paraview_plugins + +[ -d \$PARAVIEW_LIB_DIR/paraview-4.2 ] && _foamAddLib \$PARAVIEW_LIB_DIR/paraview-4.2 + +# Enable access to the package applications if present +[ -d \$PARAVIEW_BIN_DIR ] && _foamAddPath \$PARAVIEW_BIN_DIR + +# Additional binary path if running on Mac OS X +[ -d \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS ] && _foamAddPath \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS + +DOT_SH_EOF + + # + # Generate package specific .csh file for foam-extend + # +cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +setenv PARAVIEW_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS +setenv PARAVIEW_BIN_DIR \$PARAVIEW_DIR/bin +setenv PARAVIEW_LIB_DIR \$PARAVIEW_DIR/lib +setenv PARAVIEW_INCLUDE_DIR \$PARAVIEW_DIR/include/paraview-4.2 + +setenv PARAVIEW_VERSION %{version} + +# NB: It is important to set the PV_PLUGIN_PATH location to a directory containing only the ParaView plugins. +# Otherwise, paraview will try to automatically autoload each and every dynamic library it can find in the +# specified directory to see if a given library is a paraview plugin. +# In the case of \$FOAM_LIBBIN, with over 80 libraries, this is a total waste of time that will slow down the +# startup of paraview or even make paraview crash on startup. +setenv PV_PLUGIN_PATH \$FOAM_LIBBIN/paraview_plugins + +if ( -e \$PARAVIEW_BIN_DIR ) then + _foamAddPath \$PARAVIEW_BIN_DIR +endif + +if ( -e \$PARAVIEW_LIB_DIR/paraview-4.2 ) then + _foamAddLib \$PARAVIEW_LIB_DIR/paraview-4.2 +endif + + +# Additional binary path if running on Mac OS X +if ( -e \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS ) then + _foamAddPath \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS +endif +DOT_CSH_EOF + + #finally, generate a .tgz file for systems where using rpm for installing packages + # as a non-root user might be a problem. + (mkdir -p %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz packages/%{name}-%{version}) + +%clean + +%files +%defattr(-,root,root) +%{_installPrefix} + diff --git a/ThirdParty/rpmBuild/SPECS/ParaView-4.3.1.spec b/ThirdParty/rpmBuild/SPECS/ParaView-4.3.1.spec new file mode 100644 index 000000000..e10f71f5b --- /dev/null +++ b/ThirdParty/rpmBuild/SPECS/ParaView-4.3.1.spec @@ -0,0 +1,274 @@ +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | foam-extend: Open Source CFD +# \\ / O peration | +# \\ / A nd | For copyright notice see file Copyright +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of foam-extend. +# +# foam-extend 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 3 of the License, or (at your +# option) any later version. +# +# foam-extend 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 foam-extend. If not, see . +# +# Script +# RPM spec file for ParaView-4.3.1 +# +# Description +# RPM spec file for creating a relocatable RPM +# +# Authors: +# Martin Beaudoin, Hydro-Quebec, (2010) +# Andreas Feymark, Chalmers University of Technology, (2013) +# +#------------------------------------------------------------------------------ + +# We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable +%{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)} +%{expand:%%define _WM_OPTIONS %(echo $WM_OPTIONS)} + +# Disable the generation of debuginfo packages +%define debug_package %{nil} + +# The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory +%define _topdir %{_WM_THIRD_PARTY_DIR}/rpmBuild +%define _tmppath %{_topdir}/tmp + +# Will install the package directly $WM_THIRD_PARTY_DIR +# Some comments about package relocation: +# By using this prefix for the Prefix: parameter in this file, you will make this +# package relocatable. +# +# This is fine, as long as your software is itself relocatable. +# +# Simply take note that libraries built with libtool are not relocatable because the +# prefix we specify will be hard-coded in the library .la files. +# Ref: http://sourceware.org/autobook/autobook/autobook_80.html +# +# In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will +# not be able to reutilize this RPM, even though it is relocatable. You will need to +# regenerate the RPM. +# +%define _prefix %{_WM_THIRD_PARTY_DIR} + +%define name ParaView +%define release %{_WM_OPTIONS} +%define version 4.3.1 + +%define buildroot %{_topdir}/BUILD/%{name}-%{version}-root + +BuildRoot: %{buildroot} +Summary: ParaView +License: Unkown +Name: %{name} +Version: %{version} +Release: %{release} +URL: http://www.paraview.org/files/v4.3/ +Source: %url/%{name}-v%{version}-source.tar.gz +Prefix: %{_prefix} +Group: Development/Tools +Patch0: paraview-4.3.1.patch_darwin + +%define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS} + +#-------------------------------------------------------------------------- +# +# Here, we define default compiling options for cmake +# +# One can override the option on the commande line : --define='MACRO EXPR' +# +%{!?_withVerbose: %define _withVerbose false} +%{!?_withMesa: %define _withMesa false} +%{!?_withMPI: %define _withMPI false} +%{!?_withPython: %define _withPython false} +%{!?_withQt: %define _withQt true} +%{!?_qmakePath: %define _qmakePath Undefined} +%{!?_mesaIncludePath: %define _mesaIncludePath Undefined} +%{!?_mesaLibPath: %define _mesaLibPath Undefined} +%{!?_pythonLibPath: %define _pythonLibPath Undefined} + +#-------------------------------------------------------------------------- + +%description +%{summary} + +%prep +%setup -q -n %{name}-v%{version}-source + +%ifos darwin +%patch0 -p1 +%endif + +%build +# +# set CMake cache variables +# + addCMakeVariable() + { + while [ -n "$1" ] + do + CMAKE_VARIABLES="$CMAKE_VARIABLES -D$1" + shift + done + } + + # export WM settings in a form that GNU configure recognizes + [ -n "$WM_CC" ] && export CC="$WM_CC" + [ -n "$WM_CXX" ] && export CXX="$WM_CXX" + [ -n "$WM_CFLAGS" ] && export CFLAGS="$WM_CFLAGS" + [ -n "$WM_CXXFLAGS" ] && export CXXFLAGS="$WM_CXXFLAGS" + [ -n "$WM_LDFLAGS" ] && export LDFLAGS="$WM_LDFLAGS" + + set +x + echo "" + echo "Compilation options:" + echo " _withVerbose : %{_withVerbose}" + echo " _withMesa : %{_withMesa}" + echo " _withMPI : %{_withMPI}" + echo " _withPython : %{_withPython}" + echo " _withQt : %{_withQt}" + echo " _qmakePath : %{_qmakePath}" + echo " _mesaIncludePath : %{_mesaIncludePath}" + echo " _mesaLibPath : %{_mesaLibPath}" + echo " _pythonLibPath : %{_pythonLibPath}" + echo "" + set -x + + # start with these general settings + addCMakeVariable VTK_USE_TK:BOOL=OFF + addCMakeVariable BUILD_SHARED_LIBS:BOOL=ON VTK_USE_RPATH:BOOL=OFF + addCMakeVariable CMAKE_BUILD_TYPE:STRING=Release + + # include development files in "make install" + addCMakeVariable PARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON + + # new alternative to "make HTMLDocumentation" + addCMakeVariable PARAVIEW_GENERATE_PROXY_DOCUMENTATION:BOOL=ON + + %ifos darwin + # Additional installation rules for Mac OS X + addCMakeVariable PARAVIEW_EXTRA_INSTALL_RULES_FILE:FILEPATH=%{_topdir}/BUILD/%{name}-%{version}/Applications/ParaView-3.8.1_extra_install_Darwin.cmake +%endif + + # Add the value of _qmakePath for QT_QMAKE_EXECUTABLE + addCMakeVariable QT_QMAKE_EXECUTABLE:FILEPATH=%{_qmakePath} + + echo "CMAKE_VARIABLES: $CMAKE_VARIABLES" + + mkdir -p ./buildObj + cd ./buildObj + + cmake \ + -DCMAKE_INSTALL_PREFIX:PATH=%{_installPrefix} \ + $CMAKE_VARIABLES \ + .. + + [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1 + make -j $WM_NCOMPPROCS + +%install + # On OpenSUSE, rpmbuild, will choke when detecting unreferenced symlinks + # created during installation. + # Qt version 4.6.3 will generate some unreferenced symlinks when + # ParaView is compiled and installed. By enabling the following + # environment variable, the command brp-symlink will still complain + # about missing link targets, but it won't stop rpmbuild from generating + # the final rpm. + # For all other Unix distros, this is a no-op. + export NO_BRP_STALE_LINK_ERROR=yes + + cd buildObj + make install DESTDIR=$RPM_BUILD_ROOT + + # Creation of foam-extend specific .csh and .sh files" + + echo "" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" + echo "" + # + # Generate package specific .sh file for foam-extend + # +mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc +cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export PARAVIEW_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS +export PARAVIEW_BIN_DIR=\$PARAVIEW_DIR/bin +export PARAVIEW_LIB_DIR=\$PARAVIEW_DIR/lib +export PARAVIEW_INCLUDE_DIR=\$PARAVIEW_DIR/include/paraview-4.2 + +export PARAVIEW_VERSION=%{version} + +# NB: It is important to set the PV_PLUGIN_PATH location to a directory containing only the ParaView plugins. +# Otherwise, paraview will try to automatically autoload each and every dynamic library it can find in the +# specified directory to see if a given library is a paraview plugin. +# In the case of \$FOAM_LIBBIN, with over 80 libraries, this is a total waste of time that will slow down the +# startup of paraview or even make paraview crash on startup. +export PV_PLUGIN_PATH=\$FOAM_LIBBIN/paraview_plugins + +[ -d \$PARAVIEW_LIB_DIR/paraview-4.2 ] && _foamAddLib \$PARAVIEW_LIB_DIR/paraview-4.2 + +# Enable access to the package applications if present +[ -d \$PARAVIEW_BIN_DIR ] && _foamAddPath \$PARAVIEW_BIN_DIR + +# Additional binary path if running on Mac OS X +[ -d \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS ] && _foamAddPath \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS + +DOT_SH_EOF + + # + # Generate package specific .csh file for foam-extend + # +cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +setenv PARAVIEW_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS +setenv PARAVIEW_BIN_DIR \$PARAVIEW_DIR/bin +setenv PARAVIEW_LIB_DIR \$PARAVIEW_DIR/lib +setenv PARAVIEW_INCLUDE_DIR \$PARAVIEW_DIR/include/paraview-4.2 + +setenv PARAVIEW_VERSION %{version} + +# NB: It is important to set the PV_PLUGIN_PATH location to a directory containing only the ParaView plugins. +# Otherwise, paraview will try to automatically autoload each and every dynamic library it can find in the +# specified directory to see if a given library is a paraview plugin. +# In the case of \$FOAM_LIBBIN, with over 80 libraries, this is a total waste of time that will slow down the +# startup of paraview or even make paraview crash on startup. +setenv PV_PLUGIN_PATH \$FOAM_LIBBIN/paraview_plugins + +if ( -e \$PARAVIEW_BIN_DIR ) then + _foamAddPath \$PARAVIEW_BIN_DIR +endif + +if ( -e \$PARAVIEW_LIB_DIR/paraview-4.2 ) then + _foamAddLib \$PARAVIEW_LIB_DIR/paraview-4.2 +endif + + +# Additional binary path if running on Mac OS X +if ( -e \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS ) then + _foamAddPath \$PARAVIEW_BIN_DIR/paraview.app/Contents/MacOS +endif +DOT_CSH_EOF + + #finally, generate a .tgz file for systems where using rpm for installing packages + # as a non-root user might be a problem. + (mkdir -p %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz packages/%{name}-%{version}) + +%clean + +%files +%defattr(-,root,root) +%{_installPrefix} + diff --git a/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.4.spec b/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.4.spec new file mode 100644 index 000000000..500715fbf --- /dev/null +++ b/ThirdParty/rpmBuild/SPECS/PyFoam-0.6.4.spec @@ -0,0 +1,201 @@ +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | foam-extend: Open Source CFD +# \\ / O peration | +# \\ / A nd | For copyright notice see file Copyright +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of foam-extend. +# +# foam-extend 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 3 of the License, or (at your +# option) any later version. +# +# foam-extend 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 foam-extend. If not, see . +# +# Script +# RPM spec file for PyFoam-0.6.4 +# +# Description +# RPM spec file for PyFoam version 0.6.4 +# +# Author: +# Martin Beaudoin, Hydro-Quebec, (2013) +# +#------------------------------------------------------------------------------ + +# We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable +%{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)} +%{expand:%%define _WM_OPTIONS %(echo $WM_OPTIONS)} + +# Disable the generation of debuginfo packages +%define debug_package %{nil} + +# The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory +%define _topdir %{_WM_THIRD_PARTY_DIR}/rpmBuild +%define _tmppath %{_topdir}/tmp + +# Will install the package directly $WM_THIRD_PARTY_DIR +# Some comments about package relocation: +# By using this prefix for the Prefix: parameter in this file, you will make this +# package relocatable. +# +# This is fine, as long as your software is itself relocatable. +# +# Simply take note that libraries built with libtool are not relocatable because the +# prefix we specify will be hard-coded in the library .la files. +# Ref: http://sourceware.org/autobook/autobook/autobook_80.html +# +# In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will +# not be able to reutilize this RPM, even though it is relocatable. You will need to +# regenerate the RPM. +# +%define _prefix %{_WM_THIRD_PARTY_DIR} + +%define name PyFoam +%define release 1 +%define version 0.6.4 + +%define buildroot %{_topdir}/BUILD/%{name}-%{version}-root + +BuildRoot: %{buildroot} +Summary: PyFoam +License: Unkown +Name: %{name} +Version: %{version} +Release: %{release} +BuildArch: noarch +URL: http://openfoamwiki.net/images/3/3b/PyFoam-0.6.4.tar.gz +Source: %url/%{name}-%{version}.tar.gz +Prefix: %{_prefix} +Group: Development/Tools + +%define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/noarch + +%description +%{summary} + +%prep +%setup -q -n PyFoam-%{version} + +%build + # Make the shebang line portable + python setup.py build --executable "/usr/bin/env python" + +%install + python setup.py install --prefix=$RPM_BUILD_ROOT/%{_installPrefix} + + %define pythonVersion $(python -V 2>&1 | awk -F ' ' {'print $2'} | awk -F \. {'print $1 "." $2'}) + + # Creation of foam-extend specific .csh and .sh files" + + echo "" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" + echo "" + # + # Generate package specific .sh file for foam-extend + # +mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc +cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export PYFOAM_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch +export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH + +# Enable access to the package applications if present +[ -d \$PYFOAM_DIR/bin ] && _foamAddPath \$PYFOAM_DIR/bin + +DOT_SH_EOF + + # + # Generate package specific .csh file for foam-extend + # +cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +setenv PYFOAM_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch + +if ! \$?PYTHONPATH then + setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages +else + setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH +endif + + +if ( -e \$PYFOAM_DIR/bin ) then + _foamAddPath \$PYFOAM_DIR/bin +endif + +if \$?PYFOAM_SITE_DIR then + if ( -e \$PYFOAM_SITE_DIR/bin ) then + _foamAddPath \$PYFOAM_SITE_DIR/bin + endif +endif +DOT_CSH_EOF + +cat << DOT_HARDCODED_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.sh +# In this version of the configuration script, the paths are hardcoded, +# which makes it easier to load PyFoam without the foam-extend environment +# variables +# +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export PYFOAM_DIR=$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch +export PYTHONPATH=\$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH + +# Enable access to the package applications if present +[ -d \$PYFOAM_DIR/bin ] && export PATH=\$PYFOAM_DIR/bin:\$PATH + +DOT_HARDCODED_SH_EOF + + # + # Generate package specific .csh file for foam-extend + # +cat << DOT_HARDCODED_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}_hardcoded.csh +# In this version of the configuration script, the paths are hardcoded, +# which makes it easier to load PyFoam without the foam-extend environment +# variables +# +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +setenv PYFOAM_DIR $WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/noarch + +if ! \$?PYTHONPATH then + setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages +else + setenv PYTHONPATH \$PYFOAM_DIR/lib/python%{pythonVersion}/site-packages:\$PYTHONPATH +endif + + +if ( -e \$PYFOAM_DIR/bin ) then + _foamAddPath \$PYFOAM_DIR/bin +endif + +if \$?PYFOAM_SITE_DIR then + if ( -e \$PYFOAM_SITE_DIR/bin ) then + _foamAddPath \$PYFOAM_SITE_DIR/bin + endif +endif +DOT_HARDCODED_CSH_EOF + + #finally, generate a .tgz file for systems where using rpm for installing packages + # as a non-root user might be a problem. + (mkdir -p %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz packages/%{name}-%{version}) + + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%{_installPrefix} diff --git a/ThirdParty/rpmBuild/SPECS/gcc-4.7.4.spec b/ThirdParty/rpmBuild/SPECS/gcc-4.7.4.spec new file mode 100644 index 000000000..d4bed42c5 --- /dev/null +++ b/ThirdParty/rpmBuild/SPECS/gcc-4.7.4.spec @@ -0,0 +1,174 @@ +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | foam-extend: Open Source CFD +# \\ / O peration | +# \\ / A nd | For copyright notice see file Copyright +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of foam-extend. +# +# foam-extend 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 3 of the License, or (at your +# option) any later version. +# +# foam-extend 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 foam-extend. If not, see . +# +# Script +# RPM spec file for gcc-4.7.4 +# +# Description +# RPM spec file for creating a relocatable RPM +# +# Author: +# Hrvoje Jasak, Wikki Ltd. (2015) +# +#------------------------------------------------------------------------------ + +# We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable +%{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)} +%{expand:%%define _WM_OPTIONS %(echo $WM_OPTIONS)} + +# Disable the generation of debuginfo packages +%define debug_package %{nil} + +# The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory +%define _topdir %{_WM_THIRD_PARTY_DIR}/rpmBuild +%define _tmppath %{_topdir}/tmp + +# Will install the package directly $WM_THIRD_PARTY_DIR +# Some comments about package relocation: +# By using this prefix for the Prefix: parameter in thi file, you will make this +# package relocatable. +# +# This is fine, as long as your software is itself relocatable. +# +# Simply take note that libraries built with libtool are not relocatable because the +# prefix we specify will be hard-coded in the library .la files. +# Ref: http://sourceware.org/autobook/autobook/autobook_80.html +# +# In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will +# not be able to reutilize this RPM, even though it is relocatable. You will need to +# regenerate the RPM. +# +%define _prefix %{_WM_THIRD_PARTY_DIR} + +%define name gcc +%define release %{_WM_OPTIONS} +%define version 4.7.4 + +%define buildroot %{_topdir}/BUILD/%{name}-%{version}-root + +BuildRoot: %{buildroot} +Summary: gcc +License: Unkown +Name: %{name} +Version: %{version} +Release: %{release} +URL: ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.4 +Source: %url/%{name}-%{version}.tar.gz +Prefix: %{_prefix} +Group: Development/Tools + + +%define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS} + +%description +%{summary} + +%prep +%setup -q + +%build + # export WM settings in a form that GNU configure recognizes + [ -n "$WM_CC" ] && export CC="$WM_CC" + [ -n "$WM_CXX" ] && export CXX="$WM_CXX" + [ -n "$WM_CFLAGS" ] && export CFLAGS="$WM_CFLAGS" + [ -n "$WM_CXXFLAGS" ] && export CXXFLAGS="$WM_CXXFLAGS" + [ -n "$WM_LDFLAGS" ] && export LDFLAGS="$WM_LDFLAGS" + + GMP_VERSION=gmp-5.1.2 + MPFR_VERSION=mpfr-3.1.2 + MPC_VERSION=mpc-1.0.1 + + mkdir ./objBuildDir + cd ./objBuildDir + + ../configure \ + --prefix=%{_installPrefix} \ + --enable-languages=c,c++ \ + --enable-shared \ + --disable-multilib \ + --with-mpc=$WM_THIRD_PARTY_DIR/packages/$MPC_VERSION/platforms/$WM_OPTIONS \ + --with-gmp=$WM_THIRD_PARTY_DIR/packages/$GMP_VERSION/platforms/$WM_OPTIONS \ + --with-mpfr=$WM_THIRD_PARTY_DIR/packages/$MPFR_VERSION/platforms/$WM_OPTIONS + + [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1 + make -j $WM_NCOMPPROCS + +%install + cd ./objBuildDir + make install DESTDIR=$RPM_BUILD_ROOT + + # Creation of foam-extend specific .csh and .sh files" + + echo "" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" + echo "" + # + # Generate package specific .sh file for foam-extend + # +mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc +cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export GCC_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS + +[ -d \$GCC_DIR/lib ] && _foamAddLib \$GCC_DIR/lib + +[ -d \$GCC_DIR/lib64 ] && _foamAddLib \$GCC_DIR/lib64 + +# Enable access to the package applications if present +[ -d \$GCC_DIR/bin ] && _foamAddPath \$GCC_DIR/bin +DOT_SH_EOF + + # + # Generate package specific .csh file for foam-extend + # +cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +setenv GCC_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS + +if ( -e \$GCC_DIR/lib ) then + _foamAddLib \$GCC_DIR/lib +endif + +if ( -e \$GCC_DIR/lib64 ) then + _foamAddLib \$GCC_DIR/lib64 +endif + +if ( -e \$GCC_DIR/bin ) then + _foamAddPath \$GCC_DIR/bin +endif +DOT_CSH_EOF + + #finally, generate a .tgz file for systems where using rpm for installing packages + # as a non-root user might be a problem. + (mkdir -p %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz packages/%{name}-%{version}) + + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%{_installPrefix} diff --git a/ThirdParty/rpmBuild/SPECS/gcc-4.9.2.spec b/ThirdParty/rpmBuild/SPECS/gcc-4.9.2.spec new file mode 100644 index 000000000..48bed74e4 --- /dev/null +++ b/ThirdParty/rpmBuild/SPECS/gcc-4.9.2.spec @@ -0,0 +1,174 @@ +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | foam-extend: Open Source CFD +# \\ / O peration | +# \\ / A nd | For copyright notice see file Copyright +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of foam-extend. +# +# foam-extend 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 3 of the License, or (at your +# option) any later version. +# +# foam-extend 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 foam-extend. If not, see . +# +# Script +# RPM spec file for gcc-4.9.2 +# +# Description +# RPM spec file for creating a relocatable RPM +# +# Author: +# Hrvoje Jasak, Wikki Ltd. (2015) +# +#------------------------------------------------------------------------------ + +# We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable +%{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)} +%{expand:%%define _WM_OPTIONS %(echo $WM_OPTIONS)} + +# Disable the generation of debuginfo packages +%define debug_package %{nil} + +# The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory +%define _topdir %{_WM_THIRD_PARTY_DIR}/rpmBuild +%define _tmppath %{_topdir}/tmp + +# Will install the package directly $WM_THIRD_PARTY_DIR +# Some comments about package relocation: +# By using this prefix for the Prefix: parameter in thi file, you will make this +# package relocatable. +# +# This is fine, as long as your software is itself relocatable. +# +# Simply take note that libraries built with libtool are not relocatable because the +# prefix we specify will be hard-coded in the library .la files. +# Ref: http://sourceware.org/autobook/autobook/autobook_80.html +# +# In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will +# not be able to reutilize this RPM, even though it is relocatable. You will need to +# regenerate the RPM. +# +%define _prefix %{_WM_THIRD_PARTY_DIR} + +%define name gcc +%define release %{_WM_OPTIONS} +%define version 4.9.2 + +%define buildroot %{_topdir}/BUILD/%{name}-%{version}-root + +BuildRoot: %{buildroot} +Summary: gcc +License: Unkown +Name: %{name} +Version: %{version} +Release: %{release} +URL: ftp://ftp.gnu.org/gnu/gcc/gcc-4.9.2 +Source: %url/%{name}-%{version}.tar.gz +Prefix: %{_prefix} +Group: Development/Tools + + +%define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS} + +%description +%{summary} + +%prep +%setup -q + +%build + # export WM settings in a form that GNU configure recognizes + [ -n "$WM_CC" ] && export CC="$WM_CC" + [ -n "$WM_CXX" ] && export CXX="$WM_CXX" + [ -n "$WM_CFLAGS" ] && export CFLAGS="$WM_CFLAGS" + [ -n "$WM_CXXFLAGS" ] && export CXXFLAGS="$WM_CXXFLAGS" + [ -n "$WM_LDFLAGS" ] && export LDFLAGS="$WM_LDFLAGS" + + GMP_VERSION=gmp-5.1.2 + MPFR_VERSION=mpfr-3.1.2 + MPC_VERSION=mpc-1.0.1 + + mkdir ./objBuildDir + cd ./objBuildDir + + ../configure \ + --prefix=%{_installPrefix} \ + --enable-languages=c,c++ \ + --enable-shared \ + --disable-multilib \ + --with-mpc=$WM_THIRD_PARTY_DIR/packages/$MPC_VERSION/platforms/$WM_OPTIONS \ + --with-gmp=$WM_THIRD_PARTY_DIR/packages/$GMP_VERSION/platforms/$WM_OPTIONS \ + --with-mpfr=$WM_THIRD_PARTY_DIR/packages/$MPFR_VERSION/platforms/$WM_OPTIONS + + [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1 + make -j $WM_NCOMPPROCS + +%install + cd ./objBuildDir + make install DESTDIR=$RPM_BUILD_ROOT + + # Creation of foam-extend specific .csh and .sh files" + + echo "" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" + echo "" + # + # Generate package specific .sh file for foam-extend + # +mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc +cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export GCC_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS + +[ -d \$GCC_DIR/lib ] && _foamAddLib \$GCC_DIR/lib + +[ -d \$GCC_DIR/lib64 ] && _foamAddLib \$GCC_DIR/lib64 + +# Enable access to the package applications if present +[ -d \$GCC_DIR/bin ] && _foamAddPath \$GCC_DIR/bin +DOT_SH_EOF + + # + # Generate package specific .csh file for foam-extend + # +cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +setenv GCC_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS + +if ( -e \$GCC_DIR/lib ) then + _foamAddLib \$GCC_DIR/lib +endif + +if ( -e \$GCC_DIR/lib64 ) then + _foamAddLib \$GCC_DIR/lib64 +endif + +if ( -e \$GCC_DIR/bin ) then + _foamAddPath \$GCC_DIR/bin +endif +DOT_CSH_EOF + + #finally, generate a .tgz file for systems where using rpm for installing packages + # as a non-root user might be a problem. + (mkdir -p %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz packages/%{name}-%{version}) + + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%{_installPrefix} diff --git a/ThirdParty/rpmBuild/SPECS/gmp-4.3.2.spec b/ThirdParty/rpmBuild/SPECS/gmp-4.3.2.spec new file mode 100644 index 000000000..f0e5d6733 --- /dev/null +++ b/ThirdParty/rpmBuild/SPECS/gmp-4.3.2.spec @@ -0,0 +1,155 @@ +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | foam-extend: Open Source CFD +# \\ / O peration | +# \\ / A nd | For copyright notice see file Copyright +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of foam-extend. +# +# foam-extend 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 3 of the License, or (at your +# option) any later version. +# +# foam-extend 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 foam-extend. If not, see . +# +# Script +# RPM spec file for gmp-4.3.2 +# +# Description +# RPM spec file for creating a relocatable RPM +# +# Author: +# Martin Beaudoin, Hydro-Quebec, (2010) +# +#------------------------------------------------------------------------------ + +# We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable +%{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)} +%{expand:%%define _WM_OPTIONS %(echo $WM_OPTIONS)} + +# Disable the generation of debuginfo packages +%define debug_package %{nil} + +# The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory +%define _topdir %{_WM_THIRD_PARTY_DIR}/rpmBuild +%define _tmppath %{_topdir}/tmp + +# Will install the package directly $WM_THIRD_PARTY_DIR +# Some comments about package relocation: +# By using this prefix for the Prefix: parameter in thi file, you will make this +# package relocatable. +# +# This is fine, as long as your software is itself relocatable. +# +# Simply take note that libraries built with libtool are not relocatable because the +# prefix we specify will be hard-coded in the library .la files. +# Ref: http://sourceware.org/autobook/autobook/autobook_80.html +# +# In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will +# not be able to reutilize this RPM, even though it is relocatable. You will need to +# regenerate the RPM. +# +%define _prefix %{_WM_THIRD_PARTY_DIR} + +%define name gmp +%define release %{_WM_OPTIONS} +%define version 4.3.2 + +%define buildroot %{_topdir}/BUILD/%{name}-%{version}-root + +BuildRoot: %{buildroot} +Summary: gmp +License: Unkown +Name: %{name} +Version: %{version} +Release: %{release} +URL: ftp://ftp.gnu.org/gnu/gmp +Source: %url/%{name}-%{version}.tar.bz2 +Prefix: %{_prefix} +Group: Development/Tools + +%define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS} + +%description +%{summary} + +%prep +%setup -q + +%build + # export WM settings in a form that GNU configure recognizes + [ -n "$WM_CC" ] && export CC="$WM_CC" + [ -n "$WM_CXX" ] && export CXX="$WM_CXX" + [ -n "$WM_CFLAGS" ] && export CFLAGS="$WM_CFLAGS" + [ -n "$WM_CXXFLAGS" ] && export CXXFLAGS="$WM_CXXFLAGS" + [ -n "$WM_LDFLAGS" ] && export LDFLAGS="$WM_LDFLAGS" + + ./configure --prefix=%{_installPrefix} + + [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1 + make -j $WM_NCOMPPROCS + +%install + make install DESTDIR=$RPM_BUILD_ROOT + + # Creation of foam-extend specific .csh and .sh files" + + echo "" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" + echo "" + # + # Generate package specific .sh file for foam-extend + # +mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc +cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export GMP_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS + +[ -d \$GMP_DIR/lib ] && _foamAddLib \$GMP_DIR/lib + +# Enable access to the package applications if present +[ -d \$GMP_DIR/bin ] && _foamAddPath \$GMP_DIR/bin +DOT_SH_EOF + + # + # Generate package specific .csh file for foam-extend + # +cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +setenv GMP_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS + +if ( -e \$GMP_DIR/lib ) then + _foamAddLib \$GMP_DIR/lib +endif + +if ( -e \$GMP_DIR/bin ) then + _foamAddPath \$GMP_DIR/bin +endif +DOT_CSH_EOF + + #finally, generate a .tgz file for systems where using rpm for installing packages + # as a non-root user might be a problem. + (mkdir -p %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz packages/%{name}-%{version}) + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%{_installPrefix}/etc +%{_installPrefix}/include +%{_installPrefix}/lib +%{_installPrefix}/share + diff --git a/ThirdParty/rpmBuild/SPECS/mpfr-2.4.2.spec b/ThirdParty/rpmBuild/SPECS/mpfr-2.4.2.spec new file mode 100644 index 000000000..ad7a684b9 --- /dev/null +++ b/ThirdParty/rpmBuild/SPECS/mpfr-2.4.2.spec @@ -0,0 +1,157 @@ +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | foam-extend: Open Source CFD +# \\ / O peration | +# \\ / A nd | For copyright notice see file Copyright +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of foam-extend. +# +# foam-extend 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 3 of the License, or (at your +# option) any later version. +# +# foam-extend 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 foam-extend. If not, see . +# +# Script +# RPM spec file for mpfr-2.4.2 +# +# Description +# RPM spec file for creating a relocatable RPM +# +# Author: +# Martin Beaudoin, Hydro-Quebec, (2010) +# +#------------------------------------------------------------------------------ + +# We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable +%{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)} +%{expand:%%define _WM_OPTIONS %(echo $WM_OPTIONS)} + +# Disable the generation of debuginfo packages +%define debug_package %{nil} + +# The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory +%define _topdir %{_WM_THIRD_PARTY_DIR}/rpmBuild +%define _tmppath %{_topdir}/tmp + +# Will install the package directly $WM_THIRD_PARTY_DIR +# Some comments about package relocation: +# By using this prefix for the Prefix: parameter in thi file, you will make this +# package relocatable. +# +# This is fine, as long as your software is itself relocatable. +# +# Simply take note that libraries built with libtool are not relocatable because the +# prefix we specify will be hard-coded in the library .la files. +# Ref: http://sourceware.org/autobook/autobook/autobook_80.html +# +# In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will +# not be able to reutilize this RPM, even though it is relocatable. You will need to +# regenerate the RPM. +# +%define _prefix %{_WM_THIRD_PARTY_DIR} + +%define name mpfr +%define release %{_WM_OPTIONS} +%define version 2.4.2 + +%define buildroot %{_topdir}/BUILD/%{name}-%{version}-root + +BuildRoot: %{buildroot} +Summary: mpfr +License: Unkown +Name: %{name} +Version: %{version} +Release: %{release} +URL: http://www.mpfr.org/mpfr-current +Source: %url/%{name}-%{version}.tar.gz +Prefix: %{_prefix} +Group: Development/Tools + +%define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS} + +%description +%{summary} + +%prep +%setup -q + +%build + # export WM settings in a form that GNU configure recognizes + [ -n "$WM_CC" ] && export CC="$WM_CC" + [ -n "$WM_CXX" ] && export CXX="$WM_CXX" + [ -n "$WM_CFLAGS" ] && export CFLAGS="$WM_CFLAGS" + [ -n "$WM_CXXFLAGS" ] && export CXXFLAGS="$WM_CXXFLAGS" + [ -n "$WM_LDFLAGS" ] && export LDFLAGS="$WM_LDFLAGS" + + GMP_VERSION=gmp-5.1.2 + ./configure \ + --prefix=%{_installPrefix} \ + --with-gmp=$WM_THIRD_PARTY_DIR/packages/$GMP_VERSION/platforms/$WM_OPTIONS + + [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1 + make -j $WM_NCOMPPROCS + +%install + make install DESTDIR=$RPM_BUILD_ROOT + + + # Creation of foam-extend specific .csh and .sh files" + + echo "" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" + echo "" + # + # Generate package specific .sh file for foam-extend + # +mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc +cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export MPFR_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS + +[ -d \$MPFR_DIR/lib ] && _foamAddLib \$MPFR_DIR/lib + +# Enable access to the package applications if present +[ -d \$MPFR_DIR/bin ] && _foamAddPath \$MPFR_DIR/bin +DOT_SH_EOF + + # + # Generate package specific .csh file for foam-extend + # +cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +setenv MPFR_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS + +if ( -e \$MPFR_DIR/lib ) then + _foamAddLib \$MPFR_DIR/lib +endif + +if ( -e \$MPFR_DIR/bin ) then + _foamAddPath \$MPFR_DIR/bin +endif +DOT_CSH_EOF + + #finally, generate a .tgz file for systems where using rpm for installing packages + # as a non-root user might be a problem. + (mkdir -p %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz packages/%{name}-%{version}) + + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%{_installPrefix} + diff --git a/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.8.6.spec b/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.8.6.spec new file mode 100644 index 000000000..09b4283ce --- /dev/null +++ b/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.8.6.spec @@ -0,0 +1,183 @@ +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | foam-extend: Open Source CFD +# \\ / O peration | +# \\ / A nd | For copyright notice see file Copyright +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of foam-extend. +# +# foam-extend 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 3 of the License, or (at your +# option) any later version. +# +# foam-extend 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 foam-extend. If not, see . +# +# Script +# RPM spec file for qt-everywhere-opensource-src-4.8.6 +# +# Description +# RPM spec file for creating a relocatable RPM +# +# Author: +# Martin Beaudoin, Hydro-Quebec, (2014) +# +#------------------------------------------------------------------------------ + +# We grab the value of WM_THIRD_PARTY and WM_OPTIONS from the environment variable +%{expand:%%define _WM_THIRD_PARTY_DIR %(echo $WM_THIRD_PARTY_DIR)} +%{expand:%%define _WM_OPTIONS %(echo $WM_OPTIONS)} + +# Disable the generation of debuginfo packages +%define debug_package %{nil} + +# The topdir needs to point to the $WM_THIRD_PARTY/rpmbuild directory +%define _topdir %{_WM_THIRD_PARTY_DIR}/rpmBuild +%define _tmppath %{_topdir}/tmp + +# Will install the package directly $WM_THIRD_PARTY_DIR +# Some comments about package relocation: +# By using this prefix for the Prefix: parameter in this file, you will make this +# package relocatable. +# +# This is fine, as long as your software is itself relocatable. +# +# Simply take note that libraries built with libtool are not relocatable because the +# prefix we specify will be hard-coded in the library .la files. +# Ref: http://sourceware.org/autobook/autobook/autobook_80.html +# +# In that case, if you ever change the value of the $WM_THIRD_PARTY_DIR, you will +# not be able to reutilize this RPM, even though it is relocatable. You will need to +# regenerate the RPM. +# +%define _prefix %{_WM_THIRD_PARTY_DIR} + +%define name qt-everywhere-opensource-src +%define release %{_WM_OPTIONS} +%define version 4.8.6 + +%define buildroot %{_topdir}/BUILD/%{name}-%{version}-root + +%define _unpackaged_files_terminate_build 0 +%define _missing_doc_files_terminate_build 0 + +BuildRoot: %{buildroot} +Summary: qt-everywhere-opensource-src +License: Unkown +Name: %{name} +Version: %{version} +Release: %{release} +URL: http://download.qt-project.org/official_releases/qt/4.8/4.8.6 +Source: %url/%{name}-%{version}.tar.gz +Prefix: %{_prefix} +Group: Development/Tools + + +%define _installPrefix %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS} + +%description +%{summary} + +%prep +%setup -q + +%build + # export WM settings in a form that GNU configure recognizes + [ -n "$WM_CC" ] && export CC="$WM_CC" + [ -n "$WM_CXX" ] && export CXX="$WM_CXX" + [ -n "$WM_CFLAGS" ] && export CFLAGS="$WM_CFLAGS" + [ -n "$WM_CXXFLAGS" ] && export CXXFLAGS="$WM_CXXFLAGS" + [ -n "$WM_LDFLAGS" ] && export LDFLAGS="$WM_LDFLAGS" + +%ifos darwin + # Under Mac OS X, Qt 4.8 will only compile using the stock native g++ compiler supplied with Xcode. + # If your native Mac OS X g++ compiler is not located under /usr/bin, simply adjust the redefinition of the following variables accordingly. + # This is ugly, I know... + export CC=/usr/bin/gcc + export CXX=/usr/bin/g++ + export PATH=/usr/bin:$PATH +%endif + + ./configure \ + -opensource --confirm-license=yes \ + -release -shared \ + -nomake examples -nomake demos \ + --prefix=%{_installPrefix} + + # Explicitely specify LD_LIBRARY_PATH so it can find QT own libraries + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%{_builddir}/%{name}-%{version}/lib + + [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1 + make -j $WM_NCOMPPROCS + +%install + # Makefiles generated by qmake do not to support the DESTDIR= option + # We need to use the INSTALL_ROOT= option instead + + # Somehow, we need to clean up for the RPM to install properly + rm -rf %{_installPrefix} + + make install INSTALL_ROOT=$RPM_BUILD_ROOT + + # Creation of foam-extend specific .csh and .sh files" + + echo "" + echo "Generating foam-extend specific .csh and .sh files for the package %{name}-%{version}" + echo "" + # + # Generate package specific .sh file for foam-extend + # +mkdir -p $RPM_BUILD_ROOT/%{_installPrefix}/etc +cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export QT_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS +export QT_BIN_DIR=\$QT_DIR/bin +export QT_LIB_DIR=\$QT_DIR/lib + +# Enable access to the runtime package applications +[ -d \$QT_BIN_DIR ] && _foamAddPath \$QT_BIN_DIR +[ -d \$QT_LIB_DIR ] && _foamAddLib \$QT_LIB_DIR +DOT_SH_EOF + + # + # Generate package specific .csh file for foam-extend + # +cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.csh +# Load %{name}-%{version} libraries and binaries if available +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +setenv QT_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS +setenv QT_BIN_DIR \$QT_DIR/bin +setenv QT_LIB_DIR \$QT_DIR/lib + +if ( -e \$QT_BIN_DIR ) then + _foamAddPath \$QT_BIN_DIR +endif + +if ( -e \$QT_LIB_DIR ) then + _foamAddLib \$QT_LIB_DIR +endif +DOT_CSH_EOF + + #finally, generate a .tgz file for systems where using rpm for installing packages + # as a non-root user might be a problem. + (mkdir -p %{_topdir}/TGZS/%{_target_cpu}; cd $RPM_BUILD_ROOT/%{_prefix}; tar -zcvf %{_topdir}/TGZS/%{_target_cpu}/%{name}-%{version}.tgz packages/%{name}-%{version}) + + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%{_installPrefix} + + diff --git a/applications/solvers/basic/potentialDyMFoam/potentialDyMFoam.C b/applications/solvers/basic/potentialDyMFoam/potentialDyMFoam.C index fcd02313b..c1707f5b5 100644 --- a/applications/solvers/basic/potentialDyMFoam/potentialDyMFoam.C +++ b/applications/solvers/basic/potentialDyMFoam/potentialDyMFoam.C @@ -57,8 +57,6 @@ int main(int argc, char *argv[]) # include "readPISOControls.H" # include "checkTotalVolume.H" - runTime++; - Info<< "Time = " << runTime.timeName() << nl << endl; bool meshChanged = mesh.update(); @@ -72,6 +70,7 @@ int main(int argc, char *argv[]) } # include "volContinuity.H" +# include "meshCourantNo.H" // Solve potential flow equations adjustPhi(phi, U, p); @@ -129,6 +128,65 @@ int main(int argc, char *argv[]) << " min: " << gMin(magU.internalField()) << endl; } + if (args.optionFound("writep")) + { + // Find reference patch + label refPatch = -1; + scalar maxMagU = 0; + + // Go through all velocity patches and find the one that fixes + // velocity to the largest value + + forAll (U.boundaryField(), patchI) + { + const fvPatchVectorField& Upatch = U.boundaryField()[patchI]; + + if (Upatch.fixesValue()) + { + // Calculate mean velocity + scalar u = sum(mag(Upatch)); + label patchSize = Upatch.size(); + + reduce(u, sumOp()); + reduce(patchSize, sumOp