minor refactor. (858c184a) · Commits · NDIP / Tool Sources / Direct-Geometry Spectroscopy / DCA / DCA Main

include/dca/phys/dca_analysis/bse_solver/bse_cluster_solver.hpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -234,7 +234,7 @@ void BseClusterSolver<ParametersType, DcaDataType, ScalarType>::load_G_II_0(
		for (int m1 = 0; m1 < b::dmn_size(); m1++) {
		for (int m2 = 0; m2 < b::dmn_size(); m2++) {
		// TODO: allow more than one channel.
		switch (parameters.get_channels()[0]) {
		switch (parameters.get_four_point_channels()[0]) {
		case PARTICLE_HOLE_TRANSVERSE: {
		G_II_0(n1, n2, k, w_vertex, m1, m2, k, w_vertex) =
		-data_.G_k_w(n1, e_UP, m2, e_UP, k, w) *

include/dca/phys/dca_analysis/bse_solver/bse_lattice_solver.hpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -402,7 +402,7 @@ void BseLatticeSolver<ParametersType, DcaDataType, ScalarType>::diagonalizeGamma
		// Diagonalize the symmetric matrix \sqrt{\chi_0}\Gamma\sqrt{\chi_0}.
		// The origin in momentum space has always index = 0.
		// TODO: loop over multiple channels.
		if (parameters.get_channels()[0] == PARTICLE_PARTICLE_UP_DOWN &&
		if (parameters.get_four_point_channels()[0] == PARTICLE_PARTICLE_UP_DOWN &&
		parameters.get_four_point_momentum_transfer_index() == 0 &&
		parameters.get_four_point_frequency_transfer() == 0) {
		diagonalizeGammaChi0Symmetric();

include/dca/phys/dca_data/dca_data.hpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -287,7 +287,7 @@ DcaData<Parameters>::DcaData(Parameters& parameters_ref)
		// Reserve storage in advance such that we don't have to copy elements when we fill the vector.
		// We want to avoid copies because function's copy ctor does not copy the name (and because copies
		// are expensive).
		for (auto channel : parameters_.get_channels()) {
		for (auto channel : parameters_.get_four_point_channels()) {
		// Allocate memory for G4.
		G4_.emplace_back("G4_" + toString(channel));
		// Allocate memory for error on G4.
		@@ -325,7 +325,7 @@ void DcaData<Parameters>::read(std::string filename) {

		concurrency_.broadcast_object(Sigma);

		if (parameters_.accumulateG4()) {
		if (parameters_.isAccumulatingG4()) {
		concurrency_.broadcast_object(G_k_w);

		for (auto& G4_channel : G4_)
		@@ -348,11 +348,11 @@ void DcaData<Parameters>::read(Reader& reader) {

		reader.execute(Sigma);

		if (parameters_.accumulateG4()) {
		if (parameters_.isAccumulatingG4()) {
		reader.execute(G_k_w);

		// Try to read G4 with a legacy name.
		if (parameters_.get_channels().size() == 1) {
		if (parameters_.get_four_point_channels().size() == 1) {
		reader.execute("G4", G4_[0]);
		}

		@@ -454,7 +454,7 @@ void DcaData<Parameters>::write(Writer& writer) {
		writer.execute(G0_r_t_cluster_excluded);
		}

		if (parameters_.accumulateG4()) {
		if (parameters_.isAccumulatingG4()) {
		if (!(parameters_.dump_cluster_Greens_functions())) {
		writer.execute(G_k_w);
		writer.execute(G_k_w_err_);

include/dca/phys/dca_step/cluster_mapping/coarsegraining/coarsegraining_tp.hpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -206,7 +206,7 @@ void coarsegraining_tp<parameters_type, K_dmn>::execute(
		interpolation_matrices<scalar_type, k_HOST, q_plus_Q_dmn>::set_q_idx(Q_ind);

		// TODO: allow more than one channel.
		switch (parameters.get_channels()[0]) {
		switch (parameters.get_four_point_channels()[0]) {
		case PARTICLE_HOLE_CHARGE:
		case PARTICLE_HOLE_MAGNETIC:
		case PARTICLE_HOLE_TRANSVERSE: {
		@@ -235,7 +235,7 @@ void coarsegraining_tp<parameters_type, K_dmn>::execute(
		K_dmn::get_elements(), K_dmn::parameter_type::SHAPE);

		// TODO: allow more than one channel.
		switch (parameters.get_channels()[0]) {
		switch (parameters.get_four_point_channels()[0]) {
		case PARTICLE_HOLE_CHARGE:
		case PARTICLE_HOLE_MAGNETIC:
		case PARTICLE_HOLE_TRANSVERSE: {
		@@ -623,7 +623,7 @@ void coarsegraining_tp<parameters_type, K_dmn>::find_w1_and_w2(std::vector<doubl
		assert(std::abs(w::get_elements()[w1] - elements[w_ind]) < 1.e-6);

		// TODO: allow more than one channel.
		switch (parameters.get_channels()[0]) {
		switch (parameters.get_four_point_channels()[0]) {
		case PARTICLE_HOLE_CHARGE:
		case PARTICLE_HOLE_MAGNETIC:
		case PARTICLE_HOLE_TRANSVERSE: {
		@@ -651,7 +651,7 @@ void coarsegraining_tp<parameters_type, K_dmn>::compute_bubble(
		for (int m1 = 0; m1 < b::dmn_size(); m1++) {
		for (int m2 = 0; m2 < b::dmn_size(); m2++) {
		// TODO: allow more than one channel.
		switch (parameters.get_channels()[0]) {
		switch (parameters.get_four_point_channels()[0]) {
		case PARTICLE_HOLE_TRANSVERSE:
		bubble(n1, n2, m1, m2, q_ind) +=
		G_q(n1, e_UP, m2, e_UP, q_ind) * G_q_plus_Q(n2, e_UP, m1, e_UP, q_ind);
		@@ -685,7 +685,7 @@ void coarsegraining_tp<parameters_type, K_dmn>::compute_bubble(
		template <typename parameters_type, typename K_dmn>
		double coarsegraining_tp<parameters_type, K_dmn>::get_integration_factor() {
		// TODO: allow more than one channel.
		switch (parameters.get_channels()[0]) {
		switch (parameters.get_four_point_channels()[0]) {
		case PARTICLE_HOLE_TRANSVERSE:
		return -1.;
		break;

include/dca/phys/dca_step/cluster_solver/ctaux/ctaux_accumulator.hpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -244,7 +244,7 @@ void CtauxAccumulator<device_t, Parameters, Data>::initialize(int dca_iteration)

		MC_accumulator_data::initialize(dca_iteration);

		if (dca_iteration == parameters_.get_dca_iterations() - 1 && parameters_.accumulateG4())
		if (dca_iteration == parameters_.get_dca_iterations() - 1 && parameters_.isAccumulatingG4())
		perform_tp_accumulation_ = true;

		for (int i = 0; i < visited_expansion_order_k.size(); i++)