From 5a9d1ad7ba2b5f54239a36026e20953114969070 Mon Sep 17 00:00:00 2001
From: "Edgar P. Burkhart" <git@edgarpierre.fr>
Date: Thu, 5 May 2022 09:18:09 +0200
Subject: [PATCH] Update run_ola with hardware threads + python logs

---
 olaflow/run_ola.sh | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/olaflow/run_ola.sh b/olaflow/run_ola.sh
index cede37d..8a75802 100755
--- a/olaflow/run_ola.sh
+++ b/olaflow/run_ola.sh
@@ -9,6 +9,16 @@ then echo $inp_of not found
 	exit 1
 fi
 
+if [[ -d $out_of ]]
+then echo $out_of already exists
+	mv $out_of "$out_of.bak"
+fi
+
+if [[ -d $out_post ]]
+then echo $out_post already exists
+	mv $out_post "$out_post.bak"
+fi
+
 echo START
 cp -r --reflink $inp_of $out_of
 pushd $out_of
@@ -24,15 +34,15 @@ setFields > log/setFields.log
 
 popd
 echo Converting swash output to initial condition
-python -m processing.sws_ola -o $out_of
+python -m processing.sws_ola -o $out_of > $out_of/log/sws_ola.log
 echo Converting swash output to boundary condition
-python -m processing.sws_wavedict_paddle -o $out_of
+python -m processing.sws_wavedict_paddle -o $out_of > $out_of/log/sws_wave.log
 pushd $out_of
 
 echo Generating parallel cases
 decomposePar > log/decomposePar.log
 echo Running model
-mpirun -np 6 olaFlow -parallel > log/olaFlow.log
+mpirun --use-hwthread-cpus -np 6 olaFlow -parallel > log/olaFlow.log
 echo Merging parallel cases
 reconstructPar > log/reconstructPar.log
 #echo Removing parallel cases
@@ -43,6 +53,6 @@ postProcess -func graphUniform > log/postProcess.log
 
 popd
 echo Pickling Olaflow output
-python -m processing.pickle -i $out_of -o $out_post
+python -m processing.pickle -i $out_of -o $out_post > $out_of/log/pickle.log
 
 echo END