biod.pnpi.spb.ru
/
alexxy
/
gromacs-testing.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
639dccd
)
remade output info
author
Anatoly Titov
<toluk@omrb.pnpi.spb.ru>
Tue, 16 May 2017 22:27:02 +0000
(
01:27
+0300)
committer
Anatoly Titov
<toluk@omrb.pnpi.spb.ru>
Tue, 16 May 2017 22:27:02 +0000
(
01:27
+0300)
src/spacetimecorr.cpp
patch
|
blob
|
history
diff --git
a/src/spacetimecorr.cpp
b/src/spacetimecorr.cpp
index 27b1aa537af0dbf28ff9c24ba69d00639ce63af8..cf65838d4b36b673e2e5f29034aa193e7e521185 100644
(file)
--- a/
src/spacetimecorr.cpp
+++ b/
src/spacetimecorr.cpp
@@
-452,11
+452,12
@@
Domains::finishAnalysis(int nframes)
}
}
}
}
+ std::cout << "\n" ;
#pragma omp parallel
{
#pragma omp for schedule(dynamic)
for (int i = m; i <= k; i += 1) {
#pragma omp parallel
{
#pragma omp for schedule(dynamic)
for (int i = m; i <= k; i += 1) {
- std::cout << "
\n " << " k = " << i << " \n
";
+ std::cout << "
k = " << i << "
";
rvec *medx, *medy, temp_zero;
snew(medx, index.size());
rvec *medx, *medy, temp_zero;
snew(medx, index.size());
@@
-523,10
+524,11
@@
Domains::finishAnalysis(int nframes)
sfree(medy);
}
}
sfree(medy);
}
}
+ std::cout << "\n" ;
//make_correlation_file(crltns, "corrs.txt", m);
//make_correlation_file(crltns, "corrs.txt", m);
- for (int i1 =
20; i1 < 7
0; i1++) {
+ for (int i1 =
0; i1 < 10
0; i1++) {
int i5 = 0;
for (int i2 = 1; i2 < crltns.size(); i2++) {
for (int i3 = 0; i3 < crltns[i2].size(); i3++) {
int i5 = 0;
for (int i2 = 1; i2 < crltns.size(); i2++) {
for (int i3 = 0; i3 < crltns[i2].size(); i3++) {
@@
-537,10
+539,13
@@
Domains::finishAnalysis(int nframes)
}
}
}
}
}
}
- std::cout << i1 << " - " << i5 << "\n";
+ std::cout << i1 << " - " << i5 << " ";
+ if (i % 10 == 0) {
+ std::cout << "\n" ;
+ }
}
}
- std::cout << "\n\n
\n
";
+ std::cout << "\n\n";
std::vector< std::vector< int > > graph;
graph.resize(index.size());
std::vector< std::vector< int > > graph;
graph.resize(index.size());
@@
-577,7
+582,7
@@
Domains::finishAnalysis(int nframes)
rout_old[i].resize(1, i);
}
rout_old[i].resize(1, i);
}
- std::cout << "building routs\n" ;
+ std::cout << "building routs\n
\n
" ;
while (flag) {
flag = false;
while (flag) {
flag = false;
@@
-650,7
+655,7
@@
Domains::finishAnalysis(int nframes)
}*/
}*/
- std::cout << "\n test old \n";
+
/*
std::cout << "\n test old \n";
for (int i = 0; i < rout_old.size(); i++) {
for (int j = 0; j < rout_old[i].size(); j++) {
std::cout << index[rout_old[i][j]] << " ";
for (int i = 0; i < rout_old.size(); i++) {
for (int j = 0; j < rout_old[i].size(); j++) {
std::cout << index[rout_old[i][j]] << " ";
@@
-658,7
+663,7
@@
Domains::finishAnalysis(int nframes)
std::cout << "\n";
}
std::cout << "\n";
}
- std::cout << "\n test new \n";
+ std::cout << "\n test new \n";
*/
rout_new.resize(0);
for (int i = rout_old.size() - 1; i >= 0; i--) {
rout_new.resize(0);
for (int i = rout_old.size() - 1; i >= 0; i--) {