Verbosified driver scripts and doubled total batchesHEADmaster

1 files changed, 3 insertions, 2 deletions

diff --git a/driver-37.sh b/driver-37.sh
index cf1cefb..0200ab4 100755
--- a/driver-37.sh
+++ b/driver-37.sh
@@ -11,16 +11,17 @@ mkdir -p 37-results/
 touch 37-results/37_keff_table
 
 for r in $(seq 0.1 0.05 0.8); do
-    echo -e ${green}Running rf = $r cm... ${reset}
+    echo -e ${green}Running 37-element CANDU bundle with rf = $r cm... ${reset}
     filename=37-results/$r.log
     python3 candu-37.py -rf $r > $filename
     keff=$(cat $filename | grep "Combined k-effective" | cut -d "=" -f 2 | cut -d "+" -f 1)
     pm=$(cat $filename | grep "Combined k-effective" | cut -d "=" -f 2 | cut -d "-" -f 2)
     flow_area=$(cat $filename | grep "Flow area" | cut -d "=" -f 2)
+    clad_circ=$(cat $filename | grep "Cladding circumference" | cut -d = -f 2)
     fuel_mass=$(cat $filename | grep "Fuel mass" | cut -d "=" -f 2)
     clad_mass=$(cat $filename | grep "Cladding mass" | cut -d "=" -f 2)
     dtu=$(cat $filename | grep "DTU ratio" | cut -d "=" -f 2)
 
     echo $keff +/- $pm, $flow_area cm² flow, $fuel_mass g/cm fuel, $clad_mass g/cm clad, $dtu DTU ratio | cowsay
-    echo $keff $pm $flow_area $fuel_mass $clad_mass $dtu >> 37-results/keff_table
+    echo $keff $pm $flow_area $clad_circ $fuel_mass $clad_mass $dtu >> 37-results/keff_table
 done