diff --git a/applications/modules/compressibleVoF/fvModels/VoFCavitation/VoFCavitation.H b/applications/modules/compressibleVoF/fvModels/VoFCavitation/VoFCavitation.H index 1fca47a0ef..55843f00f6 100644 --- a/applications/modules/compressibleVoF/fvModels/VoFCavitation/VoFCavitation.H +++ b/applications/modules/compressibleVoF/fvModels/VoFCavitation/VoFCavitation.H @@ -34,8 +34,6 @@ Usage { type VoFCavitation; - libs ("libcompressibleVoFCavitation.so"); - model SchnerrSauer; KunzCoeffs diff --git a/applications/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.H b/applications/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.H index 218e69c9ea..268628e467 100644 --- a/applications/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.H +++ b/applications/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.H @@ -55,8 +55,6 @@ Usage { type VoFTurbulenceDamping; - libs ("libcompressibleVoFTurbulenceDamping.so"); - // Interface momentumTransport damping length scale // This is a required input as described in section 3.3 of the paper delta 1e-4; diff --git a/applications/modules/fluid/Make/options b/applications/modules/fluid/Make/options index c8c123d75f..905fd5e485 100644 --- a/applications/modules/fluid/Make/options +++ b/applications/modules/fluid/Make/options @@ -17,11 +17,5 @@ LIB_LIBS = \ -lfluidSolver \ -lisothermalFluid \ -lfluidThermophysicalModels \ - -lmomentumTransportModels \ -lcompressibleMomentumTransportModels \ - -lcoupledThermophysicalTransportModels \ - -lfiniteVolume \ - -lmeshTools \ - -lsampling \ - -lfvModels \ - -lfvConstraints + -lcoupledThermophysicalTransportModels diff --git a/applications/modules/incompressibleFluid/Make/options b/applications/modules/incompressibleFluid/Make/options index 43b96f970d..a238f17167 100644 --- a/applications/modules/incompressibleFluid/Make/options +++ b/applications/modules/incompressibleFluid/Make/options @@ -7,12 +7,4 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ - -lfluidSolver \ - -lmomentumTransportModels \ - -lincompressibleMomentumTransportModels \ - -lphysicalProperties \ - -lfiniteVolume \ - -lfvModels \ - -lfvConstraints \ - -lsampling \ - -lmeshTools + -lfluidSolver diff --git a/applications/modules/incompressibleVoF/fvModels/VoFCavitation/VoFCavitation.H b/applications/modules/incompressibleVoF/fvModels/VoFCavitation/VoFCavitation.H index 5953a6a804..1635753b3a 100644 --- a/applications/modules/incompressibleVoF/fvModels/VoFCavitation/VoFCavitation.H +++ b/applications/modules/incompressibleVoF/fvModels/VoFCavitation/VoFCavitation.H @@ -34,8 +34,6 @@ Usage { type VoFCavitation; - libs ("libVoFCavitation.so"); - model SchnerrSauer; KunzCoeffs diff --git a/applications/modules/incompressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.H b/applications/modules/incompressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.H index 309722c989..49b721dd65 100644 --- a/applications/modules/incompressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.H +++ b/applications/modules/incompressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.H @@ -55,8 +55,6 @@ Usage { type VoFTurbulenceDamping; - libs ("libVoFTurbulenceDamping.so"); - // Interface turbulence damping length scale // This is a required input as described in section 3.3 of the paper delta 1e-4; diff --git a/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/ejectionModels/BrunDripping/BrunDripping.H b/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/ejectionModels/BrunDripping/BrunDripping.H index b754864dd1..89d398ec98 100644 --- a/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/ejectionModels/BrunDripping/BrunDripping.H +++ b/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/ejectionModels/BrunDripping/BrunDripping.H @@ -56,8 +56,6 @@ Usage { type filmCloudTransfer; - libs ("libfilmCloudTransfer.so"); - ejection { model BrunDripping; diff --git a/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/ejectionModels/curvatureSeparation/curvatureSeparation.H b/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/ejectionModels/curvatureSeparation/curvatureSeparation.H index 1c743518c9..05981108c8 100644 --- a/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/ejectionModels/curvatureSeparation/curvatureSeparation.H +++ b/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/ejectionModels/curvatureSeparation/curvatureSeparation.H @@ -49,8 +49,6 @@ Usage { type filmCloudTransfer; - libs ("libfilmCloudTransfer.so"); - ejection { model curvatureSeparation; diff --git a/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/ejectionModels/dripping/dripping.H b/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/ejectionModels/dripping/dripping.H index f27eca0d85..8504622191 100644 --- a/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/ejectionModels/dripping/dripping.H +++ b/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/ejectionModels/dripping/dripping.H @@ -39,8 +39,6 @@ Usage { type filmCloudTransfer; - libs ("libfilmCloudTransfer.so"); - ejection { model dripping; diff --git a/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/filmCloudTransfer.H b/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/filmCloudTransfer.H index bcc1711b66..8f14837245 100644 --- a/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/filmCloudTransfer.H +++ b/applications/modules/isothermalFilm/fvModels/filmCloudTransfer/filmCloudTransfer.H @@ -33,8 +33,6 @@ Usage filmCloudTransfer { type filmCloudTransfer; - - libs ("libfilmCloudTransfer.so"); } \endverbatim diff --git a/applications/modules/isothermalFilm/fvModels/filmVoFTransfer/filmVoFTransfer.H b/applications/modules/isothermalFilm/fvModels/filmVoFTransfer/filmVoFTransfer.H index 0030124834..f9c8b9d375 100644 --- a/applications/modules/isothermalFilm/fvModels/filmVoFTransfer/filmVoFTransfer.H +++ b/applications/modules/isothermalFilm/fvModels/filmVoFTransfer/filmVoFTransfer.H @@ -34,8 +34,6 @@ Usage { type filmVoFTransfer; - libs ("libfilmVoFTransfer.so"); - deltaFactorToVoF 1.5; alphaToVoF 0.9; diff --git a/applications/modules/multiphaseEuler/functionObjects/wallBoilingProperties/wallBoilingProperties.H b/applications/modules/multiphaseEuler/functionObjects/wallBoilingProperties/wallBoilingProperties.H index b3d0466d01..4c49553c1f 100644 --- a/applications/modules/multiphaseEuler/functionObjects/wallBoilingProperties/wallBoilingProperties.H +++ b/applications/modules/multiphaseEuler/functionObjects/wallBoilingProperties/wallBoilingProperties.H @@ -40,7 +40,7 @@ Description writeWallBoilingProperties { type wallBoilingProperties; - functionObjectLibs ( "libmultiphaseEulerFoamFunctionObjects.so" ); + libs ( "libmultiphaseEulerFoamFunctionObjects.so" ); writeControl writeTime; phase liquid; } diff --git a/etc/caseDicts/postProcessing/fields/fieldAverage.cfg b/etc/caseDicts/postProcessing/fields/fieldAverage.cfg index 36276e14ec..1682a06bb1 100644 --- a/etc/caseDicts/postProcessing/fields/fieldAverage.cfg +++ b/etc/caseDicts/postProcessing/fields/fieldAverage.cfg @@ -7,7 +7,7 @@ \*---------------------------------------------------------------------------*/ type fieldAverage; -functionObjectLibs ("libfieldFunctionObjects.so"); +libs ("libfieldFunctionObjects.so"); writeControl writeTime; diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C index b33426a6f5..cdd2ad324b 100644 --- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C +++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -65,32 +65,34 @@ Foam::autoPtr Foam::functionObject::New Info<< "Selecting function " << functionType << endl; } - if (dict.found("functionObjectLibs")) + if + ( + !dictionaryConstructorTablePtr_ + || dictionaryConstructorTablePtr_->find(functionType) + == dictionaryConstructorTablePtr_->end() + ) { - libs.open + if ( - dict, - "functionObjectLibs", - dictionaryConstructorTablePtr_ - ); - } - else - { - libs.open - ( - dict, - "libs", - dictionaryConstructorTablePtr_ - ); - } + !libs.open + ( + dict, + "libs", + dictionaryConstructorTablePtr_ + ) + ) + { + libs.open("lib" + functionType.remove(':') + ".so", false); + } - if (!dictionaryConstructorTablePtr_) - { - FatalErrorInFunction - << "Unknown function type " - << functionType << nl << nl - << "Table of functionObjects is empty" - << exit(FatalError); + if (!dictionaryConstructorTablePtr_) + { + FatalErrorInFunction + << "Unknown function type " + << functionType << nl << nl + << "Table of functionObjects is empty" + << exit(FatalError); + } } dictionaryConstructorTable::iterator cstrIter = diff --git a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraint.C b/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraint.C index 8063f77c84..eb4591d002 100644 --- a/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraint.C +++ b/src/finiteVolume/cfdTools/general/fvConstraints/fvConstraint.C @@ -82,27 +82,50 @@ Foam::autoPtr Foam::fvConstraint::New ( const word& name, const fvMesh& mesh, - const dictionary& coeffs + const dictionary& dict ) { - const word constraintType(coeffs.lookup("type")); + const word constraintType(dict.lookup("type")); Info<< indent << "Selecting finite volume constraint type " << constraintType << endl; - libs.open + if ( - coeffs, - "libs", - dictionaryConstructorTablePtr_ - ); + !dictionaryConstructorTablePtr_ + || dictionaryConstructorTablePtr_->find(constraintType) + == dictionaryConstructorTablePtr_->end() + ) + { + if + ( + !libs.open + ( + dict, + "libs", + dictionaryConstructorTablePtr_ + ) + ) + { + libs.open("lib" + constraintType.remove(':') + ".so", false); + } + + if (!dictionaryConstructorTablePtr_) + { + FatalErrorInFunction + << "Unknown constraint type " + << constraintType << nl << nl + << "Table of fvConstraints is empty" + << exit(FatalError); + } + } dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(constraintType); if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalIOErrorInFunction(coeffs) + FatalIOErrorInFunction(dict) << "Unknown fvConstraint " << constraintType << nl << nl << "Valid fvConstraints are:" << nl << dictionaryConstructorTablePtr_->sortedToc() @@ -111,7 +134,7 @@ Foam::autoPtr Foam::fvConstraint::New return autoPtr ( - cstrIter()(name, constraintType, mesh, coeffs) + cstrIter()(name, constraintType, mesh, dict) ); } diff --git a/src/finiteVolume/cfdTools/general/fvModels/fvModel.C b/src/finiteVolume/cfdTools/general/fvModels/fvModel.C index 82f2663f86..935d8bb01e 100644 --- a/src/finiteVolume/cfdTools/general/fvModels/fvModel.C +++ b/src/finiteVolume/cfdTools/general/fvModels/fvModel.C @@ -94,27 +94,50 @@ Foam::autoPtr Foam::fvModel::New ( const word& name, const fvMesh& mesh, - const dictionary& coeffs + const dictionary& dict ) { - const word modelType(coeffs.lookup("type")); + const word modelType(dict.lookup("type")); Info<< indent << "Selecting finite volume model type " << modelType << endl; - libs.open + if ( - coeffs, - "libs", - dictionaryConstructorTablePtr_ - ); + !dictionaryConstructorTablePtr_ + || dictionaryConstructorTablePtr_->find(modelType) + == dictionaryConstructorTablePtr_->end() + ) + { + if + ( + !libs.open + ( + dict, + "libs", + dictionaryConstructorTablePtr_ + ) + ) + { + libs.open("lib" + modelType.remove(':') + ".so", false); + } + + if (!dictionaryConstructorTablePtr_) + { + FatalErrorInFunction + << "Unknown model type " + << modelType << nl << nl + << "Table of fvModels is empty" + << exit(FatalError); + } + } dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalIOErrorInFunction(coeffs) + FatalIOErrorInFunction(dict) << "Unknown fvModel " << modelType << nl << nl << "Valid fvModels are:" << nl << dictionaryConstructorTablePtr_->sortedToc() @@ -123,7 +146,7 @@ Foam::autoPtr Foam::fvModel::New return autoPtr ( - cstrIter()(name, modelType, mesh, coeffs) + cstrIter()(name, modelType, mesh, dict) ); } diff --git a/tutorials/compressibleVoF/ballValve/constant/fvModels b/tutorials/compressibleVoF/ballValve/constant/fvModels index d8d1277b0b..750df8fef6 100644 --- a/tutorials/compressibleVoF/ballValve/constant/fvModels +++ b/tutorials/compressibleVoF/ballValve/constant/fvModels @@ -18,8 +18,6 @@ VoFCavitation { type compressible::VoFCavitation; - libs ("libcompressibleVoFCavitation.so"); - model SchnerrSauer; liquid water; diff --git a/tutorials/compressibleVoF/damBreak/constant/fvModels b/tutorials/compressibleVoF/damBreak/constant/fvModels index 8785a2d2ed..501e5961ee 100644 --- a/tutorials/compressibleVoF/damBreak/constant/fvModels +++ b/tutorials/compressibleVoF/damBreak/constant/fvModels @@ -18,8 +18,6 @@ turbulenceDamping { type compressible::VoFTurbulenceDamping; - libs ("libcompressibleVoFTurbulenceDamping.so"); - delta 1e-4; } diff --git a/tutorials/compressibleVoF/throttle/constant/fvModels b/tutorials/compressibleVoF/throttle/constant/fvModels index ed9019859b..4f05ee8757 100644 --- a/tutorials/compressibleVoF/throttle/constant/fvModels +++ b/tutorials/compressibleVoF/throttle/constant/fvModels @@ -18,8 +18,6 @@ VoFCavitation { type compressible::VoFCavitation; - libs ("libcompressibleVoFCavitation.so"); - model SchnerrSauer; KunzCoeffs diff --git a/tutorials/incompressibleVoF/cavitatingBullet/constant/fvModels b/tutorials/incompressibleVoF/cavitatingBullet/constant/fvModels index d2a9b6bb02..ed57077768 100644 --- a/tutorials/incompressibleVoF/cavitatingBullet/constant/fvModels +++ b/tutorials/incompressibleVoF/cavitatingBullet/constant/fvModels @@ -18,8 +18,6 @@ VoFCavitation { type VoFCavitation; - libs ("libVoFCavitation.so"); - model SchnerrSauer; KunzCoeffs diff --git a/tutorials/incompressibleVoF/damBreak/damBreak/constant/fvModels b/tutorials/incompressibleVoF/damBreak/damBreak/constant/fvModels index 34d83ef88d..416e744db8 100644 --- a/tutorials/incompressibleVoF/damBreak/damBreak/constant/fvModels +++ b/tutorials/incompressibleVoF/damBreak/damBreak/constant/fvModels @@ -18,8 +18,6 @@ turbulenceDamping { type VoFTurbulenceDamping; - libs ("libVoFTurbulenceDamping.so"); - delta 1e-4; } diff --git a/tutorials/incompressibleVoF/propeller/constant/fvModels b/tutorials/incompressibleVoF/propeller/constant/fvModels index d2a9b6bb02..ed57077768 100644 --- a/tutorials/incompressibleVoF/propeller/constant/fvModels +++ b/tutorials/incompressibleVoF/propeller/constant/fvModels @@ -18,8 +18,6 @@ VoFCavitation { type VoFCavitation; - libs ("libVoFCavitation.so"); - model SchnerrSauer; KunzCoeffs diff --git a/tutorials/multiRegion/CHT/wallBoiling/system/controlDict b/tutorials/multiRegion/CHT/wallBoiling/system/controlDict index a0ccb9aa33..24b1cb751a 100644 --- a/tutorials/multiRegion/CHT/wallBoiling/system/controlDict +++ b/tutorials/multiRegion/CHT/wallBoiling/system/controlDict @@ -67,7 +67,7 @@ functions writeWallBoilingProperties { type wallBoilingProperties; - functionObjectLibs ( "libmultiphaseEulerFoamFunctionObjects.so" ); + libs ( "libmultiphaseEulerFoamFunctionObjects.so" ); writeControl writeTime; executeAtStart no; region fluid; @@ -76,7 +76,7 @@ functions outflow { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; region fluid; @@ -88,7 +88,7 @@ functions inflow { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; region fluid; @@ -100,7 +100,7 @@ functions outletGas { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; region fluid; @@ -113,7 +113,7 @@ functions outletLiquid { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; region fluid; @@ -126,7 +126,7 @@ functions inletGas { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; region fluid; @@ -139,7 +139,7 @@ functions inletLiquid { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; region fluid; @@ -153,7 +153,7 @@ functions { type writeObjects; libs ("libutilityFunctionObjects.so"); - region fluid; + region fluid; objects ( @@ -168,6 +168,7 @@ functions h.liquid h.gas ); + writeControl writeTime; writeInterval 1; } diff --git a/tutorials/multiRegion/film/VoFToFilm/constant/film/fvModels b/tutorials/multiRegion/film/VoFToFilm/constant/film/fvModels index 358970f9e6..9059efc69d 100644 --- a/tutorials/multiRegion/film/VoFToFilm/constant/film/fvModels +++ b/tutorials/multiRegion/film/VoFToFilm/constant/film/fvModels @@ -18,8 +18,6 @@ filmVoFTransfer { type filmVoFTransfer; - libs ("libfilmVoFTransfer.so"); - deltaFactorToVoF 1.5; alphaToVoF 0.9; diff --git a/tutorials/multiRegion/film/cylinder/constant/film/fvModels b/tutorials/multiRegion/film/cylinder/constant/film/fvModels index 255ed083c0..1c59af0c56 100644 --- a/tutorials/multiRegion/film/cylinder/constant/film/fvModels +++ b/tutorials/multiRegion/film/cylinder/constant/film/fvModels @@ -17,8 +17,6 @@ FoamFile filmCloudTransfer { type filmCloudTransfer; - - libs ("libfilmCloudTransfer.so"); } // ************************************************************************* // diff --git a/tutorials/multiRegion/film/cylinderDripping/constant/film/fvModels b/tutorials/multiRegion/film/cylinderDripping/constant/film/fvModels index d634c8544a..c5ef7f10a2 100644 --- a/tutorials/multiRegion/film/cylinderDripping/constant/film/fvModels +++ b/tutorials/multiRegion/film/cylinderDripping/constant/film/fvModels @@ -18,8 +18,6 @@ filmCloudTransfer { type filmCloudTransfer; - libs ("libfilmCloudTransfer.so"); - ejection { model dripping; diff --git a/tutorials/multiRegion/film/cylinderVoF/constant/VoF/fvModels b/tutorials/multiRegion/film/cylinderVoF/constant/VoF/fvModels index 3e1e6fc3ce..550aef8cc6 100644 --- a/tutorials/multiRegion/film/cylinderVoF/constant/VoF/fvModels +++ b/tutorials/multiRegion/film/cylinderVoF/constant/VoF/fvModels @@ -18,8 +18,6 @@ VoFClouds { type VoFClouds; - libs ("libVoFClouds.so"); - phase liquid; carrierPhase air; } diff --git a/tutorials/multiRegion/film/cylinderVoF/constant/film/fvModels b/tutorials/multiRegion/film/cylinderVoF/constant/film/fvModels index 571721ac41..17526961b4 100644 --- a/tutorials/multiRegion/film/cylinderVoF/constant/film/fvModels +++ b/tutorials/multiRegion/film/cylinderVoF/constant/film/fvModels @@ -17,16 +17,12 @@ FoamFile filmCloudTransfer { type filmCloudTransfer; - - libs ("libfilmCloudTransfer.so"); } filmVoFTransfer { type filmVoFTransfer; - libs ("libfilmVoFTransfer.so"); - deltaFactorToVoF 0.3; alphaToVoF 0.3; diff --git a/tutorials/multiRegion/film/hotBoxes/constant/film/fvModels b/tutorials/multiRegion/film/hotBoxes/constant/film/fvModels index 6246a09de4..d6d63918e5 100644 --- a/tutorials/multiRegion/film/hotBoxes/constant/film/fvModels +++ b/tutorials/multiRegion/film/hotBoxes/constant/film/fvModels @@ -18,8 +18,6 @@ filmCloudTransfer { type filmCloudTransfer; - libs ("libfilmCloudTransfer.so"); - ejection { model dripping; diff --git a/tutorials/multiRegion/film/splashPanel/constant/film/fvModels b/tutorials/multiRegion/film/splashPanel/constant/film/fvModels index 255ed083c0..1c59af0c56 100644 --- a/tutorials/multiRegion/film/splashPanel/constant/film/fvModels +++ b/tutorials/multiRegion/film/splashPanel/constant/film/fvModels @@ -17,8 +17,6 @@ FoamFile filmCloudTransfer { type filmCloudTransfer; - - libs ("libfilmCloudTransfer.so"); } // ************************************************************************* // diff --git a/tutorials/multiphaseEuler/wallBoilingIATE/system/controlDict b/tutorials/multiphaseEuler/wallBoilingIATE/system/controlDict index 240748743b..a574518882 100644 --- a/tutorials/multiphaseEuler/wallBoilingIATE/system/controlDict +++ b/tutorials/multiphaseEuler/wallBoilingIATE/system/controlDict @@ -57,14 +57,14 @@ functions writeWallBoilingProperties { type wallBoilingProperties; - functionObjectLibs ( "libmultiphaseEulerFoamFunctionObjects.so" ); + libs ( "libmultiphaseEulerFoamFunctionObjects.so" ); writeControl writeTime; phase liquid; } outflow { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; select patch; @@ -75,7 +75,7 @@ functions inflow { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; select patch; @@ -86,7 +86,7 @@ functions outletGas { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; select patch; @@ -98,7 +98,7 @@ functions outletLiquid { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; select patch; @@ -110,7 +110,7 @@ functions inletGas { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; select patch; @@ -122,7 +122,7 @@ functions inletLiquid { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; select patch; diff --git a/tutorials/multiphaseEuler/wallBoilingPolydisperse/system/controlDict b/tutorials/multiphaseEuler/wallBoilingPolydisperse/system/controlDict index 6a4411e76c..3d99f92e3e 100644 --- a/tutorials/multiphaseEuler/wallBoilingPolydisperse/system/controlDict +++ b/tutorials/multiphaseEuler/wallBoilingPolydisperse/system/controlDict @@ -57,14 +57,14 @@ functions writeWallBoilingProperties { type wallBoilingProperties; - functionObjectLibs ( "libmultiphaseEulerFoamFunctionObjects.so" ); + libs ( "libmultiphaseEulerFoamFunctionObjects.so" ); writeControl writeTime; phase liquid; } volumeDensity.diameter.bubbles { type populationBalanceSizeDistribution; - functionObjectLibs ( "libmultiphaseEulerFoamFunctionObjects.so" ); + libs ( "libmultiphaseEulerFoamFunctionObjects.so" ); writeControl runTime; writeInterval 0.5; setFormat raw; @@ -78,7 +78,7 @@ functions volumeDensity_bulk.diameter.bubbles { type populationBalanceSizeDistribution; - functionObjectLibs ( "libmultiphaseEulerFoamFunctionObjects.so" ); + libs ( "libmultiphaseEulerFoamFunctionObjects.so" ); writeControl runTime; writeInterval 0.5; setFormat raw; @@ -92,7 +92,7 @@ functions volumeDensity_wall.diameter.bubbles { type populationBalanceSizeDistribution; - functionObjectLibs ( "libmultiphaseEulerFoamFunctionObjects.so" ); + libs ( "libmultiphaseEulerFoamFunctionObjects.so" ); writeControl runTime; writeInterval 0.5; setFormat raw; @@ -106,7 +106,7 @@ functions outflow { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; select patch; @@ -117,7 +117,7 @@ functions inflow { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; select patch; @@ -128,7 +128,7 @@ functions outletGas { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; select patch; @@ -140,7 +140,7 @@ functions outletLiquid { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; select patch; @@ -152,7 +152,7 @@ functions inletGas { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; select patch; @@ -164,7 +164,7 @@ functions inletLiquid { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; select patch; diff --git a/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/system/controlDict b/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/system/controlDict index 96d5e9f7ba..5dc8ab40c6 100644 --- a/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/system/controlDict +++ b/tutorials/multiphaseEuler/wallBoilingPolydisperseTwoGroups/system/controlDict @@ -57,14 +57,14 @@ functions writeWallBoilingProperties { type wallBoilingProperties; - functionObjectLibs ( "libmultiphaseEulerFoamFunctionObjects.so" ); + libs ( "libmultiphaseEulerFoamFunctionObjects.so" ); writeControl writeTime; phase liquid; } volumeDensity.diameter.bubbles { type populationBalanceSizeDistribution; - functionObjectLibs ( "libmultiphaseEulerFoamFunctionObjects.so" ); + libs ( "libmultiphaseEulerFoamFunctionObjects.so" ); writeControl runTime; writeInterval 0.5; setFormat raw; @@ -78,7 +78,7 @@ functions volumeDensity_bulk.diameter.bubbles { type populationBalanceSizeDistribution; - functionObjectLibs ( "libmultiphaseEulerFoamFunctionObjects.so" ); + libs ( "libmultiphaseEulerFoamFunctionObjects.so" ); writeControl runTime; writeInterval 0.5; setFormat raw; @@ -92,7 +92,7 @@ functions volumeDensity_wall.diameter.bubbles { type populationBalanceSizeDistribution; - functionObjectLibs ( "libmultiphaseEulerFoamFunctionObjects.so" ); + libs ( "libmultiphaseEulerFoamFunctionObjects.so" ); writeControl runTime; writeInterval 0.5; setFormat raw; @@ -106,7 +106,7 @@ functions outflow { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; select patch; @@ -117,7 +117,7 @@ functions inflow { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; select patch; @@ -128,7 +128,7 @@ functions outletGas { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; select patch; @@ -140,7 +140,7 @@ functions outletGas2 { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; select patch; @@ -152,7 +152,7 @@ functions outletLiquid { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; select patch; @@ -164,7 +164,7 @@ functions inletGas { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; select patch; @@ -176,7 +176,7 @@ functions inletGas2 { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; select patch; @@ -188,7 +188,7 @@ functions inletLiquid { type surfaceFieldValue; - functionObjectLibs ( "libfieldFunctionObjects.so" ); + libs ( "libfieldFunctionObjects.so" ); log yes; writeFields false; select patch;