psr-factory 4.1.0b3__py3-none-win_amd64.whl → 4.1.0b5__py3-none-win_amd64.whl

psr/factory/factory.pmk

@@ -6592,6 +6592,7 @@ END_MASK
 DEFINE_MASK CSVDATA Optmain_Prec
 
 DEFINE_HEADER
+$version=1
 !PrecName,SolName,DelayMin,DelayMax
 END_HEADER
 DEFINE_DATA
@@ -6627,6 +6628,397 @@ SetName	     			STRING,1
 Solicitation			STRING,2
 END_DATA
 END_MASK
+
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRMaintenanceSolicitation Identification and parameters
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmcfg_v3
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmcfg.dat
+VERSION 3
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRMaintenanceSolicitation
+MODEL PSRMaintenanceSolicitation
+CREATE_OBJECTS TRUE
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+Name			STRING,1	AUTOSET(model.parm("Name"))
+UnitCode			INTEGER,2	AUTOSET(model.parm("UnitCode"))
+MinDateDay			INTEGER,3	AUTOSET(model.parm("MinDateDay"))
+MinDateMonth			INTEGER,4	AUTOSET(model.parm("MinDateMonth"))
+MinDateYear			INTEGER,5	AUTOSET(model.parm("MinDateYear"))
+MaxDateDay			INTEGER,6	AUTOSET(model.parm("MaxDateDay"))
+MaxDateMonth			INTEGER,7	AUTOSET(model.parm("MaxDateMonth"))
+MaxDateYear			INTEGER,8	AUTOSET(model.parm("MaxDateYear"))
+Duration			INTEGER,9	AUTOSET(model.parm("Duration"))
+PrefDateDay			INTEGER,10	AUTOSET(model.parm("PrefDateDay"))
+PrefDateMonth			INTEGER,11	AUTOSET(model.parm("PrefDateMonth"))
+PrefDateYear			INTEGER,12	AUTOSET(model.parm("PrefDateYear"))
+Score			REAL,13	AUTOSET(model.parm("Score"))
+Fix			INTEGER,14	AUTOSET(model.parm("Fix"))
+Plant			REFERENCE,15	AUTOSET(model.parm("Plant"))
+END_DATA
+DEFINE_HEADER
+$version=3
+!Name,UnitCode,MinDateDay,MinDateMonth,MinDateYear,MaxDateDay,MaxDateMonth,MaxDateYear,Duration,PrefDateDay,PrefDateMonth,PrefDateYear,Score,Fix,Plant
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRMaintenanceExclusive Identification and parameters
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmexcl_v3
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmexcl.dat
+VERSION 3
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRMaintenanceExclusive
+MODEL PSRMaintenanceExclusive
+CREATE_OBJECTS TRUE
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+SetName			STRING,1	AUTOSET(model.parm("SetName"))
+END_DATA
+DEFINE_HEADER
+$version=3
+!SetName
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRMaintenanceExclusive Non indexed vectors
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmexclv
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmexclv.dat
+VERSION 1
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRMaintenanceExclusive
+MODEL PSRMaintenanceExclusive
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+PSRMaintenanceExclusive		REFERENCE,1
+PlantsThermal		REFERENCE,2
+PlantsHydro		REFERENCE,3
+PlantsGnd		REFERENCE,4
+END_DATA
+DEFINE_HEADER
+$version=1
+!PSRMaintenanceExclusive,PlantsThermal,PlantsHydro,PlantsGnd
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRMaintenanceShared Identification and parameters
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmshr_v3
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmshr.dat
+VERSION 3
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRMaintenanceShared
+MODEL PSRMaintenanceShared
+CREATE_OBJECTS TRUE
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+SetName			STRING,1	AUTOSET(model.parm("SetName"))
+END_DATA
+DEFINE_HEADER
+$version=3
+!SetName
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRMaintenanceShared Non indexed vectors
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmshrv
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmshrv.dat
+VERSION 1
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRMaintenanceShared
+MODEL PSRMaintenanceShared
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+PSRMaintenanceShared		REFERENCE,1
+PlantsThermal		REFERENCE,2
+PlantsHydro		REFERENCE,3
+PlantsGnd		REFERENCE,4
+END_DATA
+DEFINE_HEADER
+$version=1
+!PSRMaintenanceShared,PlantsThermal,PlantsHydro,PlantsGnd
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRMaintenanceAssociation Identification and parameters
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmass_v2
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmass.dat
+VERSION 2
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRMaintenanceAssociation
+MODEL PSRMaintenanceAssociation
+CREATE_OBJECTS TRUE
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+SetName			STRING,1	AUTOSET(model.parm("SetName"))
+END_DATA
+DEFINE_HEADER
+$version=2
+!SetName
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRMaintenanceAssociation Non indexed vectors
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmassv
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmassv.dat
+VERSION 1
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRMaintenanceAssociation
+MODEL PSRMaintenanceAssociation
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+PSRMaintenanceAssociation		REFERENCE,1
+Solicitations		REFERENCE,2
+END_DATA
+DEFINE_HEADER
+$version=1
+!PSRMaintenanceAssociation,Solicitations
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRMaintenanceExclusiveSol Identification and parameters
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmexcls_v2
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmexcls.dat
+VERSION 2
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRMaintenanceExclusiveSol
+MODEL PSRMaintenanceExclusiveSol
+CREATE_OBJECTS TRUE
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+SetName			STRING,1	AUTOSET(model.parm("SetName"))
+END_DATA
+DEFINE_HEADER
+$version=2
+!SetName
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRMaintenanceExclusiveSol Non indexed vectors
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmexclsv
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmexclsv.dat
+VERSION 1
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRMaintenanceExclusiveSol
+MODEL PSRMaintenanceExclusiveSol
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+PSRMaintenanceExclusiveSol		REFERENCE,1
+Solicitations		REFERENCE,2
+END_DATA
+DEFINE_HEADER
+$version=1
+!PSRMaintenanceExclusiveSol,Solicitations
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRPlant Vectors indexed by RestDate
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmstgcstr
+DEFINE_AUTOMATIC_INFO
+FILENAME optmstgcstr.dat
+VERSION 1
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRPlant
+MODEL StageCstr
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+PSRPlant		REFERENCE,1
+RestDate		DATE,2	YYYY/MM/DD	AUTOSET
+RestrictedStages		INTEGER,3	AUTOSET
+END_DATA
+DEFINE_HEADER
+$version=1
+!PSRPlant,RestDate,RestrictedStages
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRSystem Vectors indexed by MinResDate
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmresmin_v2
+DEFINE_AUTOMATIC_INFO
+FILENAME optmresmin.dat
+VERSION 2
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRSystem
+MODEL MinRes
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+PSRSystem		REFERENCE,1
+MinResDate		DATE,2	YYYY/MM/DD	AUTOSET
+MinimumReserve		REAL,3	AUTOSET
+END_DATA
+DEFINE_HEADER
+$version=2
+!PSRSystem,MinResDate,MinimumReserve
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRSystem Non indexed vectors
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmload_v2
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmload.dat
+VERSION 2
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRSystem
+MODEL InstDem
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+PSRSystem		    REFERENCE,1
+InstantDemandDate	DATE,2	YYYY/MM/DD	AUTOSET
+InstantDemand		REAL,3  AUTOSET
+END_DATA
+DEFINE_HEADER
+$version=2
+!PSRSystem,InstantDemandDate,InstantDemand
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRMaintenancePrecedence Identification and parameters
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmprec_v2
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmprec.dat
+VERSION 2
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRMaintenancePrecedence
+MODEL PSRMaintenancePrecedence
+CREATE_OBJECTS TRUE
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+PrecName			STRING,1	AUTOSET(model.parm("PrecName"))
+END_DATA
+DEFINE_HEADER
+$version=2
+!PrecName
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRMaintenancePrecedence Non indexed vectors
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmprecv
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmprecv.dat
+VERSION 1
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRMaintenancePrecedence
+MODEL PSRMaintenancePrecedence
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+PSRMaintenancePrecedence		REFERENCE,1
+DelayMin		INTEGER,2
+DelayMax		INTEGER,3
+Solicitations		REFERENCE,4
+END_DATA
+DEFINE_HEADER
+$version=1
+!PSRMaintenancePrecedence,DelayMin,DelayMax,Solicitations
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRPlant Non indexed vectors
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmuntfct_v2
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmuntfct.dat
+VERSION 2
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRPlant
+MODEL UnitFactors
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+PSRPlant		REFERENCE,1
+UnitFactors		REAL,2
+END_DATA
+DEFINE_HEADER
+$version=2
+!PSRPlant,UnitFactors
+END_HEADER
+END_MASK
+//--------------------------------------------------------------------------------------------------
+// OptMain V2 - PSRPlant Non indexed vectors
+//--------------------------------------------------------------------------------------------------
+DEFINE_MASK CSVDATA Optmain_optmuntcod_v2
+
+DEFINE_AUTOMATIC_INFO
+FILENAME optmuntcod.dat
+VERSION 2
+CONTEXT_READ optmain
+CONTEXT_WRITE optmain
+CLASSNAME PSRPlant
+MODEL UnitCodes
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+PSRPlant		REFERENCE,1
+UnitCodes		INTEGER,2
+END_DATA
+DEFINE_HEADER
+$version=2
+!PSRPlant,UnitCodes
+END_HEADER
+END_MASK
+
 DEFINE_MASK CSVDATA Reliability_Generation
 DEFINE_HEADER
 Barra, Sis, Tp, Cod,      Nome, Uni, Pmn, Pmx, Qmn, Qmx,          tx.Falha,     tx.Retor
@@ -8166,6 +8558,22 @@ Kv		REAL		22,27	AUTOSET(model.parm("Kv"))
 END_DATA
 END_MASK
 
+//---------------------------------------------------------------------
+// AREA V17
+//---------------------------------------------------------------------
+DEFINE_MASK ROWDATA SDDP_V17_area
+
+DEFINE_HEADER
+$version=1
+! Num ....Nome.)
+END_HEADER
+DEFINE_DATA
+Num		INTEGER		1,5
+Nome		STRING		7,18
+END_DATA
+
+END_MASK
+
 //---------------------------------------------------------------------
 //---------------------------------------------------------------------
 DEFINE_MASK ROWDATA SDDP_v10.2_Dcirc
@@ -14308,9 +14716,8 @@ CREATE_OBJECTS TRUE
 END_AUTOMATIC_INFO
 
 DEFINE_DATA
-name			          REFERENCE,1	AUTOSET(model.parm("name"))
-Serie			          REFERENCE,2	AUTOSET(model.parm("Serie"))
-MonitoringList			REFERENCE,3	AUTOSET(model.parm("MonitoringList"))
+Serie			          REFERENCE,1	AUTOSET(model.parm("Serie"))
+MonitoringList			REFERENCE,2	AUTOSET(model.parm("MonitoringList"))
 END_DATA
 DEFINE_HEADER
 $version=1
@@ -14586,9 +14993,9 @@ DEFINE_HEADER
 END_HEADER
 
 DEFINE_DATA
-Code			INTEGER,1
-Name			STRING,2
-UseUserScenarios INTEGER,3
+Code				INTEGER,1
+Name				STRING,2
+UseUserScenarios	INTEGER,3 AUTOSET(model.parm("UseUserScenarios"))
 END_DATA
 
 END_MASK
@@ -14602,7 +15009,7 @@ DEFINE_HEADER
 END_HEADER
 
 DEFINE_DATA
-Circuit			INTEGER,1
+Circuit		INTEGER,1
 DLR			INTEGER,2
 END_DATA
 
@@ -14657,13 +15064,12 @@ DEFINE_MASK CSVDATA SDDP_dzone
 
 DEFINE_HEADER
 $version=1
-!Code,Name,SystemCode
+!Code,Name
 END_HEADER
 
 DEFINE_DATA
 Code       INTEGER 1
 Name       STRING  2
-SystemCode INTEGER 3
 END_DATA
 
 END_MASK
@@ -14672,13 +15078,12 @@ DEFINE_MASK CSVDATA SDDP_darea
 
 DEFINE_HEADER
 $version=2
-!Code,Name,SystemCode
+!Code,Name
 END_HEADER
 
 DEFINE_DATA
 Code       INTEGER 1
 Name       STRING  2
-SystemCode INTEGER 3
 END_DATA
 
 END_MASK
@@ -15223,7 +15628,7 @@ DEFINE_MASK CSVDATA SDDP_ddclink
 
 DEFINE_HEADER
 $version=1
-!Code,Name,BusFrom,BusTo,Existing,Status,Decommissioned,CapacityFromTo,CapacityToFrom,LossFactorFromTo,LossFactorToFrom,CapacityEmergencyFromTo,CapacityEmergencyToFrom,FlagQuadraticLoss,R,MeteringEnd,ReactivePowerFactorFrom,ReactivePowerFactorTo,WheelingCostFromTo,WheelingCostToFrom,Currency,ReserveMargin
+!Code,Name,BusFrom,BusTo,Existing,Decommissioned,CapacityFromTo,CapacityToFrom,LossFactorFromTo,LossFactorToFrom,CapacityEmergencyFromTo,CapacityEmergencyToFrom,FlagQuadraticLoss,R,MeteringEnd,ReactivePowerFactorFrom,ReactivePowerFactorTo,WheelingCostFromTo,WheelingCostToFrom,Currency,ReserveMargin
 END_HEADER
 
 DEFINE_DATA
@@ -15232,23 +15637,22 @@ Name                    STRING   2
 BusFromCode             INTEGER  3
 BusToCode               INTEGER  4
 Existing                INTEGER  5 AUTOSET
-Status                  INTEGER  6 AUTOSET
-Decommissioned          INTEGER  7 AUTOSET
-CapacityFromTo          REAL     8 AUTOSET
-CapacityToFrom          REAL     9 AUTOSET
-LossFactorFromTo        REAL    10 AUTOSET
-LossFactorToFrom        REAL    11 AUTOSET
-CapacityEmergencyFromTo REAL    12 AUTOSET
-CapacityEmergencyToFrom REAL    13 AUTOSET
-FlagQuadraticLoss       INTEGER 14 AUTOSET(model.parm("FlagQuadraticLoss"))
-R                       REAL    15 AUTOSET
-MeteringEnd             INTEGER 16 AUTOSET(model.parm("MeteringEnd"))
-ReactivePowerFactorFrom REAL    17 AUTOSET
-ReactivePowerFactorTo   REAL    18 AUTOSET
-WheelingCostFromTo      REAL    19	AUTOSET(model.parm("WheelingCostFromTo"))
-WheelingCostToFrom      REAL    20	AUTOSET(model.parm("WheelingCostToFrom"))
-Currency                STRING  21	AUTOSET(model.parm("Currency"))
-ReserveMargin           REAL    22	AUTOSET(model.parm("ReserveMargin"))
+Decommissioned          INTEGER  6 AUTOSET
+CapacityFromTo          REAL     7 AUTOSET
+CapacityToFrom          REAL     8 AUTOSET
+LossFactorFromTo        REAL     9 AUTOSET
+LossFactorToFrom        REAL    10 AUTOSET
+CapacityEmergencyFromTo REAL    11 AUTOSET
+CapacityEmergencyToFrom REAL    12 AUTOSET
+FlagQuadraticLoss       INTEGER 13 AUTOSET(model.parm("FlagQuadraticLoss"))
+R                       REAL    14 AUTOSET
+MeteringEnd             INTEGER 15 AUTOSET(model.parm("MeteringEnd"))
+ReactivePowerFactorFrom REAL    16 AUTOSET
+ReactivePowerFactorTo   REAL    17 AUTOSET
+WheelingCostFromTo      REAL    18	AUTOSET(model.parm("WheelingCostFromTo"))
+WheelingCostToFrom      REAL    19	AUTOSET(model.parm("WheelingCostToFrom"))
+Currency                STRING  20	AUTOSET(model.parm("Currency"))
+ReserveMargin           REAL    21	AUTOSET(model.parm("ReserveMargin"))
 
 END_DATA
 
@@ -15258,7 +15662,7 @@ DEFINE_MASK CSVDATA SDDP_mdclink
 
 DEFINE_HEADER
 $version=1
-!Day,Month,Year,Code,Name,BusFrom,BusTo,Existing,Status,Decommissioned,CapacityFromTo,CapacityToFrom,LossFactorFromTo,LossFactorToFrom,CapacityEmergencyFromTo,CapacityEmergencyToFrom,R,ReactivePowerFactorFrom,ReactivePowerFactorTo
+!Day,Month,Year,Code,Name,BusFrom,BusTo,Existing,Decommissioned,CapacityFromTo,CapacityToFrom,LossFactorFromTo,LossFactorToFrom,CapacityEmergencyFromTo,CapacityEmergencyToFrom,R,ReactivePowerFactorFrom,ReactivePowerFactorTo
 END_HEADER
 
 DEFINE_DATA
@@ -15270,20 +15674,40 @@ Name                    STRING   5
 BusFromCode             INTEGER  6
 BusToCode               INTEGER  7
 Existing                INTEGER  8 AUTOSET
-Status                  INTEGER  9 AUTOSET
-Decommissioned          INTEGER 10 AUTOSET
-CapacityFromTo          REAL    11 AUTOSET
-CapacityToFrom          REAL    12 AUTOSET
-LossFactorFromTo        REAL    13 AUTOSET
-LossFactorToFrom        REAL    14 AUTOSET
-CapacityEmergencyFromTo REAL    15 AUTOSET
-CapacityEmergencyToFrom REAL    16 AUTOSET
-R                       REAL    17 AUTOSET
-ReactivePowerFactorFrom REAL    18 AUTOSET
-ReactivePowerFactorTo   REAL    19 AUTOSET
+Decommissioned          INTEGER  9 AUTOSET
+CapacityFromTo          REAL    10 AUTOSET
+CapacityToFrom          REAL    11 AUTOSET
+LossFactorFromTo        REAL    12 AUTOSET
+LossFactorToFrom        REAL    13 AUTOSET
+CapacityEmergencyFromTo REAL    14 AUTOSET
+CapacityEmergencyToFrom REAL    15 AUTOSET
+R                       REAL    16 AUTOSET
+ReactivePowerFactorFrom REAL    17 AUTOSET
+ReactivePowerFactorTo   REAL    18 AUTOSET
 
 END_DATA
+END_MASK
+//---------------------------------------------------------------------
+DEFINE_MASK CSVDATA SDDP_dclinkstatus
+DEFINE_AUTOMATIC_INFO
+FILENAME dclinkstatus.dat
+VERSION 1
+CONTEXT_READ sddpac
+CONTEXT_WRITE sddpac
+CLASSNAME PSRLinkDC
+MODEL MODL:SDDP_SimpleTwoTerminal_DCLink
+ATTRIBUTE_ID code
+END_AUTOMATIC_INFO
 
+DEFINE_DATA
+code        REFERENCE   1
+DateStatus  DATE        2 YYYY/MM/DD AUTOSET
+Status      INTEGER     3 AUTOSET
+END_DATA
+DEFINE_HEADER
+$version=1
+!code,Date,Status
+END_HEADER
 END_MASK
 //---------------------------------------------------------------------
 DEFINE_MASK CSVDATA SDDP_dmtdclink
@@ -15381,7 +15805,7 @@ DEFINE_MASK CSVDATA SDDP_dcnvlcc
 
 DEFINE_HEADER
 $version=1
-!Code,Name,ACBusCode,DCBusCode,GroundBusCode,ConverterType,Bridges,SecondaryVoltage,Existing,Decommissioned,NominalCurrent,Xc,MinTap,MaxTap,TapSteps,MaxDcAcCapacity,MaxAcDcCapacity,MinIgnitionAngle,MaxIgnitionAngle,DesiredIgnitionAngle,MinExtinctionAngle,MaxExtinctionAngle,DesiredExtinctionAngle,Capacitance,Frequency
+!Code,Name,ACBusCode,DCBusCode,GroundBusCode,ConverterType,Bridges,SecondaryVoltage,Existing,Decommissioned,NominalCurrent,Xc,MinTap,MaxTap,TapSteps,MaxDcAcCapacity,MaxAcDcCapacity,MinIgnitionAngle,MaxIgnitionAngle,DesiredIgnitionAngle,MinExtinctionAngle,MaxExtinctionAngle,DesiredExtinctionAngle,NominalPower,Capacitance,Frequency
 END_HEADER
 
 DEFINE_DATA
@@ -15408,8 +15832,9 @@ DesiredIgnitionAngle   REAL    20 AUTOSET
 MinExtinctionAngle     REAL    21 AUTOSET
 MaxExtinctionAngle     REAL    22 AUTOSET
 DesiredExtinctionAngle REAL    23 AUTOSET
-Capacitance            REAL    24 AUTOSET
-Frequency              REAL    25 AUTOSET(model.parm("Frequency"))
+NominalPower           REAL    24 AUTOSET
+Capacitance            REAL    25 AUTOSET
+Frequency              REAL    26 AUTOSET(model.parm("Frequency"))
 END_DATA
 
 END_MASK
@@ -15418,7 +15843,7 @@ DEFINE_MASK CSVDATA SDDP_mcnvlcc
 
 DEFINE_HEADER
 $version=1
-!Day,Month,Year,Code,Name,ACBusCode,DCBusCode,GroundBusCode,Existing,Decommissioned,NominalCurrent,Xc,MinTap,MaxTap,TapSteps,MaxDcAcCapacity,MaxAcDcCapacity,MinIgnitionAngle,MaxIgnitionAngle,DesiredIgnitionAngle,MinExtinctionAngle,MaxExtinctionAngle,DesiredExtinctionAngle,Capacitance
+!Day,Month,Year,Code,Name,ACBusCode,DCBusCode,GroundBusCode,Existing,Decommissioned,NominalCurrent,Xc,MinTap,MaxTap,TapSteps,MaxDcAcCapacity,MaxAcDcCapacity,MinIgnitionAngle,MaxIgnitionAngle,DesiredIgnitionAngle,MinExtinctionAngle,MaxExtinctionAngle,DesiredExtinctionAngle,NominalPower,Capacitance
 END_HEADER
 
 DEFINE_DATA
@@ -15445,7 +15870,8 @@ DesiredIgnitionAngle   REAL    20 AUTOSET
 MinExtinctionAngle     REAL    21 AUTOSET
 MaxExtinctionAngle     REAL    22 AUTOSET
 DesiredExtinctionAngle REAL    23 AUTOSET
-Capacitance            REAL    24 AUTOSET
+NominalPower           REAL    24 AUTOSET
+Capacitance            REAL    25 AUTOSET
 END_DATA
 
 END_MASK
@@ -16417,6 +16843,30 @@ $version=1
 !code,Date,block,MinFlow,MaxFlow,MinFlowEmergency,MaxFlowEmergency
 END_HEADER
 END_MASK
+//---------------------------------------------------------------------
+//---------------------------------------------------------------------
+DEFINE_MASK CSVDATA SDDP_dcbusvolt
+DEFINE_AUTOMATIC_INFO
+FILENAME dcbusvolt.dat
+VERSION 1
+CONTEXT_READ sddpac
+CONTEXT_WRITE sddpac
+CLASSNAME PSRBusDC
+MODEL  MODL:SDDP_DCBus
+ATTRIBUTE_ID code
+END_AUTOMATIC_INFO
+
+DEFINE_DATA
+code        REFERENCE   1
+DateVolt    DATE        2 YYYY/MM/DD AUTOSET
+block       INTEGER     3
+Volt        REAL        4
+END_DATA
+DEFINE_HEADER
+$version=1
+!code,Date,block,Volt
+END_HEADER
+END_MASK
 
 //---------------------------------------------------------------------
 //---------------------------------------------------------------------
@@ -16483,7 +16933,7 @@ DEFINE_DATA
 code        REFERENCE   1
 DateTap     DATE        2 YYYY/MM/DD AUTOSET
 block       INTEGER     3
-Tap         INTEGER     4
+Tap         REAL        4
 END_DATA
 DEFINE_HEADER
 $version=1
@@ -16531,7 +16981,7 @@ DEFINE_DATA
 code                 REFERENCE   1
 DateUnitsInService   DATE        2 YYYY/MM/DD AUTOSET
 block                INTEGER     3
-UnitsInService       REAL        4
+UnitsInService       INTEGER     4
 END_DATA
 DEFINE_HEADER
 $version=1
@@ -16634,7 +17084,6 @@ $version=1
 !code,Date,block,Setpoint
 END_HEADER
 END_MASK
-
 //---------------------------------------------------------------------
 //---------------------------------------------------------------------
 DEFINE_MASK CSVDATA SDDP_hlgc
@@ -17233,6 +17682,19 @@ ElementType            INTEGER  3
 Coefficient            REAL     4
 END_DATA
 END_MASK
+
+DEFINE_MASK CSVDATA SDDP_mip_dyn_conv
+
+DEFINE_DATA
+Step                INTEGER,1
+MaxTime  	          REAL,2
+Tolerance			      REAL,3
+END_DATA
+DEFINE_HEADER
+!Step,MaxTime,Tolerance
+END_HEADER
+END_MASK
+
 //---------------------------------------------------------------------
 //---------------------------------------------------------------------
 DEFINE_MASK ROWDATA SDDP_v10.3_cloads