Fix option test case

2023-06-27 20:05:15 +08:00
parent 7f31baee3c
commit 1604f98b95
4 changed files with 25 additions and 25 deletions
--- a/api/init.py
+++ b/api/init.py
@@ -95,7 +95,7 @@ from .s21_times import TIME_STATISTIC_NONE, TIME_STATISTIC_AVERAGED, TIME_STATIS
 from .s21_times import get_time_schema, get_time, set_time

 from .s23_options_util import OPTION_UNITS_CFS, OPTION_UNITS_GPM, OPTION_UNITS_MGD, OPTION_UNITS_IMGD, OPTION_UNITS_AFD, OPTION_UNITS_LPS, OPTION_UNITS_LPM, OPTION_UNITS_MLD, OPTION_UNITS_CMH, OPTION_UNITS_CMD
-from .s23_options_util import OPTION_PRESSURE_PSI, OPTION_PRESSURE_KPA, OPTION_PRESSURE_M
+from .s23_options_util import OPTION_PRESSURE_PSI, OPTION_PRESSURE_KPA, OPTION_PRESSURE_METERS
 from .s23_options_util import OPTION_HEADLOSS_HW, OPTION_HEADLOSS_DW, OPTION_HEADLOSS_CM
 from .s23_options_util import OPTION_UNBALANCED_STOP, OPTION_UNBALANCED_CONTINUE
 from .s23_options_util import OPTION_DEMAND_MODEL_DDA, OPTION_DEMAND_MODEL_PDA
@@ -104,7 +104,7 @@ from .s23_options_util import get_option_schema, get_option
 from .batch_api import set_option_ex

 from .s23_options_util import OPTION_V3_FLOW_UNITS_CFS, OPTION_V3_FLOW_UNITS_GPM, OPTION_V3_FLOW_UNITS_MGD, OPTION_V3_FLOW_UNITS_IMGD, OPTION_V3_FLOW_UNITS_AFD, OPTION_V3_FLOW_UNITS_LPS, OPTION_V3_FLOW_UNITS_LPM, OPTION_V3_FLOW_UNITS_MLD, OPTION_V3_FLOW_UNITS_CMH, OPTION_V3_FLOW_UNITS_CMD
-from .s23_options_util import OPTION_V3_PRESSURE_UNITS_PSI, OPTION_V3_PRESSURE_UNITS_KPA, OPTION_V3_PRESSURE_UNITS_M
+from .s23_options_util import OPTION_V3_PRESSURE_UNITS_PSI, OPTION_V3_PRESSURE_UNITS_KPA, OPTION_V3_PRESSURE_UNITS_METERS
 from .s23_options_util import OPTION_V3_HEADLOSS_MODEL_HW, OPTION_V3_HEADLOSS_MODEL_DW, OPTION_V3_HEADLOSS_MODEL_CM
 from .s23_options_util import OPTION_V3_STEP_SIZING_FULL, OPTION_V3_STEP_SIZING_RELAXATION, OPTION_V3_STEP_SIZING_LINESEARCH
 from .s23_options_util import OPTION_V3_IF_UNBALANCED_STOP, OPTION_V3_IF_UNBALANCED_CONTINUE
--- a/api/s23_options_util.py
+++ b/api/s23_options_util.py
@@ -49,9 +49,9 @@ OPTION_UNITS_MLD  = 'MLD'
 OPTION_UNITS_CMH  = 'CMH'
 OPTION_UNITS_CMD  = 'CMD'

-OPTION_PRESSURE_PSI = 'PSI'
-OPTION_PRESSURE_KPA = 'KPA'
-OPTION_PRESSURE_M   = 'M'
+OPTION_PRESSURE_PSI    = 'PSI'
+OPTION_PRESSURE_KPA    = 'KPA'
+OPTION_PRESSURE_METERS = 'METERS'

 OPTION_HEADLOSS_HW = 'H-W'
 OPTION_HEADLOSS_DW = 'D-W'
@@ -155,9 +155,9 @@ OPTION_V3_FLOW_UNITS_MLD  = OPTION_UNITS_MLD
 OPTION_V3_FLOW_UNITS_CMH  = OPTION_UNITS_CMH
 OPTION_V3_FLOW_UNITS_CMD  = OPTION_UNITS_CMD

-OPTION_V3_PRESSURE_UNITS_PSI = OPTION_PRESSURE_PSI
-OPTION_V3_PRESSURE_UNITS_KPA = OPTION_PRESSURE_KPA
-OPTION_V3_PRESSURE_UNITS_M   = OPTION_PRESSURE_M
+OPTION_V3_PRESSURE_UNITS_PSI    = OPTION_PRESSURE_PSI
+OPTION_V3_PRESSURE_UNITS_KPA    = OPTION_PRESSURE_KPA
+OPTION_V3_PRESSURE_UNITS_METERS = OPTION_PRESSURE_METERS

 OPTION_V3_HEADLOSS_MODEL_HW = OPTION_HEADLOSS_HW
 OPTION_V3_HEADLOSS_MODEL_DW = OPTION_HEADLOSS_DW
--- a/test_tjnetwork.py
+++ b/test_tjnetwork.py
@@ -3780,8 +3780,8 @@ class TestApi:
        self.enter(p)

        o = get_option(p)
-        assert o['UNITS'] == OPTION_UNITS_GPM
-        assert o['PRESSURE'] == OPTION_PRESSURE_PSI
+        assert o['UNITS'] == OPTION_UNITS_LPS
+        assert o['PRESSURE'] == OPTION_PRESSURE_METERS
        assert o['HEADLOSS'] == OPTION_HEADLOSS_HW
        assert o['QUALITY'] == OPTION_QUALITY_NONE
        assert o['UNBALANCED'] == OPTION_UNBALANCED_STOP
@@ -3794,10 +3794,10 @@ class TestApi:
        assert o['SPECIFIC GRAVITY'] == '1.0'
        assert o['TRIALS'] == '40'
        assert o['ACCURACY'] == '0.001'
-        assert o['HEADERROR'] == '0.0'
-        assert o['FLOWCHANGE'] == '0.0'
-        assert o['MINIMUM PRESSURE'] == '0.0'
-        assert o['REQUIRED PRESSURE'] == '0.1'
+        assert o['HEADERROR'] == '0.0001'
+        assert o['FLOWCHANGE'] == '0.0001'
+        assert o['MINIMUM PRESSURE'] == '0.0001'
+        assert o['REQUIRED PRESSURE'] == '20.0'
        assert o['PRESSURE EXPONENT'] == '0.5'
        assert o['TOLERANCE'] == '0.01'
        assert o['HTOL'] == '0.0005'
@@ -3808,15 +3808,15 @@ class TestApi:
        assert o['DAMPLIMIT'] == '0'

        o3 = get_option_v3(p)
-        assert o3['FLOW_UNITS'] == OPTION_V3_FLOW_UNITS_GPM
-        assert o3['PRESSURE_UNITS'] == OPTION_V3_PRESSURE_UNITS_PSI
+        assert o3['FLOW_UNITS'] == OPTION_V3_FLOW_UNITS_LPS
+        assert o3['PRESSURE_UNITS'] == OPTION_V3_PRESSURE_UNITS_METERS
        assert o3['HEADLOSS_MODEL'] == OPTION_V3_HEADLOSS_MODEL_HW
        assert o3['SPECIFIC_GRAVITY'] == '1.0'
        assert o3['SPECIFIC_VISCOSITY'] == '1.0'
        assert o3['MAXIMUM_TRIALS'] == '40'
        assert o3['HEAD_TOLERANCE'] == '0.0005'
        assert o3['FLOW_TOLERANCE'] == '0.0001'
-        assert o3['FLOW_CHANGE_LIMIT'] == '0.0'
+        assert o3['FLOW_CHANGE_LIMIT'] == '0.0001'
        assert o3['RELATIVE_ACCURACY'] == '0.001'
        assert o3['TIME_WEIGHT'] == '0.0'
        assert o3['STEP_SIZING'] == OPTION_V3_STEP_SIZING_FULL
@@ -3824,8 +3824,8 @@ class TestApi:
        assert o3['DEMAND_MODEL'] == OPTION_V3_DEMAND_MODEL_FIXED
        assert o3['DEMAND_PATTERN'] == '1'
        assert o3['DEMAND_MULTIPLIER'] == '1.0'
-        assert o3['MINIMUM_PRESSURE'] == '0.0'
-        assert o3['SERVICE_PRESSURE'] == '0.1'
+        assert o3['MINIMUM_PRESSURE'] == '0.0001'
+        assert o3['SERVICE_PRESSURE'] == '20.0'
        assert o3['PRESSURE_EXPONENT'] == '0.5'
        assert o3['LEAKAGE_MODEL'] == OPTION_V3_LEAKAGE_MODEL_NONE
        assert o3['LEAKAGE_COEFF1'] == '0.0'
--- a/tjnetwork.py
+++ b/tjnetwork.py
@@ -80,9 +80,9 @@ OPTION_UNITS_MLD  = api.OPTION_UNITS_MLD
 OPTION_UNITS_CMH  = api.OPTION_UNITS_CMH
 OPTION_UNITS_CMD  = api.OPTION_UNITS_CMD

-OPTION_PRESSURE_PSI = api.OPTION_PRESSURE_PSI
-OPTION_PRESSURE_KPA = api.OPTION_PRESSURE_KPA
-OPTION_PRESSURE_M   = api.OPTION_PRESSURE_M
+OPTION_PRESSURE_PSI    = api.OPTION_PRESSURE_PSI
+OPTION_PRESSURE_KPA    = api.OPTION_PRESSURE_KPA
+OPTION_PRESSURE_METERS = api.OPTION_PRESSURE_METERS

 OPTION_HEADLOSS_HW = api.OPTION_HEADLOSS_HW
 OPTION_HEADLOSS_DW = api.OPTION_HEADLOSS_DW
@@ -110,9 +110,9 @@ OPTION_V3_FLOW_UNITS_MLD  = api.OPTION_V3_FLOW_UNITS_MLD
 OPTION_V3_FLOW_UNITS_CMH  = api.OPTION_V3_FLOW_UNITS_CMH
 OPTION_V3_FLOW_UNITS_CMD  = api.OPTION_V3_FLOW_UNITS_CMD

-OPTION_V3_PRESSURE_UNITS_PSI = api.OPTION_V3_PRESSURE_UNITS_PSI
-OPTION_V3_PRESSURE_UNITS_KPA = api.OPTION_V3_PRESSURE_UNITS_KPA
-OPTION_V3_PRESSURE_UNITS_M   = api.OPTION_V3_PRESSURE_UNITS_M
+OPTION_V3_PRESSURE_UNITS_PSI    = api.OPTION_V3_PRESSURE_UNITS_PSI
+OPTION_V3_PRESSURE_UNITS_KPA    = api.OPTION_V3_PRESSURE_UNITS_KPA
+OPTION_V3_PRESSURE_UNITS_METERS = api.OPTION_V3_PRESSURE_UNITS_METERS

 OPTION_V3_HEADLOSS_MODEL_HW = api.OPTION_V3_HEADLOSS_MODEL_HW
 OPTION_V3_HEADLOSS_MODEL_DW = api.OPTION_V3_HEADLOSS_MODEL_DW