[nonisothermal] improve naming and meaning of solid thermal parameters
This implements FS#216. The "heatCapacity" function of the spatial parameters and the volume variables for the implicit nonisothermal models was a misnomer, since it returned an effective quantity, namely, heatCapacity*density*(1 - porosity) in [J/(K m^3)]. Except for mpnc, which resulted in an additional inconsistency. Corresponding to the decision documented in FS#216, this patch renames the function to "solidHeatCapacity" and returns always the "true" (non-effective) heat capacity in [J/(kg K)]. This requires an additional function "solidDensity" which returns the mass density of the porous matrix. Moreover, the functions "thermalConductivitySolid/Fluid" are renamed to "solid/fluidThermalConductivity". The decision to prepend with "solid/fluid" rather than to append is motivated by consistency with components and fluid systems, where "gas" and "liquid" are always prepended to the corresponding function names. _Beware_: this change breaks compatibility. You have to adapt your spatial parameters such that they offer functions "solidHeatCapacity", "solidDensity" and "solidThermalConductivity". Reviewed by Alex. git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14070 2fb0f335-1f38-0410-981e-8018bf24f1b0
Showing
- dumux/implicit/box/boxfvelementgeometry.hh 2 additions, 2 deletionsdumux/implicit/box/boxfvelementgeometry.hh
- dumux/implicit/common/implicitvelocityoutput.hh 155 additions, 48 deletionsdumux/implicit/common/implicitvelocityoutput.hh
- dumux/implicit/mpnc/energy/mpncfluxvariablesenergy.hh 4 additions, 4 deletionsdumux/implicit/mpnc/energy/mpncfluxvariablesenergy.hh
- dumux/implicit/mpnc/energy/mpncfluxvariablesenergykinetic.hh 4 additions, 4 deletionsdumux/implicit/mpnc/energy/mpncfluxvariablesenergykinetic.hh
- dumux/implicit/mpnc/energy/mpnclocalresidualenergy.hh 2 additions, 2 deletionsdumux/implicit/mpnc/energy/mpnclocalresidualenergy.hh
- dumux/implicit/mpnc/energy/mpnclocalresidualenergykinetic.hh 4 additions, 4 deletionsdumux/implicit/mpnc/energy/mpnclocalresidualenergykinetic.hh
- dumux/implicit/mpnc/energy/mpncvolumevariablesenergy.hh 21 additions, 14 deletionsdumux/implicit/mpnc/energy/mpncvolumevariablesenergy.hh
- dumux/implicit/mpnc/energy/mpncvolumevariablesenergykinetic.hh 78 additions, 54 deletions.../implicit/mpnc/energy/mpncvolumevariablesenergykinetic.hh
- dumux/implicit/nonisothermal/nilocalresidual.hh 7 additions, 6 deletionsdumux/implicit/nonisothermal/nilocalresidual.hh
- dumux/implicit/nonisothermal/nivolumevariables.hh 34 additions, 12 deletionsdumux/implicit/nonisothermal/nivolumevariables.hh
- dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh 2 additions, 2 deletions.../fluidmatrixinteractions/1p/thermalconductivityaverage.hh
- dumux/material/fluidmatrixinteractions/2p/thermalconductivitysimplefluidlumping.hh 3 additions, 3 deletions...xinteractions/2p/thermalconductivitysimplefluidlumping.hh
- dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh 3 additions, 3 deletions...fluidmatrixinteractions/2p/thermalconductivitysomerton.hh
- dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh 4 additions, 4 deletions...uidmatrixinteractions/3p/thermalconductivitysomerton3p.hh
- test/implicit/1p/1pniconductionproblem.hh 3 additions, 2 deletionstest/implicit/1p/1pniconductionproblem.hh
- test/implicit/1p/1pniconvectionproblem.hh 3 additions, 2 deletionstest/implicit/1p/1pniconvectionproblem.hh
- test/implicit/1p/1pnispatialparams.hh 22 additions, 11 deletionstest/implicit/1p/1pnispatialparams.hh
- test/implicit/1p2c/1p2cniconductionproblem.hh 3 additions, 2 deletionstest/implicit/1p2c/1p2cniconductionproblem.hh
- test/implicit/1p2c/1p2cniconvectionproblem.hh 3 additions, 2 deletionstest/implicit/1p2c/1p2cniconvectionproblem.hh
- test/implicit/1p2c/1p2cnispatialparams.hh 21 additions, 9 deletionstest/implicit/1p2c/1p2cnispatialparams.hh
Loading
Please register or sign in to comment