X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=WCudaMSE%2FStudent_Cuda_Image%2Fsrc%2Fcpp%2Fcore%2F05_HeatTransfert%2Fmoo%2Fhost%2FHeatTransfert.cu;h=0818f52b1def19a1269a3e8ef7a6d263df280af7;hb=2fd5d915e8a9de4d957d6031d2d68088784eac3c;hp=7aa7cf6b3de8a6ba8c35d58e4772342b461b98cc;hpb=cb39d6a91b65d2862018430d65e633d2a8fdc818;p=GPU.git

diff --git a/WCudaMSE/Student_Cuda_Image/src/cpp/core/05_HeatTransfert/moo/host/HeatTransfert.cu b/WCudaMSE/Student_Cuda_Image/src/cpp/core/05_HeatTransfert/moo/host/HeatTransfert.cu
index 7aa7cf6..0818f52 100755
--- a/WCudaMSE/Student_Cuda_Image/src/cpp/core/05_HeatTransfert/moo/host/HeatTransfert.cu
+++ b/WCudaMSE/Student_Cuda_Image/src/cpp/core/05_HeatTransfert/moo/host/HeatTransfert.cu
@@ -10,11 +10,11 @@ using namespace std;
 
 #include "HeatTransfertDevice.h"
 
-HeatTransfert::HeatTransfert() :
+HeatTransfert::HeatTransfert(int w, int h) :
       calibreur(IntervalF(0, 1), IntervalF(0.7, 0)),
-      devImageHeaters(800, 800),
-      devImageA(800, 800),
-      devImageB(800, 800),
+      devImageHeaters(w, h),
+      devImageA(w, h),
+      devImageB(w, h),
       t(0),
       dg(8, 8, 1),
       db(32, 32, 1),
@@ -92,28 +92,31 @@ string HeatTransfert::getTitle()
 
 void HeatTransfert::setHeaters(HeatImage& image)
     {
-    for (int x = 179; x <= 195; x++)
+    const float tempCentre = 1.0;
+    const float tempCotes = 0.2;
+
+    for (int x = 279; x <= 295; x++)
         {
-        for (int y = 179; y <= 195; y++)
-            image.set(x, y, 0.2);
-        for (int y = 605; y <= 621; y++)
-            image.set(x, y, 0.2);
+        for (int y = 279; y <= 295; y++)
+            image.set(x, y, tempCotes);
+        for (int y = 505; y <= 521; y++)
+            image.set(x, y, tempCotes);
         }
 
-    for (int x = 605; x <= 621; x++)
+    for (int x = 505; x <= 521; x++)
         {
-        for (int y = 179; y <= 195; y++)
-            image.set(x, y, 0.2);
-        for (int y = 605; y <= 621; y++)
-            image.set(x, y, 0.2);
+        for (int y = 279; y <= 295; y++)
+            image.set(x, y, tempCotes);
+        for (int y = 505; y <= 521; y++)
+            image.set(x, y, tempCotes);
         }
 
-    image.set(295, 400, 0.2);
-    image.set(400, 295, 0.2);
-    image.set(505, 400, 0.2);
-    image.set(400, 505, 0.2);
+    image.set(295, 400, tempCotes);
+    image.set(400, 295, tempCotes);
+    image.set(505, 400, tempCotes);
+    image.set(400, 505, tempCotes);
 
     for (int x = 300; x <= 500; x++)
         for (int y = 300; y <= 500; y++)
-            image.set(x, y, 1);
+            image.set(x, y, tempCentre);
     }