mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Conflicts: src/thermophysicalModels/basic/Make/files src/thermophysicalModels/basic/basicThermo/basicThermo.C src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermo.C src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermo.C src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C