From 4341087e249ca73bfc1799c9427add3a080186f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Constantin=20Ri=DF?= <constantin.riss@dre.de>
Date: Mon, 18 Jan 2010 17:51:32 +0100
Subject: zweiter Waermeaustausch...

---
 Temparray.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'Temparray.h')

diff --git a/Temparray.h b/Temparray.h
index 04250c4..921de69 100644
--- a/Temparray.h
+++ b/Temparray.h
@@ -35,10 +35,15 @@ class Temparray
     int sx, sy, sz;
     float averagetemp;
 
-
     Cubehole& cubehole(int x, int y, int z, int line) {
       return cubearray[x*sy*sz*6 + y*sz*6 + z*6 + line];
     }
+    void mergetemperature(){
+      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);}}}}}}
     void tempInit(float temp0, int x0, int y0, int z0){
       for(int i=0; i<x0; i++){
         for(int j=0; j<y0; j++){
@@ -53,6 +58,7 @@ class Temparray
         }
       }
       temperatureold(2, 2, 2, 2, 2) = 90;
+      temperaturenew(2, 2, 2, 2, 2) = 90;
     }
 /*    void calcAverage(){
       float tempcache = 0;
-- 
cgit v1.2.3