From b54aed2238019c4c35d145f41a20c513927b0680 Mon Sep 17 00:00:00 2001 From: Connor Moore Date: Wed, 22 Jul 2026 08:23:31 +0200 Subject: Fixed issues with explicit/VWH filepaths and improved output for driving script --- triso_study_driver.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/triso_study_driver.sh b/triso_study_driver.sh index 8d02bfc..4e4b238 100755 --- a/triso_study_driver.sh +++ b/triso_study_driver.sh @@ -18,39 +18,39 @@ echo "\#" $(date) > results/rpt_table echo "\#" $(date) > results/rrpt_table # 1. Basic calculation without homogenization -echo "Running explicit TRISO calculation..." +echo -n "Running explicit TRISO calculation..." "${prog[@]}" -t none > results/explicit.out keff=$(cat results/explicit.out| grep "Combined k-effective" | cut -d "=" -f 2 | cut -d "+" -f 1) -pm=$(cat results/rpt/explicit.out | grep "Combined k-effective" | cut -d "=" -f 2 | cut -d "-" -f 2) -echo Found $keff +/- $pm for explicit! +pm=$(cat results/explicit.out | grep "Combined k-effective" | cut -d "=" -f 2 | cut -d "-" -f 2) +echo Found $keff +/- $pm # 2. VWH calculation -echo "Running VWH homogenization calculation..." +echo -n "Running VWH homogenization calculation..." "${prog[@]}" -t vwh > results/vwh.out keff=$(cat results/vwh.out| grep "Combined k-effective" | cut -d "=" -f 2 | cut -d "+" -f 1) -pm=$(cat results/rpt/vwh.out | grep "Combined k-effective" | cut -d "=" -f 2 | cut -d "-" -f 2) -echo Found $keff +/- $pm for VWH! +pm=$(cat results/vwh.out | grep "Combined k-effective" | cut -d "=" -f 2 | cut -d "-" -f 2) +echo found $keff +/- $pm # 3. RPT # 0.025 step size -> 21 iterations for rad in $(seq 0.65 0.025 1.15); do - echo Running RPT with $rad cm... + echo -n "Running RPT with $rad cm... " "${prog[@]}" -t rpt -r $rad > results/rpt/$rad.out keff=$(cat results/rpt/$rad.out | grep "Combined k-effective" | cut -d "=" -f 2 | cut -d "+" -f 1) pm=$(cat results/rpt/$rad.out | grep "Combined k-effective" | cut -d "=" -f 2 | cut -d "-" -f 2) md5=$(cat results/rpt/$rad.out | grep "MD5:" | cut -d ":" -f 2 | sed "s/ //g") - echo Found $keff +/- $pm for RPT with r=$rad cm... + echo found $keff +/- $pm echo $rad $keff $pm $(hostname) $md5 \($(date)\) >> results/rpt_table done # 4. RRPT # 0.025 step size -> 35 iterations for rad in $(seq 0.1 0.025 0.95); do - echo Running RRPT with $rad cm... + echo -n "Running RRPT with $rad cm... " "${prog[@]}" -t rrpt -r $rad > results/rrpt/$rad.out keff=$(cat results/rrpt/$rad.out | grep "Combined k-effective" | cut -d "=" -f 2 | cut -d "+" -f 1) pm=$(cat results/rrpt/$rad.out | grep "Combined k-effective" | cut -d "=" -f 2 | cut -d "-" -f 2) md5=$(cat results/rrpt/$rad.out | grep "MD5:" | cut -d ":" -f 2 | sed "s/ //g") - echo Found $keff +/- $pm for RRPT with r=$rad cm... + echo found $keff +/- $pm echo $rad $keff $pm $(hostname) $md5 \($(date)\) >> results/rrpt_table done -- cgit v1.2.3