Merge branch 'release/0.4.2'

dbent · dbent · commit 8c4860ba0c71 · 2015-06-25T22:06:50.000-04:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,7 @@
+## v0.4.2
+##### Fixes
+- Fix aggregate thermal rate calculation. It was double counting radiative thermal rate.
+
 ## v0.4.1
 ##### Fixes
 - Fix for configuration settings reverting to default after two reloads of KSP.
diff --git a/Source/HotSpot/Extensions/PartExtensions.cs b/Source/HotSpot/Extensions/PartExtensions.cs
@@ -7,7 +7,6 @@ public static double GetThermalFlux(this Part part)
             return part.thermalInternalFluxPrevious
                 + part.thermalConductionFlux
                 + part.thermalConvectionFlux
-                + part.thermalRadiationFlux
                 + part.thermalRadiationFlux;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ public static double GetThermalFlux(this Part part)`
`7`	`7`	`return part.thermalInternalFluxPrevious`
`8`	`8`	`+ part.thermalConductionFlux`
`9`	`9`	`+ part.thermalConvectionFlux`
`10`		`- + part.thermalRadiationFlux`
`11`	`10`	`+ part.thermalRadiationFlux;`
`12`	`11`	`}`
`13`	`12`	`}`