From 9d90643b3be4bf4b8b985165b572a3b3d2a54167 Mon Sep 17 00:00:00 2001
From: wqy <wqyuyu@outlook.com>
Date: Tue, 27 Jun 2023 20:15:08 +0800
Subject: [PATCH] Fix option test case

---
 test_tjnetwork.py | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/test_tjnetwork.py b/test_tjnetwork.py
index 4c9cc34..b22c932 100644
--- a/test_tjnetwork.py
+++ b/test_tjnetwork.py
@@ -4037,8 +4037,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
@@ -4051,10 +4051,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'
@@ -4065,15 +4065,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
@@ -4081,8 +4081,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'
@@ -4176,22 +4176,22 @@ class TestApi:
 
         css = execute_undo(p).operations
         cs = css[0]
-        assert cs['FLOW_UNITS'] == OPTION_V3_FLOW_UNITS_GPM
-        assert cs['PRESSURE_UNITS'] == OPTION_V3_PRESSURE_UNITS_PSI
+        assert cs['FLOW_UNITS'] == OPTION_V3_FLOW_UNITS_LPS
+        assert cs['PRESSURE_UNITS'] == OPTION_V3_PRESSURE_UNITS_METERS
         assert cs['HEADLOSS_MODEL'] == OPTION_V3_HEADLOSS_MODEL_HW
         assert cs['SPECIFIC_GRAVITY'] == '1.0'
         assert cs['SPECIFIC_VISCOSITY'] == '1.0'
         assert cs['MAXIMUM_TRIALS'] == '40'
         assert cs['HEAD_TOLERANCE'] == '0.0005'
         assert cs['FLOW_TOLERANCE'] == '0.0001'
-        assert cs['FLOW_CHANGE_LIMIT'] == '0.0'
+        assert cs['FLOW_CHANGE_LIMIT'] == '0.0001'
         assert cs['RELATIVE_ACCURACY'] == '0.001'
         assert cs['IF_UNBALANCED'] == OPTION_V3_IF_UNBALANCED_STOP
         assert cs['DEMAND_MODEL'] == OPTION_V3_DEMAND_MODEL_FIXED
         assert cs['DEMAND_PATTERN'] == '1'
         assert cs['DEMAND_MULTIPLIER'] == '1.0'
-        assert cs['MINIMUM_PRESSURE'] == '0.0'
-        assert cs['SERVICE_PRESSURE'] == '0.1'
+        assert cs['MINIMUM_PRESSURE'] == '0.0001'
+        assert cs['SERVICE_PRESSURE'] == '20.0'
         assert cs['PRESSURE_EXPONENT'] == '0.5'
         assert cs['EMITTER_EXPONENT'] == '0.5'
         assert cs['QUALITY_MODEL'] == OPTION_V3_QUALITY_MODEL_NONE
@@ -4199,8 +4199,8 @@ class TestApi:
         assert cs['SPECIFIC_DIFFUSIVITY'] == '1.0'
         assert cs['QUALITY_TOLERANCE'] == '0.01'
         cs = css[1]
-        assert cs['UNITS'] == OPTION_UNITS_GPM
-        assert cs['PRESSURE'] == OPTION_PRESSURE_PSI
+        assert cs['UNITS'] == OPTION_UNITS_LPS
+        assert cs['PRESSURE'] == OPTION_PRESSURE_METERS
         assert cs['HEADLOSS'] == OPTION_HEADLOSS_HW
         assert cs['QUALITY'] == OPTION_QUALITY_NONE
         assert cs['UNBALANCED'] == OPTION_UNBALANCED_STOP
@@ -4213,10 +4213,10 @@ class TestApi:
         assert cs['SPECIFIC GRAVITY'] == '1.0'
         assert cs['TRIALS'] == '40'
         assert cs['ACCURACY'] == '0.001'
-        assert cs['HEADERROR'] == '0.0'
-        assert cs['FLOWCHANGE'] == '0.0'
-        assert cs['MINIMUM PRESSURE'] == '0.0'
-        assert cs['REQUIRED PRESSURE'] == '0.1'
+        assert cs['HEADERROR'] == '0.0001'
+        assert cs['FLOWCHANGE'] == '0.0001'
+        assert cs['MINIMUM PRESSURE'] == '0.0001'
+        assert cs['REQUIRED PRESSURE'] == '20.0'
         assert cs['PRESSURE EXPONENT'] == '0.5'
         assert cs['TOLERANCE'] == '0.01'
         assert cs['HTOL'] == '0.0005'