clang tidy again

Author: JustinRayAngus

Source/FieldSolver/ImplicitSolvers/ImplicitSolver.H

@@ -26,6 +26,12 @@ public:
     ImplicitSolver() = default;
 
     virtual ~ImplicitSolver() = default;
+        
+    // Default move and copy operations
+    ImplicitSolver(const ImplicitSolver&) = default;
+    ImplicitSolver& operator=(const ImplicitSolver&) = default;
+    ImplicitSolver(ImplicitSolver&&) = default;
+    ImplicitSolver& operator=(ImplicitSolver&&) = default;
 
     //
     // the following routines are called by WarpX

Source/FieldSolver/ImplicitSolvers/SemiImplicitEM.H

@@ -32,7 +32,7 @@ public:
         // malloc_consolidate(): unaligned fastbin chunk detected
         WarpXSolverVec::clearDotMask();
     }
-
+    
     void Define ( WarpX*  a_WarpX ) override;
 
     [[nodiscard]] bool IsDefined () const override { return m_is_defined; }

Source/FieldSolver/ImplicitSolvers/ThetaImplicitEM.H

@@ -63,7 +63,7 @@ public:
         // malloc_consolidate(): unaligned fastbin chunk detected
         WarpXSolverVec::clearDotMask();
     }
-
+    
     void Define ( WarpX*  a_WarpX ) override;
 
     [[nodiscard]] bool IsDefined () const override { return m_is_defined; }
@@ -113,8 +113,8 @@ private:
     amrex::Vector<std::array< std::unique_ptr<amrex::MultiFab>, 3 > > m_Bold;
 
     void UpdateWarpXState ( const WarpXSolverVec&  a_E,
-                            const amrex::Real      a_time,
-                            const amrex::Real      a_dt );
+                            amrex::Real            a_time,
+                            amrex::Real            a_dt );
 
 };
 

Source/FieldSolver/ImplicitSolvers/ThetaImplicitEM.cpp

@@ -158,16 +158,16 @@ void ThetaImplicitEM::PreRHSOp ( const WarpXSolverVec&  a_E,
 
 void ThetaImplicitEM::ComputeRHS ( WarpXSolverVec&  a_Erhs,
                              const WarpXSolverVec&  a_E,
-                             const amrex::Real      a_time,
-                             const amrex::Real      a_dt )
+                                   amrex::Real      a_time,
+                                   amrex::Real      a_dt )
 {
     amrex::ignore_unused(a_E, a_time);
     m_WarpX->ComputeRHSE(m_theta*a_dt, a_Erhs);
 }
 
 void ThetaImplicitEM::UpdateWarpXState ( const WarpXSolverVec&  a_E,
-                                         const amrex::Real      a_time,
-                                         const amrex::Real      a_dt )
+                                         amrex::Real            a_time,
+                                         amrex::Real            a_dt )
 {
     using namespace amrex::literals;
     amrex::ignore_unused(a_time);

Source/FieldSolver/ImplicitSolvers/WarpXSolverVec.H

@@ -48,9 +48,7 @@ class WarpXSolverVec
 {
 public:
 
-    WarpXSolverVec()
-    {
-    }
+    WarpXSolverVec() = default;
 
     WarpXSolverVec(const WarpXSolverVec& a_vec)
     {
@@ -116,12 +114,24 @@ public:
         Copy(field_vec);
     }
 
-    inline
-    void operator= ( const WarpXSolverVec&  a_vec )
+    // Copy assignment operator
+    WarpXSolverVec& operator= ( const WarpXSolverVec&  a_vec )
+    {
+        if (this != &a_vec) { Copy(a_vec); }
+        return *this;
+    }
+    
+    // Move assignment operator
+    WarpXSolverVec& operator= ( WarpXSolverVec&&  a_vec ) noexcept
     {
-      Copy(a_vec);
+        if (this != &a_vec) {
+            m_is_defined = std::move(a_vec.m_is_defined);
+            m_field_vec = std::move(a_vec.m_field_vec);
+        }
+        return *this;
     }
 
+
     inline
     void operator+= ( const WarpXSolverVec&  a_vec )
     {
@@ -226,6 +236,7 @@ private:
 
     bool  m_is_defined = false;
     amrex::Vector<std::array< std::unique_ptr<amrex::MultiFab>, 3 > > m_field_vec;
+
     static constexpr int m_ncomp = 1;
     static constexpr int m_num_amr_levels = 1;
 

Source/NonlinearSolvers/JacobianFunctionMF.H

@@ -20,11 +20,14 @@ class JacobianFunctionMF
 
     using RT = typename T::value_type;
 
-    JacobianFunctionMF<T,Ops>()
-    {
-    }
-
+    JacobianFunctionMF<T,Ops>() = default;
     ~JacobianFunctionMF<T,Ops>() = default;
+       
+    // Default move and copy operations
+    JacobianFunctionMF(const JacobianFunctionMF&) = default;
+    JacobianFunctionMF& operator=(const JacobianFunctionMF&) = default;
+    JacobianFunctionMF(JacobianFunctionMF&&) = default;
+    JacobianFunctionMF& operator=(JacobianFunctionMF&&) = default;
 
     void apply ( T& a_dF, const T& a_dU );
 

Source/NonlinearSolvers/NewtonSolver.H

@@ -31,7 +31,7 @@ public:
                         Ops*  a_ops ) override;
 
     void Solve ( Vec&   a_U,
-           const Vec&   a_R,
+           const Vec&   a_b,
            amrex::Real  a_time,
            amrex::Real  a_dt ) const override;
 

Source/NonlinearSolvers/NonlinearSolver.H

@@ -20,6 +20,12 @@ class NonlinearSolver
 
         NonlinearSolver<Vec,Ops>() = default;
         virtual ~NonlinearSolver<Vec,Ops>() = default;
+    
+        // Default move and copy operations
+        NonlinearSolver(const NonlinearSolver&) = default;
+        NonlinearSolver& operator=(const NonlinearSolver&) = default;
+        NonlinearSolver(NonlinearSolver&&) = default;
+        NonlinearSolver& operator=(NonlinearSolver&&) = default;
 
         virtual void Define ( const Vec&,
                               Ops* ) = 0;
@@ -29,7 +35,7 @@ class NonlinearSolver
                              amrex::Real,
                              amrex::Real ) const = 0;
 
-        virtual bool IsDefined () const = 0;
+        [[nodiscard]] virtual bool IsDefined () const = 0;
         virtual void PrintParams () const = 0;
         virtual void GetParams (amrex::Real&, amrex::Real&, int&) = 0;