Skip to content

Commit fb7a331

Browse files
committed
Add DSS_Start to FastDSS
1 parent 9500194 commit fb7a331

5 files changed

Lines changed: 8 additions & 4 deletions

File tree

dss_python_backend/_func_info.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ class FastDSSTypes(Enum):
4646
(t.fastdss_types_void, t.fastdss_types_f64, ('Bus_Set_x', 'Bus_Set_y', 'CNData_Set_DiaCable', 'CNData_Set_DiaIns', 'CNData_Set_DiaStrand', 'CNData_Set_Diameter', 'CNData_Set_EmergAmps', 'CNData_Set_EpsR', 'CNData_Set_GMRac', 'CNData_Set_GmrStrand', 'CNData_Set_InsLayer', 'CNData_Set_NormAmps', 'CNData_Set_RStrand', 'CNData_Set_Rac', 'CNData_Set_Radius', 'CNData_Set_Rdc', 'CapControls_Set_CTratio', 'CapControls_Set_DeadTime', 'CapControls_Set_Delay', 'CapControls_Set_DelayOff', 'CapControls_Set_OFFSetting', 'CapControls_Set_ONSetting', 'CapControls_Set_PTratio', 'CapControls_Set_Vmax', 'CapControls_Set_Vmin', 'Capacitors_Set_kV', 'Capacitors_Set_kvar', 'CktElement_Set_EmergAmps', 'CktElement_Set_NormalAmps', 'CktElement_Set_VariableValue', 'Fuses_Set_Delay', 'Fuses_Set_RatedCurrent', 'GICSources_Set_EE', 'GICSources_Set_EN', 'GICSources_Set_Lat1', 'GICSources_Set_Lat2', 'GICSources_Set_Lon1', 'GICSources_Set_Lon2', 'GICSources_Set_Volts', 'Generators_Set_PF', 'Generators_Set_Vmaxpu', 'Generators_Set_Vminpu', 'Generators_Set_kV', 'Generators_Set_kVArated', 'Generators_Set_kW', 'Generators_Set_kva', 'Generators_Set_kvar', 'ISources_Set_Amps', 'ISources_Set_AngleDeg', 'ISources_Set_Frequency', 'LineCodes_Set_C0', 'LineCodes_Set_C1', 'LineCodes_Set_EmergAmps', 'LineCodes_Set_NormAmps', 'LineCodes_Set_R0', 'LineCodes_Set_R1', 'LineCodes_Set_X0', 'LineCodes_Set_X1', 'LineGeometries_Set_EmergAmps', 'LineGeometries_Set_NormAmps', 'LineGeometries_Set_RhoEarth', 'Lines_Set_C0', 'Lines_Set_C1', 'Lines_Set_EmergAmps', 'Lines_Set_Length', 'Lines_Set_NormAmps', 'Lines_Set_R0', 'Lines_Set_R1', 'Lines_Set_Rg', 'Lines_Set_Rho', 'Lines_Set_X0', 'Lines_Set_X1', 'Lines_Set_Xg', 'LoadShapes_Set_HrInterval', 'LoadShapes_Set_MaxP', 'LoadShapes_Set_MaxQ', 'LoadShapes_Set_MinInterval', 'LoadShapes_Set_PBase', 'LoadShapes_Set_Qbase', 'LoadShapes_Set_SInterval', 'Loads_Set_AllocationFactor', 'Loads_Set_CVRvars', 'Loads_Set_CVRwatts', 'Loads_Set_Cfactor', 'Loads_Set_PF', 'Loads_Set_PctMean', 'Loads_Set_PctStdDev', 'Loads_Set_RelWeight', 'Loads_Set_Rneut', 'Loads_Set_Vmaxpu', 'Loads_Set_Vminemerg', 'Loads_Set_Vminnorm', 'Loads_Set_Vminpu', 'Loads_Set_Xneut', 'Loads_Set_kV', 'Loads_Set_kW', 'Loads_Set_kva', 'Loads_Set_kvar', 'Loads_Set_kwh', 'Loads_Set_kwhdays', 'Loads_Set_pctSeriesRL', 'Loads_Set_xfkVA', 'PDElements_Set_FaultRate', 'PDElements_Set_RepairTime', 'PDElements_Set_pctPermanent', 'PVSystems_Set_Irradiance', 'PVSystems_Set_PF', 'PVSystems_Set_Pmpp', 'PVSystems_Set_kVArated', 'PVSystems_Set_kvar', 'Reactors_Set_LmH', 'Reactors_Set_R', 'Reactors_Set_Rp', 'Reactors_Set_X', 'Reactors_Set_kV', 'Reactors_Set_kvar', 'Reclosers_Set_GroundInst', 'Reclosers_Set_GroundTrip', 'Reclosers_Set_PhaseInst', 'Reclosers_Set_PhaseTrip', 'ReduceCkt_Set_Zmag', 'RegControls_Set_CTPrimary', 'RegControls_Set_Delay', 'RegControls_Set_ForwardBand', 'RegControls_Set_ForwardR', 'RegControls_Set_ForwardVreg', 'RegControls_Set_ForwardX', 'RegControls_Set_PTratio', 'RegControls_Set_ReverseBand', 'RegControls_Set_ReverseR', 'RegControls_Set_ReverseVreg', 'RegControls_Set_ReverseX', 'RegControls_Set_TapDelay', 'RegControls_Set_VoltageLimit', 'Sensors_Set_PctError', 'Sensors_Set_Weight', 'Sensors_Set_kVbase', 'Settings_Set_AllocationFactors', 'Settings_Set_EmergVmaxpu', 'Settings_Set_EmergVminpu', 'Settings_Set_LossWeight', 'Settings_Set_NormVmaxpu', 'Settings_Set_NormVminpu', 'Settings_Set_PriceSignal', 'Settings_Set_UEweight', 'Solution_Set_Capkvar', 'Solution_Set_Frequency', 'Solution_Set_GenMult', 'Solution_Set_GenPF', 'Solution_Set_GenkW', 'Solution_Set_IntervalHrs', 'Solution_Set_LoadMult', 'Solution_Set_Seconds', 'Solution_Set_StepSize', 'Solution_Set_StepsizeHr', 'Solution_Set_StepsizeMin', 'Solution_Set_Tolerance', 'Solution_Set_Total_Time', 'Solution_Set_dblHour', 'Solution_Set_pctGrowth', 'Storages_Set_AmpLimit', 'Storages_Set_AmpLimitGain', 'Storages_Set_ChargeTrigger', 'Storages_Set_DischargeTrigger', 'Storages_Set_EffCharge', 'Storages_Set_EffDischarge', 'Storages_Set_Kp', 'Storages_Set_PF', 'Storages_Set_PITol', 'Storages_Set_SafeVoltage', 'Storages_Set_TimeChargeTrig', 'Storages_Set_kV', 'Storages_Set_kVA', 'Storages_Set_kVDC', 'Storages_Set_kW', 'Storages_Set_kWRated', 'Storages_Set_kWhRated', 'Storages_Set_kvar', 'Storages_Set_puSOC', 'SwtControls_Set_Delay', 'TSData_Set_DiaCable', 'TSData_Set_DiaIns', 'TSData_Set_DiaShield', 'TSData_Set_Diameter', 'TSData_Set_EmergAmps', 'TSData_Set_EpsR', 'TSData_Set_GMRac', 'TSData_Set_InsLayer', 'TSData_Set_NormAmps', 'TSData_Set_Rac', 'TSData_Set_Radius', 'TSData_Set_Rdc', 'TSData_Set_TapeLap', 'TSData_Set_TapeLayer', 'Transformers_Set_MaxTap', 'Transformers_Set_MinTap', 'Transformers_Set_R', 'Transformers_Set_RdcOhms', 'Transformers_Set_Rneut', 'Transformers_Set_Tap', 'Transformers_Set_Xhl', 'Transformers_Set_Xht', 'Transformers_Set_Xlt', 'Transformers_Set_Xneut', 'Transformers_Set_kV', 'Transformers_Set_kVA', 'Vsources_Set_AngleDeg', 'Vsources_Set_BasekV', 'Vsources_Set_Frequency', 'Vsources_Set_pu', 'WindGens_Set_Ag', 'WindGens_Set_Cp', 'WindGens_Set_Lamda', 'WindGens_Set_PF', 'WindGens_Set_PSS', 'WindGens_Set_QSS', 'WindGens_Set_RThev', 'WindGens_Set_Rad', 'WindGens_Set_VCutIn', 'WindGens_Set_VCutOut', 'WindGens_Set_Vss', 'WindGens_Set_WindSpeed', 'WindGens_Set_XThev', 'WindGens_Set_kV', 'WindGens_Set_kVA', 'WindGens_Set_kW', 'WindGens_Set_kvar', 'WindGens_Set_pd', 'WireData_Set_CapRadius', 'WireData_Set_Diameter', 'WireData_Set_EmergAmps', 'WireData_Set_GMRac', 'WireData_Set_NormAmps', 'WireData_Set_Rac', 'WireData_Set_Radius', 'WireData_Set_Rdc', 'XYCurves_Set_Xscale', 'XYCurves_Set_Xshift', 'XYCurves_Set_Yscale', 'XYCurves_Set_Yshift', 'XYCurves_Set_x', 'XYCurves_Set_y')),
4747
(t.fastdss_types_b16, t.fastdss_types_void, ('Bus_Get_Coorddefined', 'Bus_ZscRefresh', 'CapControls_Get_UseVoltOverride', 'Capacitors_AddStep', 'Capacitors_Get_IsDelta', 'Capacitors_SubtractStep', 'CktElement_Get_Enabled', 'CktElement_Get_HasOCPDevice', 'CktElement_Get_HasSwitchControl', 'CktElement_Get_HasVoltControl', 'CktElement_Get_IsIsolated', 'DSS_Get_AllowChangeDir', 'DSS_Get_AllowDOScmd', 'DSS_Get_AllowEditor', 'DSS_Get_AllowForms', 'DSS_Get_COMErrorResults', 'DSS_Get_EnableArrayDimensions', 'DSS_Get_LegacyModels', 'Error_Get_EarlyAbort', 'Error_Get_ExtendedErrors', 'Fuses_IsBlown', 'Generators_Get_ForcedON', 'Generators_Get_IsDelta', 'LineCodes_Get_IsZ1Z0', 'LineGeometries_Get_Reduce', 'Lines_Get_IsSwitch', 'LoadShapes_Get_UseActual', 'Loads_Get_IsDelta', 'Meters_Get_DIFilesAreOpen', 'PDElements_Get_IsShunt', 'Parser_Get_AutoIncrement', 'Reactors_Get_IsDelta', 'Reactors_Get_Parallel', 'ReduceCkt_Get_KeepLoad', 'RegControls_Get_IsInverseTime', 'RegControls_Get_IsReversible', 'Sensors_Get_IsDelta', 'Sensors_Get_ReverseDelta', 'Settings_Get_AllowDuplicates', 'Settings_Get_ControlTrace', 'Settings_Get_LoadsTerminalCheck', 'Settings_Get_Trapezoidal', 'Settings_Get_ZoneLock', 'Solution_Get_ControlActionsDone', 'Solution_Get_Converged', 'Solution_Get_SystemYChanged', 'Storages_Get_LimitCurrent', 'SwtControls_Get_IsLocked', 'Transformers_Get_IsDelta', 'WindGens_Get_IsDelta', 'YMatrix_CheckConvergence', 'YMatrix_Get_LoadsNeedUpdating', 'YMatrix_Get_SolutionInitialized', 'YMatrix_Get_SystemYChanged', 'YMatrix_Get_UseAuxCurrents')),
4848
(t.fastdss_types_b16, t.fastdss_types_str, ('ZIP_Contains',)),
49+
(t.fastdss_types_b16, t.fastdss_types_i32, ('DSS_Start',)),
4950
(t.fastdss_types_b16, t.fastdss_types_i32_i32, ('CktElement_IsOpen',)),
5051
(t.fastdss_types_void, t.fastdss_types_b16, ('CapControls_Set_UseVoltOverride', 'Capacitors_Set_IsDelta', 'CktElement_Set_Enabled', 'DSS_Set_AllowChangeDir', 'DSS_Set_AllowDOScmd', 'DSS_Set_AllowEditor', 'DSS_Set_AllowForms', 'DSS_Set_COMErrorResults', 'DSS_Set_EnableArrayDimensions', 'DSS_Set_LegacyModels', 'Error_Set_EarlyAbort', 'Error_Set_ExtendedErrors', 'Generators_Set_ForcedON', 'Generators_Set_IsDelta', 'LineGeometries_Set_Reduce', 'Lines_Set_IsSwitch', 'LoadShapes_Set_UseActual', 'Loads_Set_IsDelta', 'Meters_DoReliabilityCalc', 'Parser_Set_AutoIncrement', 'Reactors_Set_IsDelta', 'Reactors_Set_Parallel', 'ReduceCkt_Set_KeepLoad', 'RegControls_Set_IsInverseTime', 'RegControls_Set_IsReversible', 'Sensors_Set_IsDelta', 'Sensors_Set_ReverseDelta', 'Settings_Set_AllowDuplicates', 'Settings_Set_ControlTrace', 'Settings_Set_LoadsTerminalCheck', 'Settings_Set_Trapezoidal', 'Settings_Set_ZoneLock', 'Solution_Set_ControlActionsDone', 'Solution_Set_Converged', 'Storages_Set_LimitCurrent', 'SwtControls_Set_IsLocked', 'Transformers_Set_IsDelta', 'WindGens_Set_IsDelta', 'YMatrix_Set_LoadsNeedUpdating', 'YMatrix_Set_SolutionInitialized', 'YMatrix_Set_SystemYChanged', 'YMatrix_Set_UseAuxCurrents')),
5152
(t.fastdss_types_void, t.fastdss_types_void, ('CapControls_Reset', 'Capacitors_Close', 'Capacitors_Open', 'Circuit_EndOfTimeStepUpdate', 'Circuit_Sample', 'Circuit_SaveSample', 'Circuit_UpdateStorage', 'CtrlQueue_ClearActions', 'CtrlQueue_ClearQueue', 'CtrlQueue_DoAllQueue', 'CtrlQueue_Show', 'DSSProgress_Close', 'DSSProgress_Show', 'DSS_ClearAll', 'DSS_DisposeGRData', 'DSS_Reset', 'DSS_ResetStringBuffer', 'ctx_Dispose', 'Fuses_Close', 'Fuses_Open', 'Fuses_Reset', 'LoadShapes_Normalize', 'LoadShapes_UseFloat32', 'LoadShapes_UseFloat64', 'Meters_CloseAllDIFiles', 'Meters_OpenAllDIFiles', 'Meters_Reset', 'Meters_ResetAll', 'Meters_Sample', 'Meters_SampleAll', 'Meters_Save', 'Meters_SaveAll', 'Monitors_Process', 'Monitors_ProcessAll', 'Monitors_Reset', 'Monitors_ResetAll', 'Monitors_Sample', 'Monitors_SampleAll', 'Monitors_Save', 'Monitors_SaveAll', 'Monitors_Show', 'Parallel_CreateActor', 'Parallel_Wait', 'Parser_ResetDelimiters', 'Reclosers_Close', 'Reclosers_Open', 'Reclosers_Reset', 'ReduceCkt_Do1phLaterals', 'ReduceCkt_DoBranchRemove', 'ReduceCkt_DoDangling', 'ReduceCkt_DoDefault', 'ReduceCkt_DoLoopBreak', 'ReduceCkt_DoParallelLines', 'ReduceCkt_DoShortLines', 'ReduceCkt_DoSwitches', 'RegControls_Reset', 'Relays_Close', 'Relays_Open', 'Relays_Reset', 'Sensors_Reset', 'Sensors_ResetAll', 'Solution_CheckControls', 'Solution_CheckFaultStatus', 'Solution_Cleanup', 'Solution_DoControlActions', 'Solution_FinishTimeStep', 'Solution_InitSnap', 'Solution_SampleControlDevices', 'Solution_Sample_DoControlActions', 'Solution_Solve', 'Solution_SolveAll', 'Solution_SolveDirect', 'Solution_SolveNoControl', 'Solution_SolvePflow', 'Solution_SolvePlusControl', 'Solution_SolveSnap', 'SwtControls_Reset', 'YMatrix_GetPCInjCurr', 'YMatrix_GetSourceInjCurrents', 'YMatrix_SetGeneratordQdV', 'YMatrix_ZeroInjCurr', 'ZIP_Close')),

src/_fastdss.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -822,14 +822,14 @@ static PyObject *AltDSS_PyStrListGetter_call(AltDSS_PyStrListGetterObject *f, Py
822822
PyLong_FromLong(num),
823823
PyUnicode_FromString(errorDesc)
824824
));
825-
DSS_Dispose_PPAnsiChar(&cstr_list, count[1]);
825+
f->dssCFuncs->DSS_Dispose_PPAnsiChar(&cstr_list, count[1]);
826826
return NULL;
827827
}
828828

829829
result = PyList_New(count[0]);
830830
if (PyErr_Occurred())
831831
{
832-
DSS_Dispose_PPAnsiChar(&cstr_list, count[1]);
832+
f->dssCFuncs->DSS_Dispose_PPAnsiChar(&cstr_list, count[1]);
833833
return NULL;
834834
}
835835

@@ -857,12 +857,12 @@ static PyObject *AltDSS_PyStrListGetter_call(AltDSS_PyStrListGetterObject *f, Py
857857
if (PyErr_Occurred())
858858
{
859859
Py_DECREF(result);
860-
DSS_Dispose_PPAnsiChar(&cstr_list, count[1]);
860+
f->dssCFuncs->DSS_Dispose_PPAnsiChar(&cstr_list, count[1]);
861861
return NULL;
862862
}
863863
PyList_SET_ITEM(result, i, item);
864864
}
865-
DSS_Dispose_PPAnsiChar(&cstr_list, count[1]);
865+
f->dssCFuncs->DSS_Dispose_PPAnsiChar(&cstr_list, count[1]);
866866
return result;
867867
}
868868

src/_fastdss_func_info.inc.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1434,6 +1434,7 @@ FastDSSFuncInfo info[] = {
14341434
{fastdss_types_b16, fastdss_types_void, offsetof(AltDSSCAPI, YMatrix_Get_SystemYChanged), offsetof(AltDSS_PyContextObject, f_YMatrix_Get_SystemYChanged), "YMatrix_Get_SystemYChanged"},
14351435
{fastdss_types_b16, fastdss_types_void, offsetof(AltDSSCAPI, YMatrix_Get_UseAuxCurrents), offsetof(AltDSS_PyContextObject, f_YMatrix_Get_UseAuxCurrents), "YMatrix_Get_UseAuxCurrents"},
14361436
{fastdss_types_b16, fastdss_types_str, offsetof(AltDSSCAPI, ZIP_Contains), offsetof(AltDSS_PyContextObject, f_ZIP_Contains), "ZIP_Contains"},
1437+
{fastdss_types_b16, fastdss_types_i32, offsetof(AltDSSCAPI, DSS_Start), offsetof(AltDSS_PyContextObject, f_DSS_Start), "DSS_Start"},
14371438
{fastdss_types_b16, fastdss_types_i32_i32, offsetof(AltDSSCAPI, CktElement_IsOpen), offsetof(AltDSS_PyContextObject, f_CktElement_IsOpen), "CktElement_IsOpen"},
14381439
{fastdss_types_void, fastdss_types_b16, offsetof(AltDSSCAPI, CapControls_Set_UseVoltOverride), offsetof(AltDSS_PyContextObject, f_CapControls_Set_UseVoltOverride), "CapControls_Set_UseVoltOverride"},
14391440
{fastdss_types_void, fastdss_types_b16, offsetof(AltDSSCAPI, Capacitors_Set_IsDelta), offsetof(AltDSS_PyContextObject, f_Capacitors_Set_IsDelta), "Capacitors_Set_IsDelta"},

src/_fastdss_py_members.inc.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1434,6 +1434,7 @@ static PyMemberDef AltDSS_PyContext_members[] = {
14341434
{"YMatrix_Get_SystemYChanged", Py_T_OBJECT_EX, offsetof(AltDSS_PyContextObject, f_YMatrix_Get_SystemYChanged)},
14351435
{"YMatrix_Get_UseAuxCurrents", Py_T_OBJECT_EX, offsetof(AltDSS_PyContextObject, f_YMatrix_Get_UseAuxCurrents)},
14361436
{"ZIP_Contains", Py_T_OBJECT_EX, offsetof(AltDSS_PyContextObject, f_ZIP_Contains)},
1437+
{"DSS_Start", Py_T_OBJECT_EX, offsetof(AltDSS_PyContextObject, f_DSS_Start)},
14371438
{"CktElement_IsOpen", Py_T_OBJECT_EX, offsetof(AltDSS_PyContextObject, f_CktElement_IsOpen)},
14381439
{"CapControls_Set_UseVoltOverride", Py_T_OBJECT_EX, offsetof(AltDSS_PyContextObject, f_CapControls_Set_UseVoltOverride)},
14391440
{"Capacitors_Set_IsDelta", Py_T_OBJECT_EX, offsetof(AltDSS_PyContextObject, f_Capacitors_Set_IsDelta)},

src/_fastdss_struct_members.inc.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1433,6 +1433,7 @@ PyObject *f_YMatrix_Get_SolutionInitialized;
14331433
PyObject *f_YMatrix_Get_SystemYChanged;
14341434
PyObject *f_YMatrix_Get_UseAuxCurrents;
14351435
PyObject *f_ZIP_Contains;
1436+
PyObject *f_DSS_Start;
14361437
PyObject *f_CktElement_IsOpen;
14371438
PyObject *f_CapControls_Set_UseVoltOverride;
14381439
PyObject *f_Capacitors_Set_IsDelta;

0 commit comments

Comments
 (0)