From 93ba5bac4ce00462fac78c0c336154cd2438ff33 Mon Sep 17 00:00:00 2001
From: Klaus Mosthaf <klmos@env.dtu.dk>
Date: Thu, 24 Jan 2013 08:40:19 +0000
Subject: [PATCH] updated changelog

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@10078 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
 CHANGELOG | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 28994d0ac3..58cd2ccda7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -45,12 +45,23 @@ Differences Between DuMuX 2.2 and DuMuX 2.3 (up to r10000)
 
   - The table of available parameters has been improved, see 
     http://www.dumux.org/doxygen-stable/html-2.2/a00838.php
-    
+
+  - Improved handling of the conductive heat fluxes in the non-isothermal implicit  
+	two-phase models, see \TODO FS#172.
+
   - Introduced new selection of start/stop messages, \TODO FS#170.
 
 * IMMEDIATE INTERFACE CHANGES not allowing/requiring a deprecation period:
   - The property Salinity used in the BrineCO2FluidSystem 
     has been renamed to ProblemSalinity. 
+  - The matrixHeatFlux(...) and boundaryMatrixHeatFlux(...) methods in the spatial
+	parameters of nonisothermal implicit twophase models has been removed.
+	Instead, the computation of the effective thermal conductivity has been sourced 
+	out to the fluidmatrixinteractions in a separate file (somerton), which
+	can be exchanged. The spatial parameters file needs a method 
+	thermalConductivitySolid(...), where the thermal conductivity of the solid
+	material only is specified. The rest is computed in the respective
+	flux variables.
 
 * Deprecated CLASSES/FILES, to be removed after 2.3:
   - The following headers in dumux/boxmodels/ have been deprecated and forward 
-- 
GitLab