diff --git a/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.C b/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.C index 71e10898023f6bf6e8c3129825cd8f2ee56bdcf3..7888ec234739944f9a4c6ed210ee3509270a23bb 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.C +++ b/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.C @@ -127,7 +127,7 @@ Foam::surfaceTensionModels::liquidProperties::sigma() const } -bool Foam::surfaceTensionModels::liquidProperties::read +bool Foam::surfaceTensionModels::liquidProperties::readDict ( const dictionary& dict ) diff --git a/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.H b/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.H index b209dfc9d6e34ef2a1163e04637ddf859102b901..7c1e4940acf4f88099bce855eed246beb3a636d1 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.H +++ b/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.H @@ -104,7 +104,7 @@ public: virtual tmp<volScalarField> sigma() const; //- Update surface tension coefficient from given dictionary - virtual bool read(const dictionary& dict); + virtual bool readDict(const dictionary& dict); //- Write in dictionary format virtual bool writeData(Ostream& os) const; diff --git a/src/transportModels/interfaceProperties/interfaceProperties.C b/src/transportModels/interfaceProperties/interfaceProperties.C index 5d2008130b2503ca61c5f592495e69dd054aea6b..b2fc80eb309f3c017152af247b6438b2d0983e97 100644 --- a/src/transportModels/interfaceProperties/interfaceProperties.C +++ b/src/transportModels/interfaceProperties/interfaceProperties.C @@ -239,7 +239,7 @@ void Foam::interfaceProperties::correct() bool Foam::interfaceProperties::read() { alpha1_.mesh().solverDict(alpha1_.name()).lookup("cAlpha") >> cAlpha_; - sigmaPtr_->read(transportPropertiesDict_); + sigmaPtr_->readDict(transportPropertiesDict_); return true; } diff --git a/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.C b/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.C index bbe92e5196e95f23504add3f833eca19e27d1691..9a19092e0464a865daee7a7c45adea035e859a31 100644 --- a/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.C +++ b/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.C @@ -83,7 +83,7 @@ Foam::surfaceTensionModels::constant::sigma() const } -bool Foam::surfaceTensionModels::constant::read(const dictionary& dict) +bool Foam::surfaceTensionModels::constant::readDict(const dictionary& dict) { // Handle sub-dictionary format as a special case if (dict.isDict("sigma")) diff --git a/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.H b/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.H index feef36300c256e2c0c272799a793ff04c7038774..fdc1f91b8d551beb86eb045f5965c88dbfa832aa 100644 --- a/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.H +++ b/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.H @@ -98,7 +98,7 @@ public: virtual tmp<volScalarField> sigma() const; //- Update surface tension coefficient from given dictionary - virtual bool read(const dictionary& dict); + virtual bool readDict(const dictionary& dict); //- Write in dictionary format virtual bool writeData(Ostream& os) const; diff --git a/src/transportModels/interfaceProperties/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H b/src/transportModels/interfaceProperties/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H index 930a8444f1d7e572e62070b097036efdad261398..a5cddff4ef9176ab28e2e23b0fe5a18a96cb56c4 100644 --- a/src/transportModels/interfaceProperties/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H +++ b/src/transportModels/interfaceProperties/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H @@ -143,7 +143,7 @@ public: virtual tmp<volScalarField> sigma() const = 0; //- Update surface tension coefficient from given dictionary - virtual bool read(const dictionary& dict) = 0; + virtual bool readDict(const dictionary& dict) = 0; //- Write in dictionary format virtual bool writeData(Ostream& os) const = 0; diff --git a/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C b/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C index c56ac7f4a8bde8332bd12b03f625c5a1c8414562..03fb3a106c75cbd13f791b2c9c63a1d37cf68472 100644 --- a/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C +++ b/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C @@ -104,7 +104,7 @@ Foam::surfaceTensionModels::temperatureDependent::sigma() const } -bool Foam::surfaceTensionModels::temperatureDependent::read +bool Foam::surfaceTensionModels::temperatureDependent::readDict ( const dictionary& dict ) diff --git a/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.H b/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.H index c0bded7c311205f814f58d69e0d7f2fce2645be2..e442fda63e679e243a5363e00fc20bb7a259a83d 100644 --- a/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.H +++ b/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.H @@ -113,7 +113,7 @@ public: virtual tmp<volScalarField> sigma() const; //- Update surface tension coefficient from given dictionary - virtual bool read(const dictionary& dict); + virtual bool readDict(const dictionary& dict); //- Write in dictionary format virtual bool writeData(Ostream& os) const;