Mercurial > bms / file diff

--- a/www/js/global.js	Sun Oct 27 23:06:58 2019 +0100
+++ b/www/js/global.js	Mon Oct 28 13:44:12 2019 +0100
@@ -903,16 +903,22 @@
 
  // Ideas from Zymurgy March-April 2018. These are not exact formulas!
  whirlibus = 0;
- if (Use == 4) { // Any whirlpool
+ if (Use == 3 || Use == 4) { // Flameout or any whirlpool
   if (Whirlpool9) {
    // 20 mg/l/50 min
    whirlibus += (alpha * mass * 20) / liters * (Whirlpool9 / 50);
    //console.log('Whirlpool9:' + alpha * mass * 20 + ' liter:' + liters + ' time:' + Whirlpool9 + ' ibu' + (alpha * mass * 20) / liters * (Whirlpool9 / 50));
+  } else {
+   if (Use == 3) // Flameout hops are 2 minutes in this range.
+    whirlibus += (alpha * mass * 20) / liters * (2 / 50);
   }
   if (Whirlpool7) {
    // 6 mg/l/50 min
    whirlibus += (alpha * mass * 6) / liters * (Whirlpool7 / 50);
    //console.log('Whirlpool7:' + alpha * mass * 6 + ' liter:' + liters + ' time:' + Whirlpool7 + ' ibu' + (alpha * mass * 6) / liters * (Whirlpool7 / 50));
+  } else {
+   if (Use == 3) // Flameout hops are 4 minutes in this range.
+    whirlibus += (alpha * mass * 6) / liters * (4 / 50);
   }
   if (Whirlpool6) {
    // 2 mg/l/50 min