Commit f5018ad0 by Francois Gygi

Rename file format variable

parent 9a9988cf
......@@ -51,7 +51,7 @@ void ExternalPotential::update(const ChargeDensity& cd)
vector<double> vext_read, vext_read_loc;
tm_read_vext.start();
if ( io_ == "cube" )
if ( fmt_ == "cube" )
{
// read cube file, n_'s are determined by cube file
if ( myrow == 0 )
......@@ -89,7 +89,7 @@ void ExternalPotential::update(const ChargeDensity& cd)
}
MPI_Bcast(&n_[0],3,MPI_INT,0,vcomm);
}
else if (io_ == "xml")
else if ( fmt_ == "xml" )
{
if (myrow == 0)
{
......
......@@ -39,15 +39,15 @@ class ExternalPotential
double amplitude_; // overall scaling factor of external potential
vector<double> vext_r_; // vext in real space
std::string filename_; // file name for external potential
std::string io_; // "cube", "base64_serial" or "base64_parallel"
std::string fmt_; // file format: "cube" or "xml"
public:
ExternalPotential(Sample& s, std::string name, std::string io="xml"):
ExternalPotential(Sample& s, std::string name, std::string fmt="xml"):
s_(s), filename_(name), ecut_(0.0), amplitude_(1.0), magnitude_(0.0),
io_(io)
fmt_(fmt)
{
assert( io_ == "cube" || io == "xml" );
assert( fmt_ == "cube" || fmt_ == "xml" );
}
~ExternalPotential() {}
......
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