OpenFOAM-10: fix compatibility for utilities

Pierre Horgue · Pierre Horgue · commit 6ff873c2c46d · 2024-11-05T14:58:52.000+01:00
diff --git a/utilities/darcyFoam/createFields.H b/utilities/darcyFoam/createFields.H
@@ -1,5 +1,5 @@
 word phaseName("");
-if (args.found("phase")) phaseName = args.opt("phase");
+if (args.optionFound("phase")) phaseName = args.option("phase");
 
 Info << nl << "Reading field p\n" << endl;
 volScalarField p
diff --git a/utilities/darcyFoam/readEvent.H b/utilities/darcyFoam/readEvent.H
@@ -1,4 +1,4 @@
-bool sourceEventIsPresent = transportProperties.found("eventFileWaterSource");
+bool sourceEventIsPresent = transportProperties.optionFound("eventFileWaterSource");
 word sourceEventFileName = transportProperties.lookupOrDefault<word>("eventFileWaterSource","");
 sourceEventFile sourceEvent(sourceEventFileName);
 if (sourceEventIsPresent)
diff --git a/utilities/setBoundaryWaterLevel/Make/options b/utilities/setBoundaryWaterLevel/Make/options
@@ -2,12 +2,14 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
+    -I$(LIB_SRC)/triSurface/lnInclude \
     -I../../libraries/toolsGIS/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
     -lsurfMesh \
+    -ltriSurface \
     -L$(FOAM_USER_LIBBIN) \
     -lPMFporousBoundaryConditions \
     -lPMFtoolsGIS
diff --git a/utilities/setBoundaryWaterLevel/potentialField.H b/utilities/setBoundaryWaterLevel/potentialField.H
@@ -13,16 +13,16 @@
         );
  
     //-- Reading patch information
-    word patchName = args.opt("patch");
+    word patchName = args.option("patch");
     label patchID = mesh.boundaryMesh().findPatchID(patchName);
     fvPatchScalarField& potentialPatch = potential.boundaryFieldRef()[patchID];
 
     //-- Compute and set up head pressure
-    if (args.found("DEM"))
+    if (args.optionFound("DEM"))
     {
         //- reading DEM informations
-        DEMfile fixedPotentialDEM(args.opt("DEM"));
-	scalar offsetPotential = args.getOrDefault<scalar>("offset",0.);
+        DEMfile fixedPotentialDEM(args.option("DEM"));
+	scalar offsetPotential = args.optionLookupOrDefault<scalar>("offset",0.);
 	if (offsetPotential==0)
 	{
 	    Info << nl << "Potential fixed using DEM" << endl;
@@ -39,14 +39,14 @@
             potentialPatch[facei] = fixedPotentialDEM.interpolate(faces[facei]) + offsetPotential;
         }
     }
-    else if (args.found("STL"))
+    else if (args.optionFound("STL"))
     {
         //- reading STL informations
-        word STLfile = args.opt("STL");
+        word STLfile = args.option("STL");
         triSurfaceMesh potentialSTL(IOobject(STLfile,mesh));
         pointField pPoints( potentialSTL.points() );
-	scalar thresholdPotential = args.getOrDefault<scalar>("threshold",0.);
-	scalar offsetPotential = args.getOrDefault<scalar>("offset",0.);
+	scalar thresholdPotential = args.optionLookupOrDefault<scalar>("threshold",0.);
+	scalar offsetPotential = args.optionLookupOrDefault<scalar>("offset",0.);
         Info << nl << "Potential fixed using points over " << thresholdPotential <<  " in STL = " << STLfile << " offseted by " << offsetPotential << endl;
         const vectorField& faces = mesh.boundary()[patchID].patch().faceCentres();
 	
@@ -70,10 +70,10 @@
             potentialPatch[facei] = pPoints[id_point].z() + offsetPotential;    
         }
     }  
-    else if (args.found("value"))
+    else if (args.optionFound("value"))
     {
         //- uniform potential
-        scalar uniformPotential = args.getOrDefault<scalar>("value",0.);
+        scalar uniformPotential = args.optionLookupOrDefault<scalar>("value",0.);
         Info << nl << "Uniform potential fixed = " << uniformPotential << " m " << endl;
         //- computing and writing local potential
         forAll(potentialPatch,facei)
diff --git a/utilities/setBoundaryWaterLevel/pressureheadField.H b/utilities/setBoundaryWaterLevel/pressureheadField.H
@@ -14,16 +14,16 @@
         );
 
     //-- Reading patch information
-    word patchName = args.opt("patch");
+    word patchName = args.option("patch");
     label patchID = mesh.boundaryMesh().findPatchID(patchName);
     fvPatchScalarField& hPatch = h.boundaryFieldRef()[patchID];
   
     //-- Compute and set up head pressure
-    if (args.found("DEM"))
+    if (args.optionFound("DEM"))
     {
         //- reading DEM informations
-        DEMfile fixedPotentialDEM(args.opt("DEM"));
-	scalar offseth = args.getOrDefault<scalar>("offset",0.);
+        DEMfile fixedPotentialDEM(args.option("DEM"));
+	scalar offseth = args.optionLookupOrDefault<scalar>("offset",0.);
 	if (offseth==0)
 	{
 	    Info << nl << "Potential fixed using DEM " << endl;
@@ -40,14 +40,14 @@
             hPatch[facei] = fixedPotentialDEM.interpolate(faces[facei]) - faces[facei].z() + offseth;
         }
     }
-    else if (args.found("STL"))
+    else if (args.optionFound("STL"))
     {
         //- reading STL informations
-        word STLfile = args.opt("STL");
+        word STLfile = args.option("STL");
         triSurfaceMesh potentialSTL(IOobject(STLfile,mesh));
         pointField pPoints( potentialSTL.points() );
-	scalar thresholdh = args.getOrDefault<scalar>("threshold",0.);
-	scalar offseth = args.getOrDefault<scalar>("offset",0.);
+	scalar thresholdh = args.optionLookupOrDefault<scalar>("threshold",0.);
+	scalar offseth = args.optionLookupOrDefault<scalar>("offset",0.);
 	Info << nl << "Potential fixed using points over " << thresholdh <<  " in STL = " << STLfile << " offseted by " << offseth << endl;
 	
         //- computing local potential
@@ -75,7 +75,7 @@
     {
         //- uniform potential
         const vectorField& faces = mesh.boundary()[patchID].patch().faceCentres();
-        scalar potential = args.opt("value",0.);
+        scalar potential = args.optionLookupOrDefault("value",0.);
         Info << nl << "Uniform potential fixed = " << potential << " m " << endl;
         forAll(hPatch,facei)
         {
diff --git a/utilities/setBoundaryWaterLevel/setBoundaryWaterLevel.C b/utilities/setBoundaryWaterLevel/setBoundaryWaterLevel.C
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
     
     Foam::argList args(argc,argv); 
 
-    if (!args.found("patch"))
+    if (!args.optionFound("patch"))
     {
         FatalError << "no patch specified" 
             << nl << " use option -patch"
@@ -82,9 +82,9 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
 
     word field("h");
-    if (args.found("field"))
+    if (args.optionFound("field"))
     {
-        field = args.opt("field");
+        field = args.option("field");
     }
 
     if(field == "h")
diff --git a/utilities/setFieldsFromDEM/setFieldsFromDEM.C b/utilities/setFieldsFromDEM/setFieldsFromDEM.C
@@ -59,9 +59,9 @@ int main(int argc, char *argv[])
     Foam::argList args(argc,argv); 
 
     word nameDEM = "default";
-    if (args.found("file"))
+    if (args.optionFound("file"))
     {
-        nameDEM = args.opt("file");
+        nameDEM = args.option("file");
     }
     else
     {
@@ -71,9 +71,9 @@ int main(int argc, char *argv[])
     }
 
     word nameField = "default";
-    if (args.found("field"))
+    if (args.optionFound("field"))
     {
-        nameField = args.opt("field");
+        nameField = args.option("field");
     }
     else
     {
@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
             << exit(FatalError);
     }
     
-    scalar offset = args.opt("offset",0.);
+    scalar offset = args.optionLookupOrDefault("offset",0.);
 
     #include "createTime.H"
     #include "createMesh.H"
@@ -93,9 +93,9 @@ int main(int argc, char *argv[])
     DEMfile sourceFile(nameDEM);
 
     word fileDir = "constant";
-    if (args.found("folder"))
+    if (args.optionFound("folder"))
     {
-        fileDir = args.opt("folder");
+        fileDir = args.option("folder");
     }
 
     volScalarField outputFile
diff --git a/utilities/setFieldsFromXY/setFieldsFromXY.C b/utilities/setFieldsFromXY/setFieldsFromXY.C
@@ -64,9 +64,9 @@ int main(int argc, char *argv[])
     Foam::argList args(argc,argv); 
 
     word nameXY = "default";
-    if (args.found("file"))
+    if (args.optionFound("file"))
     {
-        nameXY = args.opt("file");
+        nameXY = args.option("file");
     }
     else
     {
@@ -76,9 +76,9 @@ int main(int argc, char *argv[])
     }
 
     word nameField = "default";
-    if (args.found("field"))
+    if (args.optionFound("field"))
     {
-        nameField = args.opt("field");
+        nameField = args.option("field");
     }
 
     else
@@ -88,8 +88,8 @@ int main(int argc, char *argv[])
             << exit(FatalError);
     }
 
-    scalar offset = args.opt("offset",0.);
-    label npoints = args.opt("npoints",3);
+    scalar offset = args.optionLookupOrDefault("offset",0.);
+    label npoints = args.optionLookupOrDefault("npoints",3);
 
     #include "createTime.H"
     #include "createMesh.H"
@@ -100,9 +100,9 @@ int main(int argc, char *argv[])
     XYfile sourceFile(nameXY, mesh, npoints);
 
     word fileDir = "constant";
-    if (args.found("folder"))
+    if (args.optionFound("folder"))
     {
-        fileDir = args.opt("folder");
+        fileDir = args.option("folder");
     }
 
     volScalarField outputFile
diff --git a/utilities/subSetMeshFromDEM/subsetMeshFromDEM.C b/utilities/subSetMeshFromDEM/subsetMeshFromDEM.C
@@ -47,8 +47,8 @@ Usage
 int main(int argc, char *argv[])
 {
 
-    argList::addArgument("DEMtop","DEM file (.xyz) for top patch");
-    argList::addArgument("DEMbottom","DEM file (.xyz) for bottom patch");
+    argList::validArgs.append("DEMtop"),
+    argList::validArgs.append("DEMbottom");
     
     Foam::argList args(argc,argv); 
 
@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
         scalar ztop = topFile.interpolate(mesh.C()[celli]);
         if (mesh.C()[celli].z() < ztop) topCells.insert(celli);
     } 
-    fvMeshSubset::exposedPatchName = "top";
+
     fvMeshSubset topMesh(mesh);
     topMesh.setCellSubset(topCells, -1, true);
     const fvMesh& interMesh = topMesh.subMesh();
@@ -82,13 +82,13 @@ int main(int argc, char *argv[])
         scalar zbottom = bottomFile.interpolate(interMesh.C()[celli]);
         if (interMesh.C()[celli].z() > zbottom) bottomCells.insert(celli);
     } 
-    fvMeshSubset::exposedPatchName = "bottom";
+
     fvMeshSubset finalMesh(topMesh.subMesh());
     finalMesh.setCellSubset(bottomCells, -1, true);
 
     //- write final mesh
     fvMesh& outMesh = finalMesh.subMesh();
-    fvMeshTools::removeEmptyPatches(outMesh, true);
+
     outMesh.setInstance(runTime.constant());
     outMesh.write();
         

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-bool sourceEventIsPresent = transportProperties.found("eventFileWaterSource");`
	`1`	`+bool sourceEventIsPresent = transportProperties.optionFound("eventFileWaterSource");`
`2`	`2`	`word sourceEventFileName = transportProperties.lookupOrDefault<word>("eventFileWaterSource","");`
`3`	`3`	`sourceEventFile sourceEvent(sourceEventFileName);`
`4`	`4`	`if (sourceEventIsPresent)`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ int main(int argc, char *argv[])`
`71`	`71`
`72`	`72`	`Foam::argList args(argc,argv);`
`73`	`73`
`74`		`- if (!args.found("patch"))`
	`74`	`+ if (!args.optionFound("patch"))`
`75`	`75`	`{`
`76`	`76`	`FatalError << "no patch specified"`
`77`	`77`	`<< nl << " use option -patch"`
`@@ -82,9 +82,9 @@ int main(int argc, char *argv[])`
`82`	`82`	`#include "createMesh.H"`
`83`	`83`
`84`	`84`	`word field("h");`
`85`		`- if (args.found("field"))`
	`85`	`+ if (args.optionFound("field"))`
`86`	`86`	`{`
`87`		`- field = args.opt("field");`
	`87`	`+ field = args.option("field");`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`if(field == "h")`
Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,9 @@ int main(int argc, char *argv[])`
`59`	`59`	`Foam::argList args(argc,argv);`
`60`	`60`
`61`	`61`	`word nameDEM = "default";`
`62`		`- if (args.found("file"))`
	`62`	`+ if (args.optionFound("file"))`
`63`	`63`	`{`
`64`		`- nameDEM = args.opt("file");`
	`64`	`+ nameDEM = args.option("file");`
`65`	`65`	`}`
`66`	`66`	`else`
`67`	`67`	`{`
`@@ -71,9 +71,9 @@ int main(int argc, char *argv[])`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`word nameField = "default";`
`74`		`- if (args.found("field"))`
	`74`	`+ if (args.optionFound("field"))`
`75`	`75`	`{`
`76`		`- nameField = args.opt("field");`
	`76`	`+ nameField = args.option("field");`
`77`	`77`	`}`
`78`	`78`	`else`
`79`	`79`	`{`
`@@ -82,7 +82,7 @@ int main(int argc, char *argv[])`
`82`	`82`	`<< exit(FatalError);`
`83`	`83`	`}`
`84`	`84`
`85`		`- scalar offset = args.opt("offset",0.);`
	`85`	`+ scalar offset = args.optionLookupOrDefault("offset",0.);`
`86`	`86`
`87`	`87`	`#include "createTime.H"`
`88`	`88`	`#include "createMesh.H"`
`@@ -93,9 +93,9 @@ int main(int argc, char *argv[])`
`93`	`93`	`DEMfile sourceFile(nameDEM);`
`94`	`94`
`95`	`95`	`word fileDir = "constant";`
`96`		`- if (args.found("folder"))`
	`96`	`+ if (args.optionFound("folder"))`
`97`	`97`	`{`
`98`		`- fileDir = args.opt("folder");`
	`98`	`+ fileDir = args.option("folder");`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`volScalarField outputFile`
Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,9 @@ int main(int argc, char *argv[])`
`64`	`64`	`Foam::argList args(argc,argv);`
`65`	`65`
`66`	`66`	`word nameXY = "default";`
`67`		`- if (args.found("file"))`
	`67`	`+ if (args.optionFound("file"))`
`68`	`68`	`{`
`69`		`- nameXY = args.opt("file");`
	`69`	`+ nameXY = args.option("file");`
`70`	`70`	`}`
`71`	`71`	`else`
`72`	`72`	`{`
`@@ -76,9 +76,9 @@ int main(int argc, char *argv[])`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`word nameField = "default";`
`79`		`- if (args.found("field"))`
	`79`	`+ if (args.optionFound("field"))`
`80`	`80`	`{`
`81`		`- nameField = args.opt("field");`
	`81`	`+ nameField = args.option("field");`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`else`
`@@ -88,8 +88,8 @@ int main(int argc, char *argv[])`
`88`	`88`	`<< exit(FatalError);`
`89`	`89`	`}`
`90`	`90`
`91`		`- scalar offset = args.opt("offset",0.);`
`92`		`- label npoints = args.opt("npoints",3);`
	`91`	`+ scalar offset = args.optionLookupOrDefault("offset",0.);`
	`92`	`+ label npoints = args.optionLookupOrDefault("npoints",3);`
`93`	`93`
`94`	`94`	`#include "createTime.H"`
`95`	`95`	`#include "createMesh.H"`
`@@ -100,9 +100,9 @@ int main(int argc, char *argv[])`
`100`	`100`	`XYfile sourceFile(nameXY, mesh, npoints);`
`101`	`101`
`102`	`102`	`word fileDir = "constant";`
`103`		`- if (args.found("folder"))`
	`103`	`+ if (args.optionFound("folder"))`
`104`	`104`	`{`
`105`		`- fileDir = args.opt("folder");`
	`105`	`+ fileDir = args.option("folder");`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`volScalarField outputFile`