zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: add -opt-switch support for strings (eg, named enums) - issue #2222

Browse Source
This commit is contained in:
Mark Olesen
2022-08-24 13:01:48 +02:00
parent 500ec9dd12
commit 2a9e68c2bf
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/OpenFOAM/global/debug/simpleObjectRegistry.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2019-2021 OpenCFD Ltd.
Copyright (C) 2019-2022 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -107,21 +107,30 @@ void Foam::simpleObjectRegistry::setNamedValue
if (eq != std::string::npos)
{
std::string strval(name.substr(eq+1));
string strval(name.substr(eq+1));
name.erase(eq); // Truncate the name
float fvalue(val);
// Treat 'name=' like 'name' (ie, default value)
if (strval.length())
{
float fvalue(0);
if (Foam::readInt(strval, val))
{
tok = static_cast<label>(val);
if (Foam::readInt(strval, val))
{
// Parses as int
tok = static_cast<label>(val);
}
else if (Foam::readFloat(strval, fvalue))
{
// Parses as float
tok = fvalue;
}
else
{
// Accept 'name=string' for named enums,
tok = std::move(strval);
}
}
else if (Foam::readFloat(strval, fvalue))
{
tok = fvalue;
}
// Treat 'name=' like 'name' (ie, no value parameter)
// silently ignore 'name=junk', but could warn
}