Commit a08d0abe by Francois Gygi

changed namespace to fpmd


git-svn-id: http://qboxcode.org/svn/qb/trunk@434 cba15fb0-1239-40c8-b417-11db7ca47a34
parent 94b34632
......@@ -3,7 +3,7 @@
// SaveCmd.C:
//
////////////////////////////////////////////////////////////////////////////////
// $Id: SaveCmd.C,v 1.8 2004-08-11 17:56:24 fgygi Exp $
// $Id: SaveCmd.C,v 1.9 2006-03-07 07:36:57 fgygi Exp $
#include "SaveCmd.h"
......@@ -83,7 +83,7 @@ int SaveCmd::action(int argc, char **argv)
{
outfile = fopen(filename,"w");
string header("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
"<qbox:sample xmlns:qbox=\"");
"<fpmd:sample xmlns:fpmd=\"");
header += qbox_xmlns();
header += string("\"\n");
header += string(
......@@ -117,7 +117,7 @@ int SaveCmd::action(int argc, char **argv)
if ( ui->onpe0() )
{
char *trailer = "</qbox:sample>\n";
char *trailer = "</fpmd:sample>\n";
fwrite(trailer,sizeof(char),strlen(trailer),outfile);
fclose(outfile);
}
......@@ -131,7 +131,7 @@ int SaveCmd::action(int argc, char **argv)
os
<<"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
<<"<qbox:sample xmlns:qbox=\""
<<"<fpmd:sample xmlns:fpmd=\""
<< qbox_xmlns()
<< "\"\n"
<<" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
......@@ -153,7 +153,7 @@ int SaveCmd::action(int argc, char **argv)
}
if ( ui->onpe0() )
os << "</qbox:sample>" << endl;
os << "</fpmd:sample>" << endl;
os.close();
#endif
......
......@@ -14,6 +14,9 @@ Include current energy e0 in arguments of IonicStepper::compute_rp, in
addition to forces f0. Use e0 to backtrack when energy rises in the SDA alg.
--------------------------------------------------------------------------------
rel1_28_0
qb.C, SaveCmd.C, qbox_xmlns.C, xmlSpecies.C: change namespace to fpmd
--------------------------------------------------------------------------------
rel1_27_1
minor updates to make single-node version work.
--------------------------------------------------------------------------------
......
......@@ -3,7 +3,7 @@
// qb.C
//
////////////////////////////////////////////////////////////////////////////////
// $Id: qb.C,v 1.49 2006-03-07 07:23:36 fgygi Exp $
// $Id: qb.C,v 1.50 2006-03-07 07:36:57 fgygi Exp $
#include <iostream>
#include <string>
......@@ -114,25 +114,24 @@ int main(int argc, char **argv, char **envp)
{
cout << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl;
cout << "<!--\n\n";
cout << " ===========================\n";
cout << " ============================\n";
cout << " I qbox "
<< setw(17) << left << release() << " I\n";
cout << " I I\n";
cout << " I I\n";
cout << " I I\n";
cout << " I I\n";
cout << " I I\n";
cout << " I I\n";
cout << " I I\n";
cout << " I I\n";
cout << " I I\n";
cout << " I I\n";
cout << " I I\n";
cout << " I F.Gygi UC Davis I\n";
cout << " I Copyright 2005-2006 I\n";
cout << " ===========================\n\n";
<< setw(17) << left << release() << " I\n";
cout << " I I\n";
cout << " I I\n";
cout << " I I\n";
cout << " I I\n";
cout << " I I\n";
cout << " I I\n";
cout << " I I\n";
cout << " I I\n";
cout << " I I\n";
cout << " I I\n";
cout << " I F.Gygi, UC Davis I\n";
cout << " I Copyright (c) 2005-2006 I\n";
cout << " ============================\n\n";
cout << "-->\n";
cout << "<qbox:simulation xmlns:qbox=\"" << qbox_xmlns() << "\">" << endl;
cout << "<fpmd:simulation xmlns:fpmd=\"" << qbox_xmlns() << "\">" << endl;
cout << "<release> " << release() << " " << TARGET << " </release>" << endl;
// Identify executable name, checksum, size and link date
......@@ -275,7 +274,7 @@ int main(int argc, char **argv, char **envp)
{
cout << "<real_time> " << tm.real() << " </real_time>" << endl;
cout << "<end_time> " << isodate() << " </end_time>" << endl;
cout << "</qbox:simulation>" << endl;
cout << "</fpmd:simulation>" << endl;
}
} // end of Context scope
......
......@@ -3,10 +3,10 @@
// qbox_xmlns.C
//
////////////////////////////////////////////////////////////////////////////////
// $Id: qbox_xmlns.C,v 1.1 2004-08-11 17:56:24 fgygi Exp $
// $Id: qbox_xmlns.C,v 1.2 2006-03-07 07:36:57 fgygi Exp $
#include "qbox_xmlns.h"
std::string qbox_xmlns(void)
{
return std::string("http://www.llnl.gov/casc/fpmd/qbox/ns/qbox-1.0");
return std::string("http://www.quantum-simulation.org/ns/fpmd/fpmd-1.0");
}
......@@ -3,10 +3,10 @@
// release.C
//
////////////////////////////////////////////////////////////////////////////////
// $Id: release.C,v 1.26 2006-03-07 07:23:36 fgygi Exp $
// $Id: release.C,v 1.27 2006-03-07 07:36:57 fgygi Exp $
#include "release.h"
std::string release(void)
{
return std::string("1.27.1");
return std::string("1.28.0");
}
//
// xmlSpecies.C: transform a GP pseudopotential file into a qbox xml species
// xmlSpecies.C: transform a GP pseudopotential file into a fpmd xml species
//
// use: xmlSpecies < psfile > xmlfile
//
......@@ -45,7 +45,7 @@ int main(int argc, char **argv)
}
cout << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl;
cout << "<qbox:species xmlns:qbox=\""
cout << "<fpmd:species xmlns:fpmd=\""
<< qbox_xmlns()
<< "\"" << endl;
cout << " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " << endl;
......@@ -112,7 +112,7 @@ int main(int argc, char **argv)
}
cout << "</norm_conserving_pseudopotential>" << endl;
cout << "</qbox:species>" << endl;
cout << "</fpmd:species>" << endl;
return 0;
}
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