diff --git a/dumux/io/plotthermalconductivitymodel.hh b/dumux/io/plotthermalconductivitymodel.hh index ca6c7ac4b8238771654bb384de039824ea2a97f7..aaced25a75ee1a2a338cd3c4976d9c43427cd654 100644 --- a/dumux/io/plotthermalconductivitymodel.hh +++ b/dumux/io/plotthermalconductivitymodel.hh @@ -24,23 +24,13 @@ #ifndef DUMUX_PLOT_THERMAL_CONDUCTIVITY_LAW_HH #define DUMUX_PLOT_THERMAL_CONDUCTIVITY_LAW_HH -#include <dumux/common/basicproperties.hh> +#include <dumux/common/properties.hh> #include <dumux/io/gnuplotinterface.hh> #include <dumux/material/fluidstates/compositional.hh> namespace Dumux { -namespace Properties -{ -NEW_PROP_TAG(ThermalConductivityModel); -NEW_PROP_TAG(CompositionalFluidState); -NEW_PROP_TAG(FluidSystem); -NEW_PROP_TAG(FluidState); -NEW_PROP_TAG(Indices); -NEW_PROP_TAG(Scalar); -} - /*! * \brief Interface for plotting the non-isothermal two-phase fluid-matrix-interaction laws */ @@ -75,8 +65,8 @@ public: fluidstate.setTemperature(temperature); fluidstate.setPressure(wPhaseIdx, pressure); fluidstate.setPressure(nPhaseIdx, pressure); - lambdaW_ = FluidSystem::template thermalConductivity<FluidState>(fluidstate, wPhaseIdx); - lambdaN_ = FluidSystem::template thermalConductivity<FluidState>(fluidstate, nPhaseIdx); + lambdaW_ = FluidSystem::thermalConductivity(fluidstate, wPhaseIdx); + lambdaN_ = FluidSystem::thermalConductivity(fluidstate, nPhaseIdx); } /*!