Commit 4d3604b4 authored by kraus's avatar kraus

remove old hash method

parent d1dd3977
......@@ -21,10 +21,7 @@ public:
hash_input += arg;
}
// // append PID
// std::ostringstream pidStr;
// pidStr << world_pid;
hash_input += "_" + std::to_string(world_pid);//pidStr.str();
hash_input += "_" + std::to_string(world_pid);
std::hash<std::string> hashFunction;
size_t hash_value = hashFunction(hash_input);
......
......@@ -86,7 +86,6 @@ namespace {
AMR_YT_DUMP_FREQ,
#endif
MEMORYDUMP,
USEUUID,
SIZE
};
}
......@@ -251,9 +250,6 @@ Option::Option():
itsAttr[MEMORYDUMP] = Attributes::makeBool
("MEMORYDUMP", "If true, write memory to SDDS file", memoryDump);
itsAttr[USEUUID] = Attributes::makeBool
("USEUUID", "If true, uses UUID to create unique directory names", useUUID);
registerOwnership(AttributeHandler::STATEMENT);
FileStream::setEcho(echo);
......@@ -301,7 +297,6 @@ Option::Option(const std::string &name, Option *parent):
Attributes::setReal(itsAttr[AMR_YT_DUMP_FREQ], amrYtDumpFreq);
#endif
Attributes::setBool(itsAttr[MEMORYDUMP], memoryDump);
Attributes::setBool(itsAttr[USEUUID], useUUID);
}
......@@ -459,8 +454,6 @@ void Option::execute() {
if(Attributes::getBool(itsAttr[TELL])) {
*gmsg << "\nCurrent settings of options:\n" << *this << endl;
}
useUUID = Attributes::getBool(itsAttr[USEUUID]);
}
void Option::handlePsDumpFrame(const std::string &dumpFrame) {
......
......@@ -99,6 +99,4 @@ namespace Options {
#endif
bool memoryDump = false;
bool useUUID = true;
}
\ No newline at end of file
......@@ -148,8 +148,6 @@ namespace Options {
#endif
extern bool memoryDump;
extern bool useUUID;
}
#endif // OPAL_Options_HH
\ No newline at end of file
......@@ -15,7 +15,6 @@
#include "Util/SDDSReader.h"
#include "Util/SDDSParser/SDDSParserException.h"
#include "Util/OptPilotException.h"
#include "Util/HashNameGenerator.h"
#include "Util/NativeHashGenerator.h"
#include "Expression/SumErrSq.h"
......@@ -94,12 +93,7 @@ OpalSimulation::OpalSimulation(Expressions::Named_t objectives,
// hash the dictionary to get a short unique directory name for temporary
// simulation data
std::string hash;
if (Options::useUUID) {
hash = NativeHashGenerator::generate(dict);
} else {
hash = HashNameGenerator::generate(dict);
}
std::string hash = NativeHashGenerator::generate(dict);
std::ostringstream tmp;
tmp.precision(15);
......
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