OpenFOAM-9: fix compatibility

Author: Pierre Horgue

libraries/numericalMethods/timestepManager/timestepManager.C

@@ -47,7 +47,7 @@ Foam::timestepManager::timestepManager(
     vf_(vf),
     truncationError_(truncationError),
     dryCells_(dryCells),
-    timeScheme_(vf.mesh().schemes().ddt("ddt("+vf.name()+")")),
+    timeScheme_(vf.mesh().ddtScheme("ddt("+vf.name()+")")),
     d3dt3Operator_(vf.mesh(),runTime.deltaTValue()),
     d2dt2Operator_(vf.mesh()),
     dVmax_(0),

libraries/porousBoundaryConditions/eventFlux/eventFlux.C

@@ -80,7 +80,7 @@ eventFlux
 {
     word eventFileName = dict.lookupOrDefault<word>("eventFile","");
     //- Read if backward time scheme is used
-    if (internalField().mesh().schemes().ddt("source") == "backward")
+    if (internalField().mesh().ddtScheme("source") == "backward")
     {
         isBackwardScheme_ = true;
     }
@@ -130,7 +130,7 @@ eventFlux
     }
 
     //- Read if backward time scheme is used
-    if (word(internalField().mesh().schemes().ddt("source")) == "backward")
+    if (word(internalField().mesh().ddtScheme("source")) == "backward")
     {
         isBackwardScheme_ = true;
     }

libraries/porousModels/porousMediumTransportModels/dualPorosityTransport/dualPorosityTransport.C

@@ -124,7 +124,7 @@ void Foam::porousMediumTransportModels::dualPorosityTransport::solveTransport
     //- fracture part
     composition_.correct(U, theta);
 
-    dictionary solverDict = pmModel_.mesh().solution().solverDict("C");
+    dictionary solverDict = pmModel_.mesh().solverDict("C");
     forAll(composition_.Y(), speciesi)
     {
         auto& C = composition_.Y(speciesi);
@@ -178,7 +178,7 @@ void Foam::porousMediumTransportModels::dualPorosityTransport::solveTransport
                 + alphaS_ * thetaMatrix_ * (Cfracture - C)
             );
 
-        CMatrixEqn.solve(pmModel_.mesh().solution().solverDict("C"));
+        CMatrixEqn.solve(pmModel_.mesh().solverDict("C"));
 
         Info<< "Concentration: Min(" << speciesName << ") = " << gMin(C.internalField())
             << " Max(" << speciesName << ") = " << gMax(C.internalField())

libraries/porousModels/porousMediumTransportModels/simplePorosityTransport/simplePorosityTransport.C

@@ -71,7 +71,7 @@ void Foam::porousMediumTransportModels::simplePorosityTransport::solveTransport
 {
     composition_.correct(U, theta);
 
-    dictionary solverDict = pmModel_.mesh().solution().solverDict("C");
+    dictionary solverDict = pmModel_.mesh().solverDict("C");
     forAll(composition_.Y(), speciesi)
     {
         auto& C = composition_.Y(speciesi);

libraries/toolsGIS/eventFile/eventFile.C

@@ -201,7 +201,7 @@ void Foam::eventFile::setTimeScheme(const word& dtFieldName, const fvMesh& mesh)
     ddtScheme_ = fv::ddtScheme<scalar>::New
     ( 
         mesh,
-        mesh.schemes().ddt("ddt(" + dtFieldName + ")")
+        mesh.ddtScheme("ddt(" + dtFieldName + ")")
     );
 
     mesh_ = &mesh;

solvers/groundwater2DFoam/readTimeControls.H

@@ -60,7 +60,7 @@ if (adjustTimeStep)
 const bool eventTimeTracking =
    runTime.controlDict().lookupOrDefault("eventTimeTracking", false);
 
-const dictionary& residualControl = mesh.solution().subOrEmptyDict("residualControl");
+const dictionary& residualControl = mesh.solutionDict().subOrEmptyDict("residualControl");
 const scalar residualPotential = residualControl.lookupOrDefault<scalar>("potential", 0);
 scalar maxResidual = GREAT;
 if (steady && residualPotential ==0)

solvers/groundwater2DFoam/updateForcing.H

@@ -1,7 +1,5 @@
 //- Fixed potential values
-const labelUList fp_ids(fixedPotentialIDList);
-const scalarList fp_values(fixedPotentialValueList);
-if (fixedPotentialList.size() > 0) potentialEqn.setValues<List>(fp_ids, fp_values);
+if (fixedPotentialList.size() > 0) potentialEqn.setValues(fixedPotentialIDList, fixedPotentialValueList);
 
 //- Seepage option
 if (seepageActive)

solvers/groundwaterFoam/readPicardNewtonControls.H

@@ -33,10 +33,10 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-const dictionary& PicardDict = mesh.solution().subOrEmptyDict("Picard");
+const dictionary& PicardDict = mesh.solutionDict().subOrEmptyDict("Picard");
 const scalar tolerancePicard = PicardDict.lookupOrDefault<scalar>("tolerance", GREAT);
 label maxIterPicard = PicardDict.lookupOrDefault<label>("maxIter",10);
-const dictionary& NewtonDict = mesh.solution().subOrEmptyDict("Newton");
+const dictionary& NewtonDict = mesh.solutionDict().subOrEmptyDict("Newton");
 const scalar toleranceNewton = NewtonDict.lookupOrDefault<scalar>("tolerance", GREAT);
 const label maxIterNewton = NewtonDict.lookupOrDefault<label>("maxIter",10);
 

solvers/groundwaterTransport2DFoam/CEqn.H

@@ -28,7 +28,7 @@ forAll(composition.Y(), speciesi)
             - fvm::Sp(seepageTerm,C)
         );
 
-    CEqn.solve(mesh.solution().solverDict("C"));
+    CEqn.solve(mesh.solverDict("C"));
 
     dtManagerC[speciesi].updateDerivatives();
 

solvers/porousScalarTransport2DFoam/CEqn.H

@@ -24,7 +24,7 @@ forAll(composition.Y(), speciesi)
             - fvm::Sp(seepageTerm,C)
         );
 
-    CEqn.solve(mesh.solution().solverDict("C"));
+    CEqn.solve(mesh.solverDict("C"));
 
     dtManagerC[speciesi].updateDerivatives();
 

utilities/darcyFoam/readEvent.H

@@ -1,4 +1,4 @@
-bool sourceEventIsPresent = transportProperties.optionFound("eventFileWaterSource");
+bool sourceEventIsPresent = transportProperties.found("eventFileWaterSource");
 word sourceEventFileName = transportProperties.lookupOrDefault<word>("eventFileWaterSource","");
 sourceEventFile sourceEvent(sourceEventFileName);
 if (sourceEventIsPresent)