Commit 57d93139 authored by frey_m's avatar frey_m
Browse files

use *.data()

parent d7850229
...@@ -707,8 +707,8 @@ void EnvelopeBunch::synchronizeSlices() { ...@@ -707,8 +707,8 @@ void EnvelopeBunch::synchronizeSlices() {
z_m[mySliceStartOffset_m+i] = slices_m[i]->p[SLI_z]; z_m[mySliceStartOffset_m+i] = slices_m[i]->p[SLI_z];
} }
allreduce(&(z_m[0]), numSlices_m, std::plus<double>()); allreduce(z_m.data(), numSlices_m, std::plus<double>());
allreduce(&(b_m[0]), numSlices_m, std::plus<double>()); allreduce(b_m.data(), numSlices_m, std::plus<double>());
} }
void EnvelopeBunch::calcI() { void EnvelopeBunch::calcI() {
...@@ -805,7 +805,7 @@ void EnvelopeBunch::calcI() { ...@@ -805,7 +805,7 @@ void EnvelopeBunch::calcI() {
} }
} }
allreduce(&(I1[0]), n1, std::plus<double>()); allreduce(I1.data(), n1, std::plus<double>());
for(int i = 1; i < n1 - 1; i++) { for(int i = 1; i < n1 - 1; i++) {
if(I1[i] == 0.0) if(I1[i] == 0.0)
I1[i] = I1[i-1]; I1[i] = I1[i-1];
...@@ -873,8 +873,8 @@ void EnvelopeBunch::calcI() { ...@@ -873,8 +873,8 @@ void EnvelopeBunch::calcI() {
} }
} }
//allreduce(&(z2_temp[0]), n1, std::plus<double>()); //allreduce(z2_temp.data(), n1, std::plus<double>());
//allreduce(&(I2_temp[0]), n1, std::plus<double>()); //allreduce(I2_temp.data(), n1, std::plus<double>());
////FIXME: we dont need copy of z2 and I2: z2[i-k] = z2[i]; ////FIXME: we dont need copy of z2 and I2: z2[i-k] = z2[i];
//int k = 0; //int k = 0;
...@@ -992,7 +992,7 @@ void EnvelopeBunch::cSpaceCharge() { ...@@ -992,7 +992,7 @@ void EnvelopeBunch::cSpaceCharge() {
return; return;
} }
allreduce(&xi[0], numSlices_m, std::plus<double>()); allreduce(xi.data(), numSlices_m, std::plus<double>());
allreduce(&sm, 1, std::plus<double>()); allreduce(&sm, 1, std::plus<double>());
A0 = sm / nVTot; A0 = sm / nVTot;
double dzMin = 5.0 * Physics::c * Q_m / (Imax * numSlices_m); double dzMin = 5.0 * Physics::c * Q_m / (Imax * numSlices_m);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment