Commit 8f3d598d by Francois Gygi

Merge branch 'develop'

parents ba195fe8 51217eee
......@@ -208,8 +208,8 @@ BasisMapping::BasisMapping (const Basis &basis, int np0, int np1, int np2) :
if (hm < 0) hm += np0_;
if (km < 0) km += np1_;
zvec_to_val_.push_back(hp+np1_*kp);
zvec_to_val_.push_back(hm+np1_*km);
zvec_to_val_.push_back(hp+np0_*kp);
zvec_to_val_.push_back(hm+np0_*km);
}
}
else
......@@ -222,7 +222,7 @@ BasisMapping::BasisMapping (const Basis &basis, int np0, int np1, int np2) :
k = basis_.rod_k(0,irod);
if (h < 0) h += np0_;
if (k < 0) k += np1_;
zvec_to_val_.push_back(h+np1_*k);
zvec_to_val_.push_back(h+np0_*k);
}
}
}
......
......@@ -1362,6 +1362,7 @@ double ExchangeOperator::compute_exchange_at_gamma_(const Wavefunction &wf,
cout << setprecision(3);
cout << " ExchangeOperator: bisection time: "
<< tmb.real() << " s" << endl;
cout << setprecision(10);
}
} // if use_bisection_
......
......@@ -356,8 +356,10 @@ void Wavefunction::set_nrowmax(int n)
if ( n > ctxt_.size() )
{
if ( ctxt_.onpe0() )
cout << " Wavefunction::set_nrowmax: nrowmax > ctxt_.size()" << endl;
return;
cout << " Wavefunction::set_nrowmax: nrowmax > number of tasks" << endl
<< " Wavefunction::set_nrowmax: nrowmax set to "
<< ctxt_.size() << endl;
n = ctxt_.size();
}
deallocate();
......
......@@ -19,5 +19,5 @@
#include "release.h"
std::string release(void)
{
return std::string("rel1_71_3");
return std::string("rel1_71_3dev");
}
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