Eliminate some unnecessary local variables

Author: ZedThree

src/mesh/coordinates.cxx

@@ -1450,16 +1450,14 @@ Field2D Coordinates::Laplace_perpXY([[maybe_unused]] const Field2D& A,
 
 ChristoffelSymbols& Coordinates::christoffel_symbols() {
   if (christoffel_symbols_cache == nullptr) {
-    auto ptr = std::make_unique<ChristoffelSymbols>(*this);
-    christoffel_symbols_cache = std::move(ptr);
+    christoffel_symbols_cache = std::make_unique<ChristoffelSymbols>(*this);
   }
   return *christoffel_symbols_cache;
 }
 
 GValues& Coordinates::g_values() const {
   if (g_values_cache == nullptr) {
-    auto ptr = std::make_unique<GValues>(*this);
-    g_values_cache = std::move(ptr);
+    g_values_cache = std::make_unique<GValues>(*this);
   }
   return *g_values_cache;
 }
@@ -1501,8 +1499,7 @@ void Coordinates::checkContravariant() {
 
 FieldMetric& Coordinates::J() const {
   if (jacobian_cache == nullptr) {
-    const auto j = recalculateJacobian();
-    jacobian_cache = std::make_unique<FieldMetric>(j);
+    jacobian_cache = std::make_unique<FieldMetric>(recalculateJacobian());
   }
   return *jacobian_cache;
 }

src/mesh/mesh.cxx

@@ -578,17 +578,14 @@ std::shared_ptr<Coordinates>
 Mesh::createDefaultCoordinates(const CELL_LOC location,
                                bool force_interpolate_from_centre) {
 
-  std::shared_ptr<Coordinates> new_coordinates;
   if (location == CELL_CENTRE || location == CELL_DEFAULT) {
     // Initialize coordinates from input
-    new_coordinates = std::make_shared<Coordinates>(this, options);
-  } else {
-    // Interpolate coordinates from CELL_CENTRE version
-    new_coordinates = std::make_shared<Coordinates>(this, options, location,
-                                                    getCoordinates(CELL_CENTRE),
-                                                    force_interpolate_from_centre);
+    return std::make_shared<Coordinates>(this, options);
   }
-  return new_coordinates;
+  // Interpolate coordinates from CELL_CENTRE version
+  return std::make_shared<Coordinates>(this, options, location,
+                                       getCoordinates(CELL_CENTRE),
+                                       force_interpolate_from_centre);
 }
 
 const Region<>& Mesh::getRegion3D(const std::string& region_name) const {