From 742d1dc6048c8d57f5253b9fa7908e60554fe61b Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Tue, 19 Jul 2022 11:13:58 +0100
Subject: [PATCH] WIP: duplicate constructor entries (#2538)
WIP: Updated multiphaseEuler runtime constructor table names
WIP: Updated multiphaseInter runtime constructor table names
WIP: Updated reactingEuler runtime constructor table names
WIP: Updated twoPhaseEuler runtime constructor table names
---
.../diameterModels/constantDiameter/constantDiameter.C | 2 +-
.../diameterModels/diameterModel/diameterModel.C | 6 +++---
.../diameterModels/diameterModel/diameterModel.H | 2 +-
.../isothermalDiameter/isothermalDiameter.C | 2 +-
.../interfacialModels/dragModels/Ergun/Ergun.C | 2 +-
.../interfacialModels/dragModels/Gibilaro/Gibilaro.C | 2 +-
.../dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C | 2 +-
.../GidaspowSchillerNaumann/GidaspowSchillerNaumann.C | 2 +-
.../dragModels/SchillerNaumann/SchillerNaumann.C | 2 +-
.../dragModels/SyamlalOBrien/SyamlalOBrien.C | 2 +-
.../interfacialModels/dragModels/WenYu/WenYu.C | 2 +-
.../interfacialModels/dragModels/blended/blended.C | 2 +-
.../interfacialModels/dragModels/dragModel/dragModel.C | 6 +++---
.../interfacialModels/dragModels/dragModel/dragModel.H | 2 +-
.../interfacialModels/dragModels/interface/interface.C | 2 +-
.../heatTransferModels/RanzMarshall/RanzMarshall.C | 2 +-
.../heatTransferModel/heatTransferModel.C | 6 +++---
.../heatTransferModel/heatTransferModel.H | 2 +-
.../InterfaceCompositionModel.H | 2 +-
.../interfaceCompositionModel.C | 6 +++---
.../interfaceCompositionModel.H | 2 +-
.../porousModels/VollerPrakash/VollerPrakash.C | 2 +-
.../porousModels/porousModel/porousModel.C | 6 +++---
.../porousModels/porousModel/porousModel.H | 2 +-
.../constantSurfaceTensionCoefficient.C | 2 +-
.../surfaceTensionModel/surfaceTensionModel.C | 6 +++---
.../surfaceTensionModel/surfaceTensionModel.H | 2 +-
.../phasesSystem/multiphaseSystem/multiphaseSystem.C | 2 +-
.../phasesSystem/multiphaseSystem/multiphaseSystem.H | 2 +-
.../multiphaseSystem/multiphaseSystemNew.C | 4 ++--
.../phasesSystem/multiphaseSystem/multiphaseSystems.C | 2 +-
.../blendingMethods/blendingMethod/blendingMethod.C | 6 +++---
.../blendingMethods/blendingMethod/blendingMethod.H | 2 +-
.../blendingMethods/hyperbolic/hyperbolic.C | 2 +-
.../blendingMethods/linear/linear.C | 2 +-
.../blendingMethods/noBlending/noBlending.C | 2 +-
.../wallBoilingSubModels/CHFModels/CHFModel/CHFModel.C | 6 +++---
.../wallBoilingSubModels/CHFModels/CHFModel/CHFModel.H | 2 +-
.../wallBoilingSubModels/CHFModels/Zuber/Zuber.C | 2 +-
.../CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.C | 6 +++---
.../CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.H | 2 +-
.../CHFSubCoolModels/HuaXu/HuaXu.C | 2 +-
.../CHFSubCoolModels/Tatsumoto/Tatsumoto.C | 2 +-
.../LeidenfrostModel/LeidenfrostModel.C | 6 +++---
.../LeidenfrostModel/LeidenfrostModel.H | 2 +-
.../LeidenfrostModels/Spiegler/Spiegler.C | 2 +-
.../wallBoilingSubModels/MHFModels/Jeschar/Jeschar.C | 2 +-
.../wallBoilingSubModels/MHFModels/MHFModel/MHFModel.C | 6 +++---
.../wallBoilingSubModels/MHFModels/MHFModel/MHFModel.H | 2 +-
.../TDNBModels/Schroeder/Schroeder.C | 2 +-
.../wallBoilingSubModels/TDNBModels/Shirai/Shirai.C | 2 +-
.../TDNBModels/TDNBModel/TDNBModel.C | 6 +++---
.../TDNBModels/TDNBModel/TDNBModel.H | 2 +-
.../KocamustafaogullariIshii.C | 2 +-
.../TolubinskiKostanchuk/TolubinskiKostanchuk.C | 2 +-
.../departureDiameterModel/departureDiameterModel.C | 6 +++---
.../departureDiameterModel/departureDiameterModel.H | 2 +-
.../departureFrequencyModels/Cole/Cole.C | 2 +-
.../departureFrequencyModel/departureFrequencyModel.C | 6 +++---
.../departureFrequencyModel/departureFrequencyModel.H | 2 +-
.../filmBoilingModels/BreenWestwater/BreenWestwater.C | 2 +-
.../filmBoilingModels/Bromley/Bromley.C | 2 +-
.../filmBoilingModel/filmBoilingModel.C | 6 +++---
.../filmBoilingModel/filmBoilingModel.H | 2 +-
.../nucleateFluxModels/Kutadeladze/Kutadeladze.C | 2 +-
.../nucleateFluxModels/exponential/exponential.C | 2 +-
.../nucleateFluxModel/nucleateFluxModel.C | 6 +++---
.../nucleateFluxModel/nucleateFluxModel.H | 2 +-
.../nucleationSiteModels/LemmertChawla/LemmertChawla.C | 2 +-
.../nucleationSiteModel/nucleationSiteModel.C | 6 +++---
.../nucleationSiteModel/nucleationSiteModel.H | 2 +-
.../partitioningModels/Lavieville/Lavieville.C | 2 +-
.../partitioningModels/cosine/cosine.C | 2 +-
.../partitioningModels/linear/linear.C | 2 +-
.../partitioningModel/partitioningModel.C | 6 +++---
.../partitioningModel/partitioningModel.H | 2 +-
.../partitioningModels/phaseFraction/phaseFraction.C | 2 +-
.../diameterModels/constantDiameter/constantDiameter.C | 2 +-
.../diameterModels/diameterModel/diameterModel.C | 6 +++---
.../diameterModels/diameterModel/diameterModel.H | 2 +-
.../isothermalDiameter/isothermalDiameter.C | 2 +-
.../linearTsubDiameter/linearTsubDiameter.C | 2 +-
.../diameterModels/velocityGroup/velocityGroup.C | 2 +-
.../InterfaceCompositionModel.H | 2 +-
.../interfaceCompositionModel.C | 6 +++---
.../interfaceCompositionModel.H | 2 +-
.../massTransferModels/Frossling/Frossling.C | 2 +-
.../massTransferModel/massTransferModel.C | 6 +++---
.../massTransferModel/massTransferModel.H | 2 +-
.../sphericalMassTransfer/sphericalMassTransfer.C | 2 +-
.../constantSurfaceTensionCoefficient.C | 2 +-
.../surfaceTensionModel/surfaceTensionModel.C | 6 +++---
.../surfaceTensionModel/surfaceTensionModel.H | 2 +-
.../TomiyamaAspectRatio/TomiyamaAspectRatio.C | 2 +-
.../VakhrushevEfremov/VakhrushevEfremov.C | 2 +-
.../aspectRatioModels/Wellek/Wellek.C | 2 +-
.../aspectRatioModel/aspectRatioModel.C | 6 +++---
.../aspectRatioModel/aspectRatioModel.H | 2 +-
.../constantAspectRatio/constantAspectRatio.C | 2 +-
.../dragModels/AttouFerschneider/AttouFerschneider.C | 2 +-
.../interfacialModels/dragModels/Beetstra/Beetstra.C | 2 +-
.../interfacialModels/dragModels/Ergun/Ergun.C | 2 +-
.../interfacialModels/dragModels/Gibilaro/Gibilaro.C | 2 +-
.../dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C | 2 +-
.../GidaspowSchillerNaumann/GidaspowSchillerNaumann.C | 2 +-
.../dragModels/IshiiZuber/IshiiZuber.C | 2 +-
.../interfacialModels/dragModels/Lain/Lain.C | 2 +-
.../dragModels/SchillerNaumann/SchillerNaumann.C | 2 +-
.../dragModels/SyamlalOBrien/SyamlalOBrien.C | 2 +-
.../interfacialModels/dragModels/Tenneti/Tenneti.C | 2 +-
.../dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C | 2 +-
.../dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C | 2 +-
.../TomiyamaKataokaZunSakaguchi.C | 2 +-
.../interfacialModels/dragModels/WenYu/WenYu.C | 2 +-
.../interfacialModels/dragModels/dragModel/dragModel.C | 6 +++---
.../interfacialModels/dragModels/dragModel/dragModel.H | 2 +-
.../dragModels/segregated/segregated.C | 2 +-
.../heatTransferModels/RanzMarshall/RanzMarshall.C | 2 +-
.../constantNu/constantNuHeatTransfer.C | 2 +-
.../heatTransferModel/heatTransferModel.C | 6 +++---
.../heatTransferModel/heatTransferModel.H | 2 +-
.../sphericalHeatTransfer/sphericalHeatTransfer.C | 2 +-
.../liftModels/LegendreMagnaudet/LegendreMagnaudet.C | 2 +-
.../interfacialModels/liftModels/Moraga/Moraga.C | 2 +-
.../liftModels/TomiyamaLift/TomiyamaLift.C | 2 +-
.../constantLiftCoefficient/constantLiftCoefficient.C | 2 +-
.../interfacialModels/liftModels/liftModel/liftModel.C | 6 +++---
.../interfacialModels/liftModels/liftModel/liftModel.H | 2 +-
.../interfacialModels/liftModels/noLift/noLift.C | 2 +-
.../liftModels/wallDampedLift/wallDampedLift.C | 2 +-
.../phaseTransferModels/deposition/deposition.C | 2 +-
.../phaseTransferModel/phaseTransferModel.C | 6 +++---
.../phaseTransferModel/phaseTransferModel.H | 2 +-
.../swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C | 2 +-
.../swarmCorrections/noSwarm/noSwarm.C | 2 +-
.../swarmCorrections/swarmCorrection/swarmCorrection.C | 6 +++---
.../swarmCorrections/swarmCorrection/swarmCorrection.H | 2 +-
.../turbulentDispersionModels/Burns/Burns.C | 2 +-
.../turbulentDispersionModels/Gosman/Gosman.C | 2 +-
.../LopezDeBertodano/LopezDeBertodano.C | 2 +-
.../constantTurbulentDispersionCoefficient.C | 2 +-
.../noTurbulentDispersion/noTurbulentDispersion.C | 2 +-
.../turbulentDispersionModel.C | 6 +++---
.../turbulentDispersionModel.H | 2 +-
.../interfacialModels/virtualMassModels/Lamb/Lamb.C | 2 +-
.../constantVirtualMassCoefficient.C | 2 +-
.../virtualMassModels/noVirtualMass/noVirtualMass.C | 2 +-
.../virtualMassModel/virtualMassModel.C | 6 +++---
.../virtualMassModel/virtualMassModel.H | 2 +-
.../wallDampingModels/cosine/cosineWallDamping.C | 2 +-
.../wallDampingModels/linear/linearWallDamping.C | 2 +-
.../wallDampingModels/noWallDamping/noWallDamping.C | 2 +-
.../wallDampingModels/sine/sineWallDamping.C | 2 +-
.../wallDampingModel/wallDampingModel.C | 6 +++---
.../wallDampingModel/wallDampingModel.H | 2 +-
.../wallLubricationModels/Antal/Antal.C | 2 +-
.../wallLubricationModels/Frank/Frank.C | 2 +-
.../TomiyamaWallLubrication/TomiyamaWallLubrication.C | 2 +-
.../noWallLubrication/noWallLubrication.C | 2 +-
.../wallLubricationModel/wallLubricationModel.C | 6 +++---
.../wallLubricationModel/wallLubricationModel.H | 2 +-
.../multiphaseSystem/multiphaseSystem.C | 2 +-
.../multiphaseSystem/multiphaseSystem.H | 2 +-
.../multiphaseSystem/multiphaseSystemNew.C | 4 ++--
.../multiphaseSystem/multiphaseSystems.C | 10 +++++-----
.../LehrMilliesMewes/LehrMilliesMewes.C | 2 +-
.../binaryBreakupModels/LuoSvendsen/LuoSvendsen.C | 2 +-
.../binaryBreakupModel/binaryBreakupModel.C | 6 +++---
.../binaryBreakupModel/binaryBreakupModel.H | 2 +-
.../powerLawUniformBinary/powerLawUniformBinary.C | 2 +-
.../LaakkonenAlopaeusAittamaa.C | 2 +-
.../breakupModels/breakupModel/breakupModel.C | 6 +++---
.../breakupModels/breakupModel/breakupModel.H | 2 +-
.../breakupModels/exponential/exponential.C | 2 +-
.../breakupModels/powerLaw/powerLaw.C | 2 +-
.../CoulaloglouTavlaridesCoalescence.C | 2 +-
.../LehrMilliesMewesCoalescence.C | 2 +-
.../populationBalanceModel/coalescenceModels/Luo/Luo.C | 2 +-
.../coalescenceModels/PrinceBlanch/PrinceBlanch.C | 2 +-
.../coalescenceModel/coalescenceModel.C | 6 +++---
.../coalescenceModel/coalescenceModel.H | 2 +-
.../constantCoalescence/constantCoalescence.C | 2 +-
.../coalescenceModels/hydrodynamic/hydrodynamic.C | 2 +-
.../LaakkonenAlopaeusAittamaaDsd.C | 2 +-
.../daughterSizeDistributionModel.C | 6 +++---
.../daughterSizeDistributionModel.H | 2 +-
.../uniformBinary/uniformBinary.C | 2 +-
.../driftModels/constantDrift/constantDrift.C | 2 +-
.../driftModels/densityChange/densityChange.C | 2 +-
.../driftModels/driftModel/driftModel.C | 6 +++---
.../driftModels/driftModel/driftModel.H | 2 +-
.../driftModels/phaseChange/phaseChange.C | 2 +-
.../constantNucleation/constantNucleation.C | 2 +-
.../nucleationModels/nucleationModel/nucleationModel.C | 6 +++---
.../nucleationModels/nucleationModel/nucleationModel.H | 2 +-
.../nucleationModels/wallBoiling/wallBoiling.C | 2 +-
.../reactingEuler/saturationModels/Antoine/Antoine.C | 2 +-
.../saturationModels/AntoineExtended/AntoineExtended.C | 2 +-
.../saturationModels/ArdenBuck/ArdenBuck.C | 2 +-
.../constantSaturationConditions.C | 2 +-
.../saturationModels/function1/function1.C | 2 +-
.../saturationModels/polynomial/polynomial.C | 2 +-
.../saturationModels/saturationModel/saturationModel.C | 6 +++---
.../saturationModels/saturationModel/saturationModel.H | 5 +++--
.../conductivityModel/Gidaspow/GidaspowConductivity.C | 2 +-
.../HrenyaSinclair/HrenyaSinclairConductivity.C | 2 +-
.../conductivityModel/Syamlal/SyamlalConductivity.C | 2 +-
.../conductivityModel/conductivityModel.C | 6 +++---
.../conductivityModel/conductivityModel.H | 2 +-
.../JohnsonJackson/JohnsonJacksonFrictionalStress.C | 2 +-
.../JohnsonJacksonSchaefferFrictionalStress.C | 2 +-
.../Schaeffer/SchaefferFrictionalStress.C | 2 +-
.../frictionalStressModel/frictionalStressModel.C | 6 +++---
.../frictionalStressModel/frictionalStressModel.H | 2 +-
.../granularPressureModel/Lun/LunPressure.C | 2 +-
.../SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C | 2 +-
.../granularPressureModel/granularPressureModel.C | 6 +++---
.../granularPressureModel/granularPressureModel.H | 2 +-
.../CarnahanStarling/CarnahanStarlingRadial.C | 2 +-
.../radialModel/LunSavage/LunSavageRadial.C | 2 +-
.../SinclairJackson/SinclairJacksonRadial.C | 2 +-
.../radialModel/radialModel/radialModel.C | 6 +++---
.../radialModel/radialModel/radialModel.H | 2 +-
.../viscosityModel/Gidaspow/GidaspowViscosity.C | 2 +-
.../HrenyaSinclair/HrenyaSinclairViscosity.C | 2 +-
.../viscosityModel/Syamlal/SyamlalViscosity.C | 2 +-
.../viscosityModel/none/noneViscosity.C | 2 +-
.../viscosityModel/viscosityModel/viscosityModel.C | 6 +++---
.../viscosityModel/viscosityModel/viscosityModel.H | 2 +-
.../twoPhaseSystem/diameterModels/IATE/IATE.C | 2 +-
.../IATE/IATEsources/IATEsource/IATEsource.C | 6 +++---
.../IATE/IATEsources/IATEsource/IATEsource.H | 2 +-
.../IATE/IATEsources/phaseChange/phaseChange.C | 2 +-
.../IATEsources/randomCoalescence/randomCoalescence.C | 2 +-
.../IATEsources/turbulentBreakUp/turbulentBreakUp.C | 2 +-
.../wakeEntrainmentCoalescence.C | 2 +-
.../IATE/IATEsources/wallBoiling/wallBoiling.C | 2 +-
.../reactingEuler/twoPhaseSystem/twoPhaseSystem.C | 2 +-
.../reactingEuler/twoPhaseSystem/twoPhaseSystem.H | 2 +-
.../reactingEuler/twoPhaseSystem/twoPhaseSystemNew.C | 4 ++--
.../reactingEuler/twoPhaseSystem/twoPhaseSystems.C | 10 +++++-----
.../conductivityModel/Gidaspow/GidaspowConductivity.C | 2 +-
.../HrenyaSinclair/HrenyaSinclairConductivity.C | 2 +-
.../conductivityModel/Syamlal/SyamlalConductivity.C | 2 +-
.../conductivityModel/conductivityModel.C | 6 +++---
.../conductivityModel/conductivityModel.H | 2 +-
.../JohnsonJackson/JohnsonJacksonFrictionalStress.C | 2 +-
.../JohnsonJacksonSchaefferFrictionalStress.C | 2 +-
.../Schaeffer/SchaefferFrictionalStress.C | 2 +-
.../frictionalStressModel/frictionalStressModel.C | 6 +++---
.../frictionalStressModel/frictionalStressModel.H | 2 +-
.../granularPressureModel/Lun/LunPressure.C | 2 +-
.../SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C | 2 +-
.../granularPressureModel/granularPressureModel.C | 6 +++---
.../granularPressureModel/granularPressureModel.H | 2 +-
.../CarnahanStarling/CarnahanStarlingRadial.C | 2 +-
.../radialModel/LunSavage/LunSavageRadial.C | 2 +-
.../SinclairJackson/SinclairJacksonRadial.C | 2 +-
.../radialModel/radialModel/radialModel.C | 6 +++---
.../radialModel/radialModel/radialModel.H | 2 +-
.../viscosityModel/Gidaspow/GidaspowViscosity.C | 2 +-
.../HrenyaSinclair/HrenyaSinclairViscosity.C | 2 +-
.../viscosityModel/Syamlal/SyamlalViscosity.C | 2 +-
.../viscosityModel/none/noneViscosity.C | 2 +-
.../viscosityModel/viscosityModel/viscosityModel.C | 6 +++---
.../viscosityModel/viscosityModel/viscosityModel.H | 2 +-
.../blendingMethods/blendingMethod/blendingMethod.C | 6 +++---
.../blendingMethods/blendingMethod/blendingMethod.H | 2 +-
.../blendingMethods/hyperbolic/hyperbolic.C | 2 +-
.../blendingMethods/linear/linear.C | 2 +-
.../blendingMethods/noBlending/noBlending.C | 2 +-
.../twoPhaseSystem/diameterModels/IATE/IATE.C | 2 +-
.../IATE/IATEsources/IATEsource/IATEsource.C | 6 +++---
.../IATE/IATEsources/IATEsource/IATEsource.H | 2 +-
.../IATEsources/randomCoalescence/randomCoalescence.C | 2 +-
.../IATEsources/turbulentBreakUp/turbulentBreakUp.C | 2 +-
.../wakeEntrainmentCoalescence.C | 2 +-
.../diameterModels/constantDiameter/constantDiameter.C | 2 +-
.../diameterModels/diameterModel/diameterModel.C | 6 +++---
.../diameterModels/diameterModel/diameterModel.H | 2 +-
.../isothermalDiameter/isothermalDiameter.C | 2 +-
.../TomiyamaAspectRatio/TomiyamaAspectRatio.C | 2 +-
.../VakhrushevEfremov/VakhrushevEfremov.C | 2 +-
.../aspectRatioModels/Wellek/Wellek.C | 2 +-
.../aspectRatioModel/aspectRatioModel.C | 6 +++---
.../aspectRatioModel/aspectRatioModel.H | 2 +-
.../constantAspectRatio/constantAspectRatio.C | 2 +-
.../interfacialModels/dragModels/Ergun/Ergun.C | 2 +-
.../interfacialModels/dragModels/Gibilaro/Gibilaro.C | 2 +-
.../dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C | 2 +-
.../GidaspowSchillerNaumann/GidaspowSchillerNaumann.C | 2 +-
.../dragModels/IshiiZuber/IshiiZuber.C | 2 +-
.../interfacialModels/dragModels/Lain/Lain.C | 2 +-
.../dragModels/SchillerNaumann/SchillerNaumann.C | 2 +-
.../dragModels/SyamlalOBrien/SyamlalOBrien.C | 2 +-
.../dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C | 2 +-
.../dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C | 2 +-
.../interfacialModels/dragModels/WenYu/WenYu.C | 2 +-
.../interfacialModels/dragModels/dragModel/dragModel.C | 6 +++---
.../interfacialModels/dragModels/dragModel/dragModel.H | 2 +-
.../dragModels/segregated/segregated.C | 2 +-
.../heatTransferModels/RanzMarshall/RanzMarshall.C | 2 +-
.../heatTransferModel/heatTransferModel.C | 6 +++---
.../heatTransferModel/heatTransferModel.H | 2 +-
.../sphericalHeatTransfer/sphericalHeatTransfer.C | 2 +-
.../liftModels/LegendreMagnaudet/LegendreMagnaudet.C | 2 +-
.../interfacialModels/liftModels/Moraga/Moraga.C | 2 +-
.../liftModels/TomiyamaLift/TomiyamaLift.C | 2 +-
.../constantLiftCoefficient/constantLiftCoefficient.C | 2 +-
.../interfacialModels/liftModels/liftModel/liftModel.C | 6 +++---
.../interfacialModels/liftModels/liftModel/liftModel.H | 2 +-
.../interfacialModels/liftModels/noLift/noLift.C | 2 +-
.../swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C | 2 +-
.../swarmCorrections/noSwarm/noSwarm.C | 2 +-
.../swarmCorrections/swarmCorrection/swarmCorrection.C | 6 +++---
.../swarmCorrections/swarmCorrection/swarmCorrection.H | 2 +-
.../turbulentDispersionModels/Burns/Burns.C | 2 +-
.../turbulentDispersionModels/Gosman/Gosman.C | 2 +-
.../LopezDeBertodano/LopezDeBertodano.C | 2 +-
.../constantTurbulentDispersionCoefficient.C | 2 +-
.../noTurbulentDispersion/noTurbulentDispersion.C | 2 +-
.../turbulentDispersionModel.C | 6 +++---
.../turbulentDispersionModel.H | 2 +-
.../interfacialModels/virtualMassModels/Lamb/Lamb.C | 2 +-
.../constantVirtualMassCoefficient.C | 2 +-
.../virtualMassModels/noVirtualMass/noVirtualMass.C | 2 +-
.../virtualMassModel/virtualMassModel.C | 6 +++---
.../virtualMassModel/virtualMassModel.H | 2 +-
.../wallLubricationModels/Antal/Antal.C | 2 +-
.../wallLubricationModels/Frank/Frank.C | 2 +-
.../TomiyamaWallLubrication/TomiyamaWallLubrication.C | 2 +-
.../noWallLubrication/noWallLubrication.C | 2 +-
.../wallLubricationModel/wallLubricationModel.C | 6 +++---
.../wallLubricationModel/wallLubricationModel.H | 2 +-
334 files changed, 469 insertions(+), 468 deletions(-)
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C
index d3667c5204d..95ed9e57a1e 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C
@@ -43,7 +43,7 @@ namespace diameterModels
(
diameterModel,
constant,
- dictionary
+ multiphaseEuler
);
}
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C
index 976ec0569b3..d3802d7bf20 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C
@@ -35,7 +35,7 @@ namespace Foam
namespace multiphaseEuler
{
defineTypeNameAndDebug(diameterModel, 0);
- defineRunTimeSelectionTable(diameterModel, dictionary);
+ defineRunTimeSelectionTable(diameterModel, multiphaseEuler);
}
}
@@ -69,7 +69,7 @@ Foam::multiphaseEuler::diameterModel::New
<< ": "
<< modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = multiphaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -78,7 +78,7 @@ Foam::multiphaseEuler::diameterModel::New
dict,
"diameterModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *multiphaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H
index 485cf710216..c92de6e4495 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H
@@ -76,7 +76,7 @@ public:
(
autoPtr,
diameterModel,
- dictionary,
+ multiphaseEuler,
(
const dictionary& dict,
const phaseModel& phase
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
index fb455ea84bf..90fe725ebff 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
@@ -43,7 +43,7 @@ namespace diameterModels
(
diameterModel,
isothermal,
- dictionary
+ multiphaseEuler
);
}
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C
index 2253ff6af64..260eb5f29a3 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C
@@ -43,7 +43,7 @@ namespace dragModels
(
dragModel,
Ergun,
- dictionary
+ multiphaseEuler
);
}
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C
index 4adb0956ac9..e6013078669 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C
@@ -43,7 +43,7 @@ namespace dragModels
(
dragModel,
Gibilaro,
- dictionary
+ multiphaseEuler
);
}
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
index c1193fdd28e..ff0aeacd196 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
@@ -43,7 +43,7 @@ namespace dragModels
(
dragModel,
GidaspowErgunWenYu,
- dictionary
+ multiphaseEuler
);
}
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
index db2659ade9e..aa11b0cfc90 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
@@ -43,7 +43,7 @@ namespace dragModels
(
dragModel,
GidaspowSchillerNaumann,
- dictionary
+ multiphaseEuler
);
}
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
index 0190f746f8e..4438ab2268c 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
@@ -43,7 +43,7 @@ namespace dragModels
(
dragModel,
SchillerNaumann,
- dictionary
+ multiphaseEuler
);
}
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
index 8c29ad32b19..db52065cad0 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
@@ -43,7 +43,7 @@ namespace dragModels
(
dragModel,
SyamlalOBrien,
- dictionary
+ multiphaseEuler
);
}
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C
index 4b6722a8e6c..fae18b5075c 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C
@@ -43,7 +43,7 @@ namespace dragModels
(
dragModel,
WenYu,
- dictionary
+ multiphaseEuler
);
}
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/blended/blended.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/blended/blended.C
index c54bf672b8f..d8c266ecd56 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/blended/blended.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/blended/blended.C
@@ -43,7 +43,7 @@ namespace dragModels
(
dragModel,
blended,
- dictionary
+ multiphaseEuler
);
}
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C
index 29ad59478c6..5606c32b1cf 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C
@@ -35,7 +35,7 @@ namespace Foam
namespace multiphaseEuler
{
defineTypeNameAndDebug(dragModel, 0);
- defineRunTimeSelectionTable(dragModel, dictionary);
+ defineRunTimeSelectionTable(dragModel, multiphaseEuler);
}
}
@@ -74,7 +74,7 @@ Foam::multiphaseEuler::dragModel::New
<< ": "
<< modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = multiphaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -83,7 +83,7 @@ Foam::multiphaseEuler::dragModel::New
dict,
"dragModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *multiphaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H
index 54c21a876d9..ebae3e3f355 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H
@@ -76,7 +76,7 @@ public:
(
autoPtr,
dragModel,
- dictionary,
+ multiphaseEuler,
(
const dictionary& interfaceDict,
const phaseModel& phase1,
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.C
index 24f6c4afb2b..8d4ab0f270c 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.C
@@ -43,7 +43,7 @@ namespace dragModels
(
dragModel,
interface,
- dictionary
+ multiphaseEuler
);
}
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
index c8b1c261672..6a1949ce9dc 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
@@ -43,7 +43,7 @@ namespace heatTransferModels
(
heatTransferModel,
RanzMarshall,
- dictionary
+ multiphaseEuler
);
}
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
index 4a310001b77..d378df187d7 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
@@ -35,7 +35,7 @@ namespace Foam
namespace multiphaseEuler
{
defineTypeNameAndDebug(heatTransferModel, 0);
- defineRunTimeSelectionTable(heatTransferModel, dictionary);
+ defineRunTimeSelectionTable(heatTransferModel, multiphaseEuler);
}
}
@@ -78,7 +78,7 @@ Foam::multiphaseEuler::heatTransferModel::New
<< ": "
<< modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = multiphaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -87,7 +87,7 @@ Foam::multiphaseEuler::heatTransferModel::New
dict,
"heatTransferModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *multiphaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
index f1e8cb7c278..6374998dc45 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
@@ -77,7 +77,7 @@ public:
(
autoPtr,
heatTransferModel,
- dictionary,
+ multiphaseEuler,
(
const dictionary& dict,
const volScalarField& alpha1,
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.H
index 0e3171b3b39..87759896f36 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.H
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.H
@@ -269,7 +269,7 @@ public:
( \
interfaceCompositionModel, \
Type##Thermo##OtherThermo, \
- dictionary \
+ multiphaseInter \
)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.C
index d457dff3446..68a11df470a 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.C
@@ -36,7 +36,7 @@ namespace Foam
namespace multiphaseInter
{
defineTypeNameAndDebug(interfaceCompositionModel, 0);
- defineRunTimeSelectionTable(interfaceCompositionModel, dictionary);
+ defineRunTimeSelectionTable(interfaceCompositionModel, multiphaseInter);
}
}
@@ -99,7 +99,7 @@ Foam::multiphaseInter::interfaceCompositionModel::New
Info<< "Selecting interfaceCompositionModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = multiphaseInterConstructorTable(modelType);
if (!ctorPtr)
{
@@ -108,7 +108,7 @@ Foam::multiphaseInter::interfaceCompositionModel::New
dict,
"interfaceCompositionModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *multiphaseInterConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.H
index 3b6d64641c1..e0e7756a518 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.H
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.H
@@ -113,7 +113,7 @@ public:
(
autoPtr,
interfaceCompositionModel,
- dictionary,
+ multiphaseInter,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/VollerPrakash/VollerPrakash.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/VollerPrakash/VollerPrakash.C
index 2771f3bc0c4..f09693fc2f6 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/VollerPrakash/VollerPrakash.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/VollerPrakash/VollerPrakash.C
@@ -40,7 +40,7 @@ namespace porousModels
(
porousModel,
VollerPrakash,
- dictionary
+ multiphaseInter
);
}
}
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.C
index 8a22281d472..b450e23a23e 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.C
@@ -33,7 +33,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(porousModel, 0);
- defineRunTimeSelectionTable(porousModel, dictionary);
+ defineRunTimeSelectionTable(porousModel, multiphaseInter);
}
@@ -74,7 +74,7 @@ Foam::porousModel::New
Info<< "Selecting porousModel for "
<< ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = multiphaseInterConstructorTable(modelType);
if (!ctorPtr)
{
@@ -83,7 +83,7 @@ Foam::porousModel::New
dict,
"porousModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *multiphaseInterConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.H
index 3fb3aa332df..ffa0e28ea1c 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.H
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.H
@@ -75,7 +75,7 @@ public:
(
autoPtr,
porousModel,
- dictionary,
+ multiphaseInter,
(
const dictionary& dict,
const fvMesh& mesh
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
index bb4970e78fe..668a3b7c71c 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
@@ -42,7 +42,7 @@ namespace surfaceTensionModels
(
surfaceTensionModel,
constantSurfaceTensionCoefficient,
- dictionary
+ multiphaseInter
);
}
}
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C
index 9f6a0c68fc1..e46d8c87908 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C
@@ -35,7 +35,7 @@ namespace Foam
namespace multiphaseInter
{
defineTypeNameAndDebug(surfaceTensionModel, 0);
- defineRunTimeSelectionTable(surfaceTensionModel, dictionary);
+ defineRunTimeSelectionTable(surfaceTensionModel, multiphaseInter);
}
}
@@ -79,7 +79,7 @@ Foam::multiphaseInter::surfaceTensionModel::New
Info<< "Selecting surfaceTensionModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = multiphaseInterConstructorTable(modelType);
if (!ctorPtr)
{
@@ -88,7 +88,7 @@ Foam::multiphaseInter::surfaceTensionModel::New
dict,
"surfaceTensionModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *multiphaseInterConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H
index 1d7bce291a2..5eeb5446ea3 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H
@@ -78,7 +78,7 @@ public:
(
autoPtr,
surfaceTensionModel,
- dictionary,
+ multiphaseInter,
(
const dictionary& dict,
const phasePair& pair,
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.C
index ffda1f535a1..9ace95d827e 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.C
@@ -51,7 +51,7 @@ namespace Foam
namespace multiphaseInter
{
defineTypeNameAndDebug(multiphaseSystem, 0);
- defineRunTimeSelectionTable(multiphaseSystem, dictionary);
+ defineRunTimeSelectionTable(multiphaseSystem, multiphaseInter);
}
}
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.H
index 4cf77007c78..48cc6791832 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.H
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.H
@@ -106,7 +106,7 @@ public:
(
autoPtr,
multiphaseSystem,
- dictionary,
+ multiphaseInter,
(
const fvMesh& mesh
),
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystemNew.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystemNew.C
index 191af99c2ec..cd3e26f90cb 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystemNew.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystemNew.C
@@ -52,7 +52,7 @@ Foam::multiphaseInter::multiphaseSystem::New
Info<< "Selecting multiphaseSystem " << systemType << endl;
- auto* ctorPtr = dictionaryConstructorTable(systemType);
+ auto* ctorPtr = multiphaseInterConstructorTable(systemType);
if (!ctorPtr)
{
@@ -61,7 +61,7 @@ Foam::multiphaseInter::multiphaseSystem::New
dict,
"multiphaseSystem",
systemType,
- *dictionaryConstructorTablePtr_
+ *multiphaseInterConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystems.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystems.C
index f772cbb8343..9f4ca5935fe 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystems.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystems.C
@@ -43,7 +43,7 @@ namespace Foam
(
multiphaseSystem,
massTransferMultiphaseSystem,
- dictionary,
+ multiphaseInter,
massTransferMultiphaseSystem
);
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C
index ce807a4c35a..87d63b5760e 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C
@@ -33,7 +33,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(blendingMethod, 0);
- defineRunTimeSelectionTable(blendingMethod, dictionary);
+ defineRunTimeSelectionTable(blendingMethod, reactingEuler);
}
@@ -61,7 +61,7 @@ Foam::blendingMethod::New
Info<< "Selecting " << modelName << " blending method: "
<< modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -70,7 +70,7 @@ Foam::blendingMethod::New
dict,
"blendingMethod",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H
index 0a47d158d96..8d5aa0817ba 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H
@@ -63,7 +63,7 @@ public:
(
autoPtr,
blendingMethod,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const wordList& phaseNames
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C
index a1c01f11064..498e895042e 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C
@@ -40,7 +40,7 @@ namespace blendingMethods
(
blendingMethod,
hyperbolic,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C
index 78a3dcc6d0f..e2f3c8c3b12 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C
@@ -40,7 +40,7 @@ namespace blendingMethods
(
blendingMethod,
linear,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C
index 9057336a159..e53b5d654e0 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C
@@ -41,7 +41,7 @@ namespace blendingMethods
(
blendingMethod,
noBlending,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.C
index 3e2d745b44f..884112810c4 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.C
@@ -34,7 +34,7 @@ namespace Foam
namespace wallBoilingModels
{
defineTypeNameAndDebug(CHFModel, 0);
- defineRunTimeSelectionTable(CHFModel, dictionary);
+ defineRunTimeSelectionTable(CHFModel, reactingEuler);
}
}
@@ -51,7 +51,7 @@ Foam::wallBoilingModels::CHFModel::New
Info<< "Selecting CHFModel: " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -60,7 +60,7 @@ Foam::wallBoilingModels::CHFModel::New
dict,
"CHFModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.H
index de4010aef2f..1cb6c7ade6f 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.H
@@ -68,7 +68,7 @@ public:
(
autoPtr,
CHFModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.C
index 78740a8ec5c..38bd957323c 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.C
@@ -44,7 +44,7 @@ namespace CHFModels
(
CHFModel,
Zuber,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.C
index e4572905196..7db3d29c673 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.C
@@ -34,7 +34,7 @@ namespace Foam
namespace wallBoilingModels
{
defineTypeNameAndDebug(CHFSubCoolModel, 0);
- defineRunTimeSelectionTable(CHFSubCoolModel, dictionary);
+ defineRunTimeSelectionTable(CHFSubCoolModel, reactingEuler);
}
}
@@ -51,7 +51,7 @@ Foam::wallBoilingModels::CHFSubCoolModel::New
Info<< "Selecting CHFSubCoolModel: " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -60,7 +60,7 @@ Foam::wallBoilingModels::CHFSubCoolModel::New
dict,
"CHFSubCoolModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.H
index cc6f66ec9dc..8587856437f 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.H
@@ -68,7 +68,7 @@ public:
(
autoPtr,
CHFSubCoolModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.C
index 2e6448ccdad..f7a5ad1c67b 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.C
@@ -44,7 +44,7 @@ namespace CHFModels
(
CHFSubCoolModel,
HuaXu,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/Tatsumoto/Tatsumoto.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/Tatsumoto/Tatsumoto.C
index d516e27152a..fb6c9580ea2 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/Tatsumoto/Tatsumoto.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/Tatsumoto/Tatsumoto.C
@@ -44,7 +44,7 @@ namespace CHFModels
(
CHFSubCoolModel,
Tatsumoto,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.C
index f9135c58144..9f6a1a7d84a 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.C
@@ -34,7 +34,7 @@ namespace Foam
namespace wallBoilingModels
{
defineTypeNameAndDebug(LeidenfrostModel, 0);
- defineRunTimeSelectionTable(LeidenfrostModel, dictionary);
+ defineRunTimeSelectionTable(LeidenfrostModel, reactingEuler);
}
}
@@ -51,7 +51,7 @@ Foam::wallBoilingModels::LeidenfrostModel::New
Info<< "Selecting LeidenfrostModel: " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -60,7 +60,7 @@ Foam::wallBoilingModels::LeidenfrostModel::New
dict,
"LeidenfrostModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.H
index 95c65bf0e34..b25de923d22 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.H
@@ -67,7 +67,7 @@ public:
(
autoPtr,
LeidenfrostModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.C
index 7ced6beb024..fe43305f5dc 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.C
@@ -42,7 +42,7 @@ namespace LeidenfrostModels
(
LeidenfrostModel,
Spiegler,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.C
index e0c929f6dd9..6e12bd50615 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.C
@@ -44,7 +44,7 @@ namespace CHFModels
(
MHFModel,
Jeschar,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.C
index 268109c4c81..6f48e9ea1e2 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.C
@@ -34,7 +34,7 @@ namespace Foam
namespace wallBoilingModels
{
defineTypeNameAndDebug(MHFModel, 0);
- defineRunTimeSelectionTable(MHFModel, dictionary);
+ defineRunTimeSelectionTable(MHFModel, reactingEuler);
}
}
@@ -51,7 +51,7 @@ Foam::wallBoilingModels::MHFModel::New
Info<< "Selecting MHFModel: " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -60,7 +60,7 @@ Foam::wallBoilingModels::MHFModel::New
dict,
"MHFModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.H
index db0ac6fba72..da16226e428 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.H
@@ -67,7 +67,7 @@ public:
(
autoPtr,
MHFModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.C
index f2b9d9e5c8d..3477968d49b 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.C
@@ -44,7 +44,7 @@ namespace TDNBModels
(
TDNBModel,
Schroeder,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Shirai/Shirai.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Shirai/Shirai.C
index d8e1700687c..caabe4d4158 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Shirai/Shirai.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Shirai/Shirai.C
@@ -41,7 +41,7 @@ namespace TDNBModels
(
TDNBModel,
Shirai,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.C
index ac8277cb2ed..0f4358d724f 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.C
@@ -34,7 +34,7 @@ namespace Foam
namespace wallBoilingModels
{
defineTypeNameAndDebug(TDNBModel, 0);
- defineRunTimeSelectionTable(TDNBModel, dictionary);
+ defineRunTimeSelectionTable(TDNBModel, reactingEuler);
}
}
@@ -51,7 +51,7 @@ Foam::wallBoilingModels::TDNBModel::New
Info<< "Selecting TDNBModel: " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -60,7 +60,7 @@ Foam::wallBoilingModels::TDNBModel::New
dict,
"TDNBModelType",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.H
index af7a30c6580..082cc063630 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.H
@@ -67,7 +67,7 @@ public:
(
autoPtr,
TDNBModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C
index ef3bbfe84b2..c337c0732ef 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C
@@ -47,7 +47,7 @@ namespace departureDiameterModels
(
departureDiameterModel,
KocamustafaogullariIshii,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C
index 9ee761d9387..6e0d872f8e7 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C
@@ -42,7 +42,7 @@ namespace departureDiameterModels
(
departureDiameterModel,
TolubinskiKostanchuk,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C
index 0636fd64a1d..3d678d37c7f 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C
@@ -35,7 +35,7 @@ namespace Foam
namespace wallBoilingModels
{
defineTypeNameAndDebug(departureDiameterModel, 0);
- defineRunTimeSelectionTable(departureDiameterModel, dictionary);
+ defineRunTimeSelectionTable(departureDiameterModel, reactingEuler);
}
}
@@ -52,7 +52,7 @@ Foam::wallBoilingModels::departureDiameterModel::New
Info<< "Selecting departureDiameterModel: " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -61,7 +61,7 @@ Foam::wallBoilingModels::departureDiameterModel::New
dict,
"departureDiameterModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H
index 8570a1ab778..271bb55792b 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H
@@ -68,7 +68,7 @@ public:
(
autoPtr,
departureDiameterModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C
index 3369122593a..06cd733dda3 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C
@@ -46,7 +46,7 @@ namespace departureFrequencyModels
(
departureFrequencyModel,
Cole,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C
index 70109170303..0b546df3973 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C
@@ -35,7 +35,7 @@ namespace Foam
namespace wallBoilingModels
{
defineTypeNameAndDebug(departureFrequencyModel, 0);
- defineRunTimeSelectionTable(departureFrequencyModel, dictionary);
+ defineRunTimeSelectionTable(departureFrequencyModel, reactingEuler);
}
}
@@ -52,7 +52,7 @@ Foam::wallBoilingModels::departureFrequencyModel::New
Info<< "Selecting departureFrequencyModel: " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -61,7 +61,7 @@ Foam::wallBoilingModels::departureFrequencyModel::New
dict,
"departureFrequencyModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H
index 6a013cda496..bf2df7e4c66 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H
@@ -68,7 +68,7 @@ public:
(
autoPtr,
departureFrequencyModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/BreenWestwater/BreenWestwater.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/BreenWestwater/BreenWestwater.C
index c916bdc05cc..15a187f86b0 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/BreenWestwater/BreenWestwater.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/BreenWestwater/BreenWestwater.C
@@ -44,7 +44,7 @@ namespace filmBoilingModels
(
filmBoilingModel,
BreenWestwater,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.C
index ca421a779e4..bc46e4eda70 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.C
@@ -45,7 +45,7 @@ namespace filmBoilingModels
(
filmBoilingModel,
Bromley,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.C
index 2ffcfea4d98..7812c6e6b34 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.C
@@ -34,7 +34,7 @@ namespace Foam
namespace wallBoilingModels
{
defineTypeNameAndDebug(filmBoilingModel, 0);
- defineRunTimeSelectionTable(filmBoilingModel, dictionary);
+ defineRunTimeSelectionTable(filmBoilingModel, reactingEuler);
}
}
@@ -51,7 +51,7 @@ Foam::wallBoilingModels::filmBoilingModel::New
Info<< "Selecting filmBoilingModel: " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -60,7 +60,7 @@ Foam::wallBoilingModels::filmBoilingModel::New
dict,
"filmBoilingModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.H
index 83a3f2a4a3a..ee819f8d9f9 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.H
@@ -67,7 +67,7 @@ public:
(
autoPtr,
filmBoilingModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/Kutadeladze/Kutadeladze.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/Kutadeladze/Kutadeladze.C
index f30f59a0e78..c21411b5dc9 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/Kutadeladze/Kutadeladze.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/Kutadeladze/Kutadeladze.C
@@ -44,7 +44,7 @@ namespace nucleateFluxModels
(
nucleateFluxModel,
Kutadeladze,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/exponential/exponential.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/exponential/exponential.C
index 5ebf3142286..d6b91853d4f 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/exponential/exponential.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/exponential/exponential.C
@@ -44,7 +44,7 @@ namespace nucleateFluxModels
(
nucleateFluxModel,
exponential,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.C
index d50e7e4ed92..c32fea24dd7 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.C
@@ -34,7 +34,7 @@ namespace Foam
namespace wallBoilingModels
{
defineTypeNameAndDebug(nucleateFluxModel, 0);
- defineRunTimeSelectionTable(nucleateFluxModel, dictionary);
+ defineRunTimeSelectionTable(nucleateFluxModel, reactingEuler);
}
}
@@ -50,7 +50,7 @@ Foam::wallBoilingModels::nucleateFluxModel::New
Info<< "Selecting nucleateFluxModel: " << modelType << endl;
- auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+ auto cstrIter = reactingEulerConstructorTablePtr_->cfind(modelType);
if (!cstrIter.found())
{
@@ -59,7 +59,7 @@ Foam::wallBoilingModels::nucleateFluxModel::New
dict,
"nucleateFluxModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.H
index 952c3d75ac7..1cc7da2fdff 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.H
@@ -65,7 +65,7 @@ public:
(
autoPtr,
nucleateFluxModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C
index 8090158f85e..861a722b6dd 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C
@@ -42,7 +42,7 @@ namespace nucleationSiteModels
(
nucleationSiteModel,
LemmertChawla,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C
index e6cf913c119..fdd647e4713 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C
@@ -35,7 +35,7 @@ namespace Foam
namespace wallBoilingModels
{
defineTypeNameAndDebug(nucleationSiteModel, 0);
- defineRunTimeSelectionTable(nucleationSiteModel, dictionary);
+ defineRunTimeSelectionTable(nucleationSiteModel, reactingEuler);
}
}
@@ -52,7 +52,7 @@ Foam::wallBoilingModels::nucleationSiteModel::New
Info<< "Selecting nucleationSiteModel: " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -61,7 +61,7 @@ Foam::wallBoilingModels::nucleationSiteModel::New
dict,
"nucleationSiteModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H
index 3c35468fd2e..79d7bb3b869 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H
@@ -69,7 +69,7 @@ public:
(
autoPtr,
nucleationSiteModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C
index 7eafe8cfe48..a8ef4e1b5d4 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C
@@ -42,7 +42,7 @@ namespace partitioningModels
(
partitioningModel,
Lavieville,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C
index 38882a966e5..0fabffeeffb 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C
@@ -42,7 +42,7 @@ namespace partitioningModels
(
partitioningModel,
cosine,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C
index 05228fafd60..c34002182f7 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C
@@ -42,7 +42,7 @@ namespace partitioningModels
(
partitioningModel,
linear,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C
index c56b69db71c..af8643d59c1 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C
@@ -35,7 +35,7 @@ namespace Foam
namespace wallBoilingModels
{
defineTypeNameAndDebug(partitioningModel, 0);
- defineRunTimeSelectionTable(partitioningModel, dictionary);
+ defineRunTimeSelectionTable(partitioningModel, reactingEuler);
}
}
@@ -53,7 +53,7 @@ Foam::wallBoilingModels::partitioningModel::New
Info<< "Selecting partitioningModel: "
<< modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -62,7 +62,7 @@ Foam::wallBoilingModels::partitioningModel::New
dict,
"partitioningModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H
index 1de2bf75483..81f0aedf816 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H
@@ -66,7 +66,7 @@ public:
(
autoPtr,
partitioningModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C
index 8530ea3098e..e227a27380c 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C
@@ -42,7 +42,7 @@ namespace partitioningModels
(
partitioningModel,
phaseFraction,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C
index 8ec8a8be023..ce51e12c38c 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C
@@ -41,7 +41,7 @@ namespace diameterModels
(
diameterModel,
constant,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C
index 02d716b849e..aebbaf9391b 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C
@@ -33,7 +33,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(diameterModel, 0);
- defineRunTimeSelectionTable(diameterModel, dictionary);
+ defineRunTimeSelectionTable(diameterModel, reactingEuler);
}
@@ -66,7 +66,7 @@ Foam::diameterModel::New
<< ": "
<< modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -75,7 +75,7 @@ Foam::diameterModel::New
dict,
"diameterModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H
index 8923468bfd5..50d509c308f 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H
@@ -74,7 +74,7 @@ public:
(
autoPtr,
diameterModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phaseModel& phase
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
index 69880fb9c70..7eaa8f91176 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
@@ -41,7 +41,7 @@ namespace diameterModels
(
diameterModel,
isothermal,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/linearTsubDiameter/linearTsubDiameter.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/linearTsubDiameter/linearTsubDiameter.C
index fb914231371..86521740f13 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/linearTsubDiameter/linearTsubDiameter.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/linearTsubDiameter/linearTsubDiameter.C
@@ -43,7 +43,7 @@ namespace diameterModels
(
diameterModel,
linearTsub,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/velocityGroup/velocityGroup.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/velocityGroup/velocityGroup.C
index 15e50d8b8f1..8864d4ae5ff 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/velocityGroup/velocityGroup.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/velocityGroup/velocityGroup.C
@@ -44,7 +44,7 @@ namespace diameterModels
(
diameterModel,
velocityGroup,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
index f87c7e51b0f..7db54d54eba 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
@@ -203,7 +203,7 @@ public:
( \
interfaceCompositionModel, \
Type##Thermo##OtherThermo, \
- dictionary \
+ reactingEuler \
)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C
index 9b428109994..292d1409347 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C
@@ -35,7 +35,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(interfaceCompositionModel, 0);
- defineRunTimeSelectionTable(interfaceCompositionModel, dictionary);
+ defineRunTimeSelectionTable(interfaceCompositionModel, reactingEuler);
}
@@ -74,7 +74,7 @@ Foam::interfaceCompositionModel::New
Info<< "Selecting interfaceCompositionModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -83,7 +83,7 @@ Foam::interfaceCompositionModel::New
dict,
"interfaceCompositionModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H
index b0472ecc1d5..9b21cdec5a9 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H
@@ -83,7 +83,7 @@ public:
(
autoPtr,
interfaceCompositionModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/Frossling/Frossling.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/Frossling/Frossling.C
index 895e27ccf07..4565cce0937 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/Frossling/Frossling.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/Frossling/Frossling.C
@@ -36,7 +36,7 @@ namespace Foam
namespace massTransferModels
{
defineTypeNameAndDebug(Frossling, 0);
- addToRunTimeSelectionTable(massTransferModel, Frossling, dictionary);
+ addToRunTimeSelectionTable(massTransferModel, Frossling, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.C
index 8486fd836d7..0cdcb766db1 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.C
@@ -36,7 +36,7 @@ namespace Foam
{
defineTypeNameAndDebug(massTransferModel, 0);
defineBlendedInterfacialModelTypeNameAndDebug(massTransferModel, 0);
- defineRunTimeSelectionTable(massTransferModel, dictionary);
+ defineRunTimeSelectionTable(massTransferModel, reactingEuler);
}
const Foam::dimensionSet Foam::massTransferModel::dimK(0, -2, 0, 0, 0);
@@ -68,7 +68,7 @@ Foam::massTransferModel::New
Info<< "Selecting massTransferModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -77,7 +77,7 @@ Foam::massTransferModel::New
dict,
"massTransferModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.H
index 7ae44c25f74..a1d3451e482 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.H
@@ -75,7 +75,7 @@ public:
(
autoPtr,
massTransferModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C
index f13ddc17195..59f382bf57a 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C
@@ -40,7 +40,7 @@ namespace massTransferModels
(
massTransferModel,
sphericalMassTransfer,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
index 56e7d554124..566193b1298 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
@@ -43,7 +43,7 @@ namespace surfaceTensionModels
(
surfaceTensionModel,
constantSurfaceTensionCoefficient,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C
index 4d4e05ce699..20e3b43d760 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C
@@ -36,7 +36,7 @@ namespace Foam
namespace reactingMultiphaseEuler
{
defineTypeNameAndDebug(surfaceTensionModel, 0);
- defineRunTimeSelectionTable(surfaceTensionModel, dictionary);
+ defineRunTimeSelectionTable(surfaceTensionModel, reactingEuler);
}
}
@@ -83,7 +83,7 @@ Foam::reactingMultiphaseEuler::surfaceTensionModel::New
Info<< "Selecting surfaceTensionModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -92,7 +92,7 @@ Foam::reactingMultiphaseEuler::surfaceTensionModel::New
dict,
"surfaceTensionModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H
index 29b27e9529e..429aa2ab864 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H
@@ -79,7 +79,7 @@ public:
(
autoPtr,
surfaceTensionModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair,
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C
index 17d4bc91c02..183608f58e4 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C
@@ -40,7 +40,7 @@ namespace aspectRatioModels
(
aspectRatioModel,
TomiyamaAspectRatio,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C
index cba225f22e8..9c6dfabc803 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C
@@ -40,7 +40,7 @@ namespace aspectRatioModels
(
aspectRatioModel,
VakhrushevEfremov,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/Wellek/Wellek.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/Wellek/Wellek.C
index eb657ceaae7..d1695769cc1 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/Wellek/Wellek.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/Wellek/Wellek.C
@@ -40,7 +40,7 @@ namespace aspectRatioModels
(
aspectRatioModel,
Wellek,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C
index 7eb974d5f7b..fe466f18eae 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C
@@ -34,7 +34,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(aspectRatioModel, 0);
- defineRunTimeSelectionTable(aspectRatioModel, dictionary);
+ defineRunTimeSelectionTable(aspectRatioModel, reactingEuler);
}
@@ -64,7 +64,7 @@ Foam::aspectRatioModel::New
Info<< "Selecting aspectRatioModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -73,7 +73,7 @@ Foam::aspectRatioModel::New
dict,
"swarmCorrection",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H
index 65f55286c67..258c8d8740c 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H
@@ -74,7 +74,7 @@ public:
(
autoPtr,
aspectRatioModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C
index 9b38688cdc9..afdfbbcb9bc 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C
@@ -40,7 +40,7 @@ namespace aspectRatioModels
(
aspectRatioModel,
constantAspectRatio,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C
index 35ebf46c5df..fa333d242a2 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C
@@ -37,7 +37,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(AttouFerschneider, 0);
- addToRunTimeSelectionTable(dragModel, AttouFerschneider, dictionary);
+ addToRunTimeSelectionTable(dragModel, AttouFerschneider, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Beetstra/Beetstra.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Beetstra/Beetstra.C
index 180ff487fdd..7e4e3817dd1 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Beetstra/Beetstra.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Beetstra/Beetstra.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(Beetstra, 0);
- addToRunTimeSelectionTable(dragModel, Beetstra, dictionary);
+ addToRunTimeSelectionTable(dragModel, Beetstra, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C
index fdf321291bd..798ded342a9 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(Ergun, 0);
- addToRunTimeSelectionTable(dragModel, Ergun, dictionary);
+ addToRunTimeSelectionTable(dragModel, Ergun, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C
index cda3832579a..0ce9b1ea1c5 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(Gibilaro, 0);
- addToRunTimeSelectionTable(dragModel, Gibilaro, dictionary);
+ addToRunTimeSelectionTable(dragModel, Gibilaro, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
index c8ee872db5e..6d876441c66 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
@@ -38,7 +38,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(GidaspowErgunWenYu, 0);
- addToRunTimeSelectionTable(dragModel, GidaspowErgunWenYu, dictionary);
+ addToRunTimeSelectionTable(dragModel, GidaspowErgunWenYu, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
index a1ec93ee354..6f577e932cc 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(GidaspowSchillerNaumann, 0);
- addToRunTimeSelectionTable(dragModel, GidaspowSchillerNaumann, dictionary);
+ addToRunTimeSelectionTable(dragModel, GidaspowSchillerNaumann, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C
index 8946f1093d4..c32df413622 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(IshiiZuber, 0);
- addToRunTimeSelectionTable(dragModel, IshiiZuber, dictionary);
+ addToRunTimeSelectionTable(dragModel, IshiiZuber, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Lain/Lain.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Lain/Lain.C
index 08e5cc32f29..d861ed45bcd 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Lain/Lain.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Lain/Lain.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(Lain, 0);
- addToRunTimeSelectionTable(dragModel, Lain, dictionary);
+ addToRunTimeSelectionTable(dragModel, Lain, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
index 40217ede5b3..57dfba953d5 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(SchillerNaumann, 0);
- addToRunTimeSelectionTable(dragModel, SchillerNaumann, dictionary);
+ addToRunTimeSelectionTable(dragModel, SchillerNaumann, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
index e50dce981ba..1d624c27211 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(SyamlalOBrien, 0);
- addToRunTimeSelectionTable(dragModel, SyamlalOBrien, dictionary);
+ addToRunTimeSelectionTable(dragModel, SyamlalOBrien, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Tenneti/Tenneti.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Tenneti/Tenneti.C
index 14f98df7c5c..67122b8f098 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Tenneti/Tenneti.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Tenneti/Tenneti.C
@@ -37,7 +37,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(Tenneti, 0);
- addToRunTimeSelectionTable(dragModel, Tenneti, dictionary);
+ addToRunTimeSelectionTable(dragModel, Tenneti, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
index d7fd59103c3..7f42bc48f50 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(TomiyamaAnalytic, 0);
- addToRunTimeSelectionTable(dragModel, TomiyamaAnalytic, dictionary);
+ addToRunTimeSelectionTable(dragModel, TomiyamaAnalytic, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
index 1863f9e38a7..02246547f11 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(TomiyamaCorrelated, 0);
- addToRunTimeSelectionTable(dragModel, TomiyamaCorrelated, dictionary);
+ addToRunTimeSelectionTable(dragModel, TomiyamaCorrelated, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C
index abd95bbb979..6d2ecb75de8 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C
@@ -40,7 +40,7 @@ namespace dragModels
(
dragModel,
TomiyamaKataokaZunSakaguchi,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C
index b60bafd71da..99340ce1ddd 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(WenYu, 0);
- addToRunTimeSelectionTable(dragModel, WenYu, dictionary);
+ addToRunTimeSelectionTable(dragModel, WenYu, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C
index 27eaf3b0d9a..caf31f478cc 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C
@@ -38,7 +38,7 @@ namespace Foam
{
defineTypeNameAndDebug(dragModel, 0);
defineBlendedInterfacialModelTypeNameAndDebug(dragModel, 0);
- defineRunTimeSelectionTable(dragModel, dictionary);
+ defineRunTimeSelectionTable(dragModel, reactingEuler);
}
const Foam::dimensionSet Foam::dragModel::dimK(1, -3, -1, 0, 0);
@@ -113,7 +113,7 @@ Foam::dragModel::New
Info<< "Selecting dragModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -122,7 +122,7 @@ Foam::dragModel::New
dict,
"dragModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H
index 660662e2ef2..f8d568d26e7 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H
@@ -81,7 +81,7 @@ public:
(
autoPtr,
dragModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair,
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/segregated/segregated.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/segregated/segregated.C
index 3f96b5353e7..0b03aa84526 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/segregated/segregated.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/segregated/segregated.C
@@ -39,7 +39,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(segregated, 0);
- addToRunTimeSelectionTable(dragModel, segregated, dictionary);
+ addToRunTimeSelectionTable(dragModel, segregated, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
index e87d53306c7..b6bf5761b8b 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
@@ -36,7 +36,7 @@ namespace Foam
namespace heatTransferModels
{
defineTypeNameAndDebug(RanzMarshall, 0);
- addToRunTimeSelectionTable(heatTransferModel, RanzMarshall, dictionary);
+ addToRunTimeSelectionTable(heatTransferModel, RanzMarshall, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.C
index 47bab24e784..505aee53acf 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.C
@@ -40,7 +40,7 @@ namespace heatTransferModels
(
heatTransferModel,
constantNuHeatTransfer,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
index 4dfa443d59c..f820d913dca 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
@@ -36,7 +36,7 @@ namespace Foam
{
defineTypeNameAndDebug(heatTransferModel, 0);
defineBlendedInterfacialModelTypeNameAndDebug(heatTransferModel, 0);
- defineRunTimeSelectionTable(heatTransferModel, dictionary);
+ defineRunTimeSelectionTable(heatTransferModel, reactingEuler);
}
const Foam::dimensionSet Foam::heatTransferModel::dimK(1, -1, -3, -1, 0);
@@ -79,7 +79,7 @@ Foam::heatTransferModel::New
Info<< "Selecting heatTransferModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -88,7 +88,7 @@ Foam::heatTransferModel::New
dict,
"heatTransferModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
index 396e715d6c4..664bd8afe57 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
@@ -78,7 +78,7 @@ public:
(
autoPtr,
heatTransferModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C
index f2a50da8677..1e3b488e0d6 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C
@@ -40,7 +40,7 @@ namespace heatTransferModels
(
heatTransferModel,
sphericalHeatTransfer,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C
index 793266b2608..c72be52b75e 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C
@@ -37,7 +37,7 @@ namespace Foam
namespace liftModels
{
defineTypeNameAndDebug(LegendreMagnaudet, 0);
- addToRunTimeSelectionTable(liftModel, LegendreMagnaudet, dictionary);
+ addToRunTimeSelectionTable(liftModel, LegendreMagnaudet, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/Moraga/Moraga.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/Moraga/Moraga.C
index 97364b5fe88..48523236301 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/Moraga/Moraga.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/Moraga/Moraga.C
@@ -37,7 +37,7 @@ namespace Foam
namespace liftModels
{
defineTypeNameAndDebug(Moraga, 0);
- addToRunTimeSelectionTable(liftModel, Moraga, dictionary);
+ addToRunTimeSelectionTable(liftModel, Moraga, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C
index 763827cae15..3589e99e696 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C
@@ -36,7 +36,7 @@ namespace Foam
namespace liftModels
{
defineTypeNameAndDebug(TomiyamaLift, 0);
- addToRunTimeSelectionTable(liftModel, TomiyamaLift, dictionary);
+ addToRunTimeSelectionTable(liftModel, TomiyamaLift, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C
index f9344d6816c..be58edfc7f2 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C
@@ -36,7 +36,7 @@ namespace Foam
namespace liftModels
{
defineTypeNameAndDebug(constantLiftCoefficient, 0);
- addToRunTimeSelectionTable(liftModel, constantLiftCoefficient, dictionary);
+ addToRunTimeSelectionTable(liftModel, constantLiftCoefficient, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/liftModel/liftModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/liftModel/liftModel.C
index dd275ac18a7..f1334f23dc0 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/liftModel/liftModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/liftModel/liftModel.C
@@ -39,7 +39,7 @@ namespace Foam
{
defineTypeNameAndDebug(liftModel, 0);
defineBlendedInterfacialModelTypeNameAndDebug(liftModel, 0);
- defineRunTimeSelectionTable(liftModel, dictionary);
+ defineRunTimeSelectionTable(liftModel, reactingEuler);
}
const Foam::dimensionSet Foam::liftModel::dimF(1, -2, -2, 0, 0);
@@ -71,7 +71,7 @@ Foam::liftModel::New
Info<< "Selecting liftModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -80,7 +80,7 @@ Foam::liftModel::New
dict,
"liftModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/liftModel/liftModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/liftModel/liftModel.H
index a71a843f815..6de8c375f72 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/liftModel/liftModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/liftModel/liftModel.H
@@ -75,7 +75,7 @@ public:
(
autoPtr,
liftModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/noLift/noLift.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/noLift/noLift.C
index 1305b838170..7e2956f5ef1 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/noLift/noLift.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/noLift/noLift.C
@@ -36,7 +36,7 @@ namespace Foam
namespace liftModels
{
defineTypeNameAndDebug(noLift, 0);
- addToRunTimeSelectionTable(liftModel, noLift, dictionary);
+ addToRunTimeSelectionTable(liftModel, noLift, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C
index 4c4d87ee418..fba63d27334 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C
@@ -36,7 +36,7 @@ namespace Foam
namespace liftModels
{
defineTypeNameAndDebug(wallDamped, 0);
- addToRunTimeSelectionTable(liftModel, wallDamped, dictionary);
+ addToRunTimeSelectionTable(liftModel, wallDamped, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/deposition/deposition.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/deposition/deposition.C
index c29471d7afa..2a65878a7ea 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/deposition/deposition.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/deposition/deposition.C
@@ -38,7 +38,7 @@ namespace Foam
namespace phaseTransferModels
{
defineTypeNameAndDebug(deposition, 0);
- addToRunTimeSelectionTable(phaseTransferModel, deposition, dictionary);
+ addToRunTimeSelectionTable(phaseTransferModel, deposition, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C
index 0dceccfc0d3..0389c6827e4 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C
@@ -36,7 +36,7 @@ namespace Foam
{
defineTypeNameAndDebug(phaseTransferModel, 0);
defineBlendedInterfacialModelTypeNameAndDebug(phaseTransferModel, 0);
- defineRunTimeSelectionTable(phaseTransferModel, dictionary);
+ defineRunTimeSelectionTable(phaseTransferModel, reactingEuler);
}
const Foam::dimensionSet Foam::phaseTransferModel::dimDmdt =
@@ -69,7 +69,7 @@ Foam::phaseTransferModel::New
Info<< "Selecting phaseTransferModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -78,7 +78,7 @@ Foam::phaseTransferModel::New
dict,
"phaseTransferModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.H
index b3ae79a3ce4..94d2b5fc664 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.H
@@ -75,7 +75,7 @@ public:
(
autoPtr,
phaseTransferModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C
index d322ef21a4c..40bf30189f5 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C
@@ -40,7 +40,7 @@ namespace swarmCorrections
(
swarmCorrection,
TomiyamaSwarm,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/noSwarm/noSwarm.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/noSwarm/noSwarm.C
index 89c08a4583b..a269e6639c6 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/noSwarm/noSwarm.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/noSwarm/noSwarm.C
@@ -36,7 +36,7 @@ namespace Foam
namespace swarmCorrections
{
defineTypeNameAndDebug(noSwarm, 0);
- addToRunTimeSelectionTable(swarmCorrection, noSwarm, dictionary);
+ addToRunTimeSelectionTable(swarmCorrection, noSwarm, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C
index 490e7d68bb6..78753c6a06f 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C
@@ -34,7 +34,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(swarmCorrection, 0);
- defineRunTimeSelectionTable(swarmCorrection, dictionary);
+ defineRunTimeSelectionTable(swarmCorrection, reactingEuler);
}
@@ -64,7 +64,7 @@ Foam::swarmCorrection::New
Info<< "Selecting swarmCorrection for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -73,7 +73,7 @@ Foam::swarmCorrection::New
dict,
"swarmCorrection",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H
index 51dfa89d54d..35ceaf90e87 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H
@@ -74,7 +74,7 @@ public:
(
autoPtr,
swarmCorrection,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/Burns/Burns.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/Burns/Burns.C
index a691e6f3dd8..8f6b7f479e5 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/Burns/Burns.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/Burns/Burns.C
@@ -43,7 +43,7 @@ namespace turbulentDispersionModels
(
turbulentDispersionModel,
Burns,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
index 90d7abbf390..fb0b9b0b46e 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
@@ -42,7 +42,7 @@ namespace turbulentDispersionModels
(
turbulentDispersionModel,
Gosman,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
index 27d010d6b09..19efe0a00b9 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
@@ -41,7 +41,7 @@ namespace turbulentDispersionModels
(
turbulentDispersionModel,
LopezDeBertodano,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
index 80cb059ffbe..e8134030df6 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
@@ -41,7 +41,7 @@ namespace turbulentDispersionModels
(
turbulentDispersionModel,
constantTurbulentDispersionCoefficient,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
index 9c7b63ffd11..42f0369db16 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
@@ -40,7 +40,7 @@ namespace turbulentDispersionModels
(
turbulentDispersionModel,
noTurbulentDispersion,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C
index dbd9b38247b..fd8c2c377bf 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C
@@ -40,7 +40,7 @@ namespace Foam
{
defineTypeNameAndDebug(turbulentDispersionModel, 0);
defineBlendedInterfacialModelTypeNameAndDebug(turbulentDispersionModel, 0);
- defineRunTimeSelectionTable(turbulentDispersionModel, dictionary);
+ defineRunTimeSelectionTable(turbulentDispersionModel, reactingEuler);
}
const Foam::dimensionSet Foam::turbulentDispersionModel::dimD(1, -1, -2, 0, 0);
@@ -73,7 +73,7 @@ Foam::turbulentDispersionModel::New
Info<< "Selecting turbulentDispersionModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -82,7 +82,7 @@ Foam::turbulentDispersionModel::New
dict,
"turbulentDispersionModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H
index 7150b01ccae..a8b8371a143 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H
@@ -76,7 +76,7 @@ public:
(
autoPtr,
turbulentDispersionModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C
index ee9c252ce47..a538d5402d1 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C
@@ -40,7 +40,7 @@ namespace virtualMassModels
(
virtualMassModel,
Lamb,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
index 47b1612dabc..4c1625e994a 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
@@ -40,7 +40,7 @@ namespace virtualMassModels
(
virtualMassModel,
constantVirtualMassCoefficient,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C
index 10f3c281ae9..fe438884b76 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C
@@ -36,7 +36,7 @@ namespace Foam
namespace virtualMassModels
{
defineTypeNameAndDebug(noVirtualMass, 0);
- addToRunTimeSelectionTable(virtualMassModel, noVirtualMass, dictionary);
+ addToRunTimeSelectionTable(virtualMassModel, noVirtualMass, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C
index aeccb73157f..fc3fec55e94 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C
@@ -37,7 +37,7 @@ namespace Foam
{
defineTypeNameAndDebug(virtualMassModel, 0);
defineBlendedInterfacialModelTypeNameAndDebug(virtualMassModel, 0);
- defineRunTimeSelectionTable(virtualMassModel, dictionary);
+ defineRunTimeSelectionTable(virtualMassModel, reactingEuler);
}
const Foam::dimensionSet Foam::virtualMassModel::dimK(dimDensity);
@@ -82,7 +82,7 @@ Foam::virtualMassModel::New
Info<< "Selecting virtualMassModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -91,7 +91,7 @@ Foam::virtualMassModel::New
dict,
"virtualMassModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H
index 10ad757b1ca..cd926224e29 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H
@@ -77,7 +77,7 @@ public:
(
autoPtr,
virtualMassModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair,
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C
index 25424120f9d..d3250f0827e 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C
@@ -40,7 +40,7 @@ namespace wallDampingModels
(
wallDampingModel,
cosine,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/linear/linearWallDamping.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/linear/linearWallDamping.C
index 90ead6f53e3..602d89eaa6b 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/linear/linearWallDamping.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/linear/linearWallDamping.C
@@ -40,7 +40,7 @@ namespace wallDampingModels
(
wallDampingModel,
linear,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.C
index 9f9152bfc66..749353677c7 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.C
@@ -40,7 +40,7 @@ namespace wallDampingModels
(
wallDampingModel,
noWallDamping,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/sine/sineWallDamping.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/sine/sineWallDamping.C
index 12937e9e56a..edc18ab3a47 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/sine/sineWallDamping.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/sine/sineWallDamping.C
@@ -40,7 +40,7 @@ namespace wallDampingModels
(
wallDampingModel,
sine,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C
index 0b057d83343..5dd075ff8f8 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C
@@ -34,7 +34,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(wallDampingModel, 0);
- defineRunTimeSelectionTable(wallDampingModel, dictionary);
+ defineRunTimeSelectionTable(wallDampingModel, reactingEuler);
}
const Foam::dimensionSet Foam::wallDampingModel::dimF(1, -2, -2, 0, 0);
@@ -67,7 +67,7 @@ Foam::wallDampingModel::New
Info<< "Selecting wallDampingModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -76,7 +76,7 @@ Foam::wallDampingModel::New
dict,
"wallDampingModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H
index 56a089a2748..41d6ac51803 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H
@@ -78,7 +78,7 @@ public:
(
autoPtr,
wallDampingModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/Antal/Antal.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/Antal/Antal.C
index 819604f9af2..3123e62595c 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/Antal/Antal.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/Antal/Antal.C
@@ -40,7 +40,7 @@ namespace wallLubricationModels
(
wallLubricationModel,
Antal,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/Frank/Frank.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/Frank/Frank.C
index 7553a761059..cef8c4ddea7 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/Frank/Frank.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/Frank/Frank.C
@@ -41,7 +41,7 @@ namespace wallLubricationModels
(
wallLubricationModel,
Frank,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C
index 1bd56ddea00..d90e6013445 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C
@@ -40,7 +40,7 @@ namespace wallLubricationModels
(
wallLubricationModel,
TomiyamaWallLubrication,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
index e4f019b446f..d559ed148d6 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
@@ -40,7 +40,7 @@ namespace wallLubricationModels
(
wallLubricationModel,
noWallLubrication,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
index c8f7622dc20..f106220b6ca 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
@@ -39,7 +39,7 @@ namespace Foam
{
defineTypeNameAndDebug(wallLubricationModel, 0);
defineBlendedInterfacialModelTypeNameAndDebug(wallLubricationModel, 0);
- defineRunTimeSelectionTable(wallLubricationModel, dictionary);
+ defineRunTimeSelectionTable(wallLubricationModel, reactingEuler);
}
const Foam::dimensionSet Foam::wallLubricationModel::dimF(1, -2, -2, 0, 0);
@@ -97,7 +97,7 @@ Foam::wallLubricationModel::New
Info<< "Selecting wallLubricationModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -106,7 +106,7 @@ Foam::wallLubricationModel::New
dict,
"wallLubricationModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H
index 2c72fd0505e..40f064165d1 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H
@@ -84,7 +84,7 @@ public:
(
autoPtr,
wallLubricationModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C
index 3b795194c94..f0686351df8 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C
@@ -51,7 +51,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(multiphaseSystem, 0);
- defineRunTimeSelectionTable(multiphaseSystem, dictionary);
+ defineRunTimeSelectionTable(multiphaseSystem, reactingEuler);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.H
index 3652477d3cb..14cecfecb22 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.H
@@ -134,7 +134,7 @@ public:
(
autoPtr,
multiphaseSystem,
- dictionary,
+ reactingEuler,
(
const fvMesh& mesh
),
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystemNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystemNew.C
index 3baa96c41ad..59fbeb46e2b 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystemNew.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystemNew.C
@@ -52,7 +52,7 @@ Foam::autoPtr<Foam::multiphaseSystem> Foam::multiphaseSystem::New
Info<< "Selecting multiphaseSystem " << systemType << endl;
- auto* ctorPtr = dictionaryConstructorTable(systemType);
+ auto* ctorPtr = reactingEulerConstructorTable(systemType);
if (!ctorPtr)
{
@@ -61,7 +61,7 @@ Foam::autoPtr<Foam::multiphaseSystem> Foam::multiphaseSystem::New
dict,
"multiphaseSystem",
systemType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystems.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystems.C
index 4d8c5bb70cb..5a9b4f99397 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystems.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystems.C
@@ -55,7 +55,7 @@ namespace Foam
(
multiphaseSystem,
basicMultiphaseSystem,
- dictionary,
+ reactingEuler,
basicMultiphaseSystem
);
@@ -76,7 +76,7 @@ namespace Foam
(
multiphaseSystem,
interfaceCompositionPhaseChangeMultiphaseSystem,
- dictionary,
+ reactingEuler,
interfaceCompositionPhaseChangeMultiphaseSystem
);
@@ -97,7 +97,7 @@ namespace Foam
(
multiphaseSystem,
thermalPhaseChangeMultiphaseSystem,
- dictionary,
+ reactingEuler,
thermalPhaseChangeMultiphaseSystem
);
@@ -118,7 +118,7 @@ namespace Foam
(
multiphaseSystem,
populationBalanceMultiphaseSystem,
- dictionary,
+ reactingEuler,
populationBalanceMultiphaseSystem
);
@@ -142,7 +142,7 @@ namespace Foam
(
multiphaseSystem,
thermalPhaseChangePopulationBalanceMultiphaseSystem,
- dictionary,
+ reactingEuler,
thermalPhaseChangePopulationBalanceMultiphaseSystem
);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C
index 05bc9e6bd12..73a4481010f 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C
@@ -43,7 +43,7 @@ namespace binaryBreakupModels
(
binaryBreakupModel,
LehrMilliesMewes,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C
index 479b083bab3..ec4bf1fda5b 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C
@@ -45,7 +45,7 @@ namespace binaryBreakupModels
(
binaryBreakupModel,
LuoSvendsen,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C
index 16402433fe9..548fd9cf1ff 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C
@@ -35,7 +35,7 @@ namespace Foam
namespace diameterModels
{
defineTypeNameAndDebug(binaryBreakupModel, 0);
- defineRunTimeSelectionTable(binaryBreakupModel, dictionary);
+ defineRunTimeSelectionTable(binaryBreakupModel, reactingEuler);
}
}
@@ -50,7 +50,7 @@ Foam::diameterModels::binaryBreakupModel::New
const dictionary& dict
)
{
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -59,7 +59,7 @@ Foam::diameterModels::binaryBreakupModel::New
dict,
"binary breakup model",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H
index 8f65770a231..99cba053ea4 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H
@@ -74,7 +74,7 @@ public:
(
autoPtr,
binaryBreakupModel,
- dictionary,
+ reactingEuler,
(
const populationBalanceModel& popBal,
const dictionary& dict
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C
index 3e646900b9f..a858679c30d 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C
@@ -42,7 +42,7 @@ namespace binaryBreakupModels
(
binaryBreakupModel,
powerLawUniformBinary,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C
index 66753fcc72c..4b97659ea17 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C
@@ -43,7 +43,7 @@ namespace breakupModels
(
breakupModel,
LaakkonenAlopaeusAittamaa,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/breakupModel/breakupModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/breakupModel/breakupModel.C
index a06980b7a8e..b43345d0b10 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/breakupModel/breakupModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/breakupModel/breakupModel.C
@@ -35,7 +35,7 @@ namespace Foam
namespace diameterModels
{
defineTypeNameAndDebug(breakupModel, 0);
- defineRunTimeSelectionTable(breakupModel, dictionary);
+ defineRunTimeSelectionTable(breakupModel, reactingEuler);
}
}
@@ -50,7 +50,7 @@ Foam::diameterModels::breakupModel::New
const dictionary& dict
)
{
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -59,7 +59,7 @@ Foam::diameterModels::breakupModel::New
dict,
"breakupModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/breakupModel/breakupModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/breakupModel/breakupModel.H
index af13733e9ce..d9f38524ea4 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/breakupModel/breakupModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/breakupModel/breakupModel.H
@@ -81,7 +81,7 @@ public:
(
autoPtr,
breakupModel,
- dictionary,
+ reactingEuler,
(
const populationBalanceModel& popBal,
const dictionary& dict
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/exponential.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/exponential.C
index 419c307a00b..859705a2d56 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/exponential.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/exponential.C
@@ -38,7 +38,7 @@ namespace diameterModels
namespace breakupModels
{
defineTypeNameAndDebug(exponential, 0);
- addToRunTimeSelectionTable(breakupModel, exponential, dictionary);
+ addToRunTimeSelectionTable(breakupModel, exponential, reactingEuler);
}
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/powerLaw.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/powerLaw.C
index 7d9f682d120..40b88d0b187 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/powerLaw.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/powerLaw.C
@@ -38,7 +38,7 @@ namespace diameterModels
namespace breakupModels
{
defineTypeNameAndDebug(powerLaw, 0);
- addToRunTimeSelectionTable(breakupModel, powerLaw, dictionary);
+ addToRunTimeSelectionTable(breakupModel, powerLaw, reactingEuler);
}
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C
index 80e028f0814..24568b594e3 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C
@@ -43,7 +43,7 @@ namespace coalescenceModels
(
coalescenceModel,
CoulaloglouTavlaridesCoalescence,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C
index 249a3d6ee19..4a36d56efff 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C
@@ -44,7 +44,7 @@ namespace coalescenceModels
(
coalescenceModel,
LehrMilliesMewesCoalescence,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/Luo/Luo.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/Luo/Luo.C
index c77a0b3b580..35221cfa703 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/Luo/Luo.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/Luo/Luo.C
@@ -46,7 +46,7 @@ namespace coalescenceModels
(
coalescenceModel,
Luo,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C
index a5d37ce8110..2145e7c651c 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C
@@ -44,7 +44,7 @@ namespace coalescenceModels
(
coalescenceModel,
PrinceBlanch,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C
index 069eb6b19ed..58e2bd55559 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C
@@ -35,7 +35,7 @@ namespace Foam
namespace diameterModels
{
defineTypeNameAndDebug(coalescenceModel, 0);
- defineRunTimeSelectionTable(coalescenceModel, dictionary);
+ defineRunTimeSelectionTable(coalescenceModel, reactingEuler);
}
}
@@ -50,7 +50,7 @@ Foam::diameterModels::coalescenceModel::New
const dictionary& dict
)
{
- auto* ctorPtr = dictionaryConstructorTable(type);
+ auto* ctorPtr = reactingEulerConstructorTable(type);
if (!ctorPtr)
{
@@ -59,7 +59,7 @@ Foam::diameterModels::coalescenceModel::New
dict,
"coalescenceModel",
type,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H
index c6edeb9f8b8..f694004130b 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H
@@ -72,7 +72,7 @@ public:
(
autoPtr,
coalescenceModel,
- dictionary,
+ reactingEuler,
(
const populationBalanceModel& popBal,
const dictionary& dict
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C
index 54117da5cbf..799fe258af3 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C
@@ -41,7 +41,7 @@ namespace coalescenceModels
(
coalescenceModel,
constantCoalescence,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C
index 77d642afab1..f9d915fdc82 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C
@@ -37,7 +37,7 @@ namespace diameterModels
namespace coalescenceModels
{
defineTypeNameAndDebug(hydrodynamic, 0);
- addToRunTimeSelectionTable(coalescenceModel, hydrodynamic, dictionary);
+ addToRunTimeSelectionTable(coalescenceModel, hydrodynamic, reactingEuler);
}
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.C
index 8d9b02628b0..b12560769c0 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.C
@@ -42,7 +42,7 @@ namespace daughterSizeDistributionModels
(
daughterSizeDistributionModel,
LaakkonenAlopaeusAittamaaDsd,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C
index ae986a95429..b451a91ddee 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C
@@ -36,7 +36,7 @@ namespace Foam
namespace diameterModels
{
defineTypeNameAndDebug(daughterSizeDistributionModel, 0);
- defineRunTimeSelectionTable(daughterSizeDistributionModel, dictionary);
+ defineRunTimeSelectionTable(daughterSizeDistributionModel, reactingEuler);
}
}
@@ -55,7 +55,7 @@ Foam::diameterModels::daughterSizeDistributionModel::New
dict.get<word>("daughterSizeDistributionModel")
);
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -64,7 +64,7 @@ Foam::diameterModels::daughterSizeDistributionModel::New
dict,
"daughterSizeDistributionModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H
index 0fef7e62280..3725d1853e6 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H
@@ -78,7 +78,7 @@ public:
(
autoPtr,
daughterSizeDistributionModel,
- dictionary,
+ reactingEuler,
(
const breakupModel& breakup,
const dictionary& dict
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C
index d2e20c2ac99..867dfb29cb2 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C
@@ -42,7 +42,7 @@ namespace daughterSizeDistributionModels
(
daughterSizeDistributionModel,
uniformBinary,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/constantDrift/constantDrift.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/constantDrift/constantDrift.C
index 52c0b298f3d..d3a32d735c8 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/constantDrift/constantDrift.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/constantDrift/constantDrift.C
@@ -38,7 +38,7 @@ namespace diameterModels
namespace driftModels
{
defineTypeNameAndDebug(constantDrift, 0);
- addToRunTimeSelectionTable(driftModel, constantDrift, dictionary);
+ addToRunTimeSelectionTable(driftModel, constantDrift, reactingEuler);
}
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/densityChange/densityChange.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/densityChange/densityChange.C
index 1da26a322c1..9c122669cd4 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/densityChange/densityChange.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/densityChange/densityChange.C
@@ -40,7 +40,7 @@ namespace diameterModels
namespace driftModels
{
defineTypeNameAndDebug(densityChangeDrift, 0);
- addToRunTimeSelectionTable(driftModel, densityChangeDrift, dictionary);
+ addToRunTimeSelectionTable(driftModel, densityChangeDrift, reactingEuler);
}
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/driftModel/driftModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/driftModel/driftModel.C
index 98e775c0146..46b251688d1 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/driftModel/driftModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/driftModel/driftModel.C
@@ -36,7 +36,7 @@ namespace Foam
namespace diameterModels
{
defineTypeNameAndDebug(driftModel, 0);
- defineRunTimeSelectionTable(driftModel, dictionary);
+ defineRunTimeSelectionTable(driftModel, reactingEuler);
}
}
@@ -51,7 +51,7 @@ Foam::diameterModels::driftModel::New
const dictionary& dict
)
{
- auto* ctorPtr = dictionaryConstructorTable(type);
+ auto* ctorPtr = reactingEulerConstructorTable(type);
if (!ctorPtr)
{
@@ -60,7 +60,7 @@ Foam::diameterModels::driftModel::New
dict,
"driftModel",
type,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/driftModel/driftModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/driftModel/driftModel.H
index 9162874c984..93ac7b0df0c 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/driftModel/driftModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/driftModel/driftModel.H
@@ -72,7 +72,7 @@ public:
(
autoPtr,
driftModel,
- dictionary,
+ reactingEuler,
(
const populationBalanceModel& popBal,
const dictionary& dict
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/phaseChange/phaseChange.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/phaseChange/phaseChange.C
index 4ec234f0495..9eba89b5ac8 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/phaseChange/phaseChange.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/phaseChange/phaseChange.C
@@ -40,7 +40,7 @@ namespace diameterModels
namespace driftModels
{
defineTypeNameAndDebug(phaseChange, 0);
- addToRunTimeSelectionTable(driftModel, phaseChange, dictionary);
+ addToRunTimeSelectionTable(driftModel, phaseChange, reactingEuler);
}
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/constantNucleation/constantNucleation.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/constantNucleation/constantNucleation.C
index 9f5f5fce988..1cebecd0220 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/constantNucleation/constantNucleation.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/constantNucleation/constantNucleation.C
@@ -42,7 +42,7 @@ namespace nucleationModels
(
nucleationModel,
constantNucleation,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C
index d36d90d34d8..c970a3d626f 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C
@@ -36,7 +36,7 @@ namespace Foam
namespace diameterModels
{
defineTypeNameAndDebug(nucleationModel, 0);
- defineRunTimeSelectionTable(nucleationModel, dictionary);
+ defineRunTimeSelectionTable(nucleationModel, reactingEuler);
}
}
@@ -51,7 +51,7 @@ Foam::diameterModels::nucleationModel::New
const dictionary& dict
)
{
- auto* ctorPtr = dictionaryConstructorTable(type);
+ auto* ctorPtr = reactingEulerConstructorTable(type);
if (!ctorPtr)
{
@@ -60,7 +60,7 @@ Foam::diameterModels::nucleationModel::New
dict,
"nucleationModel",
type,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H
index aeec5d53966..cd7658ab974 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H
@@ -72,7 +72,7 @@ public:
(
autoPtr,
nucleationModel,
- dictionary,
+ reactingEuler,
(
const populationBalanceModel& popBal,
const dictionary& dict
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C
index a38aaa2824b..586a229f6bb 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C
@@ -43,7 +43,7 @@ namespace nucleationModels
(
nucleationModel,
wallBoiling,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/saturationModels/Antoine/Antoine.C b/src/phaseSystemModels/reactingEuler/saturationModels/Antoine/Antoine.C
index fe4c0a81f16..814631ee98b 100644
--- a/src/phaseSystemModels/reactingEuler/saturationModels/Antoine/Antoine.C
+++ b/src/phaseSystemModels/reactingEuler/saturationModels/Antoine/Antoine.C
@@ -35,7 +35,7 @@ namespace Foam
namespace saturationModels
{
defineTypeNameAndDebug(Antoine, 0);
- addToRunTimeSelectionTable(saturationModel, Antoine, dictionary);
+ addToRunTimeSelectionTable(saturationModel, Antoine, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/saturationModels/AntoineExtended/AntoineExtended.C b/src/phaseSystemModels/reactingEuler/saturationModels/AntoineExtended/AntoineExtended.C
index aea431c57d7..6de9fc401d9 100644
--- a/src/phaseSystemModels/reactingEuler/saturationModels/AntoineExtended/AntoineExtended.C
+++ b/src/phaseSystemModels/reactingEuler/saturationModels/AntoineExtended/AntoineExtended.C
@@ -39,7 +39,7 @@ namespace saturationModels
(
saturationModel,
AntoineExtended,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/saturationModels/ArdenBuck/ArdenBuck.C b/src/phaseSystemModels/reactingEuler/saturationModels/ArdenBuck/ArdenBuck.C
index 63ecafc4a17..6159d0eb4b0 100644
--- a/src/phaseSystemModels/reactingEuler/saturationModels/ArdenBuck/ArdenBuck.C
+++ b/src/phaseSystemModels/reactingEuler/saturationModels/ArdenBuck/ArdenBuck.C
@@ -35,7 +35,7 @@ namespace Foam
namespace saturationModels
{
defineTypeNameAndDebug(ArdenBuck, 0);
- addToRunTimeSelectionTable(saturationModel, ArdenBuck, dictionary);
+ addToRunTimeSelectionTable(saturationModel, ArdenBuck, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/saturationModels/constantSaturationConditions/constantSaturationConditions.C b/src/phaseSystemModels/reactingEuler/saturationModels/constantSaturationConditions/constantSaturationConditions.C
index b0c2dcfc801..ec3fcebeaba 100644
--- a/src/phaseSystemModels/reactingEuler/saturationModels/constantSaturationConditions/constantSaturationConditions.C
+++ b/src/phaseSystemModels/reactingEuler/saturationModels/constantSaturationConditions/constantSaturationConditions.C
@@ -39,7 +39,7 @@ namespace saturationModels
(
saturationModel,
constantSaturationConditions,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/saturationModels/function1/function1.C b/src/phaseSystemModels/reactingEuler/saturationModels/function1/function1.C
index 5fe61e9f828..4eae6f827c0 100644
--- a/src/phaseSystemModels/reactingEuler/saturationModels/function1/function1.C
+++ b/src/phaseSystemModels/reactingEuler/saturationModels/function1/function1.C
@@ -35,7 +35,7 @@ namespace Foam
namespace saturationModels
{
defineTypeNameAndDebug(function1, 0);
- addToRunTimeSelectionTable(saturationModel, function1, dictionary);
+ addToRunTimeSelectionTable(saturationModel, function1, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/saturationModels/polynomial/polynomial.C b/src/phaseSystemModels/reactingEuler/saturationModels/polynomial/polynomial.C
index 265722cf314..677a94519ff 100644
--- a/src/phaseSystemModels/reactingEuler/saturationModels/polynomial/polynomial.C
+++ b/src/phaseSystemModels/reactingEuler/saturationModels/polynomial/polynomial.C
@@ -35,7 +35,7 @@ namespace Foam
namespace saturationModels
{
defineTypeNameAndDebug(polynomial, 0);
- addToRunTimeSelectionTable(saturationModel, polynomial, dictionary);
+ addToRunTimeSelectionTable(saturationModel, polynomial, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/saturationModels/saturationModel/saturationModel.C b/src/phaseSystemModels/reactingEuler/saturationModels/saturationModel/saturationModel.C
index a540e3fcced..66b9bed3302 100644
--- a/src/phaseSystemModels/reactingEuler/saturationModels/saturationModel/saturationModel.C
+++ b/src/phaseSystemModels/reactingEuler/saturationModels/saturationModel/saturationModel.C
@@ -33,7 +33,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(saturationModel, 0);
- defineRunTimeSelectionTable(saturationModel, dictionary);
+ defineRunTimeSelectionTable(saturationModel, reactingEuler);
}
@@ -66,7 +66,7 @@ Foam::saturationModel::New
Info<< "Selecting saturationModel: " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -75,7 +75,7 @@ Foam::saturationModel::New
dict,
"saturationModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/saturationModels/saturationModel/saturationModel.H b/src/phaseSystemModels/reactingEuler/saturationModels/saturationModel/saturationModel.H
index 7944a2eb77c..977174d360d 100644
--- a/src/phaseSystemModels/reactingEuler/saturationModels/saturationModel/saturationModel.H
+++ b/src/phaseSystemModels/reactingEuler/saturationModels/saturationModel/saturationModel.H
@@ -75,9 +75,10 @@ public:
(
autoPtr,
saturationModel,
- dictionary,
+ reactingEuler,
(
- const dictionary& dict, const objectRegistry& db
+ const dictionary& dict,
+ const objectRegistry& db
),
(dict, db)
);
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
index 1dd0e3c1596..3cf47543d47 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
@@ -43,7 +43,7 @@ namespace conductivityModels
(
conductivityModel,
Gidaspow,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
index 0355b93453c..2dbdac0ddfd 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
@@ -43,7 +43,7 @@ namespace conductivityModels
(
conductivityModel,
HrenyaSinclair,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
index 6a5546e4c89..6f67a5150b3 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
@@ -43,7 +43,7 @@ namespace conductivityModels
(
conductivityModel,
Syamlal,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C
index d0121826f31..71b6ff08949 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C
@@ -35,7 +35,7 @@ namespace Foam
namespace kineticTheoryModels
{
defineTypeNameAndDebug(conductivityModel, 0);
- defineRunTimeSelectionTable(conductivityModel, dictionary);
+ defineRunTimeSelectionTable(conductivityModel, reactingEuler);
}
}
@@ -63,7 +63,7 @@ Foam::kineticTheoryModels::conductivityModel::New
Info<< "Selecting conductivityModel " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -72,7 +72,7 @@ Foam::kineticTheoryModels::conductivityModel::New
dict,
"conductivityModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
index 41bb50e4209..024e026d4de 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
@@ -70,7 +70,7 @@ public:
(
autoPtr,
conductivityModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
index 175dcee2acf..7f7805241ec 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
@@ -44,7 +44,7 @@ namespace frictionalStressModels
(
frictionalStressModel,
JohnsonJackson,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
index 4bde1a14c05..562d4741847 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
@@ -44,7 +44,7 @@ namespace frictionalStressModels
(
frictionalStressModel,
JohnsonJacksonSchaeffer,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
index c1851d54a2e..5e5ed5ec1f3 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
@@ -44,7 +44,7 @@ namespace frictionalStressModels
(
frictionalStressModel,
Schaeffer,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C
index 41681fae71d..e9b0ecb5fb2 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C
@@ -35,7 +35,7 @@ namespace Foam
namespace kineticTheoryModels
{
defineTypeNameAndDebug(frictionalStressModel, 0);
- defineRunTimeSelectionTable(frictionalStressModel, dictionary);
+ defineRunTimeSelectionTable(frictionalStressModel, reactingEuler);
}
}
@@ -63,7 +63,7 @@ Foam::kineticTheoryModels::frictionalStressModel::New
Info<< "Selecting frictionalStressModel " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -72,7 +72,7 @@ Foam::kineticTheoryModels::frictionalStressModel::New
dict,
"frictionalStressModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
index 1f00793cf7f..c6af9f0f709 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
@@ -72,7 +72,7 @@ public:
(
autoPtr,
frictionalStressModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
index 686843eb99f..8c8c9b5dd6c 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
@@ -42,7 +42,7 @@ namespace granularPressureModels
(
granularPressureModel,
Lun,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
index efb3fdfe459..012740e6704 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
@@ -42,7 +42,7 @@ namespace granularPressureModels
(
granularPressureModel,
SyamlalRogersOBrien,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C
index 3714dde3a23..f3033ba45ab 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C
@@ -36,7 +36,7 @@ namespace kineticTheoryModels
{
defineTypeNameAndDebug(granularPressureModel, 0);
- defineRunTimeSelectionTable(granularPressureModel, dictionary);
+ defineRunTimeSelectionTable(granularPressureModel, reactingEuler);
}
}
@@ -64,7 +64,7 @@ Foam::kineticTheoryModels::granularPressureModel::New
Info<< "Selecting granularPressureModel " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -73,7 +73,7 @@ Foam::kineticTheoryModels::granularPressureModel::New
dict,
"granularPressureModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
index 783a498ae87..7398669df65 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
@@ -70,7 +70,7 @@ public:
(
autoPtr,
granularPressureModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
index cc62a8ec666..b9b55cfb46e 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
@@ -42,7 +42,7 @@ namespace radialModels
(
radialModel,
CarnahanStarling,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
index 7cdfee59e1e..494a60ef70e 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
@@ -42,7 +42,7 @@ namespace radialModels
(
radialModel,
LunSavage,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
index 4e7ffdb7c1e..e7e4a9634a9 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
@@ -42,7 +42,7 @@ namespace radialModels
(
radialModel,
SinclairJackson,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C
index 714167849b0..eb50116f99c 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C
@@ -35,7 +35,7 @@ namespace Foam
namespace kineticTheoryModels
{
defineTypeNameAndDebug(radialModel, 0);
- defineRunTimeSelectionTable(radialModel, dictionary);
+ defineRunTimeSelectionTable(radialModel, reactingEuler);
}
}
@@ -63,7 +63,7 @@ Foam::kineticTheoryModels::radialModel::New
Info<< "Selecting radialModel " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -72,7 +72,7 @@ Foam::kineticTheoryModels::radialModel::New
dict,
"radialModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H
index f84ccca6cb4..02860dace93 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H
@@ -70,7 +70,7 @@ public:
(
autoPtr,
radialModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
index d7fc0f4477a..37945bd1485 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
@@ -38,7 +38,7 @@ namespace kineticTheoryModels
namespace viscosityModels
{
defineTypeNameAndDebug(Gidaspow, 0);
- addToRunTimeSelectionTable(viscosityModel, Gidaspow, dictionary);
+ addToRunTimeSelectionTable(viscosityModel, Gidaspow, reactingEuler);
}
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
index 936019f2646..1159764ec92 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
@@ -43,7 +43,7 @@ namespace viscosityModels
(
viscosityModel,
HrenyaSinclair,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
index 5903d0adc02..71178965881 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
@@ -38,7 +38,7 @@ namespace kineticTheoryModels
namespace viscosityModels
{
defineTypeNameAndDebug(Syamlal, 0);
- addToRunTimeSelectionTable(viscosityModel, Syamlal, dictionary);
+ addToRunTimeSelectionTable(viscosityModel, Syamlal, reactingEuler);
}
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C
index e75fbf72c14..365d75efc94 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C
@@ -35,7 +35,7 @@ namespace Foam
namespace kineticTheoryModels
{
defineTypeNameAndDebug(noneViscosity, 0);
- addToRunTimeSelectionTable(viscosityModel, noneViscosity, dictionary);
+ addToRunTimeSelectionTable(viscosityModel, noneViscosity, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C
index 339ab1331dc..fd5b1d5f8a2 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C
@@ -35,7 +35,7 @@ namespace Foam
namespace kineticTheoryModels
{
defineTypeNameAndDebug(viscosityModel, 0);
- defineRunTimeSelectionTable(viscosityModel, dictionary);
+ defineRunTimeSelectionTable(viscosityModel, reactingEuler);
}
}
@@ -63,7 +63,7 @@ Foam::kineticTheoryModels::viscosityModel::New
Info<< "Selecting viscosityModel " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -72,7 +72,7 @@ Foam::kineticTheoryModels::viscosityModel::New
dict,
"viscosityModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
index 0ac77ec8803..5db37874c07 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
@@ -72,7 +72,7 @@ public:
(
autoPtr,
viscosityModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATE.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATE.C
index e9b00fa0b49..49549677bb6 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATE.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATE.C
@@ -51,7 +51,7 @@ namespace diameterModels
(
diameterModel,
IATE,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
index cdb0561a4d6..fe6aff9808a 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
@@ -38,7 +38,7 @@ namespace Foam
namespace diameterModels
{
defineTypeNameAndDebug(IATEsource, 0);
- defineRunTimeSelectionTable(IATEsource, dictionary);
+ defineRunTimeSelectionTable(IATEsource, reactingEuler);
}
}
@@ -53,7 +53,7 @@ Foam::diameterModels::IATEsource::New
const dictionary& dict
)
{
- auto* ctorPtr = dictionaryConstructorTable(type);
+ auto* ctorPtr = reactingEulerConstructorTable(type);
if (!ctorPtr)
{
@@ -62,7 +62,7 @@ Foam::diameterModels::IATEsource::New
dict,
"IATEsource",
type,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
index 26ac11e7544..bff0ab7197e 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
@@ -77,7 +77,7 @@ public:
(
autoPtr,
IATEsource,
- dictionary,
+ reactingEuler,
(
const IATE& iate,
const dictionary& dict
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/phaseChange/phaseChange.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/phaseChange/phaseChange.C
index 881f2af85f2..5b20ee352e5 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/phaseChange/phaseChange.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/phaseChange/phaseChange.C
@@ -42,7 +42,7 @@ namespace diameterModels
namespace IATEsources
{
defineTypeNameAndDebug(phaseChange, 0);
- addToRunTimeSelectionTable(IATEsource, phaseChange, dictionary);
+ addToRunTimeSelectionTable(IATEsource, phaseChange, reactingEuler);
}
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
index 3da9baf91ac..1f0d9c9d6ca 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
@@ -38,7 +38,7 @@ namespace diameterModels
namespace IATEsources
{
defineTypeNameAndDebug(randomCoalescence, 0);
- addToRunTimeSelectionTable(IATEsource, randomCoalescence, dictionary);
+ addToRunTimeSelectionTable(IATEsource, randomCoalescence, reactingEuler);
}
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
index 14ada7771de..372b38a58be 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
@@ -38,7 +38,7 @@ namespace diameterModels
namespace IATEsources
{
defineTypeNameAndDebug(turbulentBreakUp, 0);
- addToRunTimeSelectionTable(IATEsource, turbulentBreakUp, dictionary);
+ addToRunTimeSelectionTable(IATEsource, turbulentBreakUp, reactingEuler);
}
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C
index 7e0ffef0959..1ba05f97ee1 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C
@@ -42,7 +42,7 @@ namespace IATEsources
(
IATEsource,
wakeEntrainmentCoalescence,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C
index e0b87ac0a9c..0ef6cf01f95 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C
@@ -40,7 +40,7 @@ namespace diameterModels
namespace IATEsources
{
defineTypeNameAndDebug(wallBoiling, 0);
- addToRunTimeSelectionTable(IATEsource, wallBoiling, dictionary);
+ addToRunTimeSelectionTable(IATEsource, wallBoiling, reactingEuler);
}
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystem.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystem.C
index c52aae49ed6..992c42c5964 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystem.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystem.C
@@ -49,7 +49,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(twoPhaseSystem, 0);
- defineRunTimeSelectionTable(twoPhaseSystem, dictionary);
+ defineRunTimeSelectionTable(twoPhaseSystem, reactingEuler);
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystem.H b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystem.H
index c4a6632822b..2f48033cbce 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystem.H
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystem.H
@@ -96,7 +96,7 @@ public:
(
autoPtr,
twoPhaseSystem,
- dictionary,
+ reactingEuler,
(
const fvMesh& mesh
),
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystemNew.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystemNew.C
index a5a759abf3d..65fa775a3c2 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystemNew.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystemNew.C
@@ -53,7 +53,7 @@ Foam::twoPhaseSystem::New
Info<< "Selecting twoPhaseSystem " << systemType << endl;
- auto* ctorPtr = dictionaryConstructorTable(systemType);
+ auto* ctorPtr = reactingEulerConstructorTable(systemType);
if (!ctorPtr)
{
@@ -62,7 +62,7 @@ Foam::twoPhaseSystem::New
dict,
"twoPhaseSystem",
systemType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystems.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystems.C
index 064ccb8ef76..9f8d36e767d 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystems.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystems.C
@@ -55,7 +55,7 @@ namespace Foam
(
twoPhaseSystem,
basicTwoPhaseSystem,
- dictionary,
+ reactingEuler,
basicTwoPhaseSystem
);
@@ -76,7 +76,7 @@ namespace Foam
(
twoPhaseSystem,
interfaceCompositionPhaseChangeTwoPhaseSystem,
- dictionary,
+ reactingEuler,
interfaceCompositionPhaseChangeTwoPhaseSystem
);
@@ -97,7 +97,7 @@ namespace Foam
(
twoPhaseSystem,
thermalPhaseChangeTwoPhaseSystem,
- dictionary,
+ reactingEuler,
thermalPhaseChangeTwoPhaseSystem
);
@@ -118,7 +118,7 @@ namespace Foam
(
twoPhaseSystem,
populationBalanceTwoPhaseSystem,
- dictionary,
+ reactingEuler,
populationBalanceTwoPhaseSystem
);
@@ -142,7 +142,7 @@ namespace Foam
(
twoPhaseSystem,
thermalPhaseChangePopulationBalanceTwoPhaseSystem,
- dictionary,
+ reactingEuler,
thermalPhaseChangePopulationBalanceTwoPhaseSystem
);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
index 578467008f5..0f5a23d1636 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
@@ -43,7 +43,7 @@ namespace conductivityModels
(
conductivityModel,
Gidaspow,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
index d2191c1073f..75cad09e882 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
@@ -43,7 +43,7 @@ namespace conductivityModels
(
conductivityModel,
HrenyaSinclair,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
index 1f12390bfc3..8012f85a307 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
@@ -43,7 +43,7 @@ namespace conductivityModels
(
conductivityModel,
Syamlal,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C
index 53fe02cb4df..60ae24bfe6a 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C
@@ -36,7 +36,7 @@ namespace kineticTheoryModels
{
defineTypeNameAndDebug(conductivityModel, 0);
- defineRunTimeSelectionTable(conductivityModel, dictionary);
+ defineRunTimeSelectionTable(conductivityModel, twoPhaseEuler);
}
}
@@ -64,7 +64,7 @@ Foam::kineticTheoryModels::conductivityModel::New
Info<< "Selecting conductivityModel " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -73,7 +73,7 @@ Foam::kineticTheoryModels::conductivityModel::New
dict,
"conductivityModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
index 6b4fd317b8b..28b05156aa8 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
@@ -70,7 +70,7 @@ public:
(
autoPtr,
conductivityModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
index 54dc2614528..52f96fdb0a6 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
@@ -44,7 +44,7 @@ namespace frictionalStressModels
(
frictionalStressModel,
JohnsonJackson,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
index 4d7c1adafb6..cccc4c81404 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
@@ -44,7 +44,7 @@ namespace frictionalStressModels
(
frictionalStressModel,
JohnsonJacksonSchaeffer,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
index cf14452f2eb..61a3e1a5dd3 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
@@ -44,7 +44,7 @@ namespace frictionalStressModels
(
frictionalStressModel,
Schaeffer,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C
index 553af9553e8..7daa13e8104 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C
@@ -36,7 +36,7 @@ namespace kineticTheoryModels
{
defineTypeNameAndDebug(frictionalStressModel, 0);
- defineRunTimeSelectionTable(frictionalStressModel, dictionary);
+ defineRunTimeSelectionTable(frictionalStressModel, twoPhaseEuler);
}
}
@@ -64,7 +64,7 @@ Foam::kineticTheoryModels::frictionalStressModel::New
Info<< "Selecting frictionalStressModel " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -73,7 +73,7 @@ Foam::kineticTheoryModels::frictionalStressModel::New
dict,
"frictionalStressModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
index ce009b2c5fa..de3036406b4 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
@@ -72,7 +72,7 @@ public:
(
autoPtr,
frictionalStressModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
index 7262afa5ebe..6b639eca434 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
@@ -42,7 +42,7 @@ namespace granularPressureModels
(
granularPressureModel,
Lun,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
index 8c9d3c85a35..c116c162e3b 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
@@ -42,7 +42,7 @@ namespace granularPressureModels
(
granularPressureModel,
SyamlalRogersOBrien,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C
index b4eefd3fe6c..91043b5d58f 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C
@@ -36,7 +36,7 @@ namespace kineticTheoryModels
{
defineTypeNameAndDebug(granularPressureModel, 0);
- defineRunTimeSelectionTable(granularPressureModel, dictionary);
+ defineRunTimeSelectionTable(granularPressureModel, twoPhaseEuler);
}
}
@@ -64,7 +64,7 @@ Foam::kineticTheoryModels::granularPressureModel::New
Info<< "Selecting granularPressureModel " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -73,7 +73,7 @@ Foam::kineticTheoryModels::granularPressureModel::New
dict,
"granularPressureModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
index 3898eab3c61..b0fa98d1a6b 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
@@ -70,7 +70,7 @@ public:
(
autoPtr,
granularPressureModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
index 889b6694701..16210933330 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
@@ -42,7 +42,7 @@ namespace radialModels
(
radialModel,
CarnahanStarling,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
index 80ecbf0ce27..5f8cadb5c8b 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
@@ -42,7 +42,7 @@ namespace radialModels
(
radialModel,
LunSavage,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
index d8560e28a1a..da2722cd6bb 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
@@ -42,7 +42,7 @@ namespace radialModels
(
radialModel,
SinclairJackson,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C
index 756e1cd5dec..61b254ec866 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C
@@ -36,7 +36,7 @@ namespace kineticTheoryModels
{
defineTypeNameAndDebug(radialModel, 0);
- defineRunTimeSelectionTable(radialModel, dictionary);
+ defineRunTimeSelectionTable(radialModel, twoPhaseEuler);
}
}
@@ -64,7 +64,7 @@ Foam::kineticTheoryModels::radialModel::New
Info<< "Selecting radialModel " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -73,7 +73,7 @@ Foam::kineticTheoryModels::radialModel::New
dict,
"radialModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H
index 51c4f12d89b..dd1f39431de 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H
@@ -70,7 +70,7 @@ public:
(
autoPtr,
radialModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
index 79831b02d38..ba173fbdb73 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
@@ -38,7 +38,7 @@ namespace kineticTheoryModels
namespace viscosityModels
{
defineTypeNameAndDebug(Gidaspow, 0);
- addToRunTimeSelectionTable(viscosityModel, Gidaspow, dictionary);
+ addToRunTimeSelectionTable(viscosityModel, Gidaspow, twoPhaseEuler);
}
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
index bdf13107733..aeb3e135573 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
@@ -43,7 +43,7 @@ namespace viscosityModels
(
viscosityModel,
HrenyaSinclair,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
index cd39611b79b..4a7f35a8797 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
@@ -38,7 +38,7 @@ namespace kineticTheoryModels
namespace viscosityModels
{
defineTypeNameAndDebug(Syamlal, 0);
- addToRunTimeSelectionTable(viscosityModel, Syamlal, dictionary);
+ addToRunTimeSelectionTable(viscosityModel, Syamlal, twoPhaseEuler);
}
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C
index 831f4be8319..0b1e518de7a 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C
@@ -35,7 +35,7 @@ namespace Foam
namespace kineticTheoryModels
{
defineTypeNameAndDebug(noneViscosity, 0);
- addToRunTimeSelectionTable(viscosityModel, noneViscosity, dictionary);
+ addToRunTimeSelectionTable(viscosityModel, noneViscosity, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C
index 304108524b2..f78b821377b 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C
@@ -35,7 +35,7 @@ namespace Foam
namespace kineticTheoryModels
{
defineTypeNameAndDebug(viscosityModel, 0);
- defineRunTimeSelectionTable(viscosityModel, dictionary);
+ defineRunTimeSelectionTable(viscosityModel, twoPhaseEuler);
}
}
@@ -63,7 +63,7 @@ Foam::kineticTheoryModels::viscosityModel::New
Info<< "Selecting viscosityModel " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -72,7 +72,7 @@ Foam::kineticTheoryModels::viscosityModel::New
dict,
"viscosityModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
index d8d5f6877f4..395d9ac627e 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
@@ -72,7 +72,7 @@ public:
(
autoPtr,
viscosityModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C
index bfc787c3761..53a0fdd6bba 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C
@@ -33,7 +33,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(blendingMethod, 0);
- defineRunTimeSelectionTable(blendingMethod, dictionary);
+ defineRunTimeSelectionTable(blendingMethod, twoPhaseEuler);
}
@@ -60,7 +60,7 @@ Foam::blendingMethod::New
Info<< "Selecting " << dict.dictName() << " blending method: "
<< modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -69,7 +69,7 @@ Foam::blendingMethod::New
dict,
"blendingMethod",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H
index 92896a8fe3e..035eb9c7af7 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H
@@ -63,7 +63,7 @@ public:
(
autoPtr,
blendingMethod,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict,
const wordList& phaseNames
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C
index 735033c1ceb..6cf4d30f63b 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C
@@ -40,7 +40,7 @@ namespace blendingMethods
(
blendingMethod,
hyperbolic,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C
index d2b15241bf0..558b01e3fbb 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C
@@ -40,7 +40,7 @@ namespace blendingMethods
(
blendingMethod,
linear,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C
index 3f3dfe09aac..23df176b6d8 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C
@@ -41,7 +41,7 @@ namespace blendingMethods
(
blendingMethod,
noBlending,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATE.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATE.C
index 0707091f7bf..8f34d714e46 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATE.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATE.C
@@ -51,7 +51,7 @@ namespace diameterModels
(
diameterModel,
IATE,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
index 943e66153c5..057dbdfe54b 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
@@ -39,7 +39,7 @@ namespace Foam
namespace diameterModels
{
defineTypeNameAndDebug(IATEsource, 0);
- defineRunTimeSelectionTable(IATEsource, dictionary);
+ defineRunTimeSelectionTable(IATEsource, twoPhaseEuler);
}
}
@@ -54,7 +54,7 @@ Foam::diameterModels::IATEsource::New
const dictionary& dict
)
{
- auto* ctorPtr = dictionaryConstructorTable(type);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(type);
if (!ctorPtr)
{
@@ -63,7 +63,7 @@ Foam::diameterModels::IATEsource::New
dict,
"IATEsource",
type,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
index b5c928ec349..a3c8241ad33 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
@@ -76,7 +76,7 @@ public:
(
autoPtr,
IATEsource,
- dictionary,
+ twoPhaseEuler,
(
const IATE& iate,
const dictionary& dict
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
index 39ee3276dbb..db823309ac1 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
@@ -37,7 +37,7 @@ namespace diameterModels
namespace IATEsources
{
defineTypeNameAndDebug(randomCoalescence, 0);
- addToRunTimeSelectionTable(IATEsource, randomCoalescence, dictionary);
+ addToRunTimeSelectionTable(IATEsource, randomCoalescence, twoPhaseEuler);
}
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
index 36d077fae2e..bf6483c01dd 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
@@ -37,7 +37,7 @@ namespace diameterModels
namespace IATEsources
{
defineTypeNameAndDebug(turbulentBreakUp, 0);
- addToRunTimeSelectionTable(IATEsource, turbulentBreakUp, dictionary);
+ addToRunTimeSelectionTable(IATEsource, turbulentBreakUp, twoPhaseEuler);
}
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C
index 80633ce06ec..2cdc1270e0e 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C
@@ -41,7 +41,7 @@ namespace IATEsources
(
IATEsource,
wakeEntrainmentCoalescence,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.C
index cc3026fac32..1dddfc44cd4 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.C
@@ -40,7 +40,7 @@ namespace diameterModels
(
diameterModel,
constant,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/diameterModel/diameterModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/diameterModel/diameterModel.C
index 69a5aea3bdb..5bbe2b4691d 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/diameterModel/diameterModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/diameterModel/diameterModel.C
@@ -33,7 +33,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(diameterModel, 0);
- defineRunTimeSelectionTable(diameterModel, dictionary);
+ defineRunTimeSelectionTable(diameterModel, twoPhaseEuler);
}
@@ -66,7 +66,7 @@ Foam::diameterModel::New
<< ": "
<< modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -75,7 +75,7 @@ Foam::diameterModel::New
dict,
"diameterModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/diameterModel/diameterModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/diameterModel/diameterModel.H
index 5de204431b6..aabf222f25e 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/diameterModel/diameterModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/diameterModel/diameterModel.H
@@ -73,7 +73,7 @@ public:
(
autoPtr,
diameterModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict,
const phaseModel& phase
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
index 0dc52c5a43d..74cd4ae1046 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
@@ -40,7 +40,7 @@ namespace diameterModels
(
diameterModel,
isothermal,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C
index 3d924383335..a0b9f9563a5 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C
@@ -40,7 +40,7 @@ namespace aspectRatioModels
(
aspectRatioModel,
TomiyamaAspectRatio,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C
index 9544d238a61..0a85765031c 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C
@@ -40,7 +40,7 @@ namespace aspectRatioModels
(
aspectRatioModel,
VakhrushevEfremov,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/Wellek/Wellek.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/Wellek/Wellek.C
index ccb4e2eeb26..484ffb84b97 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/Wellek/Wellek.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/Wellek/Wellek.C
@@ -40,7 +40,7 @@ namespace aspectRatioModels
(
aspectRatioModel,
Wellek,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C
index 37d73220bf5..a2bb0fb44d8 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C
@@ -34,7 +34,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(aspectRatioModel, 0);
- defineRunTimeSelectionTable(aspectRatioModel, dictionary);
+ defineRunTimeSelectionTable(aspectRatioModel, twoPhaseEuler);
}
@@ -64,7 +64,7 @@ Foam::aspectRatioModel::New
Info<< "Selecting aspectRatioModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -73,7 +73,7 @@ Foam::aspectRatioModel::New
dict,
"aspectRatioModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H
index 3ad0dd2f8f8..1ec9bd55497 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H
@@ -74,7 +74,7 @@ public:
(
autoPtr,
aspectRatioModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C
index 790c071fcab..c0d3f079b31 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C
@@ -40,7 +40,7 @@ namespace aspectRatioModels
(
aspectRatioModel,
constantAspectRatio,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Ergun/Ergun.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Ergun/Ergun.C
index 10962032905..e75c3cb43b2 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Ergun/Ergun.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Ergun/Ergun.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(Ergun, 0);
- addToRunTimeSelectionTable(dragModel, Ergun, dictionary);
+ addToRunTimeSelectionTable(dragModel, Ergun, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C
index e1cec4a4554..34c45e860a9 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(Gibilaro, 0);
- addToRunTimeSelectionTable(dragModel, Gibilaro, dictionary);
+ addToRunTimeSelectionTable(dragModel, Gibilaro, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
index a5fd22e3098..eb5d5e09dbb 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
@@ -38,7 +38,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(GidaspowErgunWenYu, 0);
- addToRunTimeSelectionTable(dragModel, GidaspowErgunWenYu, dictionary);
+ addToRunTimeSelectionTable(dragModel, GidaspowErgunWenYu, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
index d4aa66225cd..8fe8b549e3e 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(GidaspowSchillerNaumann, 0);
- addToRunTimeSelectionTable(dragModel, GidaspowSchillerNaumann, dictionary);
+ addToRunTimeSelectionTable(dragModel, GidaspowSchillerNaumann, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C
index 96288f39d0f..927095c5ac9 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(IshiiZuber, 0);
- addToRunTimeSelectionTable(dragModel, IshiiZuber, dictionary);
+ addToRunTimeSelectionTable(dragModel, IshiiZuber, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Lain/Lain.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Lain/Lain.C
index 41fbca38d13..4ddd3f1c86c 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Lain/Lain.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Lain/Lain.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(Lain, 0);
- addToRunTimeSelectionTable(dragModel, Lain, dictionary);
+ addToRunTimeSelectionTable(dragModel, Lain, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
index 441a858f075..30da177c2b4 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(SchillerNaumann, 0);
- addToRunTimeSelectionTable(dragModel, SchillerNaumann, dictionary);
+ addToRunTimeSelectionTable(dragModel, SchillerNaumann, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
index 96a51810c7c..d31d8430d9c 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(SyamlalOBrien, 0);
- addToRunTimeSelectionTable(dragModel, SyamlalOBrien, dictionary);
+ addToRunTimeSelectionTable(dragModel, SyamlalOBrien, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
index 2abb7782091..846f2271851 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(TomiyamaAnalytic, 0);
- addToRunTimeSelectionTable(dragModel, TomiyamaAnalytic, dictionary);
+ addToRunTimeSelectionTable(dragModel, TomiyamaAnalytic, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
index 41148695d6d..274fbfa2316 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(TomiyamaCorrelated, 0);
- addToRunTimeSelectionTable(dragModel, TomiyamaCorrelated, dictionary);
+ addToRunTimeSelectionTable(dragModel, TomiyamaCorrelated, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/WenYu/WenYu.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/WenYu/WenYu.C
index e3130b9de4c..f5336243c7f 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/WenYu/WenYu.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/WenYu/WenYu.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(WenYu, 0);
- addToRunTimeSelectionTable(dragModel, WenYu, dictionary);
+ addToRunTimeSelectionTable(dragModel, WenYu, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/dragModel/dragModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/dragModel/dragModel.C
index 1d98c2e9c6b..e37937a9860 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/dragModel/dragModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/dragModel/dragModel.C
@@ -36,7 +36,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(dragModel, 0);
- defineRunTimeSelectionTable(dragModel, dictionary);
+ defineRunTimeSelectionTable(dragModel, twoPhaseEuler);
}
const Foam::dimensionSet Foam::dragModel::dimK(1, -3, -1, 0, 0);
@@ -111,7 +111,7 @@ Foam::dragModel::New
Info<< "Selecting dragModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -120,7 +120,7 @@ Foam::dragModel::New
dict,
"dragModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/dragModel/dragModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/dragModel/dragModel.H
index 2663b42430b..7e0f991eaf1 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/dragModel/dragModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/dragModel/dragModel.H
@@ -81,7 +81,7 @@ public:
(
autoPtr,
dragModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict,
const phasePair& pair,
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/segregated/segregated.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/segregated/segregated.C
index aa9860f0daf..2efb3ac0e95 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/segregated/segregated.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/segregated/segregated.C
@@ -39,7 +39,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(segregated, 0);
- addToRunTimeSelectionTable(dragModel, segregated, dictionary);
+ addToRunTimeSelectionTable(dragModel, segregated, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
index c20c59d2032..825fc48c7f3 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
@@ -36,7 +36,7 @@ namespace Foam
namespace heatTransferModels
{
defineTypeNameAndDebug(RanzMarshall, 0);
- addToRunTimeSelectionTable(heatTransferModel, RanzMarshall, dictionary);
+ addToRunTimeSelectionTable(heatTransferModel, RanzMarshall, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
index de6a5408bb7..ebdbe60e414 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
@@ -34,7 +34,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(heatTransferModel, 0);
- defineRunTimeSelectionTable(heatTransferModel, dictionary);
+ defineRunTimeSelectionTable(heatTransferModel, twoPhaseEuler);
}
const Foam::dimensionSet Foam::heatTransferModel::dimK(1, -1, -3, -1, 0);
@@ -73,7 +73,7 @@ Foam::heatTransferModel::New
Info<< "Selecting heatTransferModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -82,7 +82,7 @@ Foam::heatTransferModel::New
dict,
"heatTransferModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
index 58898646379..7525e52513c 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
@@ -78,7 +78,7 @@ public:
(
autoPtr,
heatTransferModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C
index 4885380778e..ad6644a3e86 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C
@@ -40,7 +40,7 @@ namespace heatTransferModels
(
heatTransferModel,
sphericalHeatTransfer,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C
index 93cd5da80cb..af7b1a4cf5e 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C
@@ -37,7 +37,7 @@ namespace Foam
namespace liftModels
{
defineTypeNameAndDebug(LegendreMagnaudet, 0);
- addToRunTimeSelectionTable(liftModel, LegendreMagnaudet, dictionary);
+ addToRunTimeSelectionTable(liftModel, LegendreMagnaudet, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/Moraga/Moraga.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/Moraga/Moraga.C
index 8064581e6fb..43ac0aae8d5 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/Moraga/Moraga.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/Moraga/Moraga.C
@@ -37,7 +37,7 @@ namespace Foam
namespace liftModels
{
defineTypeNameAndDebug(Moraga, 0);
- addToRunTimeSelectionTable(liftModel, Moraga, dictionary);
+ addToRunTimeSelectionTable(liftModel, Moraga, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C
index d6f551a8a65..daf82866db7 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C
@@ -36,7 +36,7 @@ namespace Foam
namespace liftModels
{
defineTypeNameAndDebug(TomiyamaLift, 0);
- addToRunTimeSelectionTable(liftModel, TomiyamaLift, dictionary);
+ addToRunTimeSelectionTable(liftModel, TomiyamaLift, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C
index d606d0dc6af..4f117fcb0fe 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C
@@ -36,7 +36,7 @@ namespace Foam
namespace liftModels
{
defineTypeNameAndDebug(constantLiftCoefficient, 0);
- addToRunTimeSelectionTable(liftModel, constantLiftCoefficient, dictionary);
+ addToRunTimeSelectionTable(liftModel, constantLiftCoefficient, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/liftModel/liftModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/liftModel/liftModel.C
index dec06b3e50a..d7db689b9a0 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/liftModel/liftModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/liftModel/liftModel.C
@@ -37,7 +37,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(liftModel, 0);
- defineRunTimeSelectionTable(liftModel, dictionary);
+ defineRunTimeSelectionTable(liftModel, twoPhaseEuler);
}
const Foam::dimensionSet Foam::liftModel::dimF(1, -2, -2, 0, 0);
@@ -69,7 +69,7 @@ Foam::liftModel::New
Info<< "Selecting liftModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -78,7 +78,7 @@ Foam::liftModel::New
dict,
"liftModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/liftModel/liftModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/liftModel/liftModel.H
index 7d4358205c8..3ce76540d90 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/liftModel/liftModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/liftModel/liftModel.H
@@ -75,7 +75,7 @@ public:
(
autoPtr,
liftModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/noLift/noLift.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/noLift/noLift.C
index c3bfe748743..d574ffdc1e7 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/noLift/noLift.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/noLift/noLift.C
@@ -36,7 +36,7 @@ namespace Foam
namespace liftModels
{
defineTypeNameAndDebug(noLift, 0);
- addToRunTimeSelectionTable(liftModel, noLift, dictionary);
+ addToRunTimeSelectionTable(liftModel, noLift, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C
index 61aa9c6907c..fc9ac45fae1 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C
@@ -40,7 +40,7 @@ namespace swarmCorrections
(
swarmCorrection,
TomiyamaSwarm,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/noSwarm/noSwarm.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/noSwarm/noSwarm.C
index e799cca4473..d214872d674 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/noSwarm/noSwarm.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/noSwarm/noSwarm.C
@@ -36,7 +36,7 @@ namespace Foam
namespace swarmCorrections
{
defineTypeNameAndDebug(noSwarm, 0);
- addToRunTimeSelectionTable(swarmCorrection, noSwarm, dictionary);
+ addToRunTimeSelectionTable(swarmCorrection, noSwarm, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C
index dc71b45a078..ab8b5461279 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C
@@ -34,7 +34,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(swarmCorrection, 0);
- defineRunTimeSelectionTable(swarmCorrection, dictionary);
+ defineRunTimeSelectionTable(swarmCorrection, twoPhaseEuler);
}
@@ -64,7 +64,7 @@ Foam::swarmCorrection::New
Info<< "Selecting swarmCorrection for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -73,7 +73,7 @@ Foam::swarmCorrection::New
dict,
"swarmCorrection",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H
index 6e70533e50a..c0bc09f36f5 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H
@@ -74,7 +74,7 @@ public:
(
autoPtr,
swarmCorrection,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/Burns/Burns.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/Burns/Burns.C
index c1d89aba372..56e97768ebb 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/Burns/Burns.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/Burns/Burns.C
@@ -43,7 +43,7 @@ namespace turbulentDispersionModels
(
turbulentDispersionModel,
Burns,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
index bd817480fb3..0c1e40346db 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
@@ -43,7 +43,7 @@ namespace turbulentDispersionModels
(
turbulentDispersionModel,
Gosman,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
index a4a46fa13af..4ee4b956fbc 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
@@ -41,7 +41,7 @@ namespace turbulentDispersionModels
(
turbulentDispersionModel,
LopezDeBertodano,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
index 90cf09f812f..c950712deb9 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
@@ -41,7 +41,7 @@ namespace turbulentDispersionModels
(
turbulentDispersionModel,
constantTurbulentDispersionCoefficient,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
index 83e7f5628dd..e5b4a946726 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
@@ -40,7 +40,7 @@ namespace turbulentDispersionModels
(
turbulentDispersionModel,
noTurbulentDispersion,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C
index de9f0cce223..86bb1f88b83 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C
@@ -35,7 +35,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(turbulentDispersionModel, 0);
- defineRunTimeSelectionTable(turbulentDispersionModel, dictionary);
+ defineRunTimeSelectionTable(turbulentDispersionModel, twoPhaseEuler);
}
const Foam::dimensionSet Foam::turbulentDispersionModel::dimD(1, -1, -2, 0, 0);
@@ -68,7 +68,7 @@ Foam::turbulentDispersionModel::New
Info<< "Selecting turbulentDispersionModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -77,7 +77,7 @@ Foam::turbulentDispersionModel::New
dict,
"turbulentDispersionModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H
index fe2b467d9cc..01852a1adc8 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H
@@ -75,7 +75,7 @@ public:
(
autoPtr,
turbulentDispersionModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C
index c08f64a2327..daea3844515 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C
@@ -40,7 +40,7 @@ namespace virtualMassModels
(
virtualMassModel,
Lamb,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
index 5436d22970f..8ca3e9c020e 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
@@ -40,7 +40,7 @@ namespace virtualMassModels
(
virtualMassModel,
constantVirtualMassCoefficient,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C
index a135d5d8877..027187de959 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C
@@ -36,7 +36,7 @@ namespace Foam
namespace virtualMassModels
{
defineTypeNameAndDebug(noVirtualMass, 0);
- addToRunTimeSelectionTable(virtualMassModel, noVirtualMass, dictionary);
+ addToRunTimeSelectionTable(virtualMassModel, noVirtualMass, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C
index d13e1502fcd..7c4220bd804 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C
@@ -35,7 +35,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(virtualMassModel, 0);
- defineRunTimeSelectionTable(virtualMassModel, dictionary);
+ defineRunTimeSelectionTable(virtualMassModel, twoPhaseEuler);
}
const Foam::dimensionSet Foam::virtualMassModel::dimK(dimDensity);
@@ -80,7 +80,7 @@ Foam::virtualMassModel::New
Info<< "Selecting virtualMassModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -89,7 +89,7 @@ Foam::virtualMassModel::New
dict,
"virtualMassModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H
index 91b5656fe07..29bf73dbd43 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H
@@ -77,7 +77,7 @@ public:
(
autoPtr,
virtualMassModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict,
const phasePair& pair,
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/Antal/Antal.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/Antal/Antal.C
index 15f8784f4be..ef4779239db 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/Antal/Antal.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/Antal/Antal.C
@@ -40,7 +40,7 @@ namespace wallLubricationModels
(
wallLubricationModel,
Antal,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/Frank/Frank.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/Frank/Frank.C
index 8e2b051448c..46f69079ce2 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/Frank/Frank.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/Frank/Frank.C
@@ -40,7 +40,7 @@ namespace wallLubricationModels
(
wallLubricationModel,
Frank,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C
index cfc8f5a2092..f6b78238f80 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C
@@ -40,7 +40,7 @@ namespace wallLubricationModels
(
wallLubricationModel,
TomiyamaWallLubrication,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
index 5f61de5d47b..59f4146f1d1 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
@@ -40,7 +40,7 @@ namespace wallLubricationModels
(
wallLubricationModel,
noWallLubrication,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
index 4b6cdb6d5f9..c1a5d29c6d7 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
@@ -36,7 +36,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(wallLubricationModel, 0);
- defineRunTimeSelectionTable(wallLubricationModel, dictionary);
+ defineRunTimeSelectionTable(wallLubricationModel, twoPhaseEuler);
}
const Foam::dimensionSet Foam::wallLubricationModel::dimF(1, -2, -2, 0, 0);
@@ -69,7 +69,7 @@ Foam::wallLubricationModel::New
Info<< "Selecting wallLubricationModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -78,7 +78,7 @@ Foam::wallLubricationModel::New
dict,
"wallLubricationModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H
index a2de5064221..af4e0a9ec10 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H
@@ -78,7 +78,7 @@ public:
(
autoPtr,
wallLubricationModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict,
const phasePair& pair
--
GitLab