From dd75a840ce84e862929b36e7875ddbc3a1f8fad1 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Mon, 12 Apr 2021 20:09:17 +0200
Subject: [PATCH] fwi: use enableIO instead of ioFreq

---
 garlic/exp/fwi/common.nix      |  5 ++++-
 garlic/exp/fwi/granularity.nix |  5 ++---
 garlic/exp/fwi/io.nix          |  6 +++---
 garlic/exp/fwi/reuse.nix       | 10 ++++------
 garlic/exp/fwi/ss.nix          |  5 ++---
 5 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/garlic/exp/fwi/common.nix b/garlic/exp/fwi/common.nix
index 0aea88c..dbd8442 100644
--- a/garlic/exp/fwi/common.nix
+++ b/garlic/exp/fwi/common.nix
@@ -45,6 +45,9 @@ rec {
     fwiParams = bsc.apps.fwi.params.override {
       inherit (conf) nx ny nz;
     };
+
+    ioFreq = if (conf.enableIO) then (conf.ioFreq or "-1") else "9999";
+
   in stages.exec {
     inherit nextStage;
 
@@ -84,7 +87,7 @@ rec {
     ] ++ optional (needsBlocksize conf) conf.blocksize ++ [
       "-1" # Fordward steps
       "-1" # Backward steps
-      conf.ioFreq # Write/read frequency
+      ioFreq # Write/read frequency
     ];
 
     post = ''
diff --git a/garlic/exp/fwi/granularity.nix b/garlic/exp/fwi/granularity.nix
index 47a95ab..cb9e6ce 100644
--- a/garlic/exp/fwi/granularity.nix
+++ b/garlic/exp/fwi/granularity.nix
@@ -38,7 +38,8 @@ let
     inherit (c.n) nx ny nz ntpn nodes;
 
     # Other FWI parameters
-    ioFreq = -1;
+    enableIO = true;
+    enableCTF = false;
 
     # Repeat the execution of each unit several times
     loops = 10;
@@ -50,8 +51,6 @@ let
     time = "02:00:00";
     jobName = unitName;
 
-    enableCTF = false;
-
     # Enable permissions to write in the local storage
     extraMounts = [ fs.local.temp ];
     tempDir = fs.local.temp;
diff --git a/garlic/exp/fwi/io.nix b/garlic/exp/fwi/io.nix
index d0e8317..88bc97f 100644
--- a/garlic/exp/fwi/io.nix
+++ b/garlic/exp/fwi/io.nix
@@ -29,7 +29,7 @@ let
     blocksize = [ 1 2 4 8 ];
     n = [ {nx=500; nz=500; ny=16000;} ];
     nodes = if (enableExtended) then range2 1 16 else [ 4 ];
-    ioFreq = [ 9999 (-1) ];
+    enableIO = [ false true ];
   };
 
   machineConfig = targetMachine.config;
@@ -40,11 +40,11 @@ let
     unitName = "${expName}"
     + "-nodes${toString nodes}"
     + "-bs${toString blocksize}"
-    + "-ioFreq${toString ioFreq}"
+    + (if (enableIO) then "-io1" else "-io0")
     + "-${toString gitBranch}";
 
     inherit (machineConfig) hw;
-    inherit (c) gitBranch blocksize ioFreq nodes;
+    inherit (c) gitBranch blocksize enableIO nodes;
     inherit (c.n) nx ny nz;
 
     # Repeat the execution of each unit several times
diff --git a/garlic/exp/fwi/reuse.nix b/garlic/exp/fwi/reuse.nix
index aac1b10..d907e0c 100644
--- a/garlic/exp/fwi/reuse.nix
+++ b/garlic/exp/fwi/reuse.nix
@@ -42,9 +42,7 @@ let
 
     blocksize = [ 1 2 4 8 ];
 
-    n = [
-    	{nx=300; ny=2000; nz=300;} # / half node
-    ];
+    n = [ {nx=300; ny=2000; nz=300;} ]; # / half node
   };
 
   machineConfig = targetMachine.config;
@@ -60,6 +58,9 @@ let
     inherit (c) gitBranch blocksize;
     inherit (c.n) nx ny nz;
 
+    enableCTF = false;
+    enableIO = true;
+
     # Repeat the execution of each unit several times
     loops = 10;
 
@@ -71,9 +72,6 @@ let
     time = "02:00:00";
     jobName = unitName;
 
-    enableCTF = false;
-    ioFreq = -1;
-
     # Enable permissions to write in the local storage
     extraMounts = [ fs.local.temp ];
     tempDir = fs.local.temp;
diff --git a/garlic/exp/fwi/ss.nix b/garlic/exp/fwi/ss.nix
index b3d5980..743ea48 100644
--- a/garlic/exp/fwi/ss.nix
+++ b/garlic/exp/fwi/ss.nix
@@ -60,7 +60,8 @@ let
     inherit (c.n) nx ny nz;
 
     # Other FWI parameters
-    ioFreq = -1;
+    enableIO = true;
+    enableCTF = false;
 
     # Repeat the execution of each unit several times
     loops = 10;
@@ -74,8 +75,6 @@ let
     time = "02:00:00";
     jobName = unitName;
 
-    enableCTF = false;
-
     # Enable permissions to write in the local storage
     extraMounts = [ fs.local.temp ];
     tempDir = fs.local.temp;