diff --git a/src/randomProcesses/fft/fft.C b/src/randomProcesses/fft/fft.C index 0898d40e85..21e7fd85c4 100644 --- a/src/randomProcesses/fft/fft.C +++ b/src/randomProcesses/fft/fft.C @@ -144,8 +144,8 @@ Foam::fft::realTransform1D(const scalarField& field) fftw_execute(plan); // field[0] = DC component - tmp tresult(new complexField(nBy2 + 1)); - complexField& result = tresult.ref(); + auto tresult = tmp::New(nBy2 + 1); + auto& result = tresult.ref(); result[0].Re() = out[0]; result[nBy2].Re() = out[nBy2]; @@ -237,7 +237,7 @@ Foam::tmp Foam::fft::forwardTransform const UList& nn ) { - tmp tresult(new complexField(tfield)); + auto tresult = tmp::New(tfield); transform(tresult.ref(), nn, FORWARD_TRANSFORM); @@ -253,7 +253,7 @@ Foam::tmp Foam::fft::reverseTransform const UList& nn ) { - tmp tresult(new complexField(tfield)); + auto tresult = tmp::New(tfield); transform(tresult.ref(), nn, REVERSE_TRANSFORM); diff --git a/src/randomProcesses/noise/noiseFFT/noiseFFT.C b/src/randomProcesses/noise/noiseFFT/noiseFFT.C index 0ed5706f25..3d5b77c4ca 100644 --- a/src/randomProcesses/noise/noiseFFT/noiseFFT.C +++ b/src/randomProcesses/noise/noiseFFT/noiseFFT.C @@ -43,10 +43,10 @@ Foam::tmp Foam::noiseFFT::frequencies const scalar deltaT ) { - tmp tf(new scalarField(N/2, 0)); - scalarField& f = tf.ref(); + auto tf = tmp::New(N/2, Zero); + auto& f = tf.ref(); - scalar deltaf = 1.0/(N*deltaT); + const scalar deltaf = 1.0/(N*deltaT); forAll(f, i) { f[i] = i*deltaf; @@ -297,8 +297,8 @@ Foam::tmp Foam::noiseFFT::Pf const label n = planInfo_.windowSize; const label nBy2 = n/2; - tmp tresult(new scalarField(nBy2 + 1)); - scalarField& result = tresult.ref(); + auto tresult = tmp::New(nBy2 + 1); + auto& result = tresult.ref(); // 0 th value = DC component // nBy2 th value = real only if n is even @@ -312,10 +312,8 @@ Foam::tmp Foam::noiseFFT::Pf return tresult; } - else - { - return mag(fft::realTransform1D(tpn)); - } + + return mag(fft::realTransform1D(tpn)); } diff --git a/src/randomProcesses/noise/noiseFFT/noiseFFT.H b/src/randomProcesses/noise/noiseFFT/noiseFFT.H index 92997bf992..f1d2a99bb0 100644 --- a/src/randomProcesses/noise/noiseFFT/noiseFFT.H +++ b/src/randomProcesses/noise/noiseFFT/noiseFFT.H @@ -109,7 +109,7 @@ public: //- Construct from pressure field noiseFFT(const scalar deltaT, const label windowSize = -1); - //- Destructor + //- Destructor. Cleanup/destroy plan ~noiseFFT(); diff --git a/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.C b/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.C index 26d08d2354..b65541cfe5 100644 --- a/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.C +++ b/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.C @@ -183,12 +183,6 @@ Foam::noiseModel::noiseModel(const dictionary& dict, const bool readFields) } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::noiseModel::~noiseModel() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // bool Foam::noiseModel::read(const dictionary& dict) diff --git a/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.H b/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.H index 02e403cf18..d295d73ab5 100644 --- a/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.H +++ b/src/randomProcesses/noise/noiseModels/noiseModel/noiseModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015-2017 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2015-2018 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -66,7 +66,6 @@ Description writeOctaves | Write octaves data | no | yes \endtable - SourceFiles noiseModel.C @@ -92,18 +91,6 @@ namespace Foam class noiseModel { - -private: - - // Private Member Functions - - //- No copy construct - noiseModel(const noiseModel&) = delete; - - //- No copy assignment - void operator=(const noiseModel&) = delete; - - protected: // Protected Data @@ -196,6 +183,13 @@ protected: fileName baseFileDir(const label dataseti) const; + //- No copy construct + noiseModel(const noiseModel&) = delete; + + //- No copy assignment + void operator=(const noiseModel&) = delete; + + public: //- Runtime type information @@ -220,7 +214,7 @@ public: noiseModel(const dictionary& dict, const bool readFields = true); //- Destructor - virtual ~noiseModel(); + virtual ~noiseModel() = default; // Public Member Functions diff --git a/src/randomProcesses/noise/noiseModels/noiseModel/noiseModelNew.C b/src/randomProcesses/noise/noiseModels/noiseModel/noiseModelNew.C index 9ebd3e518b..5867a75e69 100644 --- a/src/randomProcesses/noise/noiseModels/noiseModel/noiseModelNew.C +++ b/src/randomProcesses/noise/noiseModels/noiseModel/noiseModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2016 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2016-2018 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,7 +29,7 @@ License Foam::autoPtr Foam::noiseModel::New(const dictionary& dict) { - const word modelType(dict.lookup("noiseModel")); + const word modelType(dict.get("noiseModel")); Info<< "Selecting noiseModel " << modelType << endl; diff --git a/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.C b/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.C index 3a58db4cd2..844e3e4572 100644 --- a/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.C +++ b/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015-2017 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2015-2018 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -226,12 +226,6 @@ pointNoise::pointNoise(const dictionary& dict, const bool readFields) } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -pointNoise::~pointNoise() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // void pointNoise::calculate() @@ -242,7 +236,6 @@ void pointNoise::calculate() return; } - forAll(inputFileNames_, filei) { fileName fName = inputFileNames_[filei]; @@ -264,10 +257,10 @@ bool pointNoise::read(const dictionary& dict) { if (!dict.readIfPresent("files", inputFileNames_)) { - inputFileNames_.setSize(1); + inputFileNames_.resize(1); // Note: lookup uses same keyword as used by the CSV constructor - dict.lookup("file") >> inputFileNames_[0]; + dict.read("file", inputFileNames_.first()); } return true; diff --git a/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.H b/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.H index 1a860fe8e2..4c8ed0ff6f 100644 --- a/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.H +++ b/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.H @@ -130,7 +130,7 @@ public: pointNoise(const dictionary& dict, const bool readFields = true); //- Destructor - virtual ~pointNoise(); + virtual ~pointNoise() = default; // Public Member Functions diff --git a/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C b/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C index 1ad148d303..44e867bf85 100644 --- a/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C +++ b/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C @@ -428,22 +428,18 @@ bool surfaceNoise::read(const dictionary& dict) { if (noiseModel::read(dict)) { - if (dict.found("file")) + if (!dict.readIfPresent("files", inputFileNames_)) { - inputFileNames_.setSize(1); - dict.lookup("file") >> inputFileNames_[0]; - } - else - { - dict.lookup("files") >> inputFileNames_; + inputFileNames_.resize(1); + dict.read("file", inputFileNames_.first()); } dict.readIfPresent("fftWriteInterval", fftWriteInterval_); dict.readIfPresent("p", pName_); - dict.lookup("reader") >> readerType_; + dict.read("reader", readerType_); - word writerType(dict.lookup("writer")); + const word writerType(dict.get("writer")); dictionary optDict ( dict.subOrEmptyDict("writeOptions").subOrEmptyDict(writerType) diff --git a/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.H b/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.H index 6cb08327ea..55d4e6e334 100644 --- a/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.H +++ b/src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015-2017 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2015-2018 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/randomProcesses/processes/UOprocess/UOprocess.C b/src/randomProcesses/processes/UOprocess/UOprocess.C index 800d79025f..aa36bfddf8 100644 --- a/src/randomProcesses/processes/UOprocess/UOprocess.C +++ b/src/randomProcesses/processes/UOprocess/UOprocess.C @@ -63,10 +63,10 @@ UOprocess::UOprocess RootDeltaT(sqrt(DeltaT)), UOfield(Mesh.size()), - Alpha(readScalar(UOdict.lookup("UOalpha"))), - Sigma(readScalar(UOdict.lookup("UOsigma"))), - Kupper(readScalar(UOdict.lookup("UOKupper"))), - Klower(readScalar(UOdict.lookup("UOKlower"))), + Alpha(UOdict.get("UOalpha")), + Sigma(UOdict.get("UOsigma")), + Kupper(UOdict.get("UOKupper")), + Klower(UOdict.get("UOKlower")), Scale((Kupper - Klower)*pow(scalar(Mesh.size()), 1.0/vector::dim)) { const vectorField& K = Mesh; diff --git a/src/randomProcesses/windowModels/Hanning/Hanning.C b/src/randomProcesses/windowModels/Hanning/Hanning.C index 4ede8d7d3b..e319e2ccf0 100644 --- a/src/randomProcesses/windowModels/Hanning/Hanning.C +++ b/src/randomProcesses/windowModels/Hanning/Hanning.C @@ -45,13 +45,13 @@ addToRunTimeSelectionTable(windowModel, Hanning, dictionary); Hanning::Hanning(const dictionary& dict, const label nSamples) : windowModel(dict, nSamples), - symmetric_(readBool(dict.lookup("symmetric"))), - extended_(readBool(dict.lookup("extended"))), + symmetric_(dict.get("symmetric")), + extended_(dict.get("extended")), alpha_(dict.lookupOrDefault("alpha", 0.5)) // Hamming = 0.54 { // Extend range if required - label offset = extended_ ? 1 : 0; - scalar m = nSamples - 1 + 2*offset; + const label offset = extended_ ? 1 : 0; + const scalar m = nSamples - 1 + 2*offset; scalarField t(nSamples); forAll(t, i) @@ -81,19 +81,13 @@ Hanning::Hanning(const dictionary& dict, const label nSamples) } } - scalar sumSqr = sum(sqr(wf)); + const scalar sumSqr = sum(sqr(wf)); // Normalisation wf *= sqrt(nSamples/sumSqr); } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Hanning::~Hanning() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // bool Hanning::symmetric() const diff --git a/src/randomProcesses/windowModels/Hanning/Hanning.H b/src/randomProcesses/windowModels/Hanning/Hanning.H index 83d75961eb..96fc18f991 100644 --- a/src/randomProcesses/windowModels/Hanning/Hanning.H +++ b/src/randomProcesses/windowModels/Hanning/Hanning.H @@ -97,7 +97,7 @@ public: Hanning(const dictionary& dict, const label nSamples); //- Destructor - virtual ~Hanning(); + virtual ~Hanning() = default; // Public Member Functions diff --git a/src/randomProcesses/windowModels/uniform/uniform.C b/src/randomProcesses/windowModels/uniform/uniform.C index 6bc75b31a8..943645cd5d 100644 --- a/src/randomProcesses/windowModels/uniform/uniform.C +++ b/src/randomProcesses/windowModels/uniform/uniform.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2016 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2016-2018 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,19 +45,13 @@ addToRunTimeSelectionTable(windowModel, uniform, dictionary); uniform::uniform(const dictionary& dict, const label nSamples) : windowModel(dict, nSamples), - value_(readScalar(dict.lookup("value"))) + value_(dict.get("value")) { scalarField& wf = *this; wf = value_; } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -uniform::~uniform() -{} - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace windowModels diff --git a/src/randomProcesses/windowModels/uniform/uniform.H b/src/randomProcesses/windowModels/uniform/uniform.H index a690591b20..e8f1421a1b 100644 --- a/src/randomProcesses/windowModels/uniform/uniform.H +++ b/src/randomProcesses/windowModels/uniform/uniform.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2016 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2016-2018 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -73,7 +73,7 @@ public: uniform(const dictionary& dict, const label nSamples); //- Destructor - virtual ~uniform(); + virtual ~uniform() = default; }; diff --git a/src/randomProcesses/windowModels/windowModel/windowModel.C b/src/randomProcesses/windowModels/windowModel/windowModel.C index dcaae9afd9..3012809d71 100644 --- a/src/randomProcesses/windowModels/windowModel/windowModel.C +++ b/src/randomProcesses/windowModels/windowModel/windowModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015-2016 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2015-2018 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -42,17 +42,13 @@ Foam::windowModel::windowModel(const dictionary& dict, const label nSamples) nOverlapSamples_(0), nWindow_(dict.lookupOrDefault("nWindow", -1)) { - scalar prc = readScalar(dict.lookup("overlapPercent")); - nOverlapSamples_ = floor(prc/scalar(100)*nSamples); + nOverlapSamples_ = floor + ( + dict.get("overlapPercent")/scalar(100)*nSamples + ); } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::windowModel::~windowModel() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // Foam::label Foam::windowModel::nSamples() const @@ -87,7 +83,7 @@ Foam::label Foam::windowModel::validate(const label nSamplesTotal) << exit(FatalError); } - label nWindowAvailable = nWindowsTotal(nSamplesTotal); + const label nWindowAvailable = nWindowsTotal(nSamplesTotal); if (nWindow_ == -1) { @@ -107,7 +103,7 @@ Foam::label Foam::windowModel::validate(const label nSamplesTotal) << exit(FatalError); } - label nRequiredSamples = + const label nRequiredSamples = nWindow_*nSamples - (nWindow_ - 1)*nOverlapSamples_; Info<< "Windowing:" << nl diff --git a/src/randomProcesses/windowModels/windowModel/windowModel.H b/src/randomProcesses/windowModels/windowModel/windowModel.H index 7d0115b2be..10468a2e61 100644 --- a/src/randomProcesses/windowModels/windowModel/windowModel.H +++ b/src/randomProcesses/windowModels/windowModel/windowModel.H @@ -2,8 +2,8 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2016-2018 OpenCFD Ltd. + \\/ M anipulation | ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -98,7 +98,7 @@ public: //- Destructor - virtual ~windowModel(); + virtual ~windowModel() = default; // Public Member Functions diff --git a/src/randomProcesses/windowModels/windowModel/windowModelNew.C b/src/randomProcesses/windowModels/windowModel/windowModelNew.C index fad8be3d92..18a9ce5001 100644 --- a/src/randomProcesses/windowModels/windowModel/windowModelNew.C +++ b/src/randomProcesses/windowModels/windowModel/windowModelNew.C @@ -33,7 +33,7 @@ Foam::autoPtr Foam::windowModel::New const label nSamples ) { - const word modelType(dict.lookup("windowModel")); + const word modelType(dict.get("windowModel")); Info<< "Selecting windowModel " << modelType << endl; @@ -53,7 +53,6 @@ Foam::autoPtr Foam::windowModel::New ( cstrIter()(dict.subDict(modelType + "Coeffs"), nSamples) ); - } diff --git a/src/randomProcesses/windowModels/windowModel/windowModelTemplates.C b/src/randomProcesses/windowModels/windowModel/windowModelTemplates.C index 90f9971381..8c4c09cc9e 100644 --- a/src/randomProcesses/windowModels/windowModel/windowModelTemplates.C +++ b/src/randomProcesses/windowModels/windowModel/windowModelTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015-2016 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2015-2018 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,8 +48,8 @@ Foam::tmp> Foam::windowModel::apply } - tmp> tresult(new Field(nSamples, pTraits::zero)); - Field& result = tresult.ref(); + auto tresult = tmp>::New(nSamples, Zero); + auto& result = tresult.ref(); label nWindow = nWindowsTotal(fld.size()); if (windowI >= nWindow) diff --git a/src/waveModels/fvOptions/multiphaseMangrovesSource/multiphaseMangrovesSource.C b/src/waveModels/fvOptions/multiphaseMangrovesSource/multiphaseMangrovesSource.C index d7555afbb1..676103b834 100644 --- a/src/waveModels/fvOptions/multiphaseMangrovesSource/multiphaseMangrovesSource.C +++ b/src/waveModels/fvOptions/multiphaseMangrovesSource/multiphaseMangrovesSource.C @@ -53,7 +53,7 @@ namespace fv Foam::tmp Foam::fv::multiphaseMangrovesSource::dragCoeff(const volVectorField& U) const { - tmp tdragCoeff = tmp::New + auto tdragCoeff = tmp::New ( IOobject ( @@ -66,8 +66,7 @@ Foam::fv::multiphaseMangrovesSource::dragCoeff(const volVectorField& U) const mesh_, dimensionedScalar(dimless/dimTime, Zero) ); - - volScalarField& dragCoeff = tdragCoeff.ref(); + auto& dragCoeff = tdragCoeff.ref(); forAll(zoneIDs_, i) { @@ -99,7 +98,7 @@ Foam::fv::multiphaseMangrovesSource::dragCoeff(const volVectorField& U) const Foam::tmp Foam::fv::multiphaseMangrovesSource::inertiaCoeff() const { - tmp tinertiaCoeff = tmp::New + auto tinertiaCoeff = tmp::New ( IOobject ( @@ -112,8 +111,7 @@ Foam::fv::multiphaseMangrovesSource::inertiaCoeff() const mesh_, dimensionedScalar(dimless, Zero) ); - - volScalarField& inertiaCoeff = tinertiaCoeff.ref(); + auto& inertiaCoeff = tinertiaCoeff.ref(); const scalar pi = constant::mathematical::pi; @@ -229,7 +227,7 @@ bool Foam::fv::multiphaseMangrovesSource::read(const dictionary& dict) const word& regionName = regionNames[i]; const dictionary& modelDict = regionsDict.subDict(regionName); - const word& zoneName = modelDict.lookup("cellZone"); + const word zoneName(modelDict.get("cellZone")); zoneIDs_[i] = mesh_.cellZones().findIndices(zoneName); if (zoneIDs_[i].empty()) { @@ -239,18 +237,16 @@ bool Foam::fv::multiphaseMangrovesSource::read(const dictionary& dict) << exit(FatalError); } - modelDict.lookup("a") >> aZone_[i]; - modelDict.lookup("N") >> NZone_[i]; - modelDict.lookup("Cm") >> CmZone_[i]; - modelDict.lookup("Cd") >> CdZone_[i]; + modelDict.read("a", aZone_[i]); + modelDict.read("N", NZone_[i]); + modelDict.read("Cm", CmZone_[i]); + modelDict.read("Cd", CdZone_[i]); } return true; } - else - { - return false; - } + + return false; } diff --git a/src/waveModels/fvOptions/multiphaseMangrovesSource/multiphaseMangrovesSource.H b/src/waveModels/fvOptions/multiphaseMangrovesSource/multiphaseMangrovesSource.H index 217eb3f16d..77bfe7a290 100644 --- a/src/waveModels/fvOptions/multiphaseMangrovesSource/multiphaseMangrovesSource.H +++ b/src/waveModels/fvOptions/multiphaseMangrovesSource/multiphaseMangrovesSource.H @@ -47,12 +47,12 @@ SourceFiles namespace Foam { +// Forward declarations class MangrovesModel; namespace fv { - /*---------------------------------------------------------------------------*\ Class multiphaseMangrovesSource Declaration \*---------------------------------------------------------------------------*/ @@ -63,12 +63,11 @@ class multiphaseMangrovesSource { // Private Member Functions - //- Disallow default bitwise copy construct - multiphaseMangrovesSource(const multiphaseMangrovesSource&); - - //- Disallow default bitwise assignment - void operator=(const multiphaseMangrovesSource&); + //- No copy construct + multiphaseMangrovesSource(const multiphaseMangrovesSource&) = delete; + //- No copy assignment + void operator=(const multiphaseMangrovesSource&) = delete; protected: @@ -124,8 +123,7 @@ public: //- Destructor - virtual ~multiphaseMangrovesSource() - {} + virtual ~multiphaseMangrovesSource() = default; // Member Functions diff --git a/src/waveModels/fvOptions/multiphaseMangrovesTurbulenceModel/multiphaseMangrovesTurbulenceModel.C b/src/waveModels/fvOptions/multiphaseMangrovesTurbulenceModel/multiphaseMangrovesTurbulenceModel.C index 01a1083b2a..3e51f32524 100644 --- a/src/waveModels/fvOptions/multiphaseMangrovesTurbulenceModel/multiphaseMangrovesTurbulenceModel.C +++ b/src/waveModels/fvOptions/multiphaseMangrovesTurbulenceModel/multiphaseMangrovesTurbulenceModel.C @@ -55,7 +55,7 @@ Foam::fv::multiphaseMangrovesTurbulenceModel::kCoeff const volVectorField& U ) const { - tmp tkCoeff = tmp::New + auto tkCoeff = tmp::New ( IOobject ( @@ -101,7 +101,7 @@ Foam::fv::multiphaseMangrovesTurbulenceModel::epsilonCoeff const volVectorField& U ) const { - tmp tepsilonCoeff = tmp::New + auto tepsilonCoeff = tmp::New ( IOobject ( @@ -177,16 +177,16 @@ void Foam::fv::multiphaseMangrovesTurbulenceModel::addSup if (eqn.psi().name() == epsilonName_) { - fvMatrix epsilonEqn - ( + fvMatrix epsilonEqn + ( - fvm::Sp(epsilonCoeff(U), eqn.psi()) ); eqn += epsilonEqn; } else if (eqn.psi().name() == kName_) { - fvMatrix kEqn - ( + fvMatrix kEqn + ( - fvm::Sp(kCoeff(U), eqn.psi()) ); eqn += kEqn; @@ -258,7 +258,8 @@ bool Foam::fv::multiphaseMangrovesTurbulenceModel::read(const dictionary& dict) const word& regionName = regionNames[i]; const dictionary& modelDict = regionsDict.subDict(regionName); - const word& zoneName = modelDict.lookup("cellZone"); + const word zoneName(modelDict.get("cellZone")); + zoneIDs_[i] = mesh_.cellZones().findIndices(zoneName); if (zoneIDs_[i].empty()) { @@ -268,19 +269,17 @@ bool Foam::fv::multiphaseMangrovesTurbulenceModel::read(const dictionary& dict) << exit(FatalError); } - modelDict.lookup("a") >> aZone_[i]; - modelDict.lookup("N") >> NZone_[i]; - modelDict.lookup("Ckp") >> CkpZone_[i]; - modelDict.lookup("Cep") >> CepZone_[i]; - modelDict.lookup("Cd") >> CdZone_[i]; + modelDict.read("a", aZone_[i]); + modelDict.read("N", NZone_[i]); + modelDict.read("Ckp", CkpZone_[i]); + modelDict.read("Cep", CepZone_[i]); + modelDict.read("Cd", CdZone_[i]); } return true; } - else - { - return false; - } + + return false; } diff --git a/src/waveModels/fvOptions/multiphaseMangrovesTurbulenceModel/multiphaseMangrovesTurbulenceModel.H b/src/waveModels/fvOptions/multiphaseMangrovesTurbulenceModel/multiphaseMangrovesTurbulenceModel.H index 00f3b54c47..fc0848512e 100644 --- a/src/waveModels/fvOptions/multiphaseMangrovesTurbulenceModel/multiphaseMangrovesTurbulenceModel.H +++ b/src/waveModels/fvOptions/multiphaseMangrovesTurbulenceModel/multiphaseMangrovesTurbulenceModel.H @@ -50,7 +50,6 @@ namespace Foam namespace fv { - /*---------------------------------------------------------------------------*\ Class multiphaseMangrovesTurbulenceModel Declaration \*---------------------------------------------------------------------------*/ @@ -61,14 +60,14 @@ class multiphaseMangrovesTurbulenceModel { // Private Member Functions - //- Disallow default bitwise copy construct + //- No copy construct multiphaseMangrovesTurbulenceModel ( const multiphaseMangrovesTurbulenceModel& - ); + ) = delete; - //- Disallow default bitwise assignment - void operator=(const multiphaseMangrovesTurbulenceModel&); + //- No copy assignment + void operator=(const multiphaseMangrovesTurbulenceModel&) = delete; @@ -137,8 +136,7 @@ public: //- Destructor - virtual ~multiphaseMangrovesTurbulenceModel() - {} + virtual ~multiphaseMangrovesTurbulenceModel() = default; // Member Functions diff --git a/src/waveModels/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C b/src/waveModels/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C index 1cadfeefa0..799fddd547 100644 --- a/src/waveModels/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C +++ b/src/waveModels/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.C @@ -43,7 +43,7 @@ Foam::scalar Foam::waveModels::waveAbsorptionModel::timeCoeff const scalar t ) const { - // No time ramping applied applied for absorption + // No time ramping applied for absorption return 1; } @@ -67,12 +67,6 @@ Foam::waveModels::waveAbsorptionModel::waveAbsorptionModel } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::waveModels::waveAbsorptionModel::~waveAbsorptionModel() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // bool Foam::waveModels::waveAbsorptionModel::readDict diff --git a/src/waveModels/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H b/src/waveModels/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H index e30b6b5ee7..9c6dd33d24 100644 --- a/src/waveModels/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H +++ b/src/waveModels/waveAbsorptionModels/base/waveAbsorptionModel/waveAbsorptionModel.H @@ -71,7 +71,7 @@ public: ); //- Destructor - virtual ~waveAbsorptionModel(); + virtual ~waveAbsorptionModel() = default; // Public Member Functions diff --git a/src/waveModels/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C b/src/waveModels/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C index e4e47820fb..42d2ef2aad 100644 --- a/src/waveModels/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C +++ b/src/waveModels/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.C @@ -101,12 +101,6 @@ Foam::waveModels::shallowWaterAbsorption::shallowWaterAbsorption } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::waveModels::shallowWaterAbsorption::~shallowWaterAbsorption() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // bool Foam::waveModels::shallowWaterAbsorption::readDict diff --git a/src/waveModels/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.H b/src/waveModels/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.H index e390fbfff0..bd9cab7c77 100644 --- a/src/waveModels/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.H +++ b/src/waveModels/waveAbsorptionModels/derived/shallowWaterAbsorption/shallowWaterAbsorption.H @@ -88,7 +88,7 @@ public: ); //- Destructor - virtual ~shallowWaterAbsorption(); + virtual ~shallowWaterAbsorption() = default; // Public Member Functions diff --git a/src/waveModels/waveGenerationModels/base/irregularWaveModel/irregularWaveModel.C b/src/waveModels/waveGenerationModels/base/irregularWaveModel/irregularWaveModel.C index 46e1ef2ed7..dc8af033a5 100644 --- a/src/waveModels/waveGenerationModels/base/irregularWaveModel/irregularWaveModel.C +++ b/src/waveModels/waveGenerationModels/base/irregularWaveModel/irregularWaveModel.C @@ -24,9 +24,6 @@ License \*---------------------------------------------------------------------------*/ #include "irregularWaveModel.H" -#include "mathematicalConstants.H" - -using namespace Foam::constant; // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -70,12 +67,6 @@ Foam::waveModels::irregularWaveModel::irregularWaveModel } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::waveModels::irregularWaveModel::~irregularWaveModel() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // bool Foam::waveModels::irregularWaveModel::readDict @@ -85,7 +76,7 @@ bool Foam::waveModels::irregularWaveModel::readDict { if (waveGenerationModel::readDict(overrideDict)) { - lookup("rampTime") >> rampTime_; + rampTime_ = get("rampTime"); return true; } diff --git a/src/waveModels/waveGenerationModels/base/irregularWaveModel/irregularWaveModel.H b/src/waveModels/waveGenerationModels/base/irregularWaveModel/irregularWaveModel.H index 8b01b7e651..005d965a5e 100644 --- a/src/waveModels/waveGenerationModels/base/irregularWaveModel/irregularWaveModel.H +++ b/src/waveModels/waveGenerationModels/base/irregularWaveModel/irregularWaveModel.H @@ -48,13 +48,11 @@ class irregularWaveModel : public waveGenerationModel { - // Private Member Functions + //- No copy construct + irregularWaveModel(const irregularWaveModel&) = delete; - //- Disallow default bitwise copy construct - irregularWaveModel(const irregularWaveModel&); - - //- Disallow default bitwise assignment - void operator=(const irregularWaveModel&); + //- No copy assignment + void operator=(const irregularWaveModel&) = delete; protected: @@ -86,7 +84,7 @@ public: ); //- Destructor - virtual ~irregularWaveModel(); + virtual ~irregularWaveModel() = default; // Public Member Functions diff --git a/src/waveModels/waveGenerationModels/base/regularWaveModel/regularWaveModel.C b/src/waveModels/waveGenerationModels/base/regularWaveModel/regularWaveModel.C index 5939b41d29..921736f080 100644 --- a/src/waveModels/waveGenerationModels/base/regularWaveModel/regularWaveModel.C +++ b/src/waveModels/waveGenerationModels/base/regularWaveModel/regularWaveModel.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "regularWaveModel.H" -#include "mathematicalConstants.H" +#include "unitConversion.H" using namespace Foam::constant; @@ -83,12 +83,6 @@ Foam::waveModels::regularWaveModel::regularWaveModel } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::waveModels::regularWaveModel::~regularWaveModel() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // bool Foam::waveModels::regularWaveModel::readDict @@ -101,7 +95,7 @@ bool Foam::waveModels::regularWaveModel::readDict waveHeight_ = readWaveHeight(); waveAngle_ = readWaveAngle(); - lookup("wavePeriod") >> wavePeriod_; + wavePeriod_ = get("wavePeriod"); if (wavePeriod_ < 0) { FatalIOErrorInFunction(*this) @@ -126,7 +120,7 @@ void Foam::waveModels::regularWaveModel::info(Ostream& os) const irregularWaveModel::info(os); os << " Wave height : " << waveHeight_ << nl - << " Wave angle : " << 180/mathematical::pi*waveAngle_ << nl + << " Wave angle : " << radToDeg(waveAngle_) << nl << " Wave period : " << wavePeriod_ << nl << " Wave length : " << waveLength_ << nl << " Wave phase : " << wavePhase_ << nl; diff --git a/src/waveModels/waveGenerationModels/base/regularWaveModel/regularWaveModel.H b/src/waveModels/waveGenerationModels/base/regularWaveModel/regularWaveModel.H index f7ded4fa87..648bf077ae 100644 --- a/src/waveModels/waveGenerationModels/base/regularWaveModel/regularWaveModel.H +++ b/src/waveModels/waveGenerationModels/base/regularWaveModel/regularWaveModel.H @@ -99,7 +99,7 @@ public: ); //- Destructor - virtual ~regularWaveModel(); + virtual ~regularWaveModel() = default; // Public Member Functions diff --git a/src/waveModels/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C b/src/waveModels/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C index 09a95d7505..34539363ea 100644 --- a/src/waveModels/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C +++ b/src/waveModels/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.C @@ -26,11 +26,7 @@ License #include "solitaryWaveModel.H" #include "polyPatch.H" #include "SubField.H" - -#include "mathematicalConstants.H" - -using namespace Foam::constant; - +#include "unitConversion.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -82,12 +78,6 @@ Foam::waveModels::solitaryWaveModel::solitaryWaveModel } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::waveModels::solitaryWaveModel::~solitaryWaveModel() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // bool Foam::waveModels::solitaryWaveModel::readDict @@ -112,7 +102,7 @@ void Foam::waveModels::solitaryWaveModel::info(Ostream& os) const waveGenerationModel::info(os); os << " Wave height : " << waveHeight_ << nl - << " Wave angle : " << 180/mathematical::pi*waveAngle_ << nl + << " Wave angle : " << radToDeg(waveAngle_) << nl << " x0: " << x0_ << nl; } diff --git a/src/waveModels/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H b/src/waveModels/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H index e5aea9c187..eb2e92690a 100644 --- a/src/waveModels/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H +++ b/src/waveModels/waveGenerationModels/base/solitaryWaveModel/solitaryWaveModel.H @@ -87,7 +87,7 @@ public: ); //- Destructor - virtual ~solitaryWaveModel(); + virtual ~solitaryWaveModel() = default; // Public Member Functions diff --git a/src/waveModels/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C b/src/waveModels/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C index f0c8dd8567..a239903aea 100644 --- a/src/waveModels/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C +++ b/src/waveModels/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.C @@ -24,9 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "waveGenerationModel.H" -#include "mathematicalConstants.H" - -using namespace Foam::constant; +#include "unitConversion.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -43,7 +41,7 @@ namespace waveModels Foam::scalar Foam::waveModels::waveGenerationModel::readWaveHeight() const { - scalar h(readScalar(lookup("waveHeight"))); + const scalar h(get("waveHeight")); if (h < 0) { FatalIOErrorInFunction(*this) @@ -58,8 +56,7 @@ Foam::scalar Foam::waveModels::waveGenerationModel::readWaveHeight() const Foam::scalar Foam::waveModels::waveGenerationModel::readWaveAngle() const { - scalar angle(readScalar(lookup("waveAngle"))); - return angle* mathematical::pi/180; + return degToRad(get("waveAngle")); } @@ -82,12 +79,6 @@ Foam::waveModels::waveGenerationModel::waveGenerationModel } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::waveModels::waveGenerationModel::~waveGenerationModel() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // bool Foam::waveModels::waveGenerationModel::readDict @@ -97,7 +88,7 @@ bool Foam::waveModels::waveGenerationModel::readDict { if (waveModel::readDict(overrideDict)) { - lookup("activeAbsorption") >> activeAbsorption_; + activeAbsorption_ = get("activeAbsorption"); return true; } diff --git a/src/waveModels/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H b/src/waveModels/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H index 644f506a03..089fe66fb6 100644 --- a/src/waveModels/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H +++ b/src/waveModels/waveGenerationModels/base/waveGenerationModel/waveGenerationModel.H @@ -74,7 +74,7 @@ public: ); //- Destructor - virtual ~waveGenerationModel(); + virtual ~waveGenerationModel() = default; // Public Member Functions diff --git a/src/waveModels/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C b/src/waveModels/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C index f3b15401c4..0bb09af194 100644 --- a/src/waveModels/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C +++ b/src/waveModels/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C @@ -225,12 +225,6 @@ Foam::waveModels::Boussinesq::Boussinesq } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::waveModels::Boussinesq::~Boussinesq() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // bool Foam::waveModels::Boussinesq::readDict(const dictionary& overrideDict) diff --git a/src/waveModels/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H b/src/waveModels/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H index b5071d2817..e7082b0444 100644 --- a/src/waveModels/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H +++ b/src/waveModels/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.H @@ -127,7 +127,7 @@ public: ); //- Destructor - virtual ~Boussinesq(); + virtual ~Boussinesq() = default; // Public Member Functions diff --git a/src/waveModels/waveGenerationModels/derived/Grimshaw/GrimshawWaveModel.C b/src/waveModels/waveGenerationModels/derived/Grimshaw/GrimshawWaveModel.C index d344fe7cb3..3f39b76dd1 100644 --- a/src/waveModels/waveGenerationModels/derived/Grimshaw/GrimshawWaveModel.C +++ b/src/waveModels/waveGenerationModels/derived/Grimshaw/GrimshawWaveModel.C @@ -192,12 +192,6 @@ Foam::waveModels::Grimshaw::Grimshaw } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::waveModels::Grimshaw::~Grimshaw() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // bool Foam::waveModels::Grimshaw::readDict(const dictionary& overrideDict) diff --git a/src/waveModels/waveGenerationModels/derived/Grimshaw/GrimshawWaveModel.H b/src/waveModels/waveGenerationModels/derived/Grimshaw/GrimshawWaveModel.H index 34ed47c7fe..608c632eb2 100644 --- a/src/waveModels/waveGenerationModels/derived/Grimshaw/GrimshawWaveModel.H +++ b/src/waveModels/waveGenerationModels/derived/Grimshaw/GrimshawWaveModel.H @@ -117,7 +117,7 @@ public: ); //- Destructor - virtual ~Grimshaw(); + virtual ~Grimshaw() = default; // Public Member Functions diff --git a/src/waveModels/waveGenerationModels/derived/McCowan/McCowanWaveModel.C b/src/waveModels/waveGenerationModels/derived/McCowan/McCowanWaveModel.C index 5fc76286a9..bef39dbba9 100644 --- a/src/waveModels/waveGenerationModels/derived/McCowan/McCowanWaveModel.C +++ b/src/waveModels/waveGenerationModels/derived/McCowan/McCowanWaveModel.C @@ -282,12 +282,6 @@ Foam::waveModels::McCowan::McCowan } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::waveModels::McCowan::~McCowan() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // bool Foam::waveModels::McCowan::readDict(const dictionary& overrideDict) diff --git a/src/waveModels/waveGenerationModels/derived/McCowan/McCowanWaveModel.H b/src/waveModels/waveGenerationModels/derived/McCowan/McCowanWaveModel.H index 93abfc6d63..62d5b1bd6f 100644 --- a/src/waveModels/waveGenerationModels/derived/McCowan/McCowanWaveModel.H +++ b/src/waveModels/waveGenerationModels/derived/McCowan/McCowanWaveModel.H @@ -133,7 +133,7 @@ public: ); //- Destructor - virtual ~McCowan(); + virtual ~McCowan() = default; // Public Member Functions diff --git a/src/waveModels/waveGenerationModels/derived/StokesI/StokesIWaveModel.C b/src/waveModels/waveGenerationModels/derived/StokesI/StokesIWaveModel.C index 504a5a77b3..0b8a340ecd 100644 --- a/src/waveModels/waveGenerationModels/derived/StokesI/StokesIWaveModel.C +++ b/src/waveModels/waveGenerationModels/derived/StokesI/StokesIWaveModel.C @@ -209,12 +209,6 @@ Foam::waveModels::StokesI::StokesI } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::waveModels::StokesI::~StokesI() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // bool Foam::waveModels::StokesI::readDict(const dictionary& overrideDict) diff --git a/src/waveModels/waveGenerationModels/derived/StokesI/StokesIWaveModel.H b/src/waveModels/waveGenerationModels/derived/StokesI/StokesIWaveModel.H index 23a3f67e42..b68349ba05 100644 --- a/src/waveModels/waveGenerationModels/derived/StokesI/StokesIWaveModel.H +++ b/src/waveModels/waveGenerationModels/derived/StokesI/StokesIWaveModel.H @@ -121,7 +121,7 @@ public: ); //- Destructor - virtual ~StokesI(); + virtual ~StokesI() = default; // Public Member Functions diff --git a/src/waveModels/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C b/src/waveModels/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C index ca4c776698..acf10e749a 100644 --- a/src/waveModels/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C +++ b/src/waveModels/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C @@ -155,12 +155,6 @@ Foam::waveModels::StokesII::StokesII } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::waveModels::StokesII::~StokesII() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // bool Foam::waveModels::StokesII::readDict(const dictionary& overrideDict) diff --git a/src/waveModels/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H b/src/waveModels/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H index c82325b5f5..92a0c6468a 100644 --- a/src/waveModels/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H +++ b/src/waveModels/waveGenerationModels/derived/StokesII/StokesIIWaveModel.H @@ -111,7 +111,7 @@ public: ); //- Destructor - virtual ~StokesII(); + virtual ~StokesII() = default; // Public Member Functions diff --git a/src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.C b/src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.C index ccf5861605..73dbc3f7a8 100644 --- a/src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.C +++ b/src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.C @@ -846,12 +846,6 @@ Foam::waveModels::StokesV::StokesV } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::waveModels::StokesV::~StokesV() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // bool Foam::waveModels::StokesV::readDict(const dictionary& overrideDict) diff --git a/src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.H b/src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.H index c2cf90f56b..8a5eea3fc4 100644 --- a/src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.H +++ b/src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.H @@ -195,7 +195,7 @@ public: ); //- Destructor - virtual ~StokesV(); + virtual ~StokesV() = default; // Public Member Functions diff --git a/src/waveModels/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C b/src/waveModels/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C index 13ccc96ec4..e80a27988a 100644 --- a/src/waveModels/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C +++ b/src/waveModels/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C @@ -329,12 +329,6 @@ Foam::waveModels::cnoidal::cnoidal } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::waveModels::cnoidal::~cnoidal() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // bool Foam::waveModels::cnoidal::readDict(const dictionary& overrideDict) diff --git a/src/waveModels/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H b/src/waveModels/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H index 5dd6162bf3..f95eeed801 100644 --- a/src/waveModels/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H +++ b/src/waveModels/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.H @@ -160,7 +160,7 @@ public: ); //- Destructor - virtual ~cnoidal(); + virtual ~cnoidal() = default; // Public Member Functions diff --git a/src/waveModels/waveGenerationModels/derived/irregularMultiDirectional/irregularMultiDirectionalWaveModel.C b/src/waveModels/waveGenerationModels/derived/irregularMultiDirectional/irregularMultiDirectionalWaveModel.C index f212ac42e3..551d92a41a 100644 --- a/src/waveModels/waveGenerationModels/derived/irregularMultiDirectional/irregularMultiDirectionalWaveModel.C +++ b/src/waveModels/waveGenerationModels/derived/irregularMultiDirectional/irregularMultiDirectionalWaveModel.C @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "irregularMultiDirectionalWaveModel.H" -#include "mathematicalConstants.H" +#include "unitConversion.H" #include "addToRunTimeSelectionTable.H" using namespace Foam::constant; @@ -253,12 +253,6 @@ Foam::waveModels::irregularMultiDirectional::irregularMultiDirectional } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::waveModels::irregularMultiDirectional::~irregularMultiDirectional() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // bool Foam::waveModels::irregularMultiDirectional::readDict @@ -268,10 +262,10 @@ bool Foam::waveModels::irregularMultiDirectional::readDict { if (irregularWaveModel::readDict(overrideDict)) { - lookup("wavePeriods") >> irregWavePeriods_; - lookup("waveHeights") >> irregWaveHeights_; - lookup("wavePhases") >> irregWavePhases_; - lookup("waveDirs") >> irregWaveDirs_; + dictionary::read("wavePeriods", irregWavePeriods_); + dictionary::read("waveHeights", irregWaveHeights_); + dictionary::read("wavePhases", irregWavePhases_); + dictionary::read("waveDirs", irregWaveDirs_); irregWaveLengths_ = irregWaveHeights_; @@ -282,7 +276,7 @@ bool Foam::waveModels::irregularMultiDirectional::readDict irregWaveLengths_[ii][jj] = waveLength(waterDepthRef_, irregWavePeriods_[ii][jj]); irregWaveDirs_[ii][jj] = - irregWaveDirs_[ii][jj]*mathematical::pi/180; + degToRad(irregWaveDirs_[ii][jj]); } } diff --git a/src/waveModels/waveGenerationModels/derived/irregularMultiDirectional/irregularMultiDirectionalWaveModel.H b/src/waveModels/waveGenerationModels/derived/irregularMultiDirectional/irregularMultiDirectionalWaveModel.H index 31c4dfc6fe..bde03cfb58 100644 --- a/src/waveModels/waveGenerationModels/derived/irregularMultiDirectional/irregularMultiDirectionalWaveModel.H +++ b/src/waveModels/waveGenerationModels/derived/irregularMultiDirectional/irregularMultiDirectionalWaveModel.H @@ -33,6 +33,7 @@ Description #define waveModels_irregularMultiDirectional_H #include "irregularWaveModel.H" +#include "scalarList.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -54,20 +55,20 @@ private: // Proteced Data //- Wave periods for irregularMultiDirectional case [seconds] - List> irregWavePeriods_; + List irregWavePeriods_; //- Wave heights for irregularMultiDirectional case [metres] - List> irregWaveHeights_; + List irregWaveHeights_; //- Wave lengths for irregularMultiDirectional case [metres] - List> irregWaveLengths_; + List irregWaveLengths_; //- Wave phases for irregularMultiDirectional case [radians] - List> irregWavePhases_; + List irregWavePhases_; //- Direction of propagation for irregularMultiDirectional case //- [degrees] from X axis - List> irregWaveDirs_; + List irregWaveDirs_; // Private Member Functions @@ -151,7 +152,7 @@ public: ); //- Destructor - virtual ~irregularMultiDirectional(); + virtual ~irregularMultiDirectional() = default; // Public Member Functions diff --git a/src/waveModels/waveGenerationModels/derived/streamFunction/streamFunctionWaveModel.C b/src/waveModels/waveGenerationModels/derived/streamFunction/streamFunctionWaveModel.C index 181e9a4d44..c8227144d9 100644 --- a/src/waveModels/waveGenerationModels/derived/streamFunction/streamFunctionWaveModel.C +++ b/src/waveModels/waveGenerationModels/derived/streamFunction/streamFunctionWaveModel.C @@ -67,8 +67,7 @@ Foam::scalar Foam::waveModels::streamFunction::eta forAll(Ejs_, iterSF) { strfnAux += - Ejs_[iterSF]*cos((iterSF + 1) - *(kx*x + ky*y - omega*t + phase)); + Ejs_[iterSF]*cos((iterSF + 1) *(kx*x + ky*y - omega*t + phase)); } return (1/k)*strfnAux; @@ -135,12 +134,12 @@ void Foam::waveModels::streamFunction::setLevel this->eta ( waterDepthRef_, - waveKx, + waveKx, waveKy, wavePeriod_, xPaddle_[paddlei], yPaddle_[paddlei], - waveOmega, + waveOmega, t, wavePhase_ ); @@ -184,7 +183,7 @@ void Foam::waveModels::streamFunction::setVelocity wavePeriod_, xPaddle_[paddlei], yPaddle_[paddlei], - waveOmega, + waveOmega, t, wavePhase_, z @@ -218,22 +217,16 @@ Foam::waveModels::streamFunction::streamFunction } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::waveModels::streamFunction::~streamFunction() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // bool Foam::waveModels::streamFunction::readDict(const dictionary& overrideDict) { if (regularWaveModel::readDict(overrideDict)) { - overrideDict.lookup("uMean") >> uMean_; - overrideDict.lookup("waveLength") >> waveLength_; - overrideDict.lookup("Bjs") >> Bjs_; - overrideDict.lookup("Ejs") >> Ejs_; + overrideDict.read("uMean", uMean_); + overrideDict.read("waveLength", waveLength_); + overrideDict.read("Bjs", Bjs_); + overrideDict.read("Ejs", Ejs_); return true; } diff --git a/src/waveModels/waveGenerationModels/derived/streamFunction/streamFunctionWaveModel.H b/src/waveModels/waveGenerationModels/derived/streamFunction/streamFunctionWaveModel.H index 28804d3ee5..832844e98d 100644 --- a/src/waveModels/waveGenerationModels/derived/streamFunction/streamFunctionWaveModel.H +++ b/src/waveModels/waveGenerationModels/derived/streamFunction/streamFunctionWaveModel.H @@ -132,7 +132,7 @@ public: ); //- Destructor - virtual ~streamFunction(); + virtual ~streamFunction() = default; // Public Member Functions diff --git a/src/waveModels/waveModel/waveModel.C b/src/waveModels/waveModel/waveModel.C index ed7e3e1ba3..324ac5ed5b 100644 --- a/src/waveModels/waveModel/waveModel.C +++ b/src/waveModels/waveModel/waveModel.C @@ -126,8 +126,8 @@ void Foam::waveModel::initialiseGeometry() Foam::tmp Foam::waveModel::waterLevel() const { // Note: initialising as initial depth - tmp tlevel(new scalarField(nPaddle_, initialDepth_)); - scalarField& level = tlevel.ref(); + auto tlevel = tmp::New(nPaddle_, initialDepth_); + auto& level = tlevel.ref(); const volScalarField& alpha = mesh_.lookupObject(alphaName_); @@ -288,12 +288,6 @@ Foam::waveModel::waveModel } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::waveModel::~waveModel() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // bool Foam::waveModel::readDict(const dictionary& overrideDict) @@ -309,7 +303,7 @@ bool Foam::waveModel::readDict(const dictionary& overrideDict) readIfPresent("U", UName_); readIfPresent("alpha", alphaName_); - lookup("nPaddle") >> nPaddle_; + nPaddle_ = get