GIT: Resolved merge conflict
Showing
- src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.C 41 additions, 13 deletions...nctionObjects/regionFunctionObject/regionFunctionObject.C
- src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H 42 additions, 7 deletions...nctionObjects/regionFunctionObject/regionFunctionObject.H
- src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObjectTemplates.C 36 additions, 6 deletions...ects/regionFunctionObject/regionFunctionObjectTemplates.C
- src/functionObjects/field/PecletNo/PecletNo.C 1 addition, 1 deletionsrc/functionObjects/field/PecletNo/PecletNo.C
- src/functionObjects/field/blendingFactor/blendingFactor.C 7 additions, 2 deletionssrc/functionObjects/field/blendingFactor/blendingFactor.C
- src/functionObjects/field/fieldAverage/fieldAverage.C 25 additions, 3 deletionssrc/functionObjects/field/fieldAverage/fieldAverage.C
- src/functionObjects/field/fieldValues/fieldValue/fieldValue.C 1 addition, 1 deletion...functionObjects/field/fieldValues/fieldValue/fieldValue.C
- src/functionObjects/field/fieldValues/fieldValue/fieldValue.H 1 addition, 1 deletion...functionObjects/field/fieldValues/fieldValue/fieldValue.H
- src/functionObjects/field/fluxSummary/fluxSummary.C 43 additions, 50 deletionssrc/functionObjects/field/fluxSummary/fluxSummary.C
- src/functionObjects/field/mapFields/mapFields.H 1 addition, 2 deletionssrc/functionObjects/field/mapFields/mapFields.H
- src/functionObjects/field/pressure/pressure.C 2 additions, 2 deletionssrc/functionObjects/field/pressure/pressure.C
- src/functionObjects/field/valueAverage/valueAverage.H 1 addition, 1 deletionsrc/functionObjects/field/valueAverage/valueAverage.H
- src/functionObjects/forces/forceCoeffs/forceCoeffs.C 6 additions, 8 deletionssrc/functionObjects/forces/forceCoeffs/forceCoeffs.C
- src/sampling/sampledSurface/readers/ensight/ensightSurfaceReader.C 10 additions, 10 deletions...ing/sampledSurface/readers/ensight/ensightSurfaceReader.C
- src/sampling/sampledSurface/readers/ensight/ensightSurfaceReader.H 7 additions, 7 deletions...ing/sampledSurface/readers/ensight/ensightSurfaceReader.H
- src/sampling/sampledSurface/readers/ensight/ensightSurfaceReaderTemplates.C 3 additions, 3 deletions...edSurface/readers/ensight/ensightSurfaceReaderTemplates.C
- wmake/rules/General/CGAL 2 additions, 1 deletionwmake/rules/General/CGAL
- wmake/scripts/AllwmakeParseArguments 24 additions, 15 deletionswmake/scripts/AllwmakeParseArguments
Please register or sign in to comment