Commit a45a0b60 by Michael Turner

Merge branch 'fix/nekmesh-config-default' into 'master'

fix/nekmesh-config-default

See merge request !823
parents 4189f8fc 11f32a2d
......@@ -36,6 +36,7 @@ v5.0.0
- Fix inverted triangles and small memory issue in surface meshing (!798)
- Update for the CAD system, more advance self-healing and analysis (!822)
- Additional curve types in GEO reader: BSpline, Circle, Ellipse (!800)
- Fix default command line argument value (!823)
**FieldConvert**:
- Add input module for Semtex field files (!777)
......
......@@ -855,7 +855,14 @@ void Module::RegisterConfig(string key, string val)
}
else
{
it->second.value = val;
if(val.size() == 0)
{
it->second.value = it->second.defValue;
}
else
{
it->second.value = val;
}
}
}
......
......@@ -160,7 +160,8 @@ namespace NekMeshUtils
NEKMESHUTILS_EXPORT Module(MeshSharedPtr p_m) : m_mesh(p_m) {}
NEKMESHUTILS_EXPORT virtual void Process() = 0;
NEKMESHUTILS_EXPORT void RegisterConfig(std::string key, std::string value);
NEKMESHUTILS_EXPORT void RegisterConfig(std::string key,
std::string value = std::string());
NEKMESHUTILS_EXPORT void PrintConfig();
NEKMESHUTILS_EXPORT void SetDefaults();
NEKMESHUTILS_EXPORT MeshSharedPtr GetMesh()
......
......@@ -235,7 +235,7 @@ int main(int argc, char* argv[])
if (tmp2.size() == 1)
{
mod->RegisterConfig(tmp2[0], "1");
mod->RegisterConfig(tmp2[0]);
}
else if (tmp2.size() == 2)
{
......
......@@ -54,7 +54,7 @@ ProcessJac::ProcessJac(MeshSharedPtr m) : ProcessModule(m)
m_config["extract"] =
ConfigOption(false, "0.0", "Extract non-valid elements from mesh.");
m_config["list"] = ConfigOption(
false, "0", "Print list of elements having negative Jacobian.");
true, "0", "Print list of elements having negative Jacobian.");
}
ProcessJac::~ProcessJac()
......
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 sign in to comment