comparison: www/includes/formulas.php
www/includes/formulas.php
- changeset 446
- ee7bcfb8e270
- parent 428
- a5d4467c9201
- child 539
- fe9ac6d49c4f
equal
deleted
inserted
replaced
| 445:bcba4f17703f | 446:ee7bcfb8e270 |
|---|---|
| 206 { | 206 { |
| 207 global $my_factor_mashhop; | 207 global $my_factor_mashhop; |
| 208 global $my_factor_fwh; | 208 global $my_factor_fwh; |
| 209 global $my_factor_pellet; | 209 global $my_factor_pellet; |
| 210 global $my_factor_plug; | 210 global $my_factor_plug; |
| 211 global $my_factor_wethop; | |
| 212 global $my_factor_cryohop; | |
| 211 | 213 |
| 212 $fmoment = 1.0; | 214 $fmoment = 1.0; |
| 213 if (($useat == 5) || ($useat == 4) || ($useat == 3)) { // Dry hop, Whirlpool or Aroma | 215 if (($useat == 5) || ($useat == 4) || ($useat == 3)) { // Dry hop, Whirlpool or Aroma |
| 214 $fmoment = 0.0; | 216 $fmoment = 0.0; |
| 215 } else if ($useat == 0) { // Mash | 217 } else if ($useat == 0) { // Mash |
| 223 $pfactor += $my_factor_pellet / 100; | 225 $pfactor += $my_factor_pellet / 100; |
| 224 } | 226 } |
| 225 if ($form == 1) { // Plugs | 227 if ($form == 1) { // Plugs |
| 226 $pfactor += $my_factor_plug / 100; | 228 $pfactor += $my_factor_plug / 100; |
| 227 } | 229 } |
| 230 if ($form == 3) { // Wet leaf | |
| 231 $pfactor += $my_factor_wethop / 100; | |
| 232 } | |
| 233 if ($form == 4) { // Cryo hop | |
| 234 $pfactor += $my_factor_cryohop / 100; | |
| 235 } | |
| 228 | 236 |
| 229 $ibu = 0; | 237 $ibu = 0; |
| 230 if (($method == 0) || ($method == 3)) { // Tinseth or Garetz // For Garetz, we need the $ibu | 238 if (($method == 0) || ($method == 3)) { // Tinseth or Garetz // For Garetz, we need the $ibu |
| 231 $AddedAlphaAcids = (($alpha / 100) * $mass * 1000) / $volume; | 239 $AddedAlphaAcids = (($alpha / 100) * $mass * 1000) / $volume; |
| 232 $Bigness_factor = 1.65 * pow( 0.000125, $sg - 1); | 240 $Bigness_factor = 1.65 * pow( 0.000125, $sg - 1); |
