ENH: more consistent use of good() or direct testing instead valid()

applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H

@@ -17,7 +17,7 @@ tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
             vf,
             dir,
             "reconstruct("
-          + (reconFieldName != word::null ? reconFieldName : vf.name())
+          + (reconFieldName.empty() ? vf.name() : reconFieldName)
           + ')'
         )
     );

applications/test/coordinateSystem/Test-coordinateSystem.C

@@ -61,7 +61,7 @@ void basicTests(const coordinateSystem& cs)
 
     if (const auto* cartptr = isA<coordSystem::cartesian>(cs))
     {
-        if (!cartptr->valid())
+        if (!cartptr->good())
         {
             Info<< "invalid cartesian = " << (*cartptr)
                 << " with: " << (*cartptr).R() << nl;

applications/utilities/mesh/generation/blockMesh/blockMesh.C

@@ -221,7 +221,7 @@ int main(int argc, char *argv[])
 
     blockMesh blocks(meshDict, regionName, strategy, args.verbose());
 
-    if (!blocks.valid())
+    if (!blocks.good())
     {
         // Could/should be Fatal?
 

applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C

@@ -979,7 +979,7 @@ int main(int argc, char *argv[])
     // Change the front and back patch types as required
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    word frontBackType(word::null);
+    word frontBackType;
 
     if (isType<extrudeModels::wedge>(model()))
     {

applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/extrudeToRegionMesh.C

@@ -947,7 +947,7 @@ void addZoneSidePatches
 
     forAll(zoneSidePatch, zoneI)
     {
-        if (oneDPolyPatchType != word::null)
+        if (!oneDPolyPatchType.empty())
         {
             // Reuse single empty patch.
             word patchName;

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshI.H

@@ -47,7 +47,7 @@ void Foam::DelaunayMesh<Triangulation>::timeCheck
             << time().elapsedCpuTime() << " s, "
             << "delta " << time().cpuTimeIncrement()<< " s";
 
-        if (description != word::null)
+        if (!description.empty())
         {
             Info<< ", " << description << " ";
         }

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/PrintTable/PrintTable.C

@@ -33,7 +33,7 @@ template<class KeyType, class DataType>
 Foam::PrintTable<KeyType, DataType>::PrintTable()
 :
     table_(),
-    title_(string::null)
+    title_()
 {}
 
 

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C

@@ -65,7 +65,7 @@ void Foam::conformalVoronoiMesh::timeCheck
             << runTime.elapsedCpuTime() << " s, "
             << "delta " << runTime.cpuTimeIncrement()<< " s";
 
-        if (description != word::null)
+        if (!description.empty())
         {
             Info<< ", " << description << " ";
         }

applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundary.C

@@ -92,8 +92,8 @@ void Foam::helpTypes::helpBoundary::execute
 {
     setEnv("FOAM_ABORT", "", true);
 
-    word condition(word::null);
-    word fieldName(word::null);
+    word condition;
+    word fieldName;
 
     if (args.readIfPresent("browse", condition))
     {

applications/utilities/miscellaneous/foamHelp/helpTypes/helpFunctionObject/helpFunctionObject.C

@@ -72,7 +72,7 @@ void Foam::helpTypes::helpFunctionObject::execute
     const fvMesh& mesh
 )
 {
-    word function(word::null);
+    word function;
 
     if (args.readIfPresent("browse", function))
     {

applications/utilities/miscellaneous/foamHelp/helpTypes/helpSolver/helpSolver.C

@@ -80,7 +80,7 @@ void Foam::helpTypes::helpSolver::execute
     const fvMesh& mesh
 )
 {
-    word solver(word::null);
+    word solver;
 
     if (args.readIfPresent("browse", solver))
     {