diff -r fc0c10d79539 -r 2dfead81c72f src/Utils.cpp --- a/src/Utils.cpp Tue Jan 10 16:56:21 2023 +0100 +++ b/src/Utils.cpp Thu Jan 12 14:34:14 2023 +0100 @@ -444,9 +444,11 @@ double BoilTime_factor1 = ((1 - exp(-0.04 * T1)) / kUtilisation); double BoilTime_factor2 = ((1 - exp(-0.04 * T2)) / kUtilisation); double ibu = Bigness_factor * (BoilTime_factor2 - BoilTime_factor1) * AddedAlphaAcids; - //qDebug() << "TinsethIBU" << SG << Amount << Alpha << Volume << kUtilisation << Bigness_factor * (BoilTime_factor2 - BoilTime_factor1) << "ibu:" << ibu; - //qDebug() << "boilIBU" << Form << SG << Volume << Amount << BoilTime_factor2 << BoilTime_factor1 << Alpha << "IBU:" << ibu; +#ifdef DEBUG_IBU + qDebug() << "TinsethIBU" << SG << Amount << Alpha << Volume << kUtilisation << Bigness_factor * (BoilTime_factor2 - BoilTime_factor1) << "ibu:" << ibu; + qDebug() << " boilIBU" << Form << SG << Volume << Amount << BoilTime_factor2 << BoilTime_factor1 << Alpha << "IBU:" << ibu; +#endif return ibu; } @@ -501,7 +503,9 @@ double flameout_time = 1; double fibu = TinsethIBU(Form, postSG, Volume, Amount, boil_time, boil_time + flameout_time, Alpha, Utilisation, BU_factor); fibu *= IBU_reduction(bp - 0.5); /* Boilpoint minus 0.5 degree */ - //qDebug() << "during flameout" << fibu << bp; +#ifdef DEBUG_IBU + qDebug() << "during flameout" << fibu << bp; +#endif nibu += fibu; if ((Cooltype == CHILLER_TYPE_IMMERSION || Cooltype == CHILLER_TYPE_AUBAINMARIE || Cooltype == CHILLER_TYPE_NOCHILL) && CoolTo79 > 0) { @@ -512,10 +516,14 @@ for (int i = 1; i < int(CoolTo79); i++) { tibu = TinsethIBU(Form, postSG, Volume, Amount, boil_time + flameout_time + i, boil_time + flameout_time + i + 1, Alpha, Utilisation, BU_factor); tibu *= IBU_reduction((bp - 1) - (i * ((bp - 80) / CoolTo79))); - //qDebug() << " chill" << i << "time" << boil_time + flameout_time + i << "temp" << (bp - 1) - (i * ((bp - 80) / CoolTo79)) << "ibu" << tibu; +#ifdef DEBUG_IBU + qDebug() << " chill" << i << "time" << boil_time + flameout_time + i << "temp" << (bp - 1) - (i * ((bp - 80) / CoolTo79)) << "ibu" << tibu; +#endif cibu += tibu; } - //qDebug() << " immersion" << cibu; +#ifdef DEBUG_IBU + qDebug() << " immersion" << cibu; +#endif nibu += cibu; } @@ -534,10 +542,14 @@ * Asume 0.1 degree per minute. */ tibu *= IBU_reduction((bp - 1) - (i * 0.1)); - //qDebug() << " chill" << i << steps << "left" << V << A << "time" << boil_time + flameout_time + i << "ibu" << tibu; +#ifdef DEBUG_IBU + qDebug() << " chill" << i << steps << "left" << V << A << "time" << boil_time + flameout_time + i << "ibu" << tibu; +#endif cibu += tibu; } - //qDebug() << " counterflow" << cibu; +#ifdef DEBUG_IBU + qDebug() << " counterflow" << cibu; +#endif nibu += cibu; } @@ -547,22 +559,30 @@ if (Whirlpool9) { double wibu9 = TinsethIBU(Form, postSG, Volume, Amount, boil_time + flameout_time, boil_time + flameout_time + Whirlpool9, Alpha, Utilisation, BU_factor); wibu9 *= IBU_reduction(87.0); - //qDebug() << "during whirlpool9" << wibu9; +#ifdef DEBUG_IBU + qDebug() << "during whirlpool9" << wibu9; +#endif nibu += wibu9; } if (Whirlpool7) { double wibu7 = TinsethIBU(Form, postSG, Volume, Amount, boil_time + flameout_time, boil_time + flameout_time + Whirlpool7, Alpha, Utilisation, BU_factor); wibu7 *= IBU_reduction(74.0); - //qDebug() << "during whirlpool7" << wibu7; +#ifdef DEBUG_IBU + qDebug() << "during whirlpool7" << wibu7; +#endif nibu += wibu7; } if (Whirlpool6) { double wibu6 = TinsethIBU(Form, postSG, Volume, Amount, boil_time + flameout_time, boil_time + flameout_time + Whirlpool6, Alpha, Utilisation, BU_factor); wibu6 *= IBU_reduction(63.0); - //qDebug() << "during whirlpool6" << wibu6; +#ifdef DEBUG_IBU + qDebug() << "during whirlpool6" << wibu6; +#endif nibu += wibu6; } - //qDebug() << "Old IBU" << ibu << "New IBU" << nibu; +#ifdef DEBUG_IBU + qDebug() << "Old IBU" << ibu << "New IBU" << nibu; +#endif ibu = nibu; } @@ -582,10 +602,14 @@ for (int i = 1; i < int(CoolTo79); i++) { tibu = TinsethIBU(Form, postSG, Volume, Amount, flameout_time + i, flameout_time + i + 1, Alpha, Utilisation, BU_factor); tibu *= IBU_reduction((bp - 1) - (i * ((bp - 80) / CoolTo79))); - //qDebug() << " chill" << i << "time" << flameout_time + i << "temp" << (bp - 1) - (i * ((bp - 80) / CoolTo79)) << "ibu" << tibu; +#ifdef DEBUG_IBU + qDebug() << " chill" << i << "time" << flameout_time + i << "temp" << (bp - 1) - (i * ((bp - 80) / CoolTo79)) << "ibu" << tibu; +#endif cibu += tibu; } - //qDebug() << " immersion" << cibu; +#ifdef DEBUG_IBU + qDebug() << " immersion" << cibu; +#endif ibu += cibu; } @@ -604,10 +628,14 @@ * Asume 0.1 degree per minute. */ tibu *= IBU_reduction((bp - 1) - (i * 0.1)); - //qDebug() << " chill" << i << steps << "left" << V << A << "time" << flameout_time + i << "ibu" << tibu; +#ifdef DEBUG_IBU + qDebug() << " chill" << i << steps << "left" << V << A << "time" << flameout_time + i << "ibu" << tibu; +#endif cibu += tibu; } - //qDebug() << " counterflow" << cibu; +#ifdef DEBUG_IBU + qDebug() << " counterflow" << cibu; +#endif ibu += cibu; } @@ -617,19 +645,25 @@ if (Whirlpool9) { double wibu9 = TinsethIBU(Form, postSG, Volume, Amount, flameout_time, flameout_time + Whirlpool9, Alpha, Utilisation, BU_factor); wibu9 *= IBU_reduction(87.0); - //qDebug() << "during whirlpool9" << wibu9; +#ifdef DEBUG_IBU + qDebug() << "during whirlpool9" << wibu9; +#endif ibu += wibu9; } if (Whirlpool7) { double wibu7 = TinsethIBU(Form, postSG, Volume, Amount, flameout_time, flameout_time + Whirlpool7, Alpha, Utilisation, BU_factor); wibu7 *= IBU_reduction(74.0); - //qDebug() << "during whirlpool7" << wibu7; +#ifdef DEBUG_IBU + qDebug() << "during whirlpool7" << wibu7; +#endif ibu += wibu7; } if (Whirlpool6) { double wibu6 = TinsethIBU(Form, postSG, Volume, Amount, flameout_time, flameout_time + Whirlpool6, Alpha, Utilisation, BU_factor); wibu6 *= IBU_reduction(63.0); - //qDebug() << "during whirlpool6" << wibu6; +#ifdef DEBUG_IBU + qDebug() << "during whirlpool6" << wibu6; +#endif ibu += wibu6; } @@ -640,19 +674,25 @@ if (Whirlpool9) { double wibu9 = TinsethIBU(Form, postSG, Volume, Amount, 0, Whirlpool9, Alpha, Utilisation, BU_factor); wibu9 *= IBU_reduction(87.0); - //qDebug() << "during whirlpool9" << wibu9; +#ifdef DEBUG_IBU + qDebug() << "during whirlpool9" << wibu9; +#endif ibu = wibu9; } if (Whirlpool7) { double wibu7 = TinsethIBU(Form, postSG, Volume, Amount, 0, Whirlpool7, Alpha, Utilisation, BU_factor); wibu7 *= IBU_reduction(74.0); - //qDebug() << "during whirlpool7" << wibu7; +#ifdef DEBUG_IBU + qDebug() << "during whirlpool7" << wibu7; +#endif ibu = wibu7; } if (Whirlpool6) { double wibu6 = TinsethIBU(Form, postSG, Volume, Amount, 0, Whirlpool6, Alpha, Utilisation, BU_factor); wibu6 *= IBU_reduction(63.0); - //qDebug() << "during whirlpool6" << wibu6; +#ifdef DEBUG_IBU + qDebug() << "during whirlpool6" << wibu6; +#endif ibu = wibu6; } } else if (Use == HOP_USEAT_BOTTLING) { @@ -672,7 +712,9 @@ double rc = round(ibu * 1000.0) / 1000.0; +#ifdef DEBUG_IBU qDebug() << "toIBU" << Use << Form << preSG << postSG << Volume << Amount << Boiltime << Alpha << Method << Whirlpool9 << Whirlpool7 << Whirlpool6 << Fulltime << Cooltype << CoolTo79 << CoolLPM << Utilisation << BU_factor << "rc:" << rc; +#endif return rc; }