diff --git a/api/__init__.py b/api/__init__.py index 7126da2..51b7fb8 100644 --- a/api/__init__.py +++ b/api/__init__.py @@ -101,7 +101,7 @@ from .s23_options import set_option 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_HEADLOSS_MODEL_HW, OPTION_V3_HEADLOSS_MODEL_DW, OPTION_V3_HEADLOSS_MODEL_CM -from .s23_options_util import OPTION_V3_STEP_SIZING, OPTION_V3_STEP_SIZING, OPTION_V3_STEP_SIZING +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 from .s23_options_util import OPTION_V3_DEMAND_MODEL_FIXED, OPTION_V3_DEMAND_MODEL_CONSTRAINED, OPTION_V3_DEMAND_MODEL_POWER, OPTION_V3_DEMAND_MODEL_LOGISTIC from .s23_options_util import OPTION_V3_LEAKAGE_MODEL_NONE, OPTION_V3_LEAKAGE_MODEL_POWER, OPTION_V3_LEAKAGE_MODEL_FAVAD diff --git a/api/s23_options_util.py b/api/s23_options_util.py index ce4aac2..79cb7e4 100644 --- a/api/s23_options_util.py +++ b/api/s23_options_util.py @@ -164,9 +164,9 @@ OPTION_V3_HEADLOSS_MODEL_HW = OPTION_HEADLOSS_HW OPTION_V3_HEADLOSS_MODEL_DW = OPTION_HEADLOSS_DW OPTION_V3_HEADLOSS_MODEL_CM = OPTION_HEADLOSS_CM -OPTION_V3_STEP_SIZING = 'FULL' -OPTION_V3_STEP_SIZING = 'RELAXATION' -OPTION_V3_STEP_SIZING = 'LINESEARCH' +OPTION_V3_STEP_SIZING_FULL = 'FULL' +OPTION_V3_STEP_SIZING_RELAXATION = 'RELAXATION' +OPTION_V3_STEP_SIZING_LINESEARCH = 'LINESEARCH' OPTION_V3_IF_UNBALANCED_STOP = OPTION_UNBALANCED_STOP OPTION_V3_IF_UNBALANCED_CONTINUE = OPTION_UNBALANCED_CONTINUE diff --git a/tjnetwork.py b/tjnetwork.py index a831227..b874c2d 100644 --- a/tjnetwork.py +++ b/tjnetwork.py @@ -118,9 +118,9 @@ OPTION_V3_HEADLOSS_MODEL_HW = api.OPTION_V3_HEADLOSS_MODEL_HW OPTION_V3_HEADLOSS_MODEL_DW = api.OPTION_V3_HEADLOSS_MODEL_DW OPTION_V3_HEADLOSS_MODEL_CM = api.OPTION_V3_HEADLOSS_MODEL_CM -OPTION_V3_STEP_SIZING = api.OPTION_V3_STEP_SIZING -OPTION_V3_STEP_SIZING = api.OPTION_V3_STEP_SIZING -OPTION_V3_STEP_SIZING = api.OPTION_V3_STEP_SIZING +OPTION_V3_STEP_SIZING_FULL = api.OPTION_V3_STEP_SIZING_FULL +OPTION_V3_STEP_SIZING_RELAXATION = api.OPTION_V3_STEP_SIZING_RELAXATION +OPTION_V3_STEP_SIZING_LINESEARCH = api.OPTION_V3_STEP_SIZING_LINESEARCH OPTION_V3_IF_UNBALANCED_STOP = api.OPTION_V3_IF_UNBALANCED_STOP OPTION_V3_IF_UNBALANCED_CONTINUE = api.OPTION_V3_IF_UNBALANCED_CONTINUE