STYLE: initializer_list instead of IStringStream for static list construction

This commit is contained in:
Mark Olesen
2017-07-07 12:54:54 +02:00
parent 51d46079df
commit acb5d54e41
7 changed files with 122 additions and 143 deletions

View File

@ -35,9 +35,9 @@ namespace Foam
// List of sub-dictionaries to rewrite // List of sub-dictionaries to rewrite
static const Foam::List<Foam::word> subDictNames static const Foam::List<Foam::word> subDictNames
( {
Foam::IStringStream("(preconditioner smoother)")() "preconditioner", "smoother"
); };
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //

View File

@ -32,9 +32,9 @@ License
template<class Type> template<class Type>
const Foam::wordList Foam::fv::SemiImplicitSource<Type>::volumeModeTypeNames_ const Foam::wordList Foam::fv::SemiImplicitSource<Type>::volumeModeTypeNames_
( {
IStringStream("(absolute specific)")() "absolute", "specific"
); };
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //

View File

@ -32,12 +32,10 @@ License
template<class CloudType> template<class CloudType>
Foam::wordList Foam::PatchInteractionModel<CloudType>::interactionTypeNames_ Foam::wordList Foam::PatchInteractionModel<CloudType>::interactionTypeNames_
( {
IStringStream "rebound", "stick", "escape"
( };
"(rebound stick escape)"
)()
);
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //

View File

@ -30,15 +30,9 @@ License
template<class CloudType> template<class CloudType>
const Foam::wordList Foam::PhaseChangeModel<CloudType>:: const Foam::wordList Foam::PhaseChangeModel<CloudType>::
enthalpyTransferTypeNames enthalpyTransferTypeNames
( {
IStringStream "latentHeat", "enthalpyDifference"
( };
"("
"latentHeat "
"enthalpyDifference"
")"
)()
);
// * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * * // // * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * * //

View File

@ -34,12 +34,9 @@ using namespace Foam::constant::mathematical;
template<class CloudType> template<class CloudType>
Foam::wordList Foam::ThermoSurfaceFilm<CloudType>::interactionTypeNames_ Foam::wordList Foam::ThermoSurfaceFilm<CloudType>::interactionTypeNames_
( {
IStringStream "absorb", "bounce", "splashBai"
( };
"(absorb bounce splashBai)"
)()
);
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //

View File

@ -83,18 +83,13 @@ Foam::AMIInterpolation<SourcePatch, TargetPatch>::wordTointerpolationMethod
{ {
interpolationMethod method = imDirect; interpolationMethod method = imDirect;
wordList methods const wordList methods
( {
IStringStream "directAMI",
( "mapNearestAMI",
"(" "faceAreaWeightAMI",
"directAMI " "partialFaceAreaWeightAMI"
"mapNearestAMI " };
"faceAreaWeightAMI "
"partialFaceAreaWeightAMI"
")"
)()
);
if (im == "directAMI") if (im == "directAMI")
{ {

View File

@ -32,110 +32,105 @@ using namespace Foam::constant;
const Foam::List<Foam::Tuple2<Foam::scalar, Foam::scalar>> const Foam::List<Foam::Tuple2<Foam::scalar, Foam::scalar>>
Foam::radiation::blackBodyEmission::emissivePowerTable Foam::radiation::blackBodyEmission::emissivePowerTable
( {
IStringStream { 1000, 0.00032 },
( { 1100, 0.00091 },
"(" { 1200, 0.00213 },
"( 1000 0.00032)" { 1300, 0.00432 },
"( 1100 0.00091)" { 1400, 0.00779 },
"( 1200 0.00213)" { 1500, 0.01280 },
"( 1300 0.00432)" { 1600, 0.01972 },
"( 1400 0.00779)" { 1700, 0.02853 },
"( 1500 0.01280)" { 1800, 0.03934 },
"( 1600 0.01972)" { 1900, 0.05210 },
"( 1700 0.02853)" { 2000, 0.06672 },
"( 1800 0.03934)" { 2100, 0.08305 },
"( 1900 0.05210)" { 2200, 0.10088 },
"( 2000 0.06672)" { 2300, 0.12002 },
"( 2100 0.08305)" { 2400, 0.14025 },
"( 2200 0.10088)" { 2500, 0.16135 },
"( 2300 0.12002)" { 2600, 0.18311 },
"( 2400 0.14025)" { 2700, 0.20535 },
"( 2500 0.16135)" { 2800, 0.22788 },
"( 2600 0.18311)" { 2900, 0.25055 },
"( 2700 0.20535)" { 3000, 0.27322 },
"( 2800 0.22788)" { 3100, 0.29576 },
"( 2900 0.25055)" { 3200, 0.31809 },
"( 3000 0.27322)" { 3300, 0.34009 },
"( 3100 0.29576)" { 3400, 0.36172 },
"( 3200 0.31809)" { 3500, 0.38290 },
"( 3300 0.34009)" { 3600, 0.40359 },
"( 3400 0.36172)" { 3700, 0.42375 },
"( 3500 0.38290)" { 3800, 0.44336 },
"( 3600 0.40359)" { 3900, 0.46240 },
"( 3700 0.42375)" { 4000, 0.48085 },
"( 3800 0.44336)" { 4100, 0.49872 },
"( 3900 0.46240)" { 4200, 0.51599 },
"( 4000 0.48085)" { 4300, 0.53267 },
"( 4100 0.49872)" { 4400, 0.54877 },
"( 4200 0.51599)" { 4500, 0.56429 },
"( 4300 0.53267)" { 4600, 0.57925 },
"( 4400 0.54877)" { 4700, 0.59366 },
"( 4500 0.56429)" { 4800, 0.60753 },
"( 4600 0.57925)" { 4900, 0.62088 },
"( 4700 0.59366)" { 5000, 0.63372 },
"( 4800 0.60753)" { 5100, 0.64606 },
"( 4900 0.62088)" { 5200, 0.65794 },
"( 5000 0.63372)" { 5300, 0.66935 },
"( 5100 0.64606)" { 5400, 0.68033 },
"( 5200 0.65794)" { 5500, 0.69087 },
"( 5300 0.66935)" { 5600, 0.70101 },
"( 5400 0.68033)" { 5700, 0.71076 },
"( 5500 0.69087)" { 5800, 0.72012 },
"( 5600 0.70101)" { 5900, 0.72913 },
"( 5700 0.71076)" { 6000, 0.73778 },
"( 5800 0.72012)" { 6100, 0.74610 },
"( 5900 0.72913)" { 6200, 0.75410 },
"( 6000 0.73778)" { 6300, 0.76180 },
"( 6100 0.74610)" { 6400, 0.76920 },
"( 6200 0.75410)" { 6500, 0.77631 },
"( 6300 0.76180)" { 6600, 0.78316 },
"( 6400 0.76920)" { 6700, 0.78975 },
"( 6500 0.77631)" { 6800, 0.79609 },
"( 6600 0.78316)" { 6900, 0.80219 },
"( 6700 0.78975)" { 7000, 0.80807 },
"( 6800 0.79609)" { 7100, 0.81373 },
"( 6900 0.80219)" { 7200, 0.81918 },
"( 7000 0.80807)" { 7300, 0.82443 },
"( 7100 0.81373)" { 7400, 0.82949 },
"( 7200 0.81918)" { 7500, 0.83436 },
"( 7300 0.82443)" { 7600, 0.83906 },
"( 7400 0.82949)" { 7700, 0.84359 },
"( 7500 0.83436)" { 7800, 0.84796 },
"( 7600 0.83906)" { 7900, 0.85218 },
"( 7700 0.84359)" { 8000, 0.85625 },
"( 7800 0.84796)" { 8100, 0.86017 },
"( 7900 0.85218)" { 8200, 0.86396 },
"( 8000 0.85625)" { 8300, 0.86762 },
"( 8100 0.86017)" { 8400, 0.87115 },
"( 8200 0.86396)" { 8500, 0.87456 },
"( 8300 0.86762)" { 8600, 0.87786 },
"( 8400 0.87115)" { 8700, 0.88105 },
"( 8500 0.87456)" { 8800, 0.88413 },
"( 8600 0.87786)" { 8900, 0.88711 },
"( 8700 0.88105)" { 9000, 0.88999 },
"( 8800 0.88413)" { 9100, 0.89277 },
"( 8900 0.88711)" { 9200, 0.89547 },
"( 9000 0.88999)" { 9300, 0.89807 },
"( 9100 0.89277)" { 9400, 0.90060 },
"( 9200 0.89547)" { 9500, 0.90304 },
"( 9300 0.89807)" { 9600, 0.90541 },
"( 9400 0.90060)" { 9700, 0.90770 },
"( 9500 0.90304)" { 9800, 0.90992 },
"( 9600 0.90541)" { 9900, 0.91207 },
"( 9700 0.90770)" { 10000, 0.91415 },
"( 9800 0.90992)" { 12000, 0.94505 },
"( 9900 0.91207)" { 15000, 0.96893 },
"(10000 0.91415)" { 20000, 0.98555 },
"(12000 0.94505)" { 30000, 0.99529 },
"(15000 0.96893)" { 40000, 0.99792 },
"(20000 0.98555)" { 50000, 0.99890 }
"(30000 0.99529)" };
"(40000 0.99792)"
"(50000 0.99890)"
")"
)()
);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //