diff --git a/Changelog.current b/Changelog.current index 319041866..6f375633c 100644 --- a/Changelog.current +++ b/Changelog.current @@ -1,5 +1,5 @@ ################################################################################ -This file contains brief description of the changes introduced by merging +This file contains brief description of the changes introduced by merging branches There are two secions: feature and bugfix @@ -31,7 +31,7 @@ Updated wmake/rules for compilation with ICC 14 * processorPointPatch Author: Zeljko Tukovic; Merge: Dominik Christ -Correct interpolation of point data on processor boundaries after parallel +Correct interpolation of point data on processor boundaries after parallel topological changes diff --git a/ReleaseNotes b/ReleaseNotes index 38c1ff575..faaa85f00 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -42,9 +42,9 @@ December 2004) as release number 3.0. Visit http://foam-extend.org for more information. - OPENFOAM® is a registered trademark of ESI Group. OpenFOAM-extend and + OPENFOAM® is a registered trademark of ESI Group. OpenFOAM-extend and foam-extend are a community effort not endorsed by ESI Group. - + ** Installation foam-extend-3.1 can be compiled and runs on any linux system @@ -68,7 +68,7 @@ Binary packages are available for download at http://sourceforge.net/projects/openfoam-extend/ for the following systems: Ubuntu 14.04, Fedora 20 and Mac OS X. - + * Accompanying ThirdParty software: - gcc compatibility up to 4.8.2 - Paraview 4.0.1 @@ -86,7 +86,7 @@ - bison 2.7 - hwloc 1.7.2 - libccmio 2.6.1 - + ** Compatibility Upstream features from the OpenFOAM® code base are merged into foam-extend on regular basis. The interface format of @@ -328,8 +328,8 @@ user@machine> git log 3.0.. > commitLog http://sourceforge.net/apps/mantisbt/openfoam-extend ** How to contribute - All your contributions are highly welcome: New solvers, utilities and - models; bug fixes; documentation. The many ways of contributing and the + All your contributions are highly welcome: New solvers, utilities and + models; bug fixes; documentation. The many ways of contributing and the contribution process are described in detail at: http://sourceforge.net/p/openfoam-extend/wiki/HowToContribute/ diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index cba12f631..4695dede8 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -19,7 +19,7 @@ Table of Contents 9 List of Contributors: -1 Overview +1 Overview ----------- The foam-extend project is a fork of the OpenFOAM® open source library for Computational Fluid Dynamics (CFD). It is an open @@ -46,11 +46,11 @@ Table of Contents December 2004) as release number 3.0. Visit [http://foam-extend.org] for more information. - OPENFOAM® is a registered trademark of ESI Group. OpenFOAM-extend and + OPENFOAM® is a registered trademark of ESI Group. OpenFOAM-extend and foam-extend are a community effort not endorsed by ESI Group. - -2 Installation + +2 Installation --------------- foam-extend-3.1 can be compiled and runs on any linux system @@ -74,7 +74,7 @@ Table of Contents Binary packages are available for download at [http://sourceforge.net/projects/openfoam-extend/] for the following systems: Ubuntu 14.04, Fedora 20 and Mac OS X. - + * Accompanying ThirdParty software: - gcc compatibility up to 4.8.2 - Paraview 4.0.1 @@ -92,9 +92,9 @@ Table of Contents - bison 2.7 - hwloc 1.7.2 - libccmio 2.6.1 - -3 Compatibility + +3 Compatibility ---------------- Upstream features from the OpenFOAM® code base are merged into foam-extend on regular basis. The interface format of @@ -103,7 +103,7 @@ Table of Contents fixes and algorithmic improvements, considered more important than inter-operability. -4 Main differentiators between foam-extend and OpenFOAM +4 Main differentiators between foam-extend and OpenFOAM -------------------------------------------------------- A large number of features have been lost within the release of OpenFOAM since version 1.3, the code base has shrunk by more than @@ -184,7 +184,7 @@ Table of Contents * Approximately 6000 bug fixes in fundamental level libraries and discretisation techniques -5 New features in foam-extend-3.1, since foam-extend-3.0 +5 New features in foam-extend-3.1, since foam-extend-3.0 --------------------------------------------------------- The list of features is a result of the work of numerous contributors. The maintainers of foam-extend would formally like to @@ -307,7 +307,7 @@ Table of Contents - Template depth for block matrix support - Parallel efficiency improvements -6 Recent successful compilations and tests +6 Recent successful compilations and tests ------------------------------------------- * Ubuntu 14.04: @@ -337,18 +337,18 @@ Table of Contents [http://openfoam-extend.sourceforge.net/CDash/viewTest.php?buildid=743] -7 Reporting bugs +7 Reporting bugs ----------------- To report bugs, please use the MantisBT bugtracker at [http://sourceforge.net/apps/mantisbt/openfoam-extend] -8 How to contribute +8 How to contribute -------------------- - All your contributions are highly welcome: New solvers, utilities and - models; bug fixes; documentation. The many ways of contributing and the + All your contributions are highly welcome: New solvers, utilities and + models; bug fixes; documentation. The many ways of contributing and the contribution process are described in detail at: [http://sourceforge.net/p/openfoam-extend/wiki/HowToContribute/] -9 List of Contributors: +9 List of Contributors: ------------------------ See file ListOfContributors diff --git a/applications/solvers/finiteArea/liquidFilmFoam/readSolutionControls.H b/applications/solvers/finiteArea/liquidFilmFoam/readSolutionControls.H index 00930b2c1..dda7bf0d8 100644 --- a/applications/solvers/finiteArea/liquidFilmFoam/readSolutionControls.H +++ b/applications/solvers/finiteArea/liquidFilmFoam/readSolutionControls.H @@ -2,7 +2,7 @@ int nCorr = 0; if (aMesh.solutionDict().found("nOuterCorrectors")) { - nCorr = + nCorr = readInt(aMesh.solutionDict().lookup("nOuterCorrectors")); } else diff --git a/applications/solvers/finiteArea/liquidFilmFoam/surfaceCourantNo.H b/applications/solvers/finiteArea/liquidFilmFoam/surfaceCourantNo.H index 160797516..89718a940 100644 --- a/applications/solvers/finiteArea/liquidFilmFoam/surfaceCourantNo.H +++ b/applications/solvers/finiteArea/liquidFilmFoam/surfaceCourantNo.H @@ -40,7 +40,7 @@ scalar velMag = 0.0; if (aMesh.nInternalEdges()) { - edgeScalarField SfUfbyDelta = + edgeScalarField SfUfbyDelta = aMesh.edgeInterpolation::deltaCoeffs()*mag(phis); CoNum = max(SfUfbyDelta/aMesh.magLe()) @@ -53,7 +53,7 @@ if (aMesh.nInternalEdges()) } Info<< "Courant Number mean: " << meanCoNum - << " max: " << CoNum + << " max: " << CoNum << " velocity magnitude: " << velMag << endl; // ************************************************************************* // diff --git a/applications/solvers/immersedBoundary/icoIbFoam/Make/files b/applications/solvers/immersedBoundary/icoIbFoam/Make/files index 96a8e6f27..bccc003ee 100644 --- a/applications/solvers/immersedBoundary/icoIbFoam/Make/files +++ b/applications/solvers/immersedBoundary/icoIbFoam/Make/files @@ -1,3 +1,3 @@ -icoIbFoam.C +icoIbFoam.C EXE = $(FOAM_APPBIN)/icoIbFoam diff --git a/applications/solvers/immersedBoundary/porousSimpleIbFoam/Make/files b/applications/solvers/immersedBoundary/porousSimpleIbFoam/Make/files index f7992747e..1a063f7e8 100644 --- a/applications/solvers/immersedBoundary/porousSimpleIbFoam/Make/files +++ b/applications/solvers/immersedBoundary/porousSimpleIbFoam/Make/files @@ -1,3 +1,3 @@ -porousSimpleIbFoam.C +porousSimpleIbFoam.C EXE = $(FOAM_APPBIN)/porousSimpleIbFoam diff --git a/applications/solvers/immersedBoundary/simpleIbFoam/Make/files b/applications/solvers/immersedBoundary/simpleIbFoam/Make/files index ae685d71d..cea939f21 100644 --- a/applications/solvers/immersedBoundary/simpleIbFoam/Make/files +++ b/applications/solvers/immersedBoundary/simpleIbFoam/Make/files @@ -1,3 +1,3 @@ -simpleIbFoam.C +simpleIbFoam.C EXE = $(FOAM_APPBIN)/simpleIbFoam diff --git a/applications/solvers/solidMechanics/elasticIncrAcpSolidFoam/updateCrack.H b/applications/solvers/solidMechanics/elasticIncrAcpSolidFoam/updateCrack.H index 649ba6e4c..66a2ff1ba 100644 --- a/applications/solvers/solidMechanics/elasticIncrAcpSolidFoam/updateCrack.H +++ b/applications/solvers/solidMechanics/elasticIncrAcpSolidFoam/updateCrack.H @@ -12,7 +12,7 @@ nCoupledFacesToBreak = 0; // only consider tensile tractions normalTraction = max(normalTraction, scalar(0)); - + scalarField shearTraction = cohesiveZone.internalField() * mag( (I - Foam::sqr(n.internalField())) & traction.internalField() ); @@ -424,7 +424,7 @@ nCoupledFacesToBreak = 0; } faceToBreakTraction *= scaleFactor; - + topoChange = true; } diff --git a/applications/solvers/solidMechanics/readMe.txt b/applications/solvers/solidMechanics/readMe.txt index 446eef05b..a81c78519 100644 --- a/applications/solvers/solidMechanics/readMe.txt +++ b/applications/solvers/solidMechanics/readMe.txt @@ -23,7 +23,7 @@ The included solvers feature the following capabilities: arbitrary crack propagation custom boundary conditions Aitken's under-relaation for displacement field - + A number of people have contributed to the development of the solvers, mainly within Alojz Ivankovic's research group. The code has been assembled and is maintained by Philip Cardiff (University College Dublin), diff --git a/applications/utilities/immersedBoundary/ibContinuityError/Make/files b/applications/utilities/immersedBoundary/ibContinuityError/Make/files index 5a38df031..fe597de2d 100644 --- a/applications/utilities/immersedBoundary/ibContinuityError/Make/files +++ b/applications/utilities/immersedBoundary/ibContinuityError/Make/files @@ -1,3 +1,3 @@ -ibContinuityError.C +ibContinuityError.C EXE = $(FOAM_APPBIN)/ibContinuityError diff --git a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C index c7b4fe7f3..17d78b20c 100644 --- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C +++ b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C @@ -1095,7 +1095,7 @@ int main(int argc, char *argv[]) { mesh.addZones(List(0), fz, cz); } - + removeEmptyPatches(mesh); mesh.write(); diff --git a/applications/utilities/mesh/generation/cfMesh/FMSToVTK/FMSToVTK.C b/applications/utilities/mesh/generation/cfMesh/FMSToVTK/FMSToVTK.C index 747fb4e36..82f949d29 100644 --- a/applications/utilities/mesh/generation/cfMesh/FMSToVTK/FMSToVTK.C +++ b/applications/utilities/mesh/generation/cfMesh/FMSToVTK/FMSToVTK.C @@ -51,23 +51,23 @@ void writePointsToVTK { xmlTag xmlRoot("VTKFile"); xmlRoot.addAttribute("type", "PolyData"); - + xmlTag& xmlPolyData = xmlRoot.addChild("PolyData"); - + xmlTag& xmlPiece = xmlPolyData.addChild("Piece"); xmlPiece.addAttribute("NumberOfPoints", points.size()); - + xmlTag& xmlPoints = xmlPiece.addChild("Points"); - + xmlTag& xmlPointData = xmlPoints.addChild("DataArray"); xmlPointData.addAttribute("type", "Float32"); xmlPointData.addAttribute("NumberOfComponents", 3); xmlPointData.addAttribute("format", "ascii"); xmlPointData << points; - + OFstream os(fn); os << xmlRoot << endl; - + Info << "Created " << fn << endl; } @@ -83,12 +83,12 @@ void writePointsToVTK { // Create subaddressed points pointField newPoints(addr.size()); - + forAll(addr, i) { newPoints[i] = points[addr[i]]; } - + writePointsToVTK ( fn, @@ -108,23 +108,23 @@ void writeEdgesToVTK ) { labelList connectivity(edges.size()); - + forAll(edges, edgeI) { connectivity[edgeI] = 2*(edgeI+1); } - + xmlTag xmlRoot("VTKFile"); xmlRoot.addAttribute("type", "PolyData"); - + xmlTag& xmlPolyData = xmlRoot.addChild("PolyData"); - + xmlTag& xmlPiece = xmlPolyData.addChild("Piece"); xmlPiece.addAttribute("NumberOfPoints", points.size()); xmlPiece.addAttribute("NumberOfLines", edges.size()); - + xmlTag& xmlPoints = xmlPiece.addChild("Points"); - + xmlTag& xmlPointData = xmlPoints.addChild("DataArray"); xmlPointData.addAttribute("type", "Float32"); xmlPointData.addAttribute("NumberOfComponents", 3); @@ -144,7 +144,7 @@ void writeEdgesToVTK xmlConnectData.addAttribute("Name", "offsets"); xmlConnectData.addAttribute("format", "ascii"); xmlConnectData << connectivity; - + OFstream os(fn); os << xmlRoot << endl; @@ -165,28 +165,28 @@ void writeEdgesToVTK DynamicList newPoints; labelList newPointAddr(points.size(), -1); LongList newEdges(addr.size()); - + forAll(addr, addrI) { label edgeI = addr[addrI]; - + const edge& curEdge = edges[edgeI]; edge& newEdge = newEdges[addrI]; - + forAll(curEdge, i) { label pointId = curEdge[i]; - + if (newPointAddr[pointId] == -1) { newPoints.append(points[pointId]); newPointAddr[pointId] = newPoints.size()-1; } - + newEdge[i] = newPointAddr[pointId]; } } - + writeEdgesToVTK ( fn, @@ -207,30 +207,30 @@ void writeFacetsToVTK ) { labelList connectivity(facets.size()); - + forAll(facets, faceI) { connectivity[faceI] = 3*(faceI+1); } - + labelList regionData(facets.size()); - + forAll(facets, faceI) { regionData[faceI] = facets[faceI].region(); } - + xmlTag xmlRoot("VTKFile"); xmlRoot.addAttribute("type", "PolyData"); - + xmlTag& xmlPolyData = xmlRoot.addChild("PolyData"); - + xmlTag& xmlPiece = xmlPolyData.addChild("Piece"); xmlPiece.addAttribute("NumberOfPoints", points.size()); xmlPiece.addAttribute("NumberOfPolys", facets.size()); - + xmlTag& xmlPoints = xmlPiece.addChild("Points"); - + xmlTag& xmlPointData = xmlPoints.addChild("DataArray"); xmlPointData.addAttribute("type", "Float32"); xmlPointData.addAttribute("NumberOfComponents", 3); @@ -250,18 +250,18 @@ void writeFacetsToVTK xmlConnectData.addAttribute("Name", "offsets"); xmlConnectData.addAttribute("format", "ascii"); xmlConnectData << connectivity; - + xmlTag& xmlCellData = xmlPiece.addChild("CellData"); - + xmlTag& xmlCellDataArray = xmlCellData.addChild("DataArray"); xmlCellDataArray.addAttribute("type", "Int32"); xmlCellDataArray.addAttribute("Name", "region"); xmlCellDataArray.addAttribute("format", "ascii"); xmlCellDataArray << regionData; - + OFstream os(fn); os << xmlRoot << endl; - + Info << "Created " << fn << endl; } @@ -276,33 +276,33 @@ void writeFacetsToVTK const LongList& facets, const unallocLabelList& addr ) -{ +{ // Remove unused points and create subaddressed facets DynamicList newPoints; labelList newPointAddr(points.size(), -1); LongList newFacets(addr.size()); - + forAll(addr, addrI) { label faceI = addr[addrI]; - + const labelledTri& facet = facets[faceI]; const FixedList& pointIds = facet; FixedList newPointIds; - + forAll(pointIds, i) { label pointId = pointIds[i]; - + if (newPointAddr[pointId] == -1) { newPoints.append(points[pointId]); newPointAddr[pointId] = newPoints.size()-1; } - + newPointIds[i] = newPointAddr[pointId]; } - + newFacets[addrI] = labelledTri ( newPointIds[0], @@ -311,7 +311,7 @@ void writeFacetsToVTK facet.region() ); } - + writeFacetsToVTK ( fn, @@ -334,36 +334,36 @@ int main(int argc, char *argv[]) // Process commandline arguments fileName inFileName(args.args()[1]); fileName outPrefix(args.args()[2]); - + // Read original surface triSurf origSurf(inFileName); - + const pointField& points = origSurf.points(); const LongList& facets = origSurf.facets(); const LongList& edges = origSurf.featureEdges(); const geometricSurfacePatchList& patches = origSurf.patches(); - + label index = 0; - + // Create file structure for multiblock dataset mkDir(outPrefix); mkDir(outPrefix + "/patches"); mkDir(outPrefix + "/pointSubsets"); mkDir(outPrefix + "/edgeSubsets"); mkDir(outPrefix + "/faceSubsets"); - + // Create VTK multiblock dataset file xmlTag xmlRoot("VTKFile"); xmlRoot.addAttribute("type", "vtkMultiBlockDataSet"); xmlRoot.addAttribute("version", "1.0"); xmlRoot.addAttribute("byte_order", "LittleEndian"); - + xmlTag& xmlDataSet = xmlRoot.addChild("vtkMultiBlockDataSet"); - + // Write faces and feature edges { fileName fn = outPrefix / "facets.vtp"; - + writeFacetsToVTK ( outPrefix / "facets.vtp", @@ -371,16 +371,16 @@ int main(int argc, char *argv[]) points, facets ); - + xmlTag& tag = xmlDataSet.addChild("DataSet"); tag.addAttribute("index", Foam::name(index++)); tag.addAttribute("name", "facets"); tag.addAttribute("file", fn); } - + { fileName fn = outPrefix / "featureEdges.vtp"; - + writeEdgesToVTK ( outPrefix / "featureEdges.vtp", @@ -388,33 +388,33 @@ int main(int argc, char *argv[]) points, edges ); - + xmlTag& tag = xmlDataSet.addChild("DataSet"); tag.addAttribute("index", Foam::name(index++)); tag.addAttribute("name", "featureEdges"); tag.addAttribute("file", fn); } - + // Write patches // Create patch addressing List > patchAddr(patches.size()); - + forAll(facets, faceI) { patchAddr[facets[faceI].region()].append(faceI); } - + { xmlTag& xmlBlock = xmlDataSet.addChild("Block"); xmlBlock.addAttribute("index", Foam::name(index++)); xmlBlock.addAttribute("name", "patches"); - + forAll(patches, patchI) - { + { word patchName = patches[patchI].name(); - + fileName fn = outPrefix / "patches" / patchName + ".vtp"; - + writeFacetsToVTK ( fn, @@ -423,32 +423,32 @@ int main(int argc, char *argv[]) facets, patchAddr[patchI] ); - + xmlTag& tag = xmlBlock.addChild("DataSet"); tag.addAttribute("index", Foam::name(patchI)); tag.addAttribute("name", patchName); tag.addAttribute("file", fn); } } - + // Write point subsets { xmlTag& xmlBlock = xmlDataSet.addChild("Block"); xmlBlock.addAttribute("index", Foam::name(index++)); xmlBlock.addAttribute("name", "pointSubsets"); - + DynList