Skip to content
Snippets Groups Projects
Commit 00f6128d authored by Timo Koch's avatar Timo Koch
Browse files

Merge branch 'cleanup/remove-duplicate-calculations-volvars' into 'master'

[cleanup][2pnc] Remove duplicate calculation of density/mole-denstiy in VolVars

Closes #1172

See merge request !3188
parents 17b8b50e 179469cf
No related branches found
No related tags found
1 merge request!3188[cleanup][2pnc] Remove duplicate calculation of density/mole-denstiy in VolVars
Pipeline #18877 canceled
Pipeline: dumux

#18883

    Pipeline: dumux

    #18882

      Pipeline: dumux

      #18881

        +3
        ...@@ -316,13 +316,8 @@ public: ...@@ -316,13 +316,8 @@ public:
        paramCache.updateAll(fluidState); paramCache.updateAll(fluidState);
        for (int phaseIdx = 0; phaseIdx < ModelTraits::numFluidPhases(); ++phaseIdx) for (int phaseIdx = 0; phaseIdx < ModelTraits::numFluidPhases(); ++phaseIdx)
        { {
        Scalar rho = FluidSystem::density(fluidState, paramCache, phaseIdx);
        Scalar rhoMolar = FluidSystem::molarDensity(fluidState, paramCache, phaseIdx);
        Scalar mu = FluidSystem::viscosity(fluidState, paramCache, phaseIdx); Scalar mu = FluidSystem::viscosity(fluidState, paramCache, phaseIdx);
        Scalar h = EnergyVolVars::enthalpy(fluidState, paramCache, phaseIdx); Scalar h = EnergyVolVars::enthalpy(fluidState, paramCache, phaseIdx);
        fluidState.setDensity(phaseIdx, rho);
        fluidState.setMolarDensity(phaseIdx, rhoMolar);
        fluidState.setViscosity(phaseIdx, mu); fluidState.setViscosity(phaseIdx, mu);
        fluidState.setEnthalpy(phaseIdx, h); fluidState.setEnthalpy(phaseIdx, h);
        } }
        ......
        0% Loading or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment