Commit bf0a9fc6 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

preserve macroFileInfo

parent 5647ca9b
...@@ -1220,12 +1220,14 @@ namespace AMDiS { ...@@ -1220,12 +1220,14 @@ namespace AMDiS {
string valueFilename(""); string valueFilename("");
string periodicFilename(""); string periodicFilename("");
int check = 1; int check = 1;
bool preserveMacroFileInfo = false;
Parameters::get(name + "->macro file name", macroFilename); Parameters::get(name + "->macro file name", macroFilename);
Parameters::get(name + "->value file name", valueFilename); Parameters::get(name + "->value file name", valueFilename);
Parameters::get(name + "->periodic file", periodicFilename); Parameters::get(name + "->periodic file", periodicFilename);
Parameters::get(name + "->check", check); Parameters::get(name + "->check", check);
Parameters::get(name + "->preserve coarse dofs", preserveCoarseDOFs); Parameters::get(name + "->preserve coarse dofs", preserveCoarseDOFs);
Parameters::get(name + "->preserve macroFileInfo", preserveMacroFileInfo);
TEST_EXIT(macroFilename.length()) TEST_EXIT(macroFilename.length())
("No mesh defined for parameter %s->macro file name !\n", name.c_str()); ("No mesh defined for parameter %s->macro file name !\n", name.c_str());
...@@ -1238,7 +1240,7 @@ namespace AMDiS { ...@@ -1238,7 +1240,7 @@ namespace AMDiS {
macroFileInfo = macroFileInfo =
MacroReader::readMacro(macroFilename, this, periodicFilename, check); MacroReader::readMacro(macroFilename, this, periodicFilename, check);
if (!valueFilename.length()) if (!valueFilename.length() && !preserveMacroFileInfo)
clearMacroFileInfo(); clearMacroFileInfo();
initialized = true; initialized = true;
......
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