1
Fork 0

Update run_ola with hardware threads + python logs

This commit is contained in:
Edgar P. Burkhart 2022-05-05 09:18:09 +02:00
parent 1441bae6e4
commit 5a9d1ad7ba
Signed by: edpibu
GPG key ID: 9833D3C5A25BD227

View file

@ -9,6 +9,16 @@ then echo $inp_of not found
exit 1 exit 1
fi 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 echo START
cp -r --reflink $inp_of $out_of cp -r --reflink $inp_of $out_of
pushd $out_of pushd $out_of
@ -24,15 +34,15 @@ setFields > log/setFields.log
popd popd
echo Converting swash output to initial condition 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 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 pushd $out_of
echo Generating parallel cases echo Generating parallel cases
decomposePar > log/decomposePar.log decomposePar > log/decomposePar.log
echo Running model 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 echo Merging parallel cases
reconstructPar > log/reconstructPar.log reconstructPar > log/reconstructPar.log
#echo Removing parallel cases #echo Removing parallel cases
@ -43,6 +53,6 @@ postProcess -func graphUniform > log/postProcess.log
popd popd
echo Pickling Olaflow output 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 echo END