Saiph: adding granularity experiment and figures

garlic/apps/saiph/default.nix

@@ -8,10 +8,15 @@
 , boost
 , gitBranch ? "master"
 , numComm ? null
+, nbx ? null
+, nby ? null
+, nbz ? null
 , vectFlags ? null
 #, breakpointHook
 }:
 
+with stdenv.lib;
+
 stdenv.mkDerivation rec {
   name = "saiph";
 
@@ -20,7 +25,7 @@ stdenv.mkDerivation rec {
     ref = "${gitBranch}";
   };
 
-  programPath = "/bin/ExHeat3D";
+  programPath = "/bin/Heat3D_vect";
 
   enableParallelBuilding = true;
   dontStrip = true;
@@ -49,15 +54,18 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "-f" "Makefile.${cc.cc.CC}"
     "apps"
-    "APP=ExHeat3D"
-    ( if (numComm != null) then "NUM_COMM=${toString numComm}" else "" )
-    ( if (vectFlags != null) then "VECT_FLAGS=${toString vectFlags}" else "" )
-  ];
-
+    "APP=Heat3D_vect"
+  ] ++ optional (nbx != null) "NB_X=${toString nbx}"
+    ++ optional (nby != null) "NB_Y=${toString nby}"
+    ++ optional (nbz != null) "NB_Z=${toString nbz}"
+    ++ optional (numComm != null) "NUM_COMM=${toString numComm}"
+    ++ optional (vectFlags != null) "VECT_FLAGS=${toString vectFlags}"
+    ;
+    
   installPhase = ''
     mkdir -p $out/lib
     mkdir -p $out/bin
     cp obj/libsaiphv2.so $out/lib/
-    cp bin/ExHeat3D $out/bin/
+    cp bin/Heat3D_vect $out/bin/
   '';
 }