Merge branch 'master' of develop.openfoam.com:Development/OpenFOAM-plus into feature-shared-file
Conflicts: applications/utilities/mesh/advanced/refinementLevel/refinementLevel.C applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundary.C applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamUpdateInfo.C applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C applications/utilities/postProcessing/velocityField/Co/Co.C applications/utilities/postProcessing/velocityField/Pe/Pe.C applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C applications/utilities/preProcessing/changeDictionary/changeDictionary.C applications/utilities/preProcessing/setFields/setFields.C applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C applications/utilities/surface/surfaceRedistributePar/surfaceRedistributePar.C src/OpenFOAM/db/IOobject/IOobject.C src/OpenFOAM/db/IOobjects/CompactIOList/CompactIOList.C src/OpenFOAM/db/IOobjects/IOField/IOField.C src/OpenFOAM/db/IOobjects/IOList/IOList.C src/OpenFOAM/db/IOobjects/IOPtrList/IOPtrList.C src/OpenFOAM/db/IOobjects/IOdictionary/IOdictionary.C src/OpenFOAM/db/Time/findInstance.C src/OpenFOAM/db/regIOobject/regIOobject.C src/OpenFOAM/db/regIOobject/regIOobjectI.H src/OpenFOAM/db/regIOobject/regIOobjectRead.C src/OpenFOAM/db/regIOobject/regIOobjectWrite.C src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/IOmapDistribute.C src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C src/dynamicMesh/fvMeshDistribute/IOmapDistributePolyMesh.C src/dynamicMesh/motionSolver/componentDisplacement/componentDisplacementMotionSolver.C src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8Data.C src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/refinementHistory.C src/dynamicMesh/polyTopoChange/polyTopoChanger/polyTopoChanger.C src/edgeMesh/edgeMeshFormats/edgeMesh/edgeMeshFormat.C src/edgeMesh/extendedEdgeMesh/extendedEdgeMeshFormats/extendedEdgeMeshFormat/extendedEdgeMeshFormat.C src/edgeMesh/extendedEdgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMesh.C src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C src/lagrangian/basic/Cloud/CloudIO.C src/meshTools/sets/cellSources/fieldToCell/fieldToCell.C src/postProcessing/foamCalcFunctions/basic/addSubtract/addSubtract.C src/postProcessing/functionObjects/field/fieldCoordinateSystemTransform/fieldCoordinateSystemTransformTemplates.C src/postProcessing/functionObjects/field/readFields/readFieldsTemplates.C src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C src/triSurface/triSurface/surfacePatch/surfacePatchIOList.C
Showing
- Allwmake 4 additions, 1 deletionAllwmake
- README.md 22 additions, 0 deletionsREADME.md
- README.org 0 additions, 30 deletionsREADME.org
- applications/solvers/DNS/DNSSolversDoc.H 30 additions, 0 deletionsapplications/solvers/DNS/DNSSolversDoc.H
- applications/solvers/DNS/dnsFoam/dnsFoam.C 3 additions, 0 deletionsapplications/solvers/DNS/dnsFoam/dnsFoam.C
- applications/solvers/basic/basicSolversDoc.H 30 additions, 0 deletionsapplications/solvers/basic/basicSolversDoc.H
- applications/solvers/basic/laplacianFoam/laplacianFoam.C 23 additions, 1 deletionapplications/solvers/basic/laplacianFoam/laplacianFoam.C
- applications/solvers/basic/potentialFoam/Make/options 0 additions, 2 deletionsapplications/solvers/basic/potentialFoam/Make/options
- applications/solvers/basic/potentialFoam/createControls.H 0 additions, 9 deletionsapplications/solvers/basic/potentialFoam/createControls.H
- applications/solvers/basic/potentialFoam/createFields.H 23 additions, 2 deletionsapplications/solvers/basic/potentialFoam/createFields.H
- applications/solvers/basic/potentialFoam/potentialFoam.C 60 additions, 11 deletionsapplications/solvers/basic/potentialFoam/potentialFoam.C
- applications/solvers/basic/scalarTransportFoam/Make/options 0 additions, 1 deletionapplications/solvers/basic/scalarTransportFoam/Make/options
- applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C 33 additions, 4 deletions...s/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
- applications/solvers/combustion/PDRFoam/EaEqn.H 10 additions, 1 deletionapplications/solvers/combustion/PDRFoam/EaEqn.H
- applications/solvers/combustion/PDRFoam/EauEqn.H 9 additions, 1 deletionapplications/solvers/combustion/PDRFoam/EauEqn.H
- applications/solvers/combustion/PDRFoam/Make/options 3 additions, 2 deletionsapplications/solvers/combustion/PDRFoam/Make/options
- applications/solvers/combustion/PDRFoam/PDRFoam.C 17 additions, 10 deletionsapplications/solvers/combustion/PDRFoam/PDRFoam.C
- applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C 1 addition, 0 deletionsapplications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C
- applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H 1 addition, 1 deletion.../PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H
- applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C 3 additions, 5 deletions...RFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C
Please register or sign in to comment