# HG changeset patch # User Michiel Broek # Date 1598539251 -7200 # Node ID a7ce9b8d19d8625a8673dbdaf56e8079bc9c4dac # Parent 8dae8479d5e8271cce95ae62c8c2722946feabaf Disabled dead code. diff -r 8dae8479d5e8 -r a7ce9b8d19d8 www/js/prod_edit.js --- a/www/js/prod_edit.js Tue Aug 25 22:12:06 2020 +0200 +++ b/www/js/prod_edit.js Thu Aug 27 16:40:51 2020 +0200 @@ -2975,9 +2975,9 @@ } // mg/l as CaCO3 - function ResidualAlkalinity(total_alkalinity, calcium, magnesium) { - return total_alkalinity - (calcium / 1.4 + magnesium / 1.7); - } +// function ResidualAlkalinity(total_alkalinity, calcium, magnesium) { +// return total_alkalinity - (calcium / 1.4 + magnesium / 1.7); +// } function PartCO3(pH) { var H = Math.pow(10, -pH); @@ -3229,7 +3229,7 @@ RA = (parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMHCO3 / MMNaHCO3 * 1000) / liters; bicarbonate = wg_bicarbonate + RA; total_alkalinity = bicarbonate * 50 / 61; - RA = ResidualAlkalinity(wb_total_alkalinity, wb_calcium, wb_magnesium); +// RA = ResidualAlkalinity(wb_total_alkalinity, wb_calcium, wb_magnesium); } break; case 1: @@ -3245,7 +3245,7 @@ RA = (parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMHCO3 / MMNa2CO3 * 1000) / liters; bicarbonate = wg_bicarbonate + RA; total_alkalinity = bicarbonate * 50 / 61; - RA = ResidualAlkalinity(wb_total_alkalinity, wb_calcium, wb_magnesium); +// RA = ResidualAlkalinity(wb_total_alkalinity, wb_calcium, wb_magnesium); } break; case 2: @@ -3265,7 +3265,7 @@ parseFloat($('#wa_caso4').jqxNumberInput('decimal')) * MMCa / MMCaSO4 * 1000 + parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMCa / MMCaCO3 * 1000) / liters; calcium = wg_calcium + RA; - RA = ResidualAlkalinity(wb_total_alkalinity, wb_calcium, wb_magnesium); +// RA = ResidualAlkalinity(wb_total_alkalinity, wb_calcium, wb_magnesium); } break; case 3: @@ -3282,7 +3282,7 @@ parseFloat($('#wa_caso4').jqxNumberInput('decimal')) * MMCa / MMCaSO4 * 1000 + parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMCa / MMCaOH2 * 1000) / liters; calcium = wg_calcium + RA; - RA = ResidualAlkalinity(wb_total_alkalinity, wb_calcium, wb_magnesium); +// RA = ResidualAlkalinity(wb_total_alkalinity, wb_calcium, wb_magnesium); } break; } @@ -3305,7 +3305,7 @@ RA = (parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMHCO3 / MMNaHCO3 * 1000) / liters; bicarbonate = wg_bicarbonate + RA; total_alkalinity = bicarbonate * 50 / 61; - RA = ResidualAlkalinity(wb_total_alkalinity, wb_calcium, wb_magnesium); +// RA = ResidualAlkalinity(wb_total_alkalinity, wb_calcium, wb_magnesium); break; case 1: // Sodiumcarbonate RA = (parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMNa / MMNaCl * 1000 + @@ -3315,13 +3315,13 @@ RA = (parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMHCO3 / MMNa2CO3 * 1000) / liters; bicarbonate = wg_bicarbonate + RA; total_alkalinity = bicarbonate * 50 / 61; - RA = ResidualAlkalinity(wb_total_alkalinity, wb_calcium, wb_magnesium); +// RA = ResidualAlkalinity(wb_total_alkalinity, wb_calcium, wb_magnesium); break; case 2: // Calciumcarbonate: Bicarbonate RA = (parseFloat($('#wa_base').jqxNumberInput('decimal')) / 3 * MMHCO3 * 1000 / MMCaCO3) / liters; bicarbonate = wg_bicarbonate + RA; total_alkalinity = bicarbonate * 50 / 61; - RA = ResidualAlkalinity(wb_total_alkalinity, wb_calcium, wb_magnesium); +// RA = ResidualAlkalinity(wb_total_alkalinity, wb_calcium, wb_magnesium); // Ca RA = (parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCa * 1000 / MMCaCl2 + parseFloat($('#wa_caso4').jqxNumberInput('decimal')) * MMCa * 1000 / MMCaSO4 +