diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phasePair/phasePair/phasePair.H b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phasePair/phasePair/phasePair.H index 413bda2b04..02dd12e2b1 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phasePair/phasePair/phasePair.H +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phasePair/phasePair/phasePair.H @@ -22,11 +22,11 @@ License along with OpenFOAM. If not, see . Class - Foam::phasePair description for mass transfer between a pair of - phases. The direction of the mass transfer is from the phase - 'from' to the phasse 'to'. + Foam::phasePair Description + Description for mass transfer between a pair of phases. The direction of + the mass transfer is from the phase 'from' to the phasse 'to'. SourceFiles phasePair.C diff --git a/bin/foamLog b/bin/foamLog index 021b935243..facdf58607 100755 --- a/bin/foamLog +++ b/bin/foamLog @@ -241,7 +241,7 @@ getAllQueries() #-- Add ones from database, present in log file # Note: just like awk, line selected with regular expression, # column with string. - local dbQueries=$(getDbQueryList $db) + local dbQueries="$(getDbQueryList $db)" for var in $dbQueries do diff --git a/src/OpenFOAM/containers/Bits/PackedList/PackedList.H b/src/OpenFOAM/containers/Bits/PackedList/PackedList.H index d4e4399c41..c30710c02f 100644 --- a/src/OpenFOAM/containers/Bits/PackedList/PackedList.H +++ b/src/OpenFOAM/containers/Bits/PackedList/PackedList.H @@ -157,7 +157,7 @@ public: // \code // (numElem / elem_per_block) // + (numElem % elem_per_block) ? 1 : 0 - // \code + // \endcode // But avoiding the modulus operation static constexpr label num_blocks(label numElem) { @@ -498,7 +498,6 @@ public: Ostream& os, const PackedList& list ); - }; diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H index 6bd43b8c9e..7d19a907ca 100644 --- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H +++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H @@ -32,7 +32,7 @@ Description field and derived quantities. Alternatively, the same actions can be executed after the simulation using the \c -postProcess command-line option. - \subsection secFunctionObjects Using function objects + \section secFunctionObjects Using function objects FunctionObjects are selected by additional entries in the $FOAM_CASE/system/controlDict dictionary. Each object is listed in the \c diff --git a/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.H b/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.H index 9070362dad..ef436ffa70 100644 --- a/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.H +++ b/src/OpenFOAM/global/fileOperations/collatedFileOperation/hostCollatedFileOperation.H @@ -29,9 +29,9 @@ Description In parallel it will assume ranks are sorted according to hostname and the lowest rank per hostname will be the IO rank. The output directories - will get a unique name processors_- where N is the overall - number of processors and low and high is the range of ranks contained - in the files. Each of these subsets uses its own communicator. + will get a unique name processors\_\-\ where N is the + overall number of processors and low and high is the range of ranks + contained in the files. Each of these subsets uses its own communicator. Instead of using the hostnames the IO ranks can be assigned using the FOAM_IORANKS environment variable (also when running non-parallel), e.g. diff --git a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H index 545f20041b..c2887e65ec 100644 --- a/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H +++ b/src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.H @@ -28,8 +28,9 @@ Description fileOperations that performs all file operations on the master processor. Requires the calls to be parallel synchronised! - Limitations: - no /processor in filename - - no /uniform/ in the filename + Limitations + - no /processor in filename + - no /uniform/ in the filename The main logic is in ::filePath which returns a - same path on all processors. This can either be a global file @@ -40,12 +41,12 @@ Description - different path on all processors (processor0/0/p) system/controlDict: - filePath worldmaster: /system/controlDict + filePath worldmaster: \/system/controlDict localmaster: ,, slave : ,, processor0/uniform/time - filePath worldmaster: /processorXXX/uniform/time + filePath worldmaster: \/processorXXX/uniform/time localmaster: ,, slave : ,, diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H index c8bfbb5bac..448aa5ffcf 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H +++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H @@ -279,6 +279,7 @@ public: // // if (nOrig == zones.size()) { existing... } else { new... } // \endcode + // \param zoneName the name of the zone // \param verbose report if an existing zone was selected or // a new zone was created. // \return non-const reference to the existing or new zone diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H index ae7066f96e..d46a53e00b 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H +++ b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H @@ -86,6 +86,12 @@ public: //- Copy constructor explicit Table(const Table& tbl); + //- Construct and return a clone + virtual tmp> clone() const + { + return tmp>(new Table(*this)); + } + //- Destructor virtual ~Table(); diff --git a/src/OpenFOAM/primitives/strings/stringOps/stringOps.H b/src/OpenFOAM/primitives/strings/stringOps/stringOps.H index 6a483affa2..85414c9008 100644 --- a/src/OpenFOAM/primitives/strings/stringOps/stringOps.H +++ b/src/OpenFOAM/primitives/strings/stringOps/stringOps.H @@ -218,10 +218,10 @@ namespace stringOps // -# current directory // - leading "./" : the current directory // -# leading tag expansion for commonly used directories - // - / : user/group/other OpenFOAM directory - // - / : FOAM_CASE directory - // - / : FOAM_CASE/constant directory - // - / : FOAM_CASE/system directory + // - \/ : user/group/other OpenFOAM directory + // - \/ : FOAM_CASE directory + // - \/ : FOAM_CASE/constant directory + // - \/ : FOAM_CASE/system directory // -# tilde expansion // - leading "~/" : home directory // - leading "~user" : home directory for specified user @@ -258,10 +258,10 @@ namespace stringOps // -# current directory // - leading "./" : the current directory // -# leading tag expansion for commonly used directories - // - / : user/group/other OpenFOAM directory - // - / : FOAM_CASE directory - // - / : FOAM_CASE/constant directory - // - / : FOAM_CASE/system directory + // - \/ : user/group/other OpenFOAM directory + // - \/ : FOAM_CASE directory + // - \/ : FOAM_CASE/constant directory + // - \/ : FOAM_CASE/system directory // -# tilde expansion // - leading "~/" : home directory // - leading "~user" : home directory for specified user diff --git a/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C b/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C index 805d0ca16b..6686114c1d 100644 --- a/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C +++ b/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2018 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -50,14 +50,12 @@ void kEpsilonLopesdaCosta::setPorosityCoefficient const scalar Cpm = readScalar(pm.dict().lookup(C.name())); - forAll(cellZoneIDs, zonei) + for (const label zonei : cellZoneIDs) { - const labelList& cells = - this->mesh_.cellZones()[cellZoneIDs[zonei]]; + const labelList& cells = this->mesh_.cellZones()[zonei]; - forAll(cells, i) + for (const label celli : cells) { - const label celli = cells[i]; C[celli] = Cpm; } } @@ -79,15 +77,14 @@ void kEpsilonLopesdaCosta::setCdSigma const scalar Cpm = readScalar(pm.dict().lookup(C.name())); - forAll(cellZoneIDs, zonei) + for (const label zonei : cellZoneIDs) { - const labelList& cells = - this->mesh_.cellZones()[cellZoneIDs[zonei]]; + const labelList& cells = this->mesh_.cellZones()[zonei]; forAll(cells, i) { const label celli = cells[i]; - C[celli] = Cpm*Sigma[celli]; + C[celli] = Cpm*Sigma[i]; } } } @@ -115,10 +112,13 @@ void kEpsilonLopesdaCosta::setPorosityCoefficients() ); setPorosityCoefficient(Cmu_, pm); + Cmu_.correctBoundaryConditions(); setPorosityCoefficient(C1_, pm); setPorosityCoefficient(C2_, pm); setPorosityCoefficient(sigmak_, pm); setPorosityCoefficient(sigmaEps_, pm); + sigmak_.correctBoundaryConditions(); + sigmaEps_.correctBoundaryConditions(); setCdSigma(CdSigma_, pm); setPorosityCoefficient(betap_, pm); diff --git a/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.H b/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.H index 4957f2641b..d5914bcafe 100644 --- a/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.H +++ b/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.H @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::powerLawLopesdaCosta + Foam::porosityModels::powerLawLopesdaCosta Description Variant of the power law porosity model with spatially varying @@ -105,7 +105,7 @@ public: /*---------------------------------------------------------------------------*\ - Class powerLawLopesdaCosta Declaration + Class powerLawLopesdaCosta Declaration \*---------------------------------------------------------------------------*/ class powerLawLopesdaCosta diff --git a/src/combustionModels/EDC/EDC.H b/src/combustionModels/EDC/EDC.H index 5cda96b6f6..fdddde56be 100644 --- a/src/combustionModels/EDC/EDC.H +++ b/src/combustionModels/EDC/EDC.H @@ -35,7 +35,7 @@ Description There are many versions and developments of the EDC model, 4 of which are currently supported in this implementation: v1981, v1996, v2005 and v2016. The model variant is selected using the optional \c version entry in - the \c EDCCoeffs dictionary, \eg + the \c EDCCoeffs dictionary, e.g. \verbatim EDCCoeffs diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver.C index 6992db05b0..49672e704b 100644 --- a/src/dynamicMesh/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver.C +++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/multiSolidBodyMotionSolver.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2018 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -117,8 +117,9 @@ Foam::multiSolidBodyMotionSolver::multiSolidBodyMotionSolver pointIDs_[zonei].transfer(ptIDs); Info<< "Applying solid body motion " << SBMFs_[zonei].type() - << " to " << pointIDs_[zonei].size() << " points of cellZone " - << iter().keyword() << endl; + << " to " + << returnReduce(pointIDs_[zonei].size(), sumOp