Update nf scaling.

tutorials/nawi_spring_meeting2023.ipynb

@@ -935,7 +935,7 @@
     "        units=pyunits.mg / pyunits.L,\n",
     "        doc=\"Maximum total hardness as CaCO3\",\n",
     "    )\n",
-    "m.fs.max_hardness.fix(0.25*value(m.fs.feed.properties[0].total_hardness))\n",
+    "m.fs.max_hardness.fix(0.5*value(m.fs.feed.properties[0].total_hardness))\n",
     "\n",
     "m.fs.max_hardness_constraint = Constraint(expr=m.fs.unit.mixed_permeate[0].total_hardness \n",
     "                               <= m.fs.max_hardness)\n",

watertap/examples/flowsheets/nf_dspmde/nf.py

@@ -275,7 +275,6 @@ def unfix_opt_vars(m):
     m.fs.NF.nfUnit.velocity.unfix()
     m.fs.NF.nfUnit.velocity.setub(0.25)
     m.fs.product.max_hardness.fix(500)
-    m.fs.NF.nfUnit.recovery_vol_phase.fix(0.90)
 
     # Touch total_hardness (on-demand property) at feed and disposal for reporting
     m.fs.feed.properties[0].total_hardness

watertap/examples/flowsheets/nf_dspmde/tests/test_nf.py

@@ -20,13 +20,13 @@
 def test_main():
     m = main()
     test_dict = {
-        "lcow": [m.fs.costing.LCOW, 0.144583],
-        "pressure": [m.fs.NF.pump.outlet.pressure[0] * 1e-5, 5.372779],
-        "area": [m.fs.NF.nfUnit.area, 405.66782957],
+        "lcow": [m.fs.costing.LCOW, 0.141678],
+        "pressure": [m.fs.NF.pump.outlet.pressure[0] * 1e-5, 5.21856],
+        "area": [m.fs.NF.nfUnit.area, 444.423],
         "recovery": [
             m.fs.NF.nfUnit.recovery_vol_phase[0.0, "Liq"] * 100,
-            90,
+            94.64,
         ],
     }
-    for (model_result, testval) in test_dict.values():
+    for model_result, testval in test_dict.values():
         assert pytest.approx(testval, rel=1e-3) == value(model_result)

watertap/examples/flowsheets/nf_dspmde/tests/test_nf_with_bypass.py

@@ -19,16 +19,16 @@
 def test_main():
     m = main()
     test_dict = {
-        "lcow": [m.fs.costing.LCOW, 0.13728251],
-        "pressure": [m.fs.NF.pump.outlet.pressure[0] * 1e-5, 4.53838],
-        "area": [m.fs.NF.nfUnit.area, 414.08584896],
+        "lcow": [m.fs.costing.LCOW, 0.1354909],
+        "pressure": [m.fs.NF.pump.outlet.pressure[0] * 1e-5, 4.60503],
+        "area": [m.fs.NF.nfUnit.area, 426.6869],
         "recovery": [
             m.fs.NF.nfUnit.recovery_vol_phase[0.0, "Liq"] * 100,
-            90,
+            92.49,
         ],
         "bypass": [
             m.fs.by_pass_splitter.split_fraction[0, "bypass"] * 100,
-            10.94636,
+            10.185489,
         ],
     }
     for model_result, testval in test_dict.values():

watertap/property_models/multicomp_aq_sol_prop_pack.py

@@ -433,7 +433,6 @@ def build(self):
         )
 
         if self.config.diffus_calculation == DiffusivityCalculation.none:
-
             self.diffus_phase_comp = Var(
                 self.phase_list,
                 self.solute_set,
@@ -664,7 +663,6 @@ def initialize(
 
         # initialize vars calculated from state vars
         for k in self.keys():
-
             # Vars indexed by phase and component_list
             for j in self[k].params.component_list:
                 if self.params.config.material_flow_basis == MaterialFlowBasis.molar:
@@ -1084,6 +1082,7 @@ def _dens_mass_phase(self):
             units=pyunits.kg * pyunits.m**-3,
             doc="Mass density",
         )
+
         # TODO: reconsider this approach for solution density based on arbitrary solute_list
         def rule_dens_mass_phase(b, p):
             if b.params.config.density_calculation == DensityCalculation.constant:
@@ -1233,7 +1232,6 @@ def _conc_equiv_phase_comp(self):
         )
 
         def rule_conc_equiv_phase_comp(b, p, j):
-
             return b.conc_equiv_phase_comp[p, j] == b.conc_mol_phase_comp[p, j] * abs(
                 b.params.charge_comp[j]
             )
@@ -1375,14 +1373,12 @@ def rule_diffus_phase_comp(b, p, j):
                     self.params.config.diffus_calculation
                     == DiffusivityCalculation.HaydukLaudie
                 ):
-
                     if j not in molar_volume_data_indices:
                         b.diffus_phase_comp[p, j].fix(
                             self.params.config.diffusivity_data[p, j]
                         )
                         return Constraint.Skip
                     else:
-
                         diffus_coeff_inv_units = pyunits.s * pyunits.m**-2
                         visc_solvent_inv_units = pyunits.cP**-1
                         molar_volume_inv_units = pyunits.mol * pyunits.cm**-3