diff options
Diffstat (limited to 'Temparray.cpp')
| -rw-r--r-- | Temparray.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/Temparray.cpp b/Temparray.cpp index e7d8b42..b47cf4b 100644 --- a/Temparray.cpp +++ b/Temparray.cpp @@ -84,7 +84,14 @@ void Temparray::calcTemp(){ } tau12 = capacity * thermalresistance; tau21 = capacity2 * thermalresistance; - std::cerr << tau12 << "\n" << tau21 << std::endl; + + temperaturenew(i, j, k, l, m) = + temperatureold(i, j, k, l, m) - ((temperatureold(i, j, k, l, m) - + temperatureold(i, j, k, l-1, m))*(1-exp(1/tau12))); + temperaturenew(i, j, k, l-1, m) = + temperatureold(i, j, k, l-1, m) + ((temperatureold(i, j, k, l, m) - + temperatureold(i, j, k, l-1, m))*(1-exp(1/tau21))); + } @@ -92,6 +99,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 m = 0; m < 4; m++) {temperatureold(i, j, k, l, m)=temperaturenew(i, j, k, l, m);}}}}} + std::cerr << temperaturenew(2, 2, 2, 2, 2) << std::endl; + std::cerr << temperaturenew(2, 2, 2, 3, 2) << std::endl; } std::list<Triangle> Temparray::getTriangles(){ |