Fix: PR conflicts (#5329)

Author: Qianruipku

source/module_lr/operator_casida/operator_lr_diag.h

@@ -42,7 +42,8 @@ namespace LR
             const int npol,
             const T* psi_in,
             T* hpsi,
-            const int ngk_ik = 0)const override
+            const int ngk_ik = 0,
+            const bool is_first_node = false)const override
         {
             ModuleBase::TITLE("OperatorLRDiag", "act");
             const int nlocal_ph = nk * pX.get_local_size();   // local size of particle-hole basis

source/module_lr/operator_casida/operator_lr_exx.cpp

@@ -75,7 +75,7 @@ namespace LR
     }
 
     template<typename T>
-    void OperatorLREXX<T>::act(const int nbands, const int nbasis, const int npol, const T* psi_in, T* hpsi, const int ngk_ik)const
+    void OperatorLREXX<T>::act(const int nbands, const int nbasis, const int npol, const T* psi_in, T* hpsi, const int ngk_ik, const bool is_first_node)const
     {
         ModuleBase::TITLE("OperatorLREXX", "act");
 

source/module_lr/operator_casida/operator_lr_exx.h

@@ -55,9 +55,15 @@ namespace LR
 
         void init(const int ik_in) override {};
 
-        virtual void act(const int nbands, const int nbasis, const int npol, const T* psi_in, T* hpsi, const int ngk_ik = 0)const override;
-
-    private:
+        virtual void act(const int nbands,
+                         const int nbasis,
+                         const int npol,
+                         const T* psi_in,
+                         T* hpsi,
+                         const int ngk_ik = 0,
+                         const bool is_first_node = false) const override;
+
+      private:
         //global sizes
         const int& nspin;
         const int& naos;

source/module_lr/operator_casida/operator_lr_hxc.cpp

@@ -17,7 +17,7 @@ inline std::complex<double> conj(std::complex<double> a) { return std::conj(a);
 namespace LR
 {
     template<typename T, typename Device>
-    void OperatorLRHxc<T, Device>::act(const int nbands, const int nbasis, const int npol, const T* psi_in, T* hpsi, const int ngk_ik)const
+    void OperatorLRHxc<T, Device>::act(const int nbands, const int nbasis, const int npol, const T* psi_in, T* hpsi, const int ngk_ik, const bool is_first_node)const
     {
         ModuleBase::TITLE("OperatorLRHxc", "act");
         const int& sl = ispin_ks[0];

source/module_lr/operator_casida/operator_lr_hxc.h

@@ -47,9 +47,15 @@ namespace LR
 
         void init(const int ik_in) override {};
 
-        virtual void act(const int nbands, const int nbasis, const int npol, const T* psi_in, T* hpsi, const int ngk_ik = 0)const override;
+        virtual void act(const int nbands,
+                         const int nbasis,
+                         const int npol,
+                         const T* psi_in,
+                         T* hpsi,
+                         const int ngk_ik = 0,
+                         const bool is_first_node = false) const override;
 
-    private:
+      private:
         void grid_calculation(const int& nbands)const;
 
         //global sizes

source/module_lr/ri_benchmark/operator_ri_hartree.h

@@ -50,7 +50,13 @@ namespace RI_Benchmark
             }
         };
         ~OperatorRIHartree() {}
-        void act(const int nbands, const int nbasis, const int npol, const T* psi_in, T* hpsi, const int ngk_ik = 0)const override
+        void act(const int nbands,
+                 const int nbasis,
+                 const int npol,
+                 const T* psi_in,
+                 T* hpsi,
+                 const int ngk_ik = 0,
+                 const bool is_first_node = false) const override
         {
             assert(GlobalV::MY_RANK == 0);  // only serial now
             assert(nbasis == npairs);