Inline solve type comparisons instead of accessor functions

adjoint() and outputs_are_intermediate() each had only a few call sites, and the direct comparisons against RandomRaySolve enumerators are clearer than the function names they were hidden behind.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: jtramm

include/openmc/random_ray/flat_source_domain.h

@@ -73,18 +73,6 @@ class FlatSourceDomain {
   int64_t lookup_mesh_bin(int64_t sr, Position r) const;
   int lookup_mesh_idx(int64_t sr) const;
 
-  // True while the adjoint solve is executing
-  static bool adjoint() { return solve_ == RandomRaySolve::ADJOINT; }
-
-  // True while the initial forward solve of an adjoint (FW-CADIS) run is
-  // executing. Output files written by this solve are tagged "forward" so that
-  // the subsequent adjoint solve does not overwrite them, and no weight window
-  // file is written.
-  static bool outputs_are_intermediate()
-  {
-    return solve_ == RandomRaySolve::FORWARD_FOR_ADJOINT;
-  }
-
   //----------------------------------------------------------------------------
   // Static Data members
   static bool volume_normalized_flux_tallies_;

src/output.cpp

@@ -623,7 +623,9 @@ void write_tallies()
 
   // Tag tallies.out written during the forward solve of an adjoint run
   const char* forward =
-    FlatSourceDomain::outputs_are_intermediate() ? "forward." : "";
+    (FlatSourceDomain::solve_ == RandomRaySolve::FORWARD_FOR_ADJOINT)
+      ? "forward."
+      : "";
 
   // Set filename for tallies_out
   std::string filename =

src/random_ray/flat_source_domain.cpp

@@ -557,7 +557,7 @@ double FlatSourceDomain::compute_fixed_source_normalization_factor() const
   // If we are in adjoint mode of a fixed source problem, the external
   // source is already normalized, such that all resulting fluxes are
   // also normalized.
-  if (adjoint()) {
+  if (solve_ == RandomRaySolve::ADJOINT) {
     return 1.0;
   }
 
@@ -797,7 +797,7 @@ void FlatSourceDomain::output_to_vtk() const
     std::string filename = openmc_plot->path_plot();
 
     // Tag plots written during the forward solve of an adjoint run
-    if (outputs_are_intermediate()) {
+    if (solve_ == RandomRaySolve::FORWARD_FOR_ADJOINT) {
       auto dot = filename.find_last_of('.');
       filename = filename.substr(0, dot) + ".forward" + filename.substr(dot);
     }
@@ -1009,9 +1009,10 @@ void FlatSourceDomain::output_to_vtk() const
 void FlatSourceDomain::apply_external_source_to_source_region(
   int src_idx, SourceRegionHandle& srh)
 {
-  auto s = (adjoint() && !model::adjoint_sources.empty())
-             ? model::adjoint_sources[src_idx].get()
-             : model::external_sources[src_idx].get();
+  auto s =
+    (solve_ == RandomRaySolve::ADJOINT && !model::adjoint_sources.empty())
+      ? model::adjoint_sources[src_idx].get()
+      : model::external_sources[src_idx].get();
   auto is = dynamic_cast<IndependentSource*>(s);
   auto discrete = dynamic_cast<Discrete*>(is->energy());
   double strength_factor = is->strength();

src/random_ray/random_ray_simulation.cpp

@@ -602,7 +602,8 @@ void RandomRaySimulation::print_results_random_ray(
     }
     fmt::print(" Volume Estimator Type             = {}\n", estimator);
 
-    std::string adjoint_true = (FlatSourceDomain::adjoint()) ? "ON" : "OFF";
+    std::string adjoint_true =
+      (FlatSourceDomain::solve_ == RandomRaySolve::ADJOINT) ? "ON" : "OFF";
     fmt::print(" Adjoint Flux Mode                 = {}\n", adjoint_true);
 
     std::string shape;

src/simulation.cpp

@@ -206,7 +206,7 @@ int openmc_simulation_finalize()
   // adjoint (FW-CADIS) run, where only the adjoint-derived weight windows
   // are meaningful.
   if (variance_reduction::weight_windows_generators.size() > 0 &&
-      !FlatSourceDomain::outputs_are_intermediate()) {
+      FlatSourceDomain::solve_ != RandomRaySolve::FORWARD_FOR_ADJOINT) {
     openmc_weight_windows_export();
   }
 

src/state_point.cpp

@@ -49,7 +49,9 @@ extern "C" int openmc_statepoint_write(const char* filename, bool* write_source)
 
     // Tag statepoints written during the forward solve of an adjoint run
     const char* forward =
-      FlatSourceDomain::outputs_are_intermediate() ? "forward." : "";
+      (FlatSourceDomain::solve_ == RandomRaySolve::FORWARD_FOR_ADJOINT)
+        ? "forward."
+        : "";
 
     // Set filename for state point
     filename_ = fmt::format("{0}statepoint.{3}{1:0{2}}.h5",