Commit da2df04a authored by maximilianlohoefer's avatar maximilianlohoefer
Browse files

removed unnecessary output

git-svn-id: https://svn.rwth-aachen.de/repos/sw440870_load_leveller/trunk@13 36cca2a8-63f0-4188-8a56-663e3b0d1cf3
parent 2549cd91
......@@ -289,22 +289,22 @@ void runner_pt :: M_global_update()
int b=i+1;
MPI_Send(&a, 1, MPI_INT, pt_node_order[i+1]+1, T_PARTNER, MPI_COMM_WORLD);
MPI_Send(&b , 1, MPI_INT, pt_node_order[i]+1, T_PARTNER, MPI_COMM_WORLD);
cerr<<"Send call to "<<pt_node_order[i+1]+1<<" and " << pt_node_order[i]+1<<"\n";
// cerr<<"Send call to "<<pt_node_order[i+1]+1<<" and " << pt_node_order[i]+1<<"\n";
MPI_Status stat;
double W1,W2;
MPI_Recv(&W1, 1, MPI_DOUBLE, pt_node_order[i+1]+1, T_WEIGHT, MPI_COMM_WORLD, &stat);
MPI_Recv(&W2, 1, MPI_DOUBLE, pt_node_order[i]+1, T_WEIGHT, MPI_COMM_WORLD, &stat);
cerr<<"Recieved weights"<<"\n";
// cerr<<"Recieved weights"<<"\n";
if(pt_rng->d()<exp(W1+W2)) {
int tmp = pt_node_order[i];
pt_node_order[i] = pt_node_order[i+1];
pt_node_order[i+1] = tmp;
++pt_accepted[i];
}
cerr<<"Send new positions"<<"\n";
// cerr<<"Send new positions"<<"\n";
MPI_Send(&b, 1, MPI_INT, pt_node_order[i+1]+1, T_PARTNER, MPI_COMM_WORLD);
MPI_Send(&a, 1, MPI_INT, pt_node_order[i]+1, T_PARTNER, MPI_COMM_WORLD);
cerr<<"Sending done"<<"\n";
// cerr<<"Sending done"<<"\n";
}
int tmp=-1;
for(int i = 1; i < world_size; i ++)
......@@ -452,11 +452,11 @@ void runner_pt :: merge_measurements()
b<<my_taskdir<<"/run"<<r<<".para"<< p<<".";
(*sys).measure[p-1].merge(b.str());
}
std::stringstream b,tb;
std::stringstream b;
b<<my_taskdir<<".para"<<p<<".out";
(*sys).write_output(b.str(),p-1);
tb<<my_taskdir<<".out";
(*sys).write_output(tb.str(),p-1);
// tb<<my_taskdir<<".out";
// (*sys).write_output(tb.str(),p-1);
(*sys).measure[p-1].clear(); //otherwise, we might run out of memory
}
(*STATUS) << my_rank << ": M " << my_taskdir << "\n";
......
Supports Markdown
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