COMP: avoid incomplete types in runTime tables, unneeded typedefs etc

applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModel.C

@@ -27,6 +27,7 @@ License
 
 #include "mixtureViscosityModel.H"
 #include "volFields.H"
+#include "surfaceMesh.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 

applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixture.C

@@ -26,6 +26,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "phaseChangeTwoPhaseMixture.H"
+#include "surfaceMesh.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 

applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/phaseChangeTwoPhaseMixtureNew.C

@@ -28,6 +28,7 @@ License
 
 #include "phaseChangeTwoPhaseMixture.H"
 #include "incompressibleTwoPhaseMixture.H"
+#include "surfaceMesh.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/combustionModels/combustionModel/combustionModelTemplates.C

@@ -73,9 +73,6 @@ Foam::autoPtr<CombustionModel> Foam::combustionModel::New
             << "combustion model " << combModelName << "." << endl;
     }
 
-    typedef typename CombustionModel::dictionaryConstructorTable cstrTableType;
-    cstrTableType* cstrTable = CombustionModel::dictionaryConstructorTablePtr_;
-
     const word compCombModelName
     (
         combModelName + '<' + CombustionModel::reactionThermo::typeName + '>'
@@ -87,9 +84,12 @@ Foam::autoPtr<CombustionModel> Foam::combustionModel::New
       + thermo.thermoName() + '>'
     );
 
-    auto compCstrIter = cstrTable->cfind(compCombModelName);
 
-    auto thermoCstrIter = cstrTable->cfind(thermoCombModelName);
+    const auto& cnstrTable = *(CombustionModel::dictionaryConstructorTablePtr_);
+
+    auto compCstrIter = cnstrTable.cfind(compCombModelName);
+
+    auto thermoCstrIter = cnstrTable.cfind(thermoCombModelName);
 
     if (!compCstrIter.found() && !thermoCstrIter.found())
     {
@@ -129,7 +129,7 @@ Foam::autoPtr<CombustionModel> Foam::combustionModel::New
             })
         );
 
-        for (const word& validName : cstrTable->sortedToc())
+        for (const word& validName : cnstrTable.sortedToc())
         {
             wordList cmpts(basicThermo::splitThermoName(validName, 2));
 
@@ -163,7 +163,7 @@ Foam::autoPtr<CombustionModel> Foam::combustionModel::New
         (
             combustionModel::typeName,
             combModelName,
-            *cstrTable
+            cnstrTable
         )
             << "All " << validCmpts2[0][0] << '/' << validCmpts2[0][1]
             << " combinations are:" << nl << nl;

src/finiteArea/fields/faPatchFields/faPatchField/faPatchFields.C

@@ -26,6 +26,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "faPatchFields.H"
+#include "areaFaMesh.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/finiteArea/fields/faePatchFields/faePatchField/faePatchFields.C

@@ -23,12 +23,10 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-    Finite area edge-based patch fields
-
 \*---------------------------------------------------------------------------*/
 
 #include "faePatchFields.H"
+#include "edgeFaMesh.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/meshTools/PatchFunction1/makePatchFunction1s.C

@@ -33,6 +33,8 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "Table.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #define makePatchFunction1s(Type)                                              \
     makePatchFunction1(Type);                                                  \
     makePatchFunction1Type(ConstantField, Type);                               \
@@ -124,29 +126,22 @@ namespace Foam
     ////  This does not work because we cannot guarantee that the Function1
     ////  static initialisation has happened already.
     //template<class Type>
-    //class addToUniform
+    //struct addToUniform
     //{
-    //public:
     //    addToUniform()
     //    {
     //        // Get the Function1 table
-    //        typedef typename Function1<Type>::dictionaryConstructorTable
-    //            F1Type;
     //        Function1<Type>::constructdictionaryConstructorTables();
-    //        const F1Type& F1Table =
+    //        const auto& F1Table =
     //            *Function1<Type>::dictionaryConstructorTablePtr_;
     //
     //        // Get the PatchFunction1 table
-    //        typedef typename PatchFunction1<Type>::dictionaryConstructorTable
-    //            PF1Type;
-    //
     //        PatchFunction1<Type>::constructdictionaryConstructorTables();
-    //        PF1Type& PF1Table =
+    //        auto& PF1Table =
     //            *PatchFunction1<Type>::dictionaryConstructorTablePtr_;
     //
     //        // Get the UniformValueField constructor
-    //        auto cstrIter =
+    //        auto cstrIter = PF1Table.cfind
-    //            PatchFunction1<Type>::dictionaryConstructorTablePtr_->cfind
     //        (
     //            PatchFunction1Types::UniformValueField<Type>::typeName
     //        );
@@ -154,12 +149,7 @@ namespace Foam
     //        // Add the UniformValueField under the Function1 name
     //        forAllConstIters(F1Table, iter)
     //        {
-    //            //bool ok =
     //            PF1Table.insert(iter.key(), cstrIter());
-    //            //if (!ok)
-    //            //{
-    //            //    std::cout<< "** problem" << std::endl;
-    //            //}
     //        }
     //    }
     //};

src/optimisation/adjointOptimisation/adjoint/optimisation/optimisationType/incompressible/optimisationType/optimisationTypeIncompressible.C

@@ -86,18 +86,17 @@ optimisationType::optimisationType
      && !isA<constrainedOptimisationMethod>(updateMethod_())
     )
     {
+        const auto& cnstrTable =
+            *(constrainedOptimisationMethod::dictionaryConstructorTablePtr_);
+
         // Has constraints but is not a constraint optimisation method
-        auto cstTablePtr
-        (
-            constrainedOptimisationMethod::dictionaryConstructorTablePtr_
-        );
         FatalErrorInFunction
             << "Found " << nConstraints << " adjoint solvers corresponding to "
-            << "constraints but the optimisation method used "
+            << "constraints but the optimisation method ("
-            << "(" << updateMethod_().type() << ") "
+            << updateMethod_().type()
-            << "is not a constrainedOptimisationMethod. " << nl
+            << ") is not a constrainedOptimisationMethod." << nl
-            << "Available constrainedOptimisationMethods are :" << nl
+            << "Available constrainedOptimisationMethods:" << nl
-            << cstTablePtr->sortedToc()
+            << cnstrTable.sortedToc()
             << exit(FatalError);
     }
     else if
@@ -109,9 +108,9 @@ optimisationType::optimisationType
         // Does not have constraints but is a constrained optimisation method
         WarningInFunction
             << "Did not find any adjoint solvers corresponding to "
-            << "constraints but the optimisation method used "
+            << "constraints but the optimisation method ("
-            << "(" << updateMethod_().type() << ") "
+            << updateMethod_().type()
-            << "is a constrainedOptimisationMethod. " << nl << nl
+            << ") is a constrainedOptimisationMethod." << nl << nl
             << "This can cause some constraintOptimisationMethods to misbehave."
             << nl << nl
             << "Either the isConstraint bool is not set in one of the adjoint "

src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C

@@ -93,7 +93,7 @@ Foam::autoPtr<ChemistryModel> Foam::basicChemistryModel::New
 
     Info<< "Selecting chemistry solver " << chemistryTypeDictNew << endl;
 
-    auto* cstrTable = ChemistryModel::thermoConstructorTablePtr_;
+    const auto& cnstrTable = *(ChemistryModel::thermoConstructorTablePtr_);
 
     const word chemSolverCompThermoName
     (
@@ -102,7 +102,7 @@ Foam::autoPtr<ChemistryModel> Foam::basicChemistryModel::New
       + thermo.thermoName() + ">>"
     );
 
-    auto cstrIter = cstrTable->cfind(chemSolverCompThermoName);
+    auto cstrIter = cnstrTable.cfind(chemSolverCompThermoName);
 
     if (!cstrIter.found())
     {
@@ -142,7 +142,7 @@ Foam::autoPtr<ChemistryModel> Foam::basicChemistryModel::New
             })
         );
 
-        for (const word& validName : cstrTable->sortedToc())
+        for (const word& validName : cnstrTable.sortedToc())
         {
             validCmpts.append
             (

src/transportModels/geometricVoF/reconstructionSchemes/reconstructionSchemes.H

@@ -41,6 +41,7 @@ SourceFiles
 #include "runTimeSelectionTables.H"
 #include "dimensionedScalar.H"
 #include "volFields.H"
+#include "surfaceFields.H"
 #include "IOdictionary.H"
 #include "DynamicField.H"
 #include "MeshedSurface.H"

src/transportModels/geometricVoF/reconstructionSchemes/reconstructionSchemesNew.C

@@ -26,7 +26,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "reconstructionSchemes.H"
-#include "messageStream.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //