Values extraction #53 run-report filename

feelpp · Jun 14, 2024 · b5bf438 · b5bf438
1 parent d56464d
commit b5bf438
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/launchProcess.sh b/launchProcess.sh
@@ -29,7 +29,7 @@ do
     yes '-' | head -n "$columns" | tr -d '\n'
     casename=$(basename $cfgPath)
     echo "[Launching ReFrame with $casename]"
-    export RFM_REPORT_FILE=$(pwd)/docs/modules/${hostname}/pages/reports/${casename%-bench.cfg}-${current_date}.json.json
+    export RFM_REPORT_FILE=$(pwd)/docs/modules/${hostname}/pages/reports/${casename%-bench.cfg}-${current_date}.json
     reframe -c $TEST_DIR/heatTest.py -S case=$cfgPath -r --system=$hostname --exec-policy=serial
 done
 

diff --git a/src/feelpp/benchmarking/reframe/regression-tests/heatTest.py b/src/feelpp/benchmarking/reframe/regression-tests/heatTest.py
@@ -26,19 +26,21 @@ def readCfg(self):
         self.dim = dim
 
 
+    @run_after('init')
+    def set_partition_dir(self):
+        self.partitionDir = self.case.replace('bench.cfg', 'partitioning')
+
+
     @run_before('run')
     def partitionMesh(self):
-        outputDir = self.case.replace('-bench.cfg', '-partitioning ')
-        meshCmd = self.meshPartionerCmd(self.num_tasks, self.geoPath, outputDir, self.dim)
+        meshCmd = self.meshPartionerCmd(self.num_tasks, self.geoPath, self.partitionDir, self.dim)
         self.prerun_cmds = [f'{meshCmd}']
 
 
-
     @run_before('run')
     def set_executable_opts(self):
-        dir = self.case[:-4]
         filename = os.path.basename(self.case).replace('-bench.cfg', f'_p{self.num_tasks}.json')
-        filePath = os.path.join(dir, filename)
+        filePath = os.path.join(self.partitionDir, filename)
         self.executable_opts = [f'--config-file={self.case}',
                                 f'--heat.filename={filePath}',
                                 '--heat.scalability-save=1']