comparison: www/includes/formulas.php
www/includes/formulas.php
- changeset 544
- f3faa54581ff
- parent 539
- fe9ac6d49c4f
- child 653
- aa25efa1d629
equal
deleted
inserted
replaced
| 543:c062eb0dd7ce | 544:f3faa54581ff |
|---|---|
| 233 if ($form == 4) { // Cryo hop | 233 if ($form == 4) { // Cryo hop |
| 234 $pfactor += $my_factor_cryohop / 100; | 234 $pfactor += $my_factor_cryohop / 100; |
| 235 } | 235 } |
| 236 | 236 |
| 237 $whirlibus = 0; | 237 $whirlibus = 0; |
| 238 if ($useat == 4) { // Any whirlpool | 238 if ($useat == 3 || $useat == 4) { // Flameout or any whirlpool |
| 239 if ($whirlpool9) | 239 if ($whirlpool9) { |
| 240 $whirlibus += ($mass * ($alpha / 100) * 20) / $volume * $whirlpool9 / 50; | 240 $whirlibus += ($mass * ($alpha / 100) * 20) / $volume * $whirlpool9 / 50; |
| 241 if ($whirlpool7) | 241 } else { |
| 242 if ($useat == 3) // Flameout hops are 2 minutes in this range. | |
| 243 $whirlibus += ($mass * ($alpha / 100) * 20) / $volume * (2 / 50); | |
| 244 } | |
| 245 if ($whirlpool7) { | |
| 242 $whirlibus += ($mass * ($alpha / 100) * 6) / $volume * $whirlpool7 / 50; | 246 $whirlibus += ($mass * ($alpha / 100) * 6) / $volume * $whirlpool7 / 50; |
| 247 } else { | |
| 248 if ($useat == 3) // Flameout hops are 4 minutes in this range. | |
| 249 $whirlibus += ($mass * ($alpha / 100) * 6) / $volume * (4 / 50); | |
| 250 } | |
| 243 if ($whirlpool6) | 251 if ($whirlpool6) |
| 244 $whirlibus += ($mass * ($alpha / 100) * 2) / $volume * $whirlpool6 / 50; | 252 $whirlibus += ($mass * ($alpha / 100) * 2) / $volume * $whirlpool6 / 50; |
| 245 } | 253 } |
| 246 | 254 |
| 247 $ibu = 0; | 255 $ibu = 0; |
