1. update Parallel_LRI::get_list()

Author: PeizeLin

include/RI/parallel/Parallel_LRI.h

@@ -40,9 +40,9 @@ class Parallel_LRI
 		const std::map<TA,std::map<TAC,Tensor<Tdata>>> &Ds) const =0;
 
 	virtual const std::vector<TA >& get_list_Aa01() const =0;
-	virtual const std::vector<TAC>& get_list_Aa2 (const TA &Aa01) const =0;
-	virtual const std::vector<TAC>& get_list_Ab01(const TA &Aa01, const TAC &Aa2) const =0;
-	virtual const std::vector<TAC>& get_list_Ab2 (const TA &Aa01, const TAC &Aa2, const TAC &Ab01) const =0;
+	virtual const std::vector<TAC>& get_list_Aa2 () const =0;
+	virtual const std::vector<TAC>& get_list_Ab01() const =0;
+	virtual const std::vector<TAC>& get_list_Ab2 () const =0;
 };
 
 }

include/RI/parallel/Parallel_LRI_Equally.h

@@ -28,10 +28,10 @@ class Parallel_LRI_Equally: public Parallel_LRI<TA,Tcell,Ndim,Tdata>
 		const Label::ab &label,
 		const std::map<TA,std::map<TAC,Tensor<Tdata>>> &Ds) const override;
 
-	const std::vector<TA >& get_list_Aa01()                                                const override { return this->list_Aa01; }
-	const std::vector<TAC>& get_list_Aa2 (const TA &Aa01)                                  const override { return this->list_Aa2;  }
-	const std::vector<TAC>& get_list_Ab01(const TA &Aa01, const TAC &Aa2)                  const override { return this->list_Ab01; }
-	const std::vector<TAC>& get_list_Ab2 (const TA &Aa01, const TAC &Aa2, const TAC &Ab01) const override { return this->list_Ab2;  }
+	const std::vector<TA >& get_list_Aa01() const override { return this->list_Aa01; }
+	const std::vector<TAC>& get_list_Aa2 () const override { return this->list_Aa2;  }
+	const std::vector<TAC>& get_list_Ab01() const override { return this->list_Ab01; }
+	const std::vector<TAC>& get_list_Ab2 () const override { return this->list_Ab2;  }
 
 // private:
 public:

include/RI/ri/LRI-cal.hpp

@@ -24,8 +24,6 @@ void LRI<TA,Tcell,Ndim,Tdata>::cal(
 {
 	using namespace Array_Operator;
 
-	dynamic_cast<Parallel_LRI_Equally_Filter<TA,Tcell,Ndim,Tdata>*>(this->parallel.get())->filter_Ab2(this->Ds_ab[Label::ab::b]);
-
 	const bool flag_D_b_transpose = [&labels]() -> bool
 	{
 		for(const Label::ab_ab &label : labels)
@@ -62,13 +60,13 @@ void LRI<TA,Tcell,Ndim,Tdata>::cal(
 
 		for(const TA &Aa01 : this->parallel->get_list_Aa01())
 		{
-			for(const TAC &Aa2 : this->parallel->get_list_Aa2(Aa01))
+			for(const TAC &Aa2 : this->parallel->get_list_Aa2())
 			{
 				const Tensor<Tdata> D_a = tools.get_Ds_ab(Label::ab::a, Aa01, Aa2);
 				if(D_a.empty())	continue;
 				const Tensor<Tdata> D_a_transpose = LRI_Cal_Aux::tensor3_transpose(D_a);
 
-				const std::vector<TAC> &list_Ab01 = this->parallel->get_list_Ab01(Aa01, Aa2);
+				const std::vector<TAC> &list_Ab01 = this->parallel->get_list_Ab01();
 				#pragma omp for schedule(dynamic) nowait
 				for(std::size_t ib01=0; ib01<list_Ab01.size(); ++ib01)
 				{
@@ -81,7 +79,7 @@ void LRI<TA,Tcell,Ndim,Tdata>::cal(
 					Ds_b01.reserve(Label::array_ab_ab.size());
 					Ds_b01_csm.reserve(Label::array_ab_ab.size());
 
-					for(const TAC &Ab2 : this->parallel->get_list_Ab2(Aa01, Aa2, Ab01))
+					for(const TAC &Ab2 : this->parallel->get_list_Ab2())
 					{
 						const Tensor<Tdata> D_b = tools.get_Ds_ab(Label::ab::b, Ab01, Ab2);
 						if(D_b.empty())	continue;

include/RI/ri/LRI.h

@@ -9,7 +9,7 @@
 #include "../ri/Label.h"
 #include "../global/Tensor.h"
 #include "CS_Matrix.h"
-#include "../parallel/Parallel_LRI_Equally_Filter.h"
+#include "../parallel/Parallel_LRI_Equally.h"
 #include "RI_Tools.h"
 #include "../global/Global_Func-2.h"
 #include "Save_Load.h"
@@ -59,7 +59,7 @@ class LRI
 
 public:
 	std::shared_ptr<Parallel_LRI<TA,Tcell,Ndim,Tdata>>
-		parallel = std::make_shared<Parallel_LRI_Equally_Filter<TA,Tcell,Ndim,Tdata>>();
+		parallel = std::make_shared<Parallel_LRI_Equally<TA,Tcell,Ndim,Tdata>>();
 	std::unordered_map< Label::ab, RI_Tools::T_filter_func<Tdata> >
 		filter_funcs;
 	std::vector<std::function<Tdata (const Label::ab_ab &label, const TA &Aa01, const TAC &Aa2, const TAC &Ab01, const TAC &Ab2)>>