From 85b933e9af1eed591ff377cc8bd13f7914db85ff Mon Sep 17 00:00:00 2001 From: David Landa Marban Date: Tue, 1 Apr 2025 13:38:51 +0200 Subject: [PATCH] Fix to broken build in macOS --- .../blackoil/blackoillocalresidualtpfa.hh | 46 +++++++++---------- opm/models/io/baseoutputmodule.hh | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/opm/models/blackoil/blackoillocalresidualtpfa.hh b/opm/models/blackoil/blackoillocalresidualtpfa.hh index 42dcee7257..553e1374e9 100644 --- a/opm/models/blackoil/blackoillocalresidualtpfa.hh +++ b/opm/models/blackoil/blackoillocalresidualtpfa.hh @@ -444,17 +444,17 @@ public: short interiorDofIdx = 0; // NB short exteriorDofIdx = 1; // NB - EnergyModule::ExtensiveQuantities::template updateEnergy(heatFlux, - interiorDofIdx, // focusDofIndex, - interiorDofIdx, - exteriorDofIdx, - intQuantsIn, - intQuantsEx, - intQuantsIn.fluidState(), - intQuantsEx.fluidState(), - inAlpha, - outAlpha, - faceArea); + EnergyModule::ExtensiveQuantities::updateEnergy(heatFlux, + interiorDofIdx, // focusDofIndex, + interiorDofIdx, + exteriorDofIdx, + intQuantsIn, + intQuantsEx, + intQuantsIn.fluidState(), + intQuantsEx.fluidState(), + inAlpha, + outAlpha, + faceArea); } EnergyModule::addHeatFlux(flux, heatFlux); } @@ -616,12 +616,12 @@ public: Scalar alpha = problem.eclTransmissibilities().thermalHalfTransBoundary(globalSpaceIdx, bdyInfo.boundaryFaceIndex); unsigned inIdx = 0;//dummy // always calculated with derivatives of this cell - EnergyModule::ExtensiveQuantities::template updateEnergyBoundary(heatFlux, - insideIntQuants, - /*focusDofIndex*/ inIdx, - inIdx, - alpha, - bdyInfo.exFluidState); + EnergyModule::ExtensiveQuantities::updateEnergyBoundary(heatFlux, + insideIntQuants, + /*focusDofIndex*/ inIdx, + inIdx, + alpha, + bdyInfo.exFluidState); EnergyModule::addHeatFlux(bdyFlux, heatFlux); } @@ -658,12 +658,12 @@ public: Scalar alpha = problem.eclTransmissibilities().thermalHalfTransBoundary(globalSpaceIdx, bdyInfo.boundaryFaceIndex); unsigned inIdx = 0;//dummy // always calculated with derivatives of this cell - EnergyModule::ExtensiveQuantities::template updateEnergyBoundary(heatFlux, - insideIntQuants, - /*focusDofIndex*/ inIdx, - inIdx, - alpha, - bdyInfo.exFluidState); + EnergyModule::ExtensiveQuantities::updateEnergyBoundary(heatFlux, + insideIntQuants, + /*focusDofIndex*/ inIdx, + inIdx, + alpha, + bdyInfo.exFluidState); EnergyModule::addHeatFlux(bdyFlux, heatFlux); } diff --git a/opm/models/io/baseoutputmodule.hh b/opm/models/io/baseoutputmodule.hh index 0966b302a0..1fd5a0faa4 100644 --- a/opm/models/io/baseoutputmodule.hh +++ b/opm/models/io/baseoutputmodule.hh @@ -335,7 +335,7 @@ protected: oss << i; snprintf(name, 512, pattern, oss.str().c_str()); - this->commitScalarBuffer(baseWriter, name, buffer[i], bufferType); + this->commitScalarBuffer_(baseWriter, name, buffer[i], bufferType); } }