some adaptions to the stuff decided today
- GenericFluidState -> NonEquilibriumFluidState (I don't remember the new name of EquilibriumFluidState) - removed updateAverageMolarMass from NonEquilibriumFluidState and EquilibriumFluidState - removed sum{Mole|Mass}Fractions from NonEquilibriumFluidState and EquilibriumFluidState - all fluid states and systems now use enthalpy instead of internal energy On a completely different front, this also makes the MpNc model compile with energy enabled, although the implementation is still incorrect. (as long as nobody is unhappy about it I won't change this in this branch!) git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7059 2fb0f335-1f38-0410-981e-8018bf24f1b0
Showing
- appl/lecture/msm/1p2cvs2p/watercontaminantfluidsystem.hh 7 additions, 7 deletionsappl/lecture/msm/1p2cvs2p/watercontaminantfluidsystem.hh
- dumux/boxmodels/1p2c/1p2cvolumevariables.hh 0 additions, 1 deletiondumux/boxmodels/1p2c/1p2cvolumevariables.hh
- dumux/boxmodels/2p2cni/2p2cnivolumevariables.hh 2 additions, 2 deletionsdumux/boxmodels/2p2cni/2p2cnivolumevariables.hh
- dumux/boxmodels/2pni/2pnivolumevariables.hh 2 additions, 2 deletionsdumux/boxmodels/2pni/2pnivolumevariables.hh
- dumux/boxmodels/MpNc/MpNcvolumevariables.hh 0 additions, 1 deletiondumux/boxmodels/MpNc/MpNcvolumevariables.hh
- dumux/boxmodels/MpNc/energy/MpNcfluxvariablesenergy.hh 42 additions, 32 deletionsdumux/boxmodels/MpNc/energy/MpNcfluxvariablesenergy.hh
- dumux/boxmodels/MpNc/energy/MpNclocalresidualenergy.hh 1 addition, 1 deletiondumux/boxmodels/MpNc/energy/MpNclocalresidualenergy.hh
- dumux/boxmodels/MpNc/energy/MpNcvolumevariablesenergy.hh 2 additions, 4 deletionsdumux/boxmodels/MpNc/energy/MpNcvolumevariablesenergy.hh
- dumux/material/MpNcconstraintsolvers/compositionfromfugacities.hh 0 additions, 6 deletions...terial/MpNcconstraintsolvers/compositionfromfugacities.hh
- dumux/material/MpNcconstraintsolvers/computefromreferencephase.hh 11 additions, 13 deletions...terial/MpNcconstraintsolvers/computefromreferencephase.hh
- dumux/material/MpNcconstraintsolvers/misciblemultiphasecomposition.hh 2 additions, 4 deletions...al/MpNcconstraintsolvers/misciblemultiphasecomposition.hh
- dumux/material/MpNcfluidstates/equilibriumfluidstate.hh 36 additions, 57 deletionsdumux/material/MpNcfluidstates/equilibriumfluidstate.hh
- dumux/material/MpNcfluidstates/immisciblefluidstate.hh 8 additions, 25 deletionsdumux/material/MpNcfluidstates/immisciblefluidstate.hh
- dumux/material/MpNcfluidstates/nonequilibriumfluidstate.hh 40 additions, 51 deletionsdumux/material/MpNcfluidstates/nonequilibriumfluidstate.hh
- dumux/material/MpNcfluidsystems/1pfluidsystem.hh 5 additions, 5 deletionsdumux/material/MpNcfluidsystems/1pfluidsystem.hh
- dumux/material/MpNcfluidsystems/2pimmisciblefluidsystem.hh 4 additions, 11 deletionsdumux/material/MpNcfluidsystems/2pimmisciblefluidsystem.hh
- dumux/material/MpNcfluidsystems/h2on2fluidsystem.hh 7 additions, 10 deletionsdumux/material/MpNcfluidsystems/h2on2fluidsystem.hh
- test/boxmodels/1p2c/interstitialfluidtrailfluidsystem.hh 2 additions, 2 deletionstest/boxmodels/1p2c/interstitialfluidtrailfluidsystem.hh
- test/boxmodels/MpNc/obstaclespatialparameters.hh 6 additions, 6 deletionstest/boxmodels/MpNc/obstaclespatialparameters.hh
Loading
Please register or sign in to comment