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
static const Foam::List<Foam::word> subDictNames
(
Foam::IStringStream("(preconditioner smoother)")()
);
{
"preconditioner", "smoother"
};
// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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