Remove setName again

Author: dschwoerer

include/bout/field.hxx

@@ -35,7 +35,6 @@ class Field;
 #include "bout/bout_types.hxx"
 #include "bout/boutcomm.hxx"
 #include "bout/boutexception.hxx"
-#include "bout/build_defines.hxx"
 #include "bout/field_data.hxx"
 #include "bout/region.hxx"
 #include "bout/traits.hxx"
@@ -668,19 +667,4 @@ inline T floor(const T& var, BoutReal f, const std::string& rgn = "RGN_ALL") {
 
 #undef FIELD_FUNC
 
-template <typename T, typename = bout::utils::EnableIfField<T>, class... Types>
-inline void setName(T& f, const std::string& name, Types... args) {
-#if BOUT_USE_TRACK
-  f.name = fmt::format(name, args...);
-#endif
-}
-
-template <typename T, typename = bout::utils::EnableIfField<T>, class... Types>
-inline T setName(T&& f, const std::string& name, Types... args) {
-#if BOUT_USE_TRACK
-  f.name = fmt::format(name, args...);
-#endif
-  return std::forward<T>(f);
-}
-
 #endif /* FIELD_H */

src/mesh/coordinates.cxx

@@ -1531,7 +1531,7 @@ Field3D Coordinates::Grad_par(const Field3D& var, CELL_LOC outloc,
 
   ASSERT1(location == outloc || outloc == CELL_DEFAULT);
 
-  return setName(::DDY(var, outloc, method) * invSg(), "Grad_par({:s})", var.name);
+  return ::DDY(var, outloc, method) * invSg();
 }
 
 /////////////////////////////////////////////////////////
@@ -1590,7 +1590,7 @@ Field3D Coordinates::Div_par(const Field3D& f, CELL_LOC outloc,
     f_B.yup(i) = f.yup(i) / Bxy_floc.yup(i);
     f_B.ydown(i) = f.ydown(i) / Bxy_floc.ydown(i);
   }
-  return setName(Bxy * Grad_par(f_B, outloc, method), "C:Div_par({:s})", f.name);
+  return xy * Grad_par(f_B, outloc, method);
 }
 
 /////////////////////////////////////////////////////////

src/solver/impls/euler/euler.cxx

@@ -150,7 +150,6 @@ void EulerSolver::take_step(BoutReal curtime, BoutReal dt, Array<BoutReal>& star
     Options& debug = *debug_ptr;
     for (auto& f : f3d) {
       f.F_var->enableTracking(fmt::format("ddt_{:s}", f.name), debug_ptr);
-      setName(*f.var, f.name);
       debug[fmt::format("pre_{:s}", f.name)] = *f.var;
       f.var->allocate();
     }

src/solver/impls/pvode/pvode.cxx

@@ -393,7 +393,6 @@ BoutReal PvodeSolver::run(BoutReal tout) {
 
       for (auto& f : f3d) {
         f.F_var->enableTracking(fmt::format("ddt_{:s}", f.name), debug_ptr);
-        setName(*f.var, f.name);
       }
       run_rhs(simtime);