Implement copy-and-swap idiom, add noexcept to appropriate methods

Author: aabrown100-git

Code/Source/solver/BoundaryCondition.cpp

@@ -36,6 +36,7 @@
 #include <iostream>
 #include <cstdio>
 #include <vector>
+#include <utility>
 
 #define n_debug_bc
 
@@ -106,27 +107,24 @@ BoundaryCondition::BoundaryCondition(const BoundaryCondition& other)
     }
 }
 
-BoundaryCondition& BoundaryCondition::operator=(const BoundaryCondition& other)
-{
-    if (this != &other) {
-        face_ = other.face_;
-        global_num_nodes_ = other.global_num_nodes_;
-        local_num_nodes_ = other.local_num_nodes_;
-        array_names_ = other.array_names_;
-        local_data_ = other.local_data_;
-        global_data_ = other.global_data_;
-        spatially_variable = other.spatially_variable;
-        vtp_file_path_ = other.vtp_file_path_;
-        flags_ = other.flags_;
-        global_node_map_ = other.global_node_map_;
-        defined_ = other.defined_;
-
-        if (other.vtp_data_) {
-            vtp_data_ = std::make_unique<VtkVtpData>(*other.vtp_data_);
-        } else {
-            vtp_data_.reset();
-        }
-    }
+void swap(BoundaryCondition& lhs, BoundaryCondition& rhs) noexcept {
+    using std::swap;
+    swap(lhs.face_, rhs.face_);
+    swap(lhs.global_num_nodes_, rhs.global_num_nodes_);
+    swap(lhs.local_num_nodes_, rhs.local_num_nodes_);
+    swap(lhs.array_names_, rhs.array_names_);
+    swap(lhs.local_data_, rhs.local_data_);
+    swap(lhs.global_data_, rhs.global_data_);
+    swap(lhs.spatially_variable, rhs.spatially_variable);
+    swap(lhs.vtp_file_path_, rhs.vtp_file_path_);
+    swap(lhs.flags_, rhs.flags_);
+    swap(lhs.global_node_map_, rhs.global_node_map_);
+    swap(lhs.vtp_data_, rhs.vtp_data_);
+    swap(lhs.defined_, rhs.defined_);
+}
+
+BoundaryCondition& BoundaryCondition::operator=(BoundaryCondition other) {
+    swap(*this, other);
     return *this;
 }
 
@@ -151,30 +149,6 @@ BoundaryCondition::BoundaryCondition(BoundaryCondition&& other) noexcept
     other.defined_ = false;
 }
 
-BoundaryCondition& BoundaryCondition::operator=(BoundaryCondition&& other) noexcept
-{
-    if (this != &other) {
-        face_ = other.face_;
-        global_num_nodes_ = other.global_num_nodes_;
-        local_num_nodes_ = other.local_num_nodes_;
-        array_names_ = std::move(other.array_names_);
-        local_data_ = std::move(other.local_data_);
-        global_data_ = std::move(other.global_data_);
-        spatially_variable = other.spatially_variable;
-        vtp_file_path_ = std::move(other.vtp_file_path_);
-        flags_ = std::move(other.flags_);
-        global_node_map_ = std::move(other.global_node_map_);
-        vtp_data_ = std::move(other.vtp_data_);
-        defined_ = other.defined_;
-
-        other.face_ = nullptr;
-        other.global_num_nodes_ = 0;
-        other.local_num_nodes_ = 0;
-        other.spatially_variable = false;
-        other.defined_ = false;
-    }
-    return *this;
-}
 
 BoundaryCondition::StringArrayMap BoundaryCondition::read_data_from_vtp_file(const std::string& vtp_file_path, const std::vector<std::string>& array_names)
 {

Code/Source/solver/BoundaryCondition.h

@@ -40,6 +40,7 @@
 #include <map>
 #include <vector>
 #include <stdexcept>
+#include <utility>
 
 // Forward declarations. These are needed because including ComMod.h causes a 
 // circular header dependency.
@@ -113,23 +114,24 @@ class BoundaryCondition {
     /// @brief Copy constructor
     BoundaryCondition(const BoundaryCondition& other);
 
-    /// @brief Copy assignment operator
-    BoundaryCondition& operator=(const BoundaryCondition& other);
+    /// @brief Unified assignment operator (handles both copy and move)
+    BoundaryCondition& operator=(BoundaryCondition other);
 
     /// @brief Move constructor
     BoundaryCondition(BoundaryCondition&& other) noexcept;
 
-    /// @brief Move assignment operator
-    BoundaryCondition& operator=(BoundaryCondition&& other) noexcept;
-
     /// @brief Virtual destructor
-    virtual ~BoundaryCondition() = default;
+    virtual ~BoundaryCondition() noexcept = default;
+
+    /// @brief Swap function for copy-and-swap idiom (friend function)
+    friend void swap(BoundaryCondition& lhs, BoundaryCondition& rhs) noexcept;
 
 
     /// @brief Get value for a specific array and node
     /// @param array_name Name of the array
     /// @param node_id Node index on the face
     /// @return Value for the array at the specified node
+    /// @throws std::runtime_error if array_name is not found
     double get_value(const std::string& array_name, int node_id) const;
 
     /// @brief Get a boolean flag by name
@@ -144,13 +146,13 @@ class BoundaryCondition {
 
     /// @brief Get global number of nodes
     /// @return Global number of nodes on the face
-    int get_global_num_nodes() const {
+    int get_global_num_nodes() const noexcept {
         return global_num_nodes_;
     }
 
     /// @brief Get local number of nodes
     /// @return Local number of nodes on the face on this processor
-    int get_local_num_nodes() const {
+    int get_local_num_nodes() const noexcept {
         return local_num_nodes_;
     }
 
@@ -162,19 +164,19 @@ class BoundaryCondition {
 
     /// @brief Check if data is loaded from VTP file
     /// @return true if loaded from VTP, false if using uniform values
-    bool is_from_vtp() const {
+    bool is_from_vtp() const noexcept {
         return spatially_variable;
     }
 
     /// @brief Get the VTP file path (empty if using uniform values)
     /// @return VTP file path
-    const std::string& get_vtp_path() const {
+    const std::string& get_vtp_path() const noexcept {
         return vtp_file_path_;
     }
 
     /// @brief Check if this BC is properly defined
     /// @return true if BC has been initialized with either VTP data or uniform values
-    bool is_defined() const {
+    bool is_defined() const noexcept {
         return defined_;
     }