diff --git a/applications/solvers/combustion/reactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/createFields.H index bebae9978c..e4475e5d1b 100644 --- a/applications/solvers/combustion/reactingFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/createFields.H @@ -1,3 +1,5 @@ +#include "createRDeltaT.H" + Info<< "Creating reaction model\n" << endl; autoPtr reaction diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C index be1245708f..a06eef279c 100644 --- a/applications/solvers/combustion/reactingFoam/reactingFoam.C +++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C @@ -52,7 +52,6 @@ int main(int argc, char *argv[]) #include "createMesh.H" #include "createControl.H" #include "createTimeControls.H" - #include "createRDeltaT.H" #include "initContinuityErrs.H" #include "createFields.H" #include "createFieldRefs.H" diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H index 02e1e65b5c..a4b328f367 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H @@ -1,3 +1,5 @@ +#include "createRDeltaT.H" + Info<< "Creating reaction model\n" << endl; autoPtr reaction diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C index 006fc6708c..ae94c219a1 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C +++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C @@ -53,7 +53,6 @@ int main(int argc, char *argv[]) #include "createMesh.H" #include "createControl.H" #include "createTimeControls.H" - #include "createRDeltaT.H" #include "initContinuityErrs.H" #include "createFields.H" #include "createFieldRefs.H" diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H index c5d3bf6a67..fbd45dd20c 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H @@ -1,3 +1,5 @@ +#include "createRDeltaT.H" + Info<< "Creating reaction model\n" << endl; autoPtr reaction diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C index 6b625b638d..55de274d83 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C +++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C @@ -53,7 +53,6 @@ int main(int argc, char *argv[]) #include "createMesh.H" #include "createControl.H" #include "createTimeControls.H" - #include "createRDeltaT.H" #include "initContinuityErrs.H" #include "createFields.H" #include "createFieldRefs.H" diff --git a/applications/solvers/compressible/rhoCentralFoam/createFields.H b/applications/solvers/compressible/rhoCentralFoam/createFields.H index d425593810..b7cbdd067f 100644 --- a/applications/solvers/compressible/rhoCentralFoam/createFields.H +++ b/applications/solvers/compressible/rhoCentralFoam/createFields.H @@ -1,3 +1,5 @@ +#include "createRDeltaT.H" + Info<< "Reading thermophysical properties\n" << endl; autoPtr pThermo diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C index 972fb96cb9..96413e0201 100644 --- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C +++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C @@ -39,6 +39,8 @@ Description #include "turbulentFluidThermoModel.H" #include "fixedRhoFvPatchScalarField.H" #include "directionInterpolate.H" +#include "localEulerDdtScheme.H" +#include "fvcSmooth.H" #include "motionSolver.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C index 12af38d9d3..65ab9d2db3 100644 --- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C +++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C @@ -54,7 +54,6 @@ int main(int argc, char *argv[]) #include "createFields.H" #include "createFieldRefs.H" #include "createTimeControls.H" - #include "createRDeltaT.H" turbulence->validate(); diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPimpleFoam/createFields.H index 8d1ccb82fd..a7ee3eca45 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/createFields.H +++ b/applications/solvers/compressible/rhoPimpleFoam/createFields.H @@ -1,3 +1,5 @@ +#include "createRDeltaT.H" + Info<< "Reading thermophysical properties\n" << endl; autoPtr pThermo diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C index 9613b4a9a6..c7046bb9b4 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C @@ -57,7 +57,6 @@ int main(int argc, char *argv[]) #include "createTime.H" #include "createDynamicFvMesh.H" #include "createControl.H" - #include "createRDeltaT.H" #include "initContinuityErrs.H" #include "createFields.H" #include "createFieldRefs.H" diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C index 1bd67653d8..1a74933ea8 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C @@ -56,7 +56,6 @@ int main(int argc, char *argv[]) #include "createMesh.H" #include "createControl.H" #include "createTimeControls.H" - #include "createRDeltaT.H" #include "initContinuityErrs.H" #include "createFields.H" #include "createFieldRefs.H" diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/include/setInitialMultiRegionDeltaT.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/include/setInitialMultiRegionDeltaT.H index bf831e93c2..f768c3c8b8 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/include/setInitialMultiRegionDeltaT.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/include/setInitialMultiRegionDeltaT.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Global - setInitialDeltaT + setInitialMultiRegionDeltaT Description Set the initial timestep for the CHT MultiRegion solver. @@ -48,7 +48,7 @@ if (adjustTimeStep) min ( min(maxCo/CoNum, maxDi/DiNum)*runTime.deltaT().value(), - maxDeltaT + min(runTime.deltaTValue(), maxDeltaT) ) ); Info<< "deltaT = " << runTime.deltaT().value() << endl; diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C index c15fde7078..c9f03a373c 100644 --- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C +++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -63,13 +63,8 @@ adjointOutletPressureFvPatchScalarField const dictionary& dict ) : - fixedValueFvPatchScalarField(p, iF) -{ - fvPatchField::operator= - ( - scalarField("value", dict, p.size()) - ); -} + fixedValueFvPatchScalarField(p, iF, dict) +{} Foam::adjointOutletPressureFvPatchScalarField:: diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C index 31134c955b..7b00d66277 100644 --- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C +++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,10 +50,8 @@ adjointOutletVelocityFvPatchVectorField const dictionary& dict ) : - fixedValueFvPatchVectorField(p, iF) -{ - fvPatchVectorField::operator=(vectorField("value", dict, p.size())); -} + fixedValueFvPatchVectorField(p, iF, dict) +{} Foam::adjointOutletVelocityFvPatchVectorField:: diff --git a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C b/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C index 66b480df0e..ae345c2066 100644 --- a/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C +++ b/applications/solvers/lagrangian/DPMFoam/DPMTurbulenceModels/DPMTurbulenceModels.C @@ -28,8 +28,8 @@ License #include "addToRunTimeSelectionTable.H" #include "makeTurbulenceModel.H" -#include "laminar.H" -#include "turbulentTransportModel.H" +#include "laminarModel.H" +#include "RASModel.H" #include "LESModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -52,6 +52,10 @@ makeBaseTurbulenceModel singlePhaseTransportModel ); +#define makeLaminarModel(Type) \ + makeTemplatedTurbulenceModel \ + (singlePhaseTransportModelPhaseIncompressibleTurbulenceModel, laminar, Type) + #define makeRASModel(Type) \ makeTemplatedTurbulenceModel \ (singlePhaseTransportModelPhaseIncompressibleTurbulenceModel, RAS, Type) @@ -60,6 +64,9 @@ makeBaseTurbulenceModel makeTemplatedTurbulenceModel \ (singlePhaseTransportModelPhaseIncompressibleTurbulenceModel, LES, Type) +#include "Stokes.H" +makeLaminarModel(Stokes); + #include "kEpsilon.H" makeRASModel(kEpsilon); diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C index 89d8637462..544cccdae2 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C +++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C @@ -56,7 +56,6 @@ int main(int argc, char *argv[]) #include "createMesh.H" #include "createControl.H" #include "createTimeControls.H" - #include "createRDeltaT.H" #include "createFields.H" #include "createFieldRefs.H" #include "createFvOptions.H" diff --git a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H index 33313ca070..d3daf7265c 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H @@ -1,3 +1,5 @@ +#include "createRDeltaT.H" + #include "readGravitationalAcceleration.H" Info<< "Creating combustion model\n" << endl; diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options index 8b2729e8c0..014cd4e356 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I. \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I${LIB_SRC}/sampling/lnInclude \ -I${LIB_SRC}/meshTools/lnInclude \ @@ -25,7 +26,6 @@ EXE_INC = \ -I$(LIB_SRC)/combustionModels/lnInclude \ -I$(FOAM_SOLVERS)/combustion/reactingFoam - EXE_LIBS = \ -lfiniteVolume \ -lfvOptions \ diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFieldRefs.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFieldRefs.H index 4748421aa4..14914688ca 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFieldRefs.H +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFieldRefs.H @@ -1 +1,5 @@ const label inertIndex(composition.species()[inertSpecie]); + +const volScalarField& T = thermo.T(); +const volScalarField& psi = thermo.psi(); +filmModelType& surfaceFilm = tsurfaceFilm(); diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H index 313c82d0e2..8ec3c94169 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H @@ -37,8 +37,6 @@ volScalarField rho ); volScalarField& p = thermo.p(); -const volScalarField& T = thermo.T(); -const volScalarField& psi = thermo.psi(); Info<< "\nReading field U\n" << endl; volVectorField U diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/createSurfaceFilmModel.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/createSurfaceFilmModel.H index 1db870f0aa..ffdbcbf6a9 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/createSurfaceFilmModel.H +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/createSurfaceFilmModel.H @@ -3,5 +3,3 @@ Info<< "\nConstructing surface film model" << endl; typedef regionModels::surfaceFilmModels::surfaceFilmModel filmModelType; autoPtr tsurfaceFilm(filmModelType::New(mesh, g)); -filmModelType& surfaceFilm = tsurfaceFilm(); - diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H index c04c242f45..e5ed566eba 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H @@ -1,3 +1,5 @@ +#include "createRDeltaT.H" + #include "readGravitationalAcceleration.H" Info<< "Creating combustion model\n" << endl; diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C index 364ab41ece..93768896b3 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C +++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C @@ -55,7 +55,6 @@ int main(int argc, char *argv[]) #include "createMesh.H" #include "createControl.H" #include "createTimeControls.H" - #include "createRDeltaT.H" #include "createFields.H" #include "createFieldRefs.H" #include "createFvOptions.H" diff --git a/applications/solvers/multiphase/driftFluxFoam/compressibleTurbulenceModels.C b/applications/solvers/multiphase/driftFluxFoam/compressibleTurbulenceModels.C index 4cb722f5f4..abf89c1500 100644 --- a/applications/solvers/multiphase/driftFluxFoam/compressibleTurbulenceModels.C +++ b/applications/solvers/multiphase/driftFluxFoam/compressibleTurbulenceModels.C @@ -28,7 +28,7 @@ License #include "addToRunTimeSelectionTable.H" #include "makeTurbulenceModel.H" -#include "laminar.H" +#include "laminarModel.H" #include "RASModel.H" #include "LESModel.H" @@ -52,6 +52,14 @@ makeBaseTurbulenceModel incompressibleTwoPhaseInteractingMixture ); +#define makeLaminarModel(Type) \ + makeTemplatedTurbulenceModel \ + ( \ + incompressibleTwoPhaseInteractingMixtureCompressibleTurbulenceModel, \ + laminar, \ + Type \ + ) + #define makeRASModel(Type) \ makeTemplatedTurbulenceModel \ ( \ @@ -68,6 +76,9 @@ makeBaseTurbulenceModel Type \ ) +#include "Stokes.H" +makeLaminarModel(Stokes); + #include "kEpsilon.H" makeRASModel(kEpsilon); diff --git a/applications/solvers/multiphase/interFoam/createFields.H b/applications/solvers/multiphase/interFoam/createFields.H index 77cabdc4c1..4a82afbd29 100644 --- a/applications/solvers/multiphase/interFoam/createFields.H +++ b/applications/solvers/multiphase/interFoam/createFields.H @@ -1,3 +1,5 @@ +#include "createRDeltaT.H" + Info<< "Reading field p_rgh\n" << endl; volScalarField p_rgh ( diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C index bc4d90fcc5..e53c0395ff 100644 --- a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C +++ b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C @@ -63,7 +63,6 @@ int main(int argc, char *argv[]) #include "createControl.H" #include "createTimeControls.H" #include "createDyMControls.H" - #include "createRDeltaT.H" #include "createFields.H" #include "createFvOptions.H" diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C index 88e31149dd..5f16dfa18d 100644 --- a/applications/solvers/multiphase/interFoam/interFoam.C +++ b/applications/solvers/multiphase/interFoam/interFoam.C @@ -65,7 +65,6 @@ int main(int argc, char *argv[]) #include "createMesh.H" #include "createControl.H" #include "createTimeControls.H" - #include "createRDeltaT.H" #include "initContinuityErrs.H" #include "createFields.H" #include "createFvOptions.H" diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H index 07e174717b..5b152b78a7 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H @@ -1,3 +1,5 @@ +#include "createRDeltaT.H" + Info<< "Reading field p_rgh\n" << endl; volScalarField p_rgh ( diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C index a22a49998c..aa0e55626e 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C @@ -55,7 +55,6 @@ int main(int argc, char *argv[]) #include "createMesh.H" #include "createControl.H" #include "createTimeControls.H" - #include "createRDeltaT.H" #include "initContinuityErrs.H" #include "createFields.H" #include "createFvOptions.H" diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Beetstra/Beetstra.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Beetstra/Beetstra.C old mode 100755 new mode 100644 diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Beetstra/Beetstra.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Beetstra/Beetstra.H old mode 100755 new mode 100644 diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.C old mode 100755 new mode 100644 diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.H old mode 100755 new mode 100644 index 3003dbc594..bc1601e976 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.H +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/Tenneti/Tenneti.H @@ -58,6 +58,7 @@ namespace dragModels { class SchillerNaumann; + /*---------------------------------------------------------------------------*\ Class Tenneti Declaration \*---------------------------------------------------------------------------*/ @@ -68,7 +69,7 @@ class Tenneti { // Private data - //- Ergun drag model + //- SchillerNaumann drag model autoPtr SchillerNaumann_; //- Residual Reynolds Number diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H index 8eafafb2fd..1fc5b19ca7 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H @@ -1,3 +1,4 @@ +#include "createRDeltaT.H" #include "readGravitationalAcceleration.H" #include "readhRef.H" diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C index 083c2567f3..92089901d6 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/multiphaseCompressibleTurbulenceModels/multiphaseCompressibleTurbulenceModels.C @@ -27,7 +27,7 @@ License #include "addToRunTimeSelectionTable.H" #include "makeTurbulenceModel.H" -#include "laminar.H" +#include "laminarModel.H" #include "RASModel.H" #include "LESModel.H" @@ -53,6 +53,10 @@ makeBaseTurbulenceModel phaseModel ); +#define makeLaminarModel(Type) \ + makeTemplatedLaminarModel \ + (phaseModelPhaseCompressibleTurbulenceModel, laminar, Type) + #define makeRASModel(Type) \ makeTemplatedTurbulenceModel \ (phaseModelPhaseCompressibleTurbulenceModel, RAS, Type) @@ -61,6 +65,9 @@ makeBaseTurbulenceModel makeTemplatedTurbulenceModel \ (phaseModelPhaseCompressibleTurbulenceModel, LES, Type) +#include "Stokes.H" +makeLaminarModel(Stokes); + #include "kEpsilon.H" makeRASModel(kEpsilon); diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C index dcb1a5b112..9807a0ae20 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C @@ -53,7 +53,6 @@ int main(int argc, char *argv[]) #include "createMesh.H" #include "createControl.H" #include "createTimeControls.H" - #include "createRDeltaT.H" #include "createFields.H" #include "createFieldRefs.H" diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H index 932c05cb0d..697269ff40 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H @@ -1,3 +1,4 @@ +#include "createRDeltaT.H" #include "readGravitationalAcceleration.H" #include "readhRef.H" diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C index cc29d74ad4..40bcc365a0 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C @@ -54,7 +54,6 @@ int main(int argc, char *argv[]) #include "createMesh.H" #include "createControl.H" #include "createTimeControls.H" - #include "createRDeltaT.H" #include "createFields.H" #include "createFieldRefs.H" diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C index bd04977f2b..bcf7911619 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C @@ -27,7 +27,7 @@ License #include "addToRunTimeSelectionTable.H" #include "makeTurbulenceModel.H" -#include "laminar.H" +#include "laminarModel.H" #include "RASModel.H" #include "LESModel.H" @@ -53,6 +53,10 @@ makeBaseTurbulenceModel phaseModel ); +#define makeLaminarModel(Type) \ + makeTemplatedLaminarModel \ + (phaseModelPhaseCompressibleTurbulenceModel, laminar, Type) + #define makeRASModel(Type) \ makeTemplatedTurbulenceModel \ (phaseModelPhaseCompressibleTurbulenceModel, RAS, Type) @@ -61,6 +65,9 @@ makeBaseTurbulenceModel makeTemplatedTurbulenceModel \ (phaseModelPhaseCompressibleTurbulenceModel, LES, Type) +#include "Stokes.H" +makeLaminarModel(Stokes); + #include "kEpsilon.H" makeRASModel(kEpsilon); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C index c60dea0f77..6871136560 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phaseCompressibleTurbulenceModels.C @@ -32,7 +32,7 @@ License #include "ThermalDiffusivity.H" #include "EddyDiffusivity.H" -#include "laminar.H" +#include "laminarModel.H" #include "RASModel.H" #include "LESModel.H" @@ -58,6 +58,10 @@ makeBaseTurbulenceModel phaseModel ); +#define makeLaminarModel(Type) \ + makeTemplatedLaminarModel \ + (phaseModelPhaseCompressibleTurbulenceModel, laminar, Type) + #define makeRASModel(Type) \ makeTemplatedTurbulenceModel \ (phaseModelPhaseCompressibleTurbulenceModel, RAS, Type) @@ -66,6 +70,9 @@ makeBaseTurbulenceModel makeTemplatedTurbulenceModel \ (phaseModelPhaseCompressibleTurbulenceModel, LES, Type) +#include "Stokes.H" +makeLaminarModel(Stokes); + #include "kEpsilon.H" makeRASModel(kEpsilon); diff --git a/applications/utilities/mesh/generation/blockMesh/blockMesh.C b/applications/utilities/mesh/generation/blockMesh/blockMesh.C index 72ca0b1b2a..31761f4009 100644 --- a/applications/utilities/mesh/generation/blockMesh/blockMesh.C +++ b/applications/utilities/mesh/generation/blockMesh/blockMesh.C @@ -86,6 +86,27 @@ int main(int argc, char *argv[]) "specify alternative dictionary for the blockMesh description" ); + argList::addNote + ( + "Block description\n" + "\n" + " For a given block, the correspondence between the ordering of\n" + " vertex labels and face labels is shown below.\n" + " For vertex numbering in the sequence 0 to 7 (block, centre):\n" + " faces 0 (f0) and 1 are left and right, respectively;\n" + " faces 2 and 3 are bottom and top;\n" + " and faces 4 and 5 are front the back:\n" + "\n" + " 4 ---- 5\n" + " f3 |\\ |\\ f5\n" + " | | 7 ---- 6 \\\n" + " | 0 |--- 1 | \\\n" + " | \\| \\| f4\n" + " f2 3 ---- 2\n" + "\n" + " f0 ----- f1\n" + ); + #include "addRegionOption.H" #include "setRootCase.H" #include "createTime.H" diff --git a/applications/utilities/miscellaneous/foamList/Make/options b/applications/utilities/miscellaneous/foamList/Make/options index 441805c465..84027a1c28 100644 --- a/applications/utilities/miscellaneous/foamList/Make/options +++ b/applications/utilities/miscellaneous/foamList/Make/options @@ -6,7 +6,8 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ -lbarotropicCompressibilityModel \ diff --git a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C index 274e3a51a3..efb7dd2a23 100644 --- a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C +++ b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C @@ -42,7 +42,7 @@ Foam::lagrangianFieldDecomposer::lagrangianFieldDecomposer ) : procMesh_(procMesh), - positions_(procMesh, cloudName, false), + positions_(procMesh, cloudName, IDLList()), particleIndices_(lagrangianPositions.size()) { label pi = 0; diff --git a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H index 6e0280398d..aca0672296 100644 --- a/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H +++ b/applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.H @@ -101,7 +101,6 @@ public: const label cloudI, const IOobjectList& lagrangianObjects, PtrList>>& lagrangianFields -// PtrList>& lagrangianFields ); template @@ -113,7 +112,6 @@ public: < PtrList, Type>> >& lagrangianFields -// PtrList, Type >>& lagrangianFields ); diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H index f8fe345822..03a76e5856 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H +++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H @@ -79,7 +79,7 @@ for (label i=0; i < nTypes; i++) ) ) { - Cloud particles(mesh); + Cloud particles(mesh, cloud::defaultName); IOobjectList objects(mesh, runTime.timeName(), cloud::prefix); diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_maxsize_info.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_maxsize_info.H index ca2033453e..aab4c0c903 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_maxsize_info.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_maxsize_info.H @@ -73,7 +73,7 @@ int USERD_get_maxsize_info { // Get the maximum number of spray parcels // and store it - Cloud lagrangian(*meshPtr); + Cloud lagrangian(*meshPtr, cloud::defaultName); if (lagrangian.size() > nMaxParcels) { diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H index 7110e2431c..6c58a72c09 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H @@ -151,7 +151,7 @@ int USERD_set_filenames { runTime.setTime(timeDirs[n+1], n+1); - Cloud lagrangian(*meshPtr); + Cloud lagrangian(*meshPtr, cloud::defaultName); n++; if (lagrangian.size()) @@ -177,7 +177,7 @@ int USERD_set_filenames delete sprayPtr; - sprayPtr = new Cloud(*meshPtr); + sprayPtr = new Cloud(*meshPtr, cloud::defaultName); IOobjectList objects(*meshPtr, runTime.timeName(), cloud::prefix); diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_time_set_and_step.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_time_set_and_step.H index 5459f67ba6..7bc4ba1c5c 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_time_set_and_step.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_time_set_and_step.H @@ -49,9 +49,7 @@ void USERD_set_time_set_and_step if (Numparts_available > nPatches+1) { delete sprayPtr; - sprayPtr = new Cloud(*meshPtr); + sprayPtr = new Cloud(*meshPtr, cloud::defaultName); } } } - - diff --git a/applications/utilities/preProcessing/mapFields/createTimes.H b/applications/utilities/preProcessing/mapFields/createTimes.H index 91e6a349ae..bcac99a3ae 100644 --- a/applications/utilities/preProcessing/mapFields/createTimes.H +++ b/applications/utilities/preProcessing/mapFields/createTimes.H @@ -1,11 +1,17 @@ Info<< "\nCreate databases as time" << endl; + const auto caseDirOrig = getEnv("FOAM_CASE"); + const auto caseNameOrig = getEnv("FOAM_CASE_NAME"); + setEnv("FOAM_CASE", rootDirSource/caseDirSource, true); + setEnv("FOAM_CASE_NAME", caseDirSource, true); Time runTimeSource ( Time::controlDictName, rootDirSource, caseDirSource ); + setEnv("FOAM_CASE", caseDirOrig, true); + setEnv("FOAM_CASE_NAME", caseNameOrig, true); Time runTimeTarget ( diff --git a/applications/utilities/preProcessing/mapFields/mapFields.C b/applications/utilities/preProcessing/mapFields/mapFields.C index 7c021c9657..106f1b2bc2 100644 --- a/applications/utilities/preProcessing/mapFields/mapFields.C +++ b/applications/utilities/preProcessing/mapFields/mapFields.C @@ -292,8 +292,8 @@ int main(int argc, char *argv[]) fileName rootDirTarget(args.rootPath()); fileName caseDirTarget(args.globalCaseName()); - const fileName casePath = args[1]; - const fileName rootDirSource = casePath.path(); + fileName casePath = args[1]; + const fileName rootDirSource = casePath.path().toAbsolute(); const fileName caseDirSource = casePath.name(); Info<< "Source: " << rootDirSource << " " << caseDirSource << endl; diff --git a/bin/foamEtcFile b/bin/foamEtcFile index 4deb76e192..3d3d01864e 100755 --- a/bin/foamEtcFile +++ b/bin/foamEtcFile @@ -103,7 +103,7 @@ OpenFOAM-*) # standard naming convention OpenFOAM- version="${projectDirName##OpenFOAM-}" ;; -openfoam[0-9]* | openfoamdev) # debian naming convention 'openfoam' +openfoam[0-9]* | openfoam-dev) # debian naming convention 'openfoam' versionNum="${projectDirName##openfoam}" case "$versionNum" in ??) # convert 2 digit version number to decimal delineated diff --git a/bin/tools/pre-commit-hook b/bin/tools/pre-commit-hook index d3bf374e04..b4f847d15f 100755 --- a/bin/tools/pre-commit-hook +++ b/bin/tools/pre-commit-hook @@ -3,8 +3,8 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | -# \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation -# \\/ M anipulation | +# \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation +# \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. #------------------------------------------------------------------------------ # License # This file is part of OpenFOAM. @@ -48,11 +48,14 @@ # test the specified files/directories for standards conformance. # #------------------------------------------------------------------------------ + hookName="pre-commit" +headerSeparator="-----------------------------------" + die() { echo "$hookName hook failure" 1>&2 - echo '-----------------------------------' 1>&2 + echo $headerSeparator 1>&2 echo '' 1>&2 echo "$@" 1>&2 echo '' 1>&2 @@ -105,7 +108,7 @@ dieOnBadFiles() if [ -n "$badFiles" ] then echo "$hookName hook failure" 1>&2 - echo '-----------------------------------' 1>&2 + echo $headerSeparator 1>&2 echo "$@" 1>&2 echo '' 1>&2 echo "File(s):" 1>&2 @@ -267,6 +270,49 @@ checkLineLengthNonDirective() } +# +# check for non-standard code patterns +# +checkNonStandardCodePatterns() +{ + echo "$hookName: checking for non-standard code ..." 1>&2 + + scope=$(gitScope $@) + + badFiles=$( + for f in $fileList + do + # limit to *.[CH] files + case "$f" in + (*.[CH]) + # Directly report the incorrect markers + git grep -n --color \ + -e '> >' -e '\bNULL\b' \ + $scope"$f" + ;; + esac + done + ) + + dieOnBadFiles "$(cat< > + + which instead should be: + + List> + + 2. The use of the 'NULL' macro should be replaced by 'nullptr' + +$headerSeparator +MESSAGE + )" +} + + # # check that OpenFOAM Foundation copyright is current # @@ -278,27 +324,27 @@ checkCopyright() badFiles=$( for f in $fileList do - startYear=`grep "Copyright.*OpenFOAM" $f | sed 's/[^0-9]*\([0-9]*\).*/\1/g'` - endYear=`grep "Copyright.*-.*OpenFOAM" $f | sed 's/[^-]*-\([0-9]*\).*/\1/g'` + startYear=`grep "Copyright.*OpenCFD" $f | sed 's/[^0-9]*\([0-9]*\).*/\1/g'` + endYear=`grep "Copyright.*-.*OpenCFD" $f | sed 's/[^-]*-\([0-9]*\).*/\1/g'` #echo "startYear=$startYear endYear=$endYear" if [ "$startYear" != "" ] then if [ "$endYear" != "" ] then - # Date is of type 2011-2012 OpenFOAM Foundation + # Date is of type 2011-2012 OpenCFD Ltd. if [ "$year" != "$endYear" ] then echo "Updated copyright for: $f" 1>&2 echo "$f" - sed -i -e "s/$startYear-$endYear OpenFOAM/$startYear-$year OpenFOAM/g" $f + sed -i -e "s/$startYear-$endYear OpenCFD/$startYear-$year OpenCFD/g" $f fi else - # Date is of type 2011 OpenFOAM Foundation + # Date is of type 2011 OpenCFD Ltd. if [ "$year" != "$startYear" ] then echo "$f" echo "Updated copyright for: $f" 1>&2 - sed -i -e "s/$startYear OpenFOAM/$startYear-$year OpenFOAM/g" $f + sed -i -e "s/$startYear OpenCFD/$startYear-$year OpenCFD/g" $f fi fi fi @@ -322,6 +368,9 @@ checkIllegalCode # ensure code conforms to 80 columns max checkLineLengthNonDirective +# check for non-standard code patterns +checkNonStandardCodePatterns + checkCopyright exit 0 diff --git a/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C index b3bcb86ecd..6cb5cc0d7b 100644 --- a/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C +++ b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.C @@ -104,7 +104,7 @@ ${typeName}FvOption${SourceType} const fvMesh& mesh ) : - option(name, modelType, dict, mesh) + cellSetOption(name, modelType, dict, mesh) { if (${verbose:-false}) { diff --git a/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H index 2a10ff9b35..c276419362 100644 --- a/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H +++ b/etc/codeTemplates/dynamicCode/codedFvOptionTemplate.H @@ -105,7 +105,7 @@ SourceFiles #ifndef codedFvOptionTemplate_H #define codedFvOptionTemplate_H -#include "fvOption.H" +#include "cellSetOption.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -121,7 +121,7 @@ namespace fv class ${typeName}FvOption${SourceType} : - public option + public cellSetOption { public: diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C index bb0d7c2ce5..861006bbbf 100644 --- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C +++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C @@ -174,7 +174,8 @@ bool Foam::functionObjectList::readFunctionObject ( const string& funcNameArgs, dictionary& functionsDict, - HashSet& requiredFields + HashSet& requiredFields, + const word& region ) { // Parse the optional functionObject arguments: @@ -314,6 +315,12 @@ bool Foam::functionObjectList::readFunctionObject funcDict.set(entry::New(entryStream).ptr()); } + // Insert the region name if specified + if (region != word::null) + { + funcDict.set("region", region); + } + // Merge this functionObject dictionary into functionsDict dictionary funcArgsDict; funcArgsDict.add(string::validate(funcNameArgs), funcDict); @@ -377,6 +384,14 @@ Foam::autoPtr Foam::functionObjectList::New dictionary& functionsDict = controlDict.subDict("functions"); + word region = word::null; + + // Set the region name if specified + if (args.optionFound("region")) + { + region = args["region"]; + } + if ( args.optionFound("dict") @@ -402,7 +417,13 @@ Foam::autoPtr Foam::functionObjectList::New if (args.optionFound("func")) { - readFunctionObject(args["func"], functionsDict, requiredFields); + readFunctionObject + ( + args["func"], + functionsDict, + requiredFields, + region + ); } if (args.optionFound("funcs")) @@ -411,7 +432,13 @@ Foam::autoPtr Foam::functionObjectList::New forAll(funcs, i) { - readFunctionObject(funcs[i], functionsDict, requiredFields); + readFunctionObject + ( + funcs[i], + functionsDict, + requiredFields, + region + ); } } diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H index 5d827a9132..917c71fc28 100644 --- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H +++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H @@ -234,7 +234,8 @@ public: ( const string& funcNameArgs0, dictionary& functionsDict, - HashSet& requiredFields + HashSet& requiredFields, + const word& region = word::null ); //- Read and set the function objects if their data have changed diff --git a/src/OpenFOAM/fields/cloud/cloud.C b/src/OpenFOAM/fields/cloud/cloud.C index 3a7b98e968..69cba912e0 100644 --- a/src/OpenFOAM/fields/cloud/cloud.C +++ b/src/OpenFOAM/fields/cloud/cloud.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,10 +30,10 @@ License namespace Foam { -defineTypeNameAndDebug(cloud, 0); + defineTypeNameAndDebug(cloud, 0); -const word cloud::prefix("lagrangian"); -word cloud::defaultName("defaultCloud"); + const word cloud::prefix("lagrangian"); + word cloud::defaultName("defaultCloud"); } @@ -45,7 +45,7 @@ Foam::cloud::cloud(const objectRegistry& obr, const word& cloudName) ( IOobject ( - (cloudName.size() ? cloudName : defaultName), + cloudName, obr.time().timeName(), prefix, obr, diff --git a/src/OpenFOAM/fields/cloud/cloud.H b/src/OpenFOAM/fields/cloud/cloud.H index 4578588380..9b7aa43291 100644 --- a/src/OpenFOAM/fields/cloud/cloud.H +++ b/src/OpenFOAM/fields/cloud/cloud.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -78,7 +78,7 @@ public: // Constructors //- Construct for the given objectRegistry and named cloud instance - cloud(const objectRegistry&, const word& cloudName = ""); + cloud(const objectRegistry&, const word& cloudName = defaultName); //- Destructor diff --git a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C index 5ce595791e..82857f5019 100644 --- a/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C +++ b/src/OpenFOAM/interpolations/patchToPatchInterpolation/PatchToPatchInterpolate.C @@ -54,7 +54,7 @@ PatchToPatchInterpolation::pointInterpolate new Field(toPatch_.nPoints(), Zero) ); - Field& result = tresult(); + Field& result = tresult.ref(); const List& fromPatchLocalFaces = fromPatch_.localFaces(); @@ -118,7 +118,7 @@ PatchToPatchInterpolation::faceInterpolate new Field(toPatch_.size(), Zero) ); - Field& result = tresult(); + Field& result = tresult.ref(); const labelListList& fromPatchFaceFaces = fromPatch_.faceFaces(); diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C index eb73b6f436..65898e9c13 100644 --- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C +++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C @@ -211,9 +211,9 @@ bool Foam::GAMGAgglomeration::continueAgglomerating ) const { const label nTotalCoarseCells = returnReduce(nCoarseCells, sumOp