Mercurial > bms / file diff

--- a/www/includes/formulas.php	Mon Dec 17 13:46:15 2018 +0100
+++ b/www/includes/formulas.php	Mon Dec 17 22:24:32 2018 +0100
@@ -643,40 +643,6 @@
         Cl2 := W2.Sulfate.Value / MMSO4;
 
 
-procedure MixWater(W1, W2, Wr: TWater);
-
-  function Mix(V1, V2, C1, C2: double): double;
-  begin
-    if (V1 + V2) > 0 then
-      Result := (V1 * C1 + V2 * C2) / (V1 + V2)
-    else
-      Result := 0;
-  end;
-
-var
-  vol1, vol2: double;
-  phnew: double;
-begin
-  vol1 := W1.Amount.Value;
-  vol2 := W2.Amount.Value;
-  if (vol1 + vol2) > 0 then
-  begin
-    Wr.Amount.Value := vol1 + vol2;
-    Wr.Calcium.Value := Mix(vol1, vol2, W1.Calcium.Value, W2.Calcium.Value);
-    Wr.Magnesium.Value := Mix(vol1, vol2, W1.Magnesium.Value, W2.Magnesium.Value);
-    Wr.Sodium.Value := Mix(vol1, vol2, W1.Sodium.Value, W2.Sodium.Value);
-    Wr.Bicarbonate.Value := Mix(vol1, vol2, W1.Bicarbonate.Value, W2.Bicarbonate.Value);
-    Wr.Sulfate.Value := Mix(vol1, vol2, W1.Sulfate.Value, W2.Sulfate.Value);
-    Wr.Chloride.Value := Mix(vol1, vol2, W1.Chloride.Value, W2.Chloride.Value);
-    pHnew := -log10((power(10, -W1.pHWater.Value) * vol1 +
-      power(10, -W2.pHWater.Value) * vol2) / (vol1 + vol2));
-    Wr.pHwater.Value := pHnew;
-  end;
-end;
-
-
-
-
 procedure TRecipe.CalcWaterBalance;
 var
   i: integer;