Improvement the experiment based on CREAMS

garlic/creams/default.nix

@@ -6,6 +6,8 @@
 , impi
 , tampi
 , mcxx
+, gnuDef
+, intelDef
 , cc
 , gitBranch
 }:
@@ -18,12 +20,16 @@ let
   else
     "IntelMPI");
 
+  compName = (if cc == intelDef then
+    "Intel"
+  else
+    "GNU");
+
 in
 stdenv.mkDerivation rec {
   name = "creams";
 
   # src = /home/Computational/pmartin1/creams-simplified;
-
   src = builtins.fetchGit {
     url = "ssh://git@bscpm02.bsc.es/pmartin1/creams-simplified.git";
     ref = "${gitBranch}";
@@ -45,7 +51,8 @@ stdenv.mkDerivation rec {
     export TAMPI_HOME=${tampi}
 
     . etc/bashrc
-    #export FORTRAN_COMPILER=GNU # GCC compiler
+
+    export FORTRAN_COMPILER=${compName}
     export MPI_LIB=${mpiName}
 
     echo

garlic/creams/input.nix

@@ -1,6 +1,7 @@
 {
   stdenv
-, nodes
+, granul ? 0
+, nprocz ? 0
 , gitBranch
 }:
 
@@ -8,17 +9,20 @@ stdenv.mkDerivation rec {
   name = "creams-input";
 
   # src = /home/Computational/pmartin1/creams-simplified;
-
   src = builtins.fetchGit {
     url = "ssh://git@bscpm02.bsc.es/pmartin1/creams-simplified.git";
     ref = "${gitBranch}";
   };
 
-  phases = [ "unpackPhase" "installPhase" ];
+  phases = [ "unpackPhase" "patchPhase" "installPhase" ];
+
+  patchPhase = ''
+    patchShebangs SodTubeBenchmark/gridScript.sh
+  '';
   
   installPhase = ''
     pushd SodTubeBenchmark
-      bash gridScript.sh 0 0 $((${toString nodes}*48)) 0
+      ./gridScript.sh 0 0 ${toString nprocz} ${toString granul}
     popd
 
     mkdir -p $out