Add custom string->enum parser for JSON values to handle invalid keys…

… and eliminate need for INVALID enums throughout the code
awslabs · Aug 11, 2023 · e07a0c7 · e07a0c7
1 parent 53a18fe
commit e07a0c7
Show file tree

Hide file tree

Showing 9 changed files with 126 additions and 170 deletions.
diff --git a/palace/drivers/transientsolver.cpp b/palace/drivers/transientsolver.cpp
@@ -217,8 +217,6 @@ std::function<double(double)> TransientSolver::GetTimeExcitation(bool dot) const
         return F{[=](double t) { return pulse_smootherstep(t, data.pulse_tau, delay); }};
       }
       break;
-    case config::TransientSolverData::ExcitationType::INVALID:
-      MFEM_ABORT("Unsupported source excitation type!");
   }
   return F{};
 }

diff --git a/palace/linalg/ksp.cpp b/palace/linalg/ksp.cpp
@@ -64,7 +64,6 @@ std::unique_ptr<IterativeSolver<OperType>> ConfigureKrylovSolver(MPI_Comm comm,
     case config::LinearSolverData::KspType::MINRES:
     case config::LinearSolverData::KspType::BICGSTAB:
     case config::LinearSolverData::KspType::DEFAULT:
-    case config::LinearSolverData::KspType::INVALID:
       MFEM_ABORT("Unexpected solver type for Krylov solver configuration!");
       break;
   }
@@ -73,29 +72,26 @@ std::unique_ptr<IterativeSolver<OperType>> ConfigureKrylovSolver(MPI_Comm comm,
   ksp->SetMaxIter(iodata.solver.linear.max_it);
 
   // Configure preconditioning side (only for GMRES).
-  if (iodata.solver.linear.pc_side_type != config::LinearSolverData::SideType::DEFAULT)
+  if (iodata.solver.linear.pc_side_type != config::LinearSolverData::SideType::DEFAULT &&
+      type != config::LinearSolverData::KspType::GMRES)
   {
-    if (type != config::LinearSolverData::KspType::GMRES)
-    {
-      Mpi::Warning(
-          comm, "Preconditioner side will be ignored for non-GMRES iterative solvers!\n");
-    }
-    else
+    Mpi::Warning(comm,
+                 "Preconditioner side will be ignored for non-GMRES iterative solvers!\n");
+  }
+  else
+  {
+    auto *gmres = static_cast<GmresSolver<OperType> *>(ksp.get());
+    switch (iodata.solver.linear.pc_side_type)
     {
-      auto *gmres = static_cast<GmresSolver<OperType> *>(ksp.get());
-      switch (iodata.solver.linear.pc_side_type)
-      {
-        case config::LinearSolverData::SideType::LEFT:
-          gmres->SetPrecSide(GmresSolver<OperType>::PrecSide::LEFT);
-          break;
-        case config::LinearSolverData::SideType::RIGHT:
-          gmres->SetPrecSide(GmresSolver<OperType>::PrecSide::RIGHT);
-          break;
-        case config::LinearSolverData::SideType::DEFAULT:
-        case config::LinearSolverData::SideType::INVALID:
-          MFEM_ABORT("Unexpected side for configuring preconditioning!");
-          break;
-      }
+      case config::LinearSolverData::SideType::LEFT:
+        gmres->SetPrecSide(GmresSolver<OperType>::PrecSide::LEFT);
+        break;
+      case config::LinearSolverData::SideType::RIGHT:
+        gmres->SetPrecSide(GmresSolver<OperType>::PrecSide::RIGHT);
+        break;
+      case config::LinearSolverData::SideType::DEFAULT:
+        // Do nothing
+        break;
     }
   }
 
@@ -116,9 +112,6 @@ std::unique_ptr<IterativeSolver<OperType>> ConfigureKrylovSolver(MPI_Comm comm,
       case config::LinearSolverData::OrthogType::CGS2:
         gmres->SetOrthogonalization(GmresSolver<OperType>::OrthogType::CGS2);
         break;
-      case config::LinearSolverData::OrthogType::INVALID:
-        MFEM_ABORT("Unexpected orthogonalization type for Krylov solver configuration!");
-        break;
     }
   }
 
@@ -210,7 +203,6 @@ ConfigurePreconditionerSolver(MPI_Comm comm, const IoData &iodata,
 #endif
       break;
     case config::LinearSolverData::Type::DEFAULT:
-    case config::LinearSolverData::Type::INVALID:
       MFEM_ABORT("Unexpected solver type for preconditioner configuration!");
       break;
   }

diff --git a/palace/linalg/strumpack.cpp b/palace/linalg/strumpack.cpp
@@ -33,7 +33,6 @@ GetCompressionType(config::LinearSolverData::CompressionType type)
       return strumpack::CompressionType::ZFP_BLR_HODLR;
       break;
     case config::LinearSolverData::CompressionType::NONE:
-    case config::LinearSolverData::CompressionType::INVALID:
       return strumpack::CompressionType::NONE;
   }
   return strumpack::CompressionType::NONE;  // For compiler warning
@@ -101,7 +100,6 @@ StrumpackSolverBase<StrumpackSolverType>::StrumpackSolverBase(
       this->SetCompressionRelTol(lr_tol);
       break;
     case config::LinearSolverData::CompressionType::NONE:
-    case config::LinearSolverData::CompressionType::INVALID:
       break;
   }
 }

diff --git a/palace/main.cpp b/palace/main.cpp
@@ -164,9 +164,6 @@ int main(int argc, char *argv[])
       solver = std::make_unique<TransientSolver>(iodata, world_root, world_size, num_thread,
                                                  git_tag);
       break;
-    case config::ProblemData::Type::INVALID:
-      Mpi::Print(world_comm, "Error: Unsupported problem type!\n\n");
-      return 1;
   }
 
   // Read the mesh from file, refine, partition, and distribute it. Then nondimensionalize

diff --git a/palace/models/lumpedportoperator.cpp b/palace/models/lumpedportoperator.cpp
@@ -63,9 +63,6 @@ LumpedPortData::LumpedPortData(const config::LumpedPortData &data,
         elems.push_back(
             std::make_unique<UniformElementData>(elem.direction, attr_marker, h1_fespace));
         break;
-      case config::internal::ElementData::CoordinateSystem::INVALID:
-        MFEM_ABORT("Unexpected coordinate system for lumped port direction!");
-        break;
     }
   }
 

diff --git a/palace/models/surfacecurrentoperator.cpp b/palace/models/surfacecurrentoperator.cpp
@@ -32,9 +32,6 @@ SurfaceCurrentData::SurfaceCurrentData(const config::SurfaceCurrentData &data,
         elems.push_back(
             std::make_unique<UniformElementData>(elem.direction, attr_marker, h1_fespace));
         break;
-      case config::internal::ElementData::CoordinateSystem::INVALID:
-        MFEM_ABORT("Unexpected coordinate system for surface current source direction!");
-        break;
     }
   }
 }

diff --git a/palace/models/timeoperator.cpp b/palace/models/timeoperator.cpp
@@ -177,9 +177,6 @@ TimeOperator::TimeOperator(const IoData &iodata, SpaceOperator &spaceop,
         type = mfem::TimeDependentOperator::EXPLICIT;
       }
       break;
-    case config::TransientSolverData::Type::INVALID:
-      MFEM_ABORT("Invalid transient solver type!");
-      break;
   }
 
   // Set up time-dependent operator for 2nd-order curl-curl equation for E.