Try removing all scaling factors for effluent concentrations

watertap-org · Oct 2, 2024 · 4282759 · 4282759
1 parent 6c450b4
commit 4282759
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 37 deletions.
diff --git a/watertap/flowsheets/full_water_resource_recovery_facility/BSM2_P_extension.py b/watertap/flowsheets/full_water_resource_recovery_facility/BSM2_P_extension.py
@@ -885,8 +885,8 @@ def display_performance_metrics(m):
     )
     print(
         "BOD5 concentration",
-        pyo.value(m.fs.FeedWater.properties[0].BOD5["effluent"]),
-        pyo.units.get_units(m.fs.FeedWater.properties[0].BOD5["effluent"]),
+        pyo.value(m.fs.FeedWater.properties[0].BOD5["raw"]),
+        pyo.units.get_units(m.fs.FeedWater.properties[0].BOD5["raw"]),
     )
     print(
         "SNKj concentration",

diff --git a/watertap/property_models/unit_specific/activated_sludge/modified_asm2d_properties.py b/watertap/property_models/unit_specific/activated_sludge/modified_asm2d_properties.py
@@ -665,38 +665,38 @@ def calculate_scaling_factors(self):
         super().calculate_scaling_factors()
 
         # TODO: revisit scaling of these new on-demand props
-        if self.is_property_constructed("VSS"):
-            if iscale.get_scaling_factor(self.VSS) is None:
-                iscale.set_scaling_factor(self.VSS, 1)
-
-        if self.is_property_constructed("ISS"):
-            if iscale.get_scaling_factor(self.ISS) is None:
-                iscale.set_scaling_factor(self.ISS, 1)
-
-        if self.is_property_constructed("TSS"):
-            if iscale.get_scaling_factor(self.TSS) is None:
-                iscale.set_scaling_factor(self.TSS, 1e1)
-
-        if self.is_property_constructed("COD"):
-            if iscale.get_scaling_factor(self.COD) is None:
-                iscale.set_scaling_factor(self.COD, 1e1)
-
-        if self.is_property_constructed("BOD5"):
-            if iscale.get_scaling_factor(self.BOD5) is None:
-                iscale.set_scaling_factor(self.BOD5, 1e1)
-
-        if self.is_property_constructed("SNKj"):
-            if iscale.get_scaling_factor(self.SNKj) is None:
-                iscale.set_scaling_factor(self.SNKj, 1e2)
-
-        if self.is_property_constructed("SNOX"):
-            if iscale.get_scaling_factor(self.SNOX) is None:
-                iscale.set_scaling_factor(self.SNOX, 1e3)
-
-        if self.is_property_constructed("SP_organic"):
-            if iscale.get_scaling_factor(self.SP_organic) is None:
-                iscale.set_scaling_factor(self.SP_organic, 1e2)
-
-        if self.is_property_constructed("SP_inorganic"):
-            if iscale.get_scaling_factor(self.SP_inorganic) is None:
-                iscale.set_scaling_factor(self.SP_inorganic, 1e3)
+        # if self.is_property_constructed("VSS"):
+        #     if iscale.get_scaling_factor(self.VSS) is None:
+        #         iscale.set_scaling_factor(self.VSS, 1)
+        #
+        # if self.is_property_constructed("ISS"):
+        #     if iscale.get_scaling_factor(self.ISS) is None:
+        #         iscale.set_scaling_factor(self.ISS, 1)
+        #
+        # if self.is_property_constructed("TSS"):
+        #     if iscale.get_scaling_factor(self.TSS) is None:
+        #         iscale.set_scaling_factor(self.TSS, 1e1)
+        #
+        # if self.is_property_constructed("COD"):
+        #     if iscale.get_scaling_factor(self.COD) is None:
+        #         iscale.set_scaling_factor(self.COD, 1e1)
+        #
+        # if self.is_property_constructed("BOD5"):
+        #     if iscale.get_scaling_factor(self.BOD5) is None:
+        #         iscale.set_scaling_factor(self.BOD5, 1e1)
+        #
+        # if self.is_property_constructed("SNKj"):
+        #     if iscale.get_scaling_factor(self.SNKj) is None:
+        #         iscale.set_scaling_factor(self.SNKj, 1e2)
+        #
+        # if self.is_property_constructed("SNOX"):
+        #     if iscale.get_scaling_factor(self.SNOX) is None:
+        #         iscale.set_scaling_factor(self.SNOX, 1e3)
+        #
+        # if self.is_property_constructed("SP_organic"):
+        #     if iscale.get_scaling_factor(self.SP_organic) is None:
+        #         iscale.set_scaling_factor(self.SP_organic, 1e2)
+        #
+        # if self.is_property_constructed("SP_inorganic"):
+        #     if iscale.get_scaling_factor(self.SP_inorganic) is None:
+        #         iscale.set_scaling_factor(self.SP_inorganic, 1e3)