Verbosified driver scripts and doubled total batchesHEADmaster

5 files changed, 15 insertions, 12 deletions

diff --git a/apollonian-52.py b/apollonian-52.py
index 2b7fcd8..261a8de 100644
--- a/apollonian-52.py
+++ b/apollonian-52.py
@@ -157,7 +157,7 @@ geometry.export_to_xml()
 ### Settings definition ###
 settings = openmc.Settings()
 settings.particles = 10000
-settings.batches = 200
+settings.batches = 400
 settings.inactive = 80
 
 #> Set up the source to sample inside the pressure tube region uniformly
@@ -187,7 +187,7 @@ DTU_ratio = (V_mod * N_mod) / (V_fuel * N_fuel)
 
 ##> Print these for the final table
 print(f"Flow area, cm² = {V_mod}")
-print(f"Cladding ciricumference, cm = {C_clad}")
+print(f"Cladding circumference, cm = {C_clad}")
 print(f"Fuel mass per length, g/cm = {V_fuel*mat_fuel.density}")
 print(f"Cladding mass per length, g/cm = {V_clad*mat_zircaloy_4.density}")
 print(f"DTU ratio = {DTU_ratio}")
diff --git a/candu-37.py b/candu-37.py
index b58dd68..518aeb8 100644
--- a/candu-37.py
+++ b/candu-37.py
@@ -168,7 +168,7 @@ geometry.export_to_xml()
 ### Settings definition ###
 settings = openmc.Settings()
 settings.particles = 10000
-settings.batches = 200
+settings.batches = 400
 settings.inactive = 80
 
 #> Set up the source to sample inside the pressure tube region uniformly
@@ -198,7 +198,7 @@ DTU_ratio = (V_mod * N_mod) / (V_fuel * N_fuel)
 
 #> Print these for the final table
 print(f"Flow area, cm² = {V_mod}")
-print(f"Cladding ciricumference, cm = {C_clad}")
+print(f"Cladding circumference, cm = {C_clad}")
 print(f"Fuel mass per length, g/cm = {V_fuel*mat_fuel.density}")
 print(f"Cladding mass per length, g/cm = {V_clad*mat_zircaloy_4.density}")
 print(f"DTU ratio = {DTU_ratio}")
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
diff --git a/driver-51.sh b/driver-51.sh
index 98f8eb5..b35344b 100755
--- a/driver-51.sh
+++ b/driver-51.sh
@@ -10,17 +10,18 @@ reset="\033[0m"
 mkdir -p 51-results/
 touch 51-results/51_keff_table
 
-for fmr in $(seq 0.1 0.05 0.9); do
-    echo -e ${green}Running fmr = $fmr... ${reset}
+for fmr in $(seq 0.1 0.05 0.95); do
+    echo -e ${green}Running 51-element Apollonian bundle with fmr = $fmr... ${reset}
     filename=51-results/$fmr.log
     python3 apollonian-52.py -fmr $fmr -bt alt > $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 >> 51-results/keff_table
+    echo $keff $pm $flow_area $clad_circ $fuel_mass $clad_mass $dtu >> 51-results/keff_table
 done
diff --git a/driver-52.sh b/driver-52.sh
index f68780f..d7f0e55 100755
--- a/driver-52.sh
+++ b/driver-52.sh
@@ -10,17 +10,18 @@ reset="\033[0m"
 mkdir -p 52-results/
 touch 52-results/52_keff_table
 
-for fmr in $(seq 0.1 0.05 0.9); do
-    echo -e ${green}Running fmr = $fmr... ${reset}
+for fmr in $(seq 0.1 0.05 0.95); do
+    echo -e ${green}Running 52-element Apollonian bundle with fmr = $fmr... ${reset}
     filename=52-results/$fmr.log
     python3 apollonian-52.py -fmr $fmr > $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 >> 52-results/keff_table
+    echo $keff $pm $flow_area $clad_circ $fuel_mass $clad_mass $dtu >> 52-results/keff_table
 done