From b4b98c1e351b66bf1750e84a070b25eba9bfb5d2 Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Thu, 8 Feb 2024 15:33:22 +0000 Subject: [PATCH] multiphaseEuler: Corrected file names in model construction error messages --- .../phaseSystem/phaseSystem/phaseSystemTemplates.C | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/applications/modules/multiphaseEuler/phaseSystem/phaseSystem/phaseSystemTemplates.C b/applications/modules/multiphaseEuler/phaseSystem/phaseSystem/phaseSystemTemplates.C index f5ede1d10c..7a77d64d9d 100644 --- a/applications/modules/multiphaseEuler/phaseSystem/phaseSystem/phaseSystemTemplates.C +++ b/applications/modules/multiphaseEuler/phaseSystem/phaseSystem/phaseSystemTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2015-2023 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2024 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,11 +34,11 @@ Foam::dictionary Foam::phaseSystem::interfacialDict(const word& name) const bool found = false; dictionary dict(name); - // If it is a dictionary then merge it in + // If it is a dictionary then use it if (this->isDict(name)) { found = true; - dict.merge(this->subDict(name)); + dict = this->subDict(name); } // Function to add old-format list/table entries @@ -182,7 +182,7 @@ void Foam::phaseSystem::generateInterfacialModels if (!names.found(name)) { names.append(name); - dicts.append(new dictionary(name)); + dicts.append(new dictionary(dict.name())); interfaces.append(interfacePtr.ptr()); models.append(nullptr); }