diff --git a/paraviewViz/run-paraview.sh b/paraviewViz/run-paraview.sh index d3cf623..a77039c 100755 --- a/paraviewViz/run-paraview.sh +++ b/paraviewViz/run-paraview.sh @@ -6,6 +6,6 @@ file=$1 dump=${file%.pvtu} dump_index=`echo $dump | cut -d - -f 3` echo "Running paraview in ${directory} on dump $dump_index" -${pvpath}/pvpython paraview-driver.py -p $directory -d $dump_index +${pvpath}/pvpython paraview-driver.py -f $directory/$file -p $directory -d $dump_index -i viz_config.py diff --git a/paraviewViz/slice.py b/paraviewViz/slice.py index fc1c816..cbdc795 100644 --- a/paraviewViz/slice.py +++ b/paraviewViz/slice.py @@ -26,7 +26,7 @@ class SliceData(): def __init__(self, dataName, dataRange, camera, colorScheme, logScale, invert, pixels, normal, origin, - cbTitle, cbBackground, cbLabels=None, cbLabelFormat=None, + cbTitle, cbBackground=0, cbLabels=None, cbLabelFormat=None, blueRedDivergentColorCenter=None, backgroundColor=[0., 0., 0.], rotation=None, reflection=None, diff --git a/smoke_test_parsl/make_viz_img.sh b/smoke_test_parsl/make_viz_img.sh index e7cc582..5c77c2e 100755 --- a/smoke_test_parsl/make_viz_img.sh +++ b/smoke_test_parsl/make_viz_img.sh @@ -1,8 +1,15 @@ #!/bin/bash # -restart_files=`ls viz_data/*fluid*.pvtu` -for file in ${restart_files[@]}; do +export pvpath="/Applications/ParaView-5.11.0.app/Contents/bin" +cd viz_data +viz_files=`ls *fluid*.pvtu` +cd .. +directory="`pwd`/viz_data" + +for file in ${viz_files[@]}; do echo "making viz images from ${file}" - #./run-paraview.sh viz_data/${file} > /dev/null 2>&1 - ./run-paraview.sh ${file} + dump=${file%.pvtu} + dump_index=`echo $dump | cut -d - -f 3` + echo "Running paraview in ${directory} on dump $dump_index" + ${pvpath}/pvpython paraview-driver.py -f $directory/$file -p $directory -d $dump_index -i viz_config.py done diff --git a/smoke_test_parsl/run-paraview.sh b/smoke_test_parsl/run-paraview.sh deleted file mode 120000 index e8c704d..0000000 --- a/smoke_test_parsl/run-paraview.sh +++ /dev/null @@ -1 +0,0 @@ -../paraviewViz/run-paraview.sh \ No newline at end of file