diff --git a/src/Allwmake b/src/Allwmake index 1809dad242f81265570e653f2b9f9c59a730eea5..1a78e00b4aa756ee5323ff740762392fdc82303d 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -61,8 +61,6 @@ wmake $makeType topoChangerFvMesh wmake $makeType ODE wmake $makeType randomProcesses -# ThermophysicalModels needs regionCoupled -wmakeLnInclude regionCoupled thermophysicalModels/Allwmake $* transportModels/Allwmake $* turbulenceModels/Allwmake $* diff --git a/src/meshTools/regionCoupled/patches/regionCoupledLduInterface/regionCoupledLduInterface.C b/src/meshTools/regionCoupled/patches/regionCoupledLduInterface/regionCoupledLduInterface.C index f8cb75729a765a24c396f2daf0129abb38b7d24a..fbc831dc612bcf89f9f4cffc0fd863ed39126fc0 100644 --- a/src/meshTools/regionCoupled/patches/regionCoupledLduInterface/regionCoupledLduInterface.C +++ b/src/meshTools/regionCoupled/patches/regionCoupledLduInterface/regionCoupledLduInterface.C @@ -26,9 +26,10 @@ License #include "regionCoupledLduInterface.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -defineTypeNameAndDebug(Foam::regionCoupledLduInterface, 0); - +namespace Foam +{ +defineTypeNameAndDebug(regionCoupledLduInterface, 0); +} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/basic/heThermo/heThermo.C b/src/thermophysicalModels/basic/heThermo/heThermo.C index aaa7aa6da358813afd6a75368f54509080996ac2..5f49a4ba752e03e483865019a6f751a273925262 100644 --- a/src/thermophysicalModels/basic/heThermo/heThermo.C +++ b/src/thermophysicalModels/basic/heThermo/heThermo.C @@ -32,7 +32,6 @@ License #include "fixedJumpAMIFvPatchFields.H" #include "energyJumpFvPatchScalarField.H" #include "energyJumpAMIFvPatchScalarField.H" -#include "energyRegionCoupledFvPatchScalarField.H" // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // @@ -103,9 +102,9 @@ Foam::wordList Foam::heThermo<BasicThermo, MixtureType>::heBoundaryTypes() { hbt[patchi] = energyJumpAMIFvPatchScalarField::typeName; } - else if (isA<energyRegionCoupledFvPatchScalarField>(tbf[patchi])) + else if (tbf[patchi].type() == "energyRegionCoupledFvPatchScalarField") { - hbt[patchi] = energyRegionCoupledFvPatchScalarField::typeName; + hbt[patchi] = "energyRegionCoupledFvPatchScalarField"; } }