Commit 868e1316 authored by Kirill Nikitin's avatar Kirill Nikitin

Various small fixes

Fix few compile warnings and a small bug in Element::Mean.
parent 601f715a
...@@ -1103,8 +1103,8 @@ namespace INMOST ...@@ -1103,8 +1103,8 @@ namespace INMOST
for(adjacent<Element>::iterator f = rfaces.begin(); f != rfaces.end(); f++) for(adjacent<Element>::iterator f = rfaces.begin(); f != rfaces.end(); f++)
{ {
adjacent<Node> nodes = f->getNodes(); adjacent<Node> nodes = f->getNodes();
n[k] = nodes.size(); int nn = n[k] = nodes.size();
for(int i = 0; i < n.back(); i++) for(int i = 0; i < nn; i++)
{ {
Storage::real_array a = nodes[i].Coords(); Storage::real_array a = nodes[i].Coords();
v.insert(v.end(),a.begin(),a.end()); v.insert(v.end(),a.begin(),a.end());
......
...@@ -798,7 +798,7 @@ namespace INMOST ...@@ -798,7 +798,7 @@ namespace INMOST
//~ #else //~ #else
std::vector<unsigned> sendsizeall(mpisize*2); std::vector<unsigned> sendsizeall(mpisize*2);
int pack_size2 = 0; int pack_size2 = 0;
unsigned usend[2] = {sendsize,pack_real.size()}; unsigned long usend[2] = {(unsigned)sendsize,pack_real.size()};
MPI_Pack_size(2,MPI_UNSIGNED,comm,&pack_size2); MPI_Pack_size(2,MPI_UNSIGNED,comm,&pack_size2);
for(unsigned k = 0; k < procs.size(); k++) for(unsigned k = 0; k < procs.size(); k++)
......
...@@ -11,7 +11,10 @@ ...@@ -11,7 +11,10 @@
//#undef REPORT_ILU_PROGRESS //#undef REPORT_ILU_PROGRESS
using namespace INMOST; using namespace INMOST;
#ifndef DEFAULT_TAU
#define DEFAULT_TAU 0.01 #define DEFAULT_TAU 0.01
#endif
#define REORDER_DDPQ #define REORDER_DDPQ
#define REORDER_NNZ #define REORDER_NNZ
#define DDPQ_TAU 0.8 //ratio is time consumed for factorization by time for schur complement calculation #define DDPQ_TAU 0.8 //ratio is time consumed for factorization by time for schur complement calculation
...@@ -1610,7 +1613,7 @@ public: ...@@ -1610,7 +1613,7 @@ public:
#elif defined(REPORT_ILU_PROGRESS) #elif defined(REPORT_ILU_PROGRESS)
if (k % 100 == 0) if (k % 100 == 0)
{ {
printf("%d %d/%d factor %6.2f%%\t\t\r",level_size.size(), cend,moend, 100.0f*(k - cbeg) / (float)(cend - cbeg)); printf("%lu %d/%d factor %6.2f%%\t\t\r",static_cast<unsigned long>(level_size.size()), cend,moend, 100.0f*(k - cbeg) / (float)(cend - cbeg));
//printf("%6.2f%% nnz LU %8d condition L %10f D %10f U %10f\r", 100.0f*(k - cbeg) / (float)(cend - cbeg), nzLU, NuL, NuD, NuU); //printf("%6.2f%% nnz LU %8d condition L %10f D %10f U %10f\r", 100.0f*(k - cbeg) / (float)(cend - cbeg), nzLU, NuL, NuD, NuU);
fflush(stdout); fflush(stdout);
} }
...@@ -1834,7 +1837,7 @@ public: ...@@ -1834,7 +1837,7 @@ public:
#if defined(REPORT_ILU_PROGRESS) #if defined(REPORT_ILU_PROGRESS)
if (i % 100 == 0) if (i % 100 == 0)
{ {
printf("%d %d/%d schur1 %6.2f%%\t\t\r", level_size.size(), cend,moend, 100.f*(i - cend) / (1.f*(wend - cend))); printf("%lu %d/%d schur1 %6.2f%%\t\t\r", static_cast<unsigned long>(level_size.size()), cend,moend, 100.f*(i - cend) / (1.f*(wend - cend)));
fflush(stdout); fflush(stdout);
} }
#endif #endif
...@@ -2074,7 +2077,7 @@ public: ...@@ -2074,7 +2077,7 @@ public:
#elif defined(REPORT_ILU_PROGRESS) #elif defined(REPORT_ILU_PROGRESS)
if (i % 100 == 0) if (i % 100 == 0)
{ {
printf("%d %d/%d schur2 %6.2f%%\t\t\r", level_size.size(),cend,moend,100.f*(i - cend) / (1.f*(wend - cend))); printf("%lu %d/%d schur2 %6.2f%%\t\t\r", static_cast<unsigned long>(level_size.size()),cend,moend,100.f*(i - cend) / (1.f*(wend - cend)));
fflush(stdout); fflush(stdout);
} }
#endif #endif
......
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