diff --git a/src/OpenFOAM/global/argList/argList.H b/src/OpenFOAM/global/argList/argList.H index 45c8de16ec338d21ed5b8f1d86f12e5f117b65f1..2682803807cdc7afcf95dac50aae22824ea4d44e 100644 --- a/src/OpenFOAM/global/argList/argList.H +++ b/src/OpenFOAM/global/argList/argList.H @@ -234,35 +234,16 @@ public: //- Read a value from the named option template<class T> - T optionRead(const word& opt) const - { - T val; - optionLookup(opt)() >> val; - return val; - } + T optionRead(const word& opt) const; //- Read a value from the named option if present. // Return true if the named option was found. template<class T> - bool optionReadIfPresent(const word& opt, T& val) const - { - if (optionFound(opt)) - { - optionLookup(opt)() >> val; - return true; - } - else - { - return false; - } - } + bool optionReadIfPresent(const word& opt, T& val) const; //- Read a List of values from the named option template<class T> - List<T> optionReadList(const word& opt) const - { - return readList<T>(optionLookup(opt)()); - } + List<T> optionReadList(const word& opt) const; // Edit @@ -300,6 +281,12 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +#ifdef NoRepository +# include "argListTemplates.C" +#endif + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + #endif // ************************************************************************* // diff --git a/src/OpenFOAM/global/argList/argListTemplates.C b/src/OpenFOAM/global/argList/argListTemplates.C new file mode 100644 index 0000000000000000000000000000000000000000..8bc3da3469cebeca753e0b211523727e49503d56 --- /dev/null +++ b/src/OpenFOAM/global/argList/argListTemplates.C @@ -0,0 +1,63 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +\*---------------------------------------------------------------------------*/ + +#include "argList.H" + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +template<class T> +T Foam::argList::optionRead(const word& opt) const +{ + T val; + + optionLookup(opt)() >> val; + return val; +} + + +template<class T> +bool Foam::argList::optionReadIfPresent(const word& opt, T& val) const +{ + if (optionFound(opt)) + { + val = optionRead<T>(opt); + return true; + } + else + { + return false; + } +} + + +template<class T> +Foam::List<T> Foam::argList::optionReadList(const word& opt) const +{ + return readList<T>(optionLookup(opt)()); +} + + +// ************************************************************************* //