diff options
Diffstat (limited to 'Temparray.cpp')
| -rw-r--r-- | Temparray.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/Temparray.cpp b/Temparray.cpp index 7615d21..9c67afd 100644 --- a/Temparray.cpp +++ b/Temparray.cpp @@ -107,13 +107,13 @@ void Temparray::calcTemp(){ for(int i = 0; i < sx; ++i) { for(int j = 0; j < sy; ++j) { for(int k = 0; k < sz; ++k) { - for(int l = 0; l < 6; ++l) { + //for(int l = 0; l < 6; ++l) { for(int m = 0; m < 4; m++) { - width = cubehole(i, j, k, l).getWidth(); - height = cubehole(i, j, k, l).getHeight(); - depth = cubehole(i, j, k, l).getDepth(); - innerwidth = cubehole(i, j, k, l).getInnerWidth(); - innerdepth = cubehole(i, j, k, l).getInnerDepth(); + width = cubehole(i, j, k, 5).getWidth(); + height = cubehole(i, j, k, 5).getHeight(); + depth = cubehole(i, j, k, 5).getDepth(); + innerwidth = cubehole(i, j, k, 5).getInnerWidth(); + innerdepth = cubehole(i, j, k, 5).getInnerDepth(); if(m % 2 == 0)area = (((depth - innerdepth)/2)*((width + innerwidth)/2)) / 0.9 * meterperunit; @@ -132,8 +132,8 @@ void Temparray::calcTemp(){ ((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; + loadableenergy = (probetemp - temperatureold(i, j, k, 5, m))/thermalresistance/10; + unloadableenergy = (temperatureold(i, j, k, 5, m)-21.5)/thermalresistance/10; tau12 = capacity * thermalresistance; @@ -150,8 +150,8 @@ void Temparray::calcTemp(){ } if(inputpower > 0) { factor = inputpower/loadableenergy; - temperaturenew(i, j, k, l, m) = - temperaturenew(i, j, k, l, m) + (probetemp-temperatureold(i, j, k, l, m)) + temperaturenew(i, j, k, 5, m) = + temperaturenew(i, j, k, 5, m) + (probetemp-temperatureold(i, j, k, 5, m)) *thermalresistance*factor*(1-exp(-(1/tau12))); } } @@ -168,13 +168,13 @@ void Temparray::calcTemp(){ } if(inputpower > 0) { factor = inputpower/unloadableenergy; - temperaturenew(i, j, k, l, m) = - temperaturenew(i, j, k, l, m) + (21.5-temperatureold(i, j, k, l, m)) + temperaturenew(i, j, k, 5, m) = + temperaturenew(i, j, k, 5, m) + (21.5-temperatureold(i, j, k, 5, m)) *thermalresistance*factor*(1-exp(-(1/tau12))); } } } - } + //} } } } |