summaryrefslogtreecommitdiffstats
path: root/Temparray.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Temparray.cpp')
-rw-r--r--Temparray.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/Temparray.cpp b/Temparray.cpp
index 83f91f0..d2379f2 100644
--- a/Temparray.cpp
+++ b/Temparray.cpp
@@ -55,6 +55,7 @@ void Temparray::calcTemp(){
float meterperunit = 3.0;
float width, height, depth, innerwidth, innerdepth;
float width2, height2, depth2, innerwidth2, innerdepth2;
+ float loadableenergy, unloadableenergy;
for(int i = 0; i < sx; ++i) {
for(int j = 0; j < sy; ++j) {
@@ -139,7 +140,10 @@ void Temparray::calcTemp(){
if(m % 2 == 1)capacity = specificcapacity *((((width - innerwidth)/2)*
((depth + innerdepth)/2)*height)
/ 0.9 * meterperunit);
-
+
+ loadableenergy = (probetemp - temperatureold(i, j, k, l, m))/thermalresistance/10;
+ unloadableenergy = (temperatureold(i, j, k, l, m)-21.5)/thermalresistance/10;
+
tau12 = capacity * thermalresistance;
temperaturenew(i, j, k, l, m) =