Commit 300fb778 authored by Doak, Peter W.'s avatar Doak, Peter W.
Browse files

cleaning up some unfortunate merging.

parent 4d1a63bf

include/dca/phys/dca_step/cluster_solver/shared_tools/accumulation/tp/tp_accumulator.hpp

+2 −16
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ public: 
  using WExchangeDmn = func::dmn_0<domains::FrequencyExchangeDomain>;



  using this_type = TpAccumulator<Parameters>;

  using Data = DcaData<Parameters>;

  using TpGreensFunction = typename Data::TpGreensFunction;



protected:

  using Profiler = typename Parameters::profiler_type;
@@ -77,7 +79,6 @@ protected: 
      func::dmn_variadic<BDmn, BDmn, BDmn, BDmn, KDmn, KDmn, KExchangeDmn, WTpDmn, WTpDmn, WExchangeDmn>;



public:

  using TpGreensFunction = func::function<Complex, TpDomain>;



  // Constructor:

  // In: G0: non interacting greens function.
@@ -120,21 +121,6 @@ public: 
  }



protected:

  using Data = DcaData<Parameters>;

  using Profiler = typename Parameters::profiler_type;



  using WTpDmn = func::dmn_0<domains::vertex_frequency_domain<domains::COMPACT>>;

  using WTpPosDmn = func::dmn_0<domains::vertex_frequency_domain<domains::COMPACT_POSITIVE>>;

  using WTpExtDmn = func::dmn_0<domains::vertex_frequency_domain<domains::EXTENDED>>;

  using WTpExtPosDmn = func::dmn_0<domains::vertex_frequency_domain<domains::EXTENDED_POSITIVE>>;

  using WExchangeDmn = func::dmn_0<domains::FrequencyExchangeDomain>;



  using Complex = std::complex<Real>;

  using SpGreenFunction =

      func::function<Complex, func::dmn_variadic<BDmn, BDmn, SDmn, KDmn, KDmn, WTpExtPosDmn, WTpExtDmn>>;



  using TpGreenFunction = typename Data::TpGreensFunction;

  using Matrix = linalg::Matrix<Complex, linalg::CPU>;



  void initializeG0();

include/dca/phys/dca_step/cluster_solver/shared_tools/accumulation/tp/tp_accumulator_gpu.hpp

+1 −3
Original line number Diff line number Diff line
@@ -130,9 +130,8 @@ private: 
  using typename BaseClass::BDmn;

  using typename BaseClass::SDmn;



  using typename BaseClass::TpGreensFunction;

  using typename BaseClass::Complex;

  using typename BaseClass::TpGreenFunction;

  using typename BaseClass::TpGreensFunction;



  using Matrix = linalg::Matrix<Complex, linalg::GPU>;
@@ -161,7 +160,6 @@ private: 
  using BaseClass::extension_index_offset_;

  using BaseClass::G0_ptr_;

  using BaseClass::G4_;

  using BaseClass::mode_;

  using BaseClass::multiple_accumulators_;

  using BaseClass::n_bands_;

  using BaseClass::n_pos_frqs_;