psr-factory 4.1.0b11__py3-none-win_amd64.whl → 4.1.0b12__py3-none-win_amd64.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (16) hide show
  1. psr/cloud/cloud.py +361 -33
  2. psr/cloud/data.py +18 -1
  3. psr/cloud/xml.py +2 -0
  4. psr/factory/__init__.py +1 -1
  5. psr/factory/api.py +5 -0
  6. psr/factory/factory.dll +0 -0
  7. psr/factory/factory.pmd +448 -74
  8. psr/factory/factory.pmk +409 -101
  9. psr/factory/libcurl-x64.dll +0 -0
  10. psr/factory/samples/{sddp_1_stage_case01.py → sddp_case01.py} +6 -10
  11. psr/factory/samples/sddp_case21.py +242 -0
  12. {psr_factory-4.1.0b11.dist-info → psr_factory-4.1.0b12.dist-info}/METADATA +3 -3
  13. {psr_factory-4.1.0b11.dist-info → psr_factory-4.1.0b12.dist-info}/RECORD +16 -15
  14. {psr_factory-4.1.0b11.dist-info → psr_factory-4.1.0b12.dist-info}/WHEEL +0 -0
  15. {psr_factory-4.1.0b11.dist-info → psr_factory-4.1.0b12.dist-info}/licenses/LICENSE.txt +0 -0
  16. {psr_factory-4.1.0b11.dist-info → psr_factory-4.1.0b12.dist-info}/top_level.txt +0 -0
psr/factory/factory.pmk CHANGED
@@ -4026,7 +4026,7 @@ END_MASK
4026
4026
  DEFINE_MASK ROWDATA NETPLAN_v2.6_Dsis
4027
4027
 
4028
4028
  DEFINE_HEADER
4029
- $NETPLAN: 02.06.00
4029
+ $NETPLAN: 03.04.00
4030
4030
  (S (........Name......) S
4031
4031
  END_HEADER
4032
4032
 
@@ -4042,7 +4042,7 @@ END_MASK
4042
4042
  DEFINE_MASK ROWDATA NETPLAN_v2.6_Dcfg
4043
4043
 
4044
4044
  DEFINE_HEADER
4045
- $NETPLAN: 02.06.00
4045
+ $NETPLAN: 03.04.00
4046
4046
  (..Date..) (..Cfg_Id..)
4047
4047
  END_HEADER
4048
4048
 
@@ -4057,7 +4057,7 @@ END_MASK
4057
4057
  DEFINE_MASK ROWDATA NETPLAN_v2.6_Dpat
4058
4058
 
4059
4059
  DEFINE_HEADER
4060
- $NETPLAN: 02.06.00
4060
+ $NETPLAN: 03.04.00
4061
4061
  (..Dem_Id..)
4062
4062
  END_HEADER
4063
4063
 
@@ -4085,7 +4085,7 @@ END_MASK
4085
4085
  DEFINE_MASK ROWDATA NETPLAN_v2.6_Ddur
4086
4086
 
4087
4087
  DEFINE_HEADER
4088
- $NETPLAN: 02.06.00
4088
+ $NETPLAN: 03.04.00
4089
4089
  (..Date..) (..Cfg_Id..) (..Dem_Id..) (Dura)
4090
4090
  END_HEADER
4091
4091
 
@@ -4102,7 +4102,7 @@ END_MASK
4102
4102
  DEFINE_MASK ROWDATA NETPLAN_v2.6_Dcte
4103
4103
 
4104
4104
  DEFINE_HEADER
4105
- $NETPLAN: 02.06.00
4105
+ $NETPLAN: 03.04.00
4106
4106
  (ID) (.Value)
4107
4107
  END_HEADER
4108
4108
 
@@ -4117,7 +4117,7 @@ END_MASK
4117
4117
  DEFINE_MASK ROWDATA NETPLAN_v2.6_Dare
4118
4118
 
4119
4119
  DEFINE_HEADER
4120
- $NETPLAN: 02.06.00
4120
+ $NETPLAN: 03.04.00
4121
4121
  (Ar) (......Name.......) (IPrg) (IMin) (IMax)
4122
4122
  END_HEADER
4123
4123
 
@@ -4153,7 +4153,7 @@ END_MASK
4153
4153
  DEFINE_MASK ROWDATA NETPLAN_v2.6_Dreg
4154
4154
 
4155
4155
  DEFINE_HEADER
4156
- $NETPLAN: 02.06.00
4156
+ $NETPLAN: 03.04.00
4157
4157
  (R (.......Rnam.......)
4158
4158
  END_HEADER
4159
4159
 
@@ -4168,7 +4168,7 @@ END_MASK
4168
4168
  DEFINE_MASK ROWDATA NETPLAN_v2.6_Dbar
4169
4169
 
4170
4170
  DEFINE_HEADER
4171
- $NETPLAN: 02.06.00
4171
+ $NETPLAN: 03.04.00
4172
4172
  (Bus) (...Name...) O (.kV.) (Ar) Rg Si (..Date..) C (.Cost.)
4173
4173
  END_HEADER
4174
4174
 
@@ -4210,7 +4210,7 @@ END_MASK
4210
4210
  DEFINE_MASK ROWDATA NETPLAN_v2.6_Dger
4211
4211
 
4212
4212
  DEFINE_HEADER
4213
- $NETPLAN: 02.06.00
4213
+ $NETPLAN: 03.04.00
4214
4214
  (Ng) (...GNam...) O (Bus) (...Name...) T Nu (Pmin) (Pmax) (Qmin) (Qmax) (PrbF) (..Date..) C (Ktr) (.Ktr Name.)
4215
4215
  END_HEADER
4216
4216
 
@@ -4265,7 +4265,7 @@ END_MASK
4265
4265
  DEFINE_MASK ROWDATA NETPLAN_v2.6_Dlin
4266
4266
 
4267
4267
  DEFINE_HEADER
4268
- $NETPLAN: 02.07.60
4268
+ $NETPLAN: 03.04.00
4269
4269
  (Bfr) (Bto) Nc O W (.R%.) (.X%.) (MVAr) (.Rn.) (.Re.) (.Fp.) (.Cost.) (..Date..) C (KeyC) TC (Name......) (EF (..Km..)
4270
4270
  END_HEADER
4271
4271
 
@@ -4296,7 +4296,7 @@ END_MASK
4296
4296
  DEFINE_MASK ROWDATA NETPLAN_v2.6_Mlin
4297
4297
 
4298
4298
  DEFINE_HEADER
4299
- $NETPLAN: 02.07.60
4299
+ $NETPLAN: 03.04.00
4300
4300
  (Bfr) (Bto) Nc O W (.R%.) (.X%.) (MVAr) (.Rn.) (.Re.) (.Fp.) (.Cost.) (..Date..) C (KeyC) TC (Name......) (EF (..Km..)
4301
4301
  END_HEADER
4302
4302
 
@@ -4323,7 +4323,7 @@ END_MASK
4323
4323
  DEFINE_MASK ROWDATA NETPLAN_v2.6_Dlad
4324
4324
 
4325
4325
  DEFINE_HEADER
4326
- $NETPLAN: 02.07.60
4326
+ $NETPLAN: 03.04.00
4327
4327
  (Bfr) (Bto) Nc O W (.R%.) (.X%.) (MVAr) (.Rn.) (.Re.) (.Fp.) (.Cost.) (..Date..) C (KeyC) TC (Name......) (EF (..Km..) I
4328
4328
  END_HEADER
4329
4329
 
@@ -4356,7 +4356,7 @@ END_MASK
4356
4356
  DEFINE_MASK ROWDATA NETPLAN_v2.6_Dtrf
4357
4357
 
4358
4358
  DEFINE_HEADER
4359
- $NETPLAN: 02.06.00
4359
+ $NETPLAN: 03.04.00
4360
4360
  (Bfr) (Bto) Nc O W (.R%.) (.X%.) (Tmn) (Tmx) (PMn) (PMx) TC (BCn) Nt (.Rn.) (.Re.) (.Fp.) (.Cost.) (..Date..) C (KeyC) (Name......)
4361
4361
  END_HEADER
4362
4362
 
@@ -4390,7 +4390,7 @@ END_MASK
4390
4390
  DEFINE_MASK ROWDATA NETPLAN_v2.6_Dtad
4391
4391
 
4392
4392
  DEFINE_HEADER
4393
- $NETPLAN: 02.06.00
4393
+ $NETPLAN: 03.04.00
4394
4394
  (Bfr) (Bto) Nc O W (.R%.) (.X%.) (Tmn) (Tmx) (PMn) (PMx) TC (BCn) Nt (.Rn.) (.Re.) (.Fp.) (.Cost.) (..Date..) C (KeyC) (Name......) I
4395
4395
  END_HEADER
4396
4396
 
@@ -4424,7 +4424,7 @@ END_MASK
4424
4424
  DEFINE_MASK ROWDATA NETPLAN_v2.6_Dshl
4425
4425
 
4426
4426
  DEFINE_HEADER
4427
- $NETPLAN: 02.06.00
4427
+ $NETPLAN: 03.04.00
4428
4428
  (Ns) (...SNam...) O (Bfr) (BTo) Nc (MVAr) B (K$/Uni) (..Date..) C
4429
4429
  END_HEADER
4430
4430
 
@@ -4447,7 +4447,7 @@ END_MASK
4447
4447
  DEFINE_MASK ROWDATA NETPLAN_v2.6_Dcsc
4448
4448
 
4449
4449
  DEFINE_HEADER
4450
- $NETPLAN: 02.07.60
4450
+ $NETPLAN: 03.04.00
4451
4451
  (Bfr) (Bto) Nc O W (XMn%) (XDe%) (XMx%) (VEsp) (.Rn.) (.Re.) (.Fp.) (.Cost.) (..Date..) C (KeyC) TC (Name......) (EF (..Km..) B T
4452
4452
  END_HEADER
4453
4453
 
@@ -4482,7 +4482,7 @@ END_MASK
4482
4482
  DEFINE_MASK ROWDATA NETPLAN_v2.6_Dctg
4483
4483
 
4484
4484
  DEFINE_HEADER
4485
- $NETPLAN: 02.06.00
4485
+ $NETPLAN: 03.04.00
4486
4486
  (Bfr) (Bto) Nc (KeyC) (.Bnam Fr..) (.Bnam To..)
4487
4487
  END_HEADER
4488
4488
 
@@ -4500,7 +4500,7 @@ END_MASK
4500
4500
  //---------------------------------------------------------------------
4501
4501
  DEFINE_MASK ROWDATA NETPLAN_v2.6_Dcba
4502
4502
  DEFINE_HEADER
4503
- $NETPLAN: 02.06.02
4503
+ $NETPLAN: 03.04.00
4504
4504
  (BDC) (..BDCnam..) O T P (Volt) (.kV.) (.Rs) (Ar) Rg Si (DC) (..Date..) C (.Cost.)
4505
4505
  END_HEADER
4506
4506
 
@@ -4528,7 +4528,7 @@ END_MASK
4528
4528
  DEFINE_MASK ROWDATA NETPLAN_v2.6_Dcli
4529
4529
 
4530
4530
  DEFINE_HEADER
4531
- $NETPLAN: 02.06.02
4531
+ $NETPLAN: 03.04.00
4532
4532
  (Bfr) (Bto) Nc O W (..R.) (..L.) (.Cn.) (.Cost.) (..Date..) C (KeyC) (Name......)
4533
4533
  END_HEADER
4534
4534
 
@@ -4552,7 +4552,7 @@ END_MASK
4552
4552
  //---------------------------------------------------------------------
4553
4553
  DEFINE_MASK ROWDATA NETPLAN_v2.6_Dcnv
4554
4554
  DEFINE_HEADER
4555
- $NETPLAN: 02.06.02
4555
+ $NETPLAN: 03.04.00
4556
4556
  (No.) O W (CA.) (CC.) (EL.) T p (Ino.) (.Xc.) (Vfs.) (Snt.) (Rra.) (Lra.) F C (Vmn.) (Vmx.) (Dsp.) (Dtn.) (Dtm.) (Tmn.) (Tmx.) (S (.Cost.) (..Date..) C (...Name...)
4557
4557
  END_HEADER
4558
4558
  DEFINE_DATA
@@ -4621,7 +4621,7 @@ END_MASK
4621
4621
  DEFINE_MASK ROWDATA NETPLAN_v3.0_dbar
4622
4622
 
4623
4623
  DEFINE_HEADER
4624
- $NETPLAN: 03.00.83
4624
+ $NETPLAN: 03.04.00
4625
4625
  (Bus) (...Name...) O (.kV.) (Ar) Rg Si (..Date..) C (.Cost.) Ty CC
4626
4626
  END_HEADER
4627
4627
 
@@ -4753,7 +4753,7 @@ END_MASK
4753
4753
  //---------------------------------------------------------------------
4754
4754
  DEFINE_MASK ROWDATA NETPLAN_v03.02.30_Dcba
4755
4755
  DEFINE_HEADER
4756
- $NETPLAN: 03.02.30
4756
+ $NETPLAN: 03.04.00
4757
4757
  (Bus) (...Name...) O T P (.kV.) (.Rs) (Ar) Rg Si (Elo (..Date..) C
4758
4758
  END_HEADER
4759
4759
 
@@ -6645,25 +6645,19 @@ CREATE_OBJECTS TRUE
6645
6645
  END_AUTOMATIC_INFO
6646
6646
 
6647
6647
  DEFINE_DATA
6648
- Name STRING,1 AUTOSET(model.parm("Name"))
6649
- UnitCode INTEGER,2 AUTOSET(model.parm("UnitCode"))
6650
- MinDateDay INTEGER,3 AUTOSET(model.parm("MinDateDay"))
6651
- MinDateMonth INTEGER,4 AUTOSET(model.parm("MinDateMonth"))
6652
- MinDateYear INTEGER,5 AUTOSET(model.parm("MinDateYear"))
6653
- MaxDateDay INTEGER,6 AUTOSET(model.parm("MaxDateDay"))
6654
- MaxDateMonth INTEGER,7 AUTOSET(model.parm("MaxDateMonth"))
6655
- MaxDateYear INTEGER,8 AUTOSET(model.parm("MaxDateYear"))
6656
- Duration INTEGER,9 AUTOSET(model.parm("Duration"))
6657
- PrefDateDay INTEGER,10 AUTOSET(model.parm("PrefDateDay"))
6658
- PrefDateMonth INTEGER,11 AUTOSET(model.parm("PrefDateMonth"))
6659
- PrefDateYear INTEGER,12 AUTOSET(model.parm("PrefDateYear"))
6660
- Score REAL,13 AUTOSET(model.parm("Score"))
6661
- Fix INTEGER,14 AUTOSET(model.parm("Fix"))
6662
- Plant REFERENCE,15 AUTOSET(model.parm("Plant"))
6648
+ Name STRING,1 AUTOSET(model.parm("Name"))
6649
+ UnitCode INTEGER,2 AUTOSET(model.parm("UnitCode"))
6650
+ MinDate DATE,3 DD/MM/YYYY AUTOSET(model.parm("MinDate"))
6651
+ MaxDate DATE,4 DD/MM/YYYY AUTOSET(model.parm("MaxDate"))
6652
+ Duration INTEGER,5 AUTOSET(model.parm("Duration"))
6653
+ PrefDate DATE,6 DD/MM/YYYY AUTOSET(model.parm("PrefDate"))
6654
+ Score REAL,7 AUTOSET(model.parm("Score"))
6655
+ Fix INTEGER,8 AUTOSET(model.parm("Fix"))
6656
+ Plant REFERENCE,9 AUTOSET(model.parm("Plant"))
6663
6657
  END_DATA
6664
6658
  DEFINE_HEADER
6665
6659
  $version=3
6666
- !Name,UnitCode,MinDateDay,MinDateMonth,MinDateYear,MaxDateDay,MaxDateMonth,MaxDateYear,Duration,PrefDateDay,PrefDateMonth,PrefDateYear,Score,Fix,Plant
6660
+ !Name,UnitCode,MinDate,MaxDate,Duration,PrefDate,Score,Fix,Plant
6667
6661
  END_HEADER
6668
6662
  END_MASK
6669
6663
  //--------------------------------------------------------------------------------------------------
@@ -6855,30 +6849,6 @@ $version=1
6855
6849
  END_HEADER
6856
6850
  END_MASK
6857
6851
  //--------------------------------------------------------------------------------------------------
6858
- // OptMain V2 - PSRPlant Vectors indexed by RestDate
6859
- //--------------------------------------------------------------------------------------------------
6860
- DEFINE_MASK CSVDATA Optmain_optmstgcstr
6861
- DEFINE_AUTOMATIC_INFO
6862
- FILENAME optmstgcstr.dat
6863
- VERSION 1
6864
- CONTEXT_READ optmain
6865
- CONTEXT_WRITE optmain
6866
- CLASSNAME PSRPlant
6867
- MODEL StageCstr
6868
- MERGE_OBJECTS TRUE
6869
- END_AUTOMATIC_INFO
6870
-
6871
- DEFINE_DATA
6872
- PSRPlant REFERENCE,1
6873
- RestDate DATE,2 YYYY/MM/DD AUTOSET
6874
- RestrictedStages INTEGER,3 AUTOSET
6875
- END_DATA
6876
- DEFINE_HEADER
6877
- $version=1
6878
- !PSRPlant,RestDate,RestrictedStages
6879
- END_HEADER
6880
- END_MASK
6881
- //--------------------------------------------------------------------------------------------------
6882
6852
  // OptMain V2 - PSRSystem Vectors indexed by MinResDate
6883
6853
  //--------------------------------------------------------------------------------------------------
6884
6854
  DEFINE_MASK CSVDATA Optmain_optmresmin_v2
@@ -6903,31 +6873,6 @@ $version=2
6903
6873
  END_HEADER
6904
6874
  END_MASK
6905
6875
  //--------------------------------------------------------------------------------------------------
6906
- // OptMain V2 - PSRSystem Non indexed vectors
6907
- //--------------------------------------------------------------------------------------------------
6908
- DEFINE_MASK CSVDATA Optmain_optmload_v2
6909
-
6910
- DEFINE_AUTOMATIC_INFO
6911
- FILENAME optmload.dat
6912
- VERSION 2
6913
- CONTEXT_READ optmain
6914
- CONTEXT_WRITE optmain
6915
- CLASSNAME PSRSystem
6916
- MODEL InstDem
6917
- MERGE_OBJECTS TRUE
6918
- END_AUTOMATIC_INFO
6919
-
6920
- DEFINE_DATA
6921
- PSRSystem REFERENCE,1
6922
- InstantDemandDate DATE,2 YYYY/MM/DD AUTOSET
6923
- InstantDemand REAL,3 AUTOSET
6924
- END_DATA
6925
- DEFINE_HEADER
6926
- $version=2
6927
- !PSRSystem,InstantDemandDate,InstantDemand
6928
- END_HEADER
6929
- END_MASK
6930
- //--------------------------------------------------------------------------------------------------
6931
6876
  // OptMain V2 - PSRMaintenancePrecedence Identification and parameters
6932
6877
  //--------------------------------------------------------------------------------------------------
6933
6878
  DEFINE_MASK CSVDATA Optmain_optmprec_v2
@@ -6988,6 +6933,7 @@ CONTEXT_WRITE optmain
6988
6933
  CLASSNAME PSRPlant
6989
6934
  MODEL UnitFactors
6990
6935
  MERGE_OBJECTS TRUE
6936
+ VECTOR_OBJECTS TRUE
6991
6937
  END_AUTOMATIC_INFO
6992
6938
 
6993
6939
  DEFINE_DATA
@@ -7012,6 +6958,7 @@ CONTEXT_WRITE optmain
7012
6958
  CLASSNAME PSRPlant
7013
6959
  MODEL UnitCodes
7014
6960
  MERGE_OBJECTS TRUE
6961
+ VECTOR_OBJECTS TRUE
7015
6962
  END_AUTOMATIC_INFO
7016
6963
 
7017
6964
  DEFINE_DATA
@@ -7024,6 +6971,55 @@ $version=2
7024
6971
  END_HEADER
7025
6972
  END_MASK
7026
6973
 
6974
+ //--------------------------------------------------------------------------------------------------
6975
+ // OptMain - PSRArea Vectors indexed by MinResDate
6976
+ //--------------------------------------------------------------------------------------------------
6977
+ DEFINE_MASK CSVDATA Optmain_optmresmina
6978
+ DEFINE_AUTOMATIC_INFO
6979
+ FILENAME optmresmina.dat
6980
+ VERSION 1
6981
+ CONTEXT_READ optmain
6982
+ CONTEXT_WRITE optmain
6983
+ CLASSNAME PSRArea
6984
+ MODEL MinResArea
6985
+ MERGE_OBJECTS TRUE
6986
+ END_AUTOMATIC_INFO
6987
+
6988
+ DEFINE_DATA
6989
+ PSRArea REFERENCE,1
6990
+ MinResDate DATE,2 YYYY/MM/DD AUTOSET
6991
+ MinimumReserve REAL,3 AUTOSET
6992
+ END_DATA
6993
+ DEFINE_HEADER
6994
+ $version=1
6995
+ !PSRArea,MinResDate,MinimumReserve
6996
+ END_HEADER
6997
+ END_MASK
6998
+
6999
+ //--------------------------------------------------------------------------------------------------
7000
+ // OptMain V2 - PSRPlant Vectors indexed by InitialDateRestricted
7001
+ //--------------------------------------------------------------------------------------------------
7002
+ DEFINE_MASK CSVDATA Optmain_optmstgcstr
7003
+ DEFINE_AUTOMATIC_INFO
7004
+ FILENAME optmstgcstr.dat
7005
+ VERSION 1
7006
+ CONTEXT_READ optmain
7007
+ CONTEXT_WRITE optmain
7008
+ CLASSNAME PSRPlant
7009
+ MODEL StageCstr
7010
+ MERGE_OBJECTS TRUE
7011
+ END_AUTOMATIC_INFO
7012
+
7013
+ DEFINE_DATA
7014
+ PSRPlant REFERENCE,1
7015
+ InitialDateRestricted DATE,2 YYYY/MM/DD AUTOSET
7016
+ EndDateRestricted DATE,3 YYYY/MM/DD AUTOSET
7017
+ END_DATA
7018
+ DEFINE_HEADER
7019
+ $version=1
7020
+ !PSRPlant,InitialDateRestricted,EndDateRestricted
7021
+ END_HEADER
7022
+ END_MASK
7027
7023
  DEFINE_MASK CSVDATA Reliability_Generation
7028
7024
  DEFINE_HEADER
7029
7025
  Barra, Sis, Tp, Cod, Nome, Uni, Pmn, Pmx, Qmn, Qmx, tx.Falha, tx.Retor
@@ -7468,7 +7464,7 @@ END_HEADER
7468
7464
 
7469
7465
  DEFINE_DATA
7470
7466
  Num INTEGER 1,4
7471
- Nome STRING 6,25
7467
+ Nome STRING 6,17
7472
7468
  ID STRING 27,28
7473
7469
  UnM STRING 30,32 AUTOSET(model.parm("UnM"))
7474
7470
  END_DATA
@@ -7482,7 +7478,7 @@ END_HEADER
7482
7478
 
7483
7479
  DEFINE_DATA
7484
7480
  Num INTEGER 1,4
7485
- Nome STRING 6,25
7481
+ Nome STRING 6,17
7486
7482
  ID STRING 27,28
7487
7483
  UnM STRING 30,32 AUTOSET(model.parm("UnM"))
7488
7484
  TimeZoneOffset INTEGER 34,36 AUTOSET(model.parm("TimeZoneOffset"))
@@ -9674,7 +9670,7 @@ DEFINE_DATA
9674
9670
  Info STRING 1,4
9675
9671
  Num INTEGER 5,8
9676
9672
  Nome STRING 15,26
9677
- DefaultPenalty INTEGER 28,28 AUTOSET(model.parm("DefaultPenalty"))
9673
+ RHSType INTEGER 28,28 AUTOSET(model.parm("RHSType"))
9678
9674
  Penalty REAL 39,50 AUTOSET(model.parm("Penalty"))
9679
9675
  ReserveAreaCode INTEGER 56,59
9680
9676
  END_DATA
@@ -9878,7 +9874,6 @@ IdentBloco STRING 1,12 ****_Res_ger
9878
9874
  Num INTEGER 13,17
9879
9875
  Nome STRING 19,30
9880
9876
  JointReserveUnit INTEGER 52,53
9881
- JointReserveInfo INTEGER 55,56
9882
9877
  END_DATA
9883
9878
 
9884
9879
  END_BLOCK
@@ -9938,7 +9933,6 @@ IdentBloco STRING 1,12 ****_Res_ger
9938
9933
  Num INTEGER 13,17
9939
9934
  Nome STRING 19,30
9940
9935
  JointReserveUnit INTEGER 52,53
9941
- JointReserveInfo INTEGER 55,56
9942
9936
  END_DATA
9943
9937
 
9944
9938
  END_BLOCK
@@ -10899,7 +10893,6 @@ Num INTEGER 14,17
10899
10893
  Nome STRING 19,30
10900
10894
  TipoUsina STRING 38,38
10901
10895
  SingleReserveUnit INTEGER 52,53
10902
- SingleReserveInfo INTEGER 55,56
10903
10896
  END_DATA
10904
10897
  END_BLOCK
10905
10898
  //-------------------------------------------------------------
@@ -10958,7 +10951,6 @@ Num INTEGER 14,17
10958
10951
  Nome STRING 19,30
10959
10952
  TipoUsina STRING 38,38
10960
10953
  SingleReserveUnit INTEGER 52,53
10961
- SingleReserveInfo INTEGER 55,56
10962
10954
  END_DATA
10963
10955
  END_BLOCK
10964
10956
  //-------------------------------------------------------------
@@ -12939,7 +12931,7 @@ DEFINE_MASK CSVDATA SDDP_v14.0_opechd
12939
12931
 
12940
12932
  DEFINE_HEADER
12941
12933
  $version=1
12942
- !Code,Name........,TrubineTravelTime,SpillingTravelTime,DischargeRampUp,DischargeRampDown,RampUp,RampDown,Commitment,StartupCost,MaxStartup
12934
+ !Code,Name........,TurbiningTravelTime,SpillingTravelTime,DischargeRampUp,DischargeRampDown,RampUp,RampDown,Commitment,StartupCost,MaxStartup,TurbRampUp,TurbRampDown,SpilRampUp,SpilRampDown,ForebayRampUp,ForebayRampDown,ForebayRampUpDay,ForebayRampDownDay
12943
12935
  END_HEADER
12944
12936
 
12945
12937
  DEFINE_DATA
@@ -12954,6 +12946,14 @@ RampDown REAL,8 AUTOSET(model.parm("RampDown"))
12954
12946
  Commitment INTEGER,9 AUTOSET(model.parm("Commitment"))
12955
12947
  StartupCost REAL,10 AUTOSET(model.parm("StartupCost"))
12956
12948
  MaxStartup INTEGER,11 AUTOSET(model.parm("MaxStartup"))
12949
+ TurbRampUp REAL,12 AUTOSET(model.parm("TurbRampUp"))
12950
+ TurbRampDown REAL,13 AUTOSET(model.parm("TurbRampDown"))
12951
+ SpilRampUp REAL,14 AUTOSET(model.parm("SpilRampUp"))
12952
+ SpilRampDown REAL,15 AUTOSET(model.parm("SpilRampDown"))
12953
+ ForebayRampUp REAL,16 AUTOSET(model.parm("ForebayRampUp"))
12954
+ ForebayRampDown REAL,17 AUTOSET(model.parm("ForebayRampDown"))
12955
+ ForebayRampUpDay REAL,18 AUTOSET(model.parm("ForebayRampUpDay"))
12956
+ ForebayRampDownDay REAL,19 AUTOSET(model.parm("ForebayRampDownDay"))
12957
12957
  END_DATA
12958
12958
 
12959
12959
  END_MASK
@@ -13593,6 +13593,130 @@ END_DATA
13593
13593
  END_BLOCK
13594
13594
 
13595
13595
  END_MASK
13596
+ //---------------------------------------------------------------------
13597
+ //---------------------------------------------------------------------
13598
+ DEFINE_MASK MIXROWDATA SDDP_ccirme_V2
13599
+
13600
+ TOTAL_BLOCK 3
13601
+
13602
+ //-------------------------------------------------------------
13603
+ //-- PRIMEIRO BLOCO -> Identificacao da versao ---
13604
+ //-------------------------------------------------------------
13605
+ DEFINE_BLOCK
13606
+ BLOCK_IDENT $version=2
13607
+ BLOCK_LENGTH 1
13608
+ NEXT_BLOCK 2
13609
+
13610
+ DEFINE_DATA
13611
+ IdentBloco STRING 1,10 $version=2
13612
+ END_DATA
13613
+
13614
+ END_BLOCK
13615
+
13616
+ //-------------------------------------------------------------
13617
+ //-- SEGUNDO BLOCO -> Identificacao do Circuito ---
13618
+ //-------------------------------------------------------------
13619
+ DEFINE_BLOCK
13620
+ BLOCK_IDENT ****
13621
+ BLOCK_LENGTH 1
13622
+ NEXT_BLOCK 3
13623
+
13624
+ DEFINE_DATA
13625
+ IdentBloco STRING 1,12 ****_Planta:
13626
+ Num INTEGER 14,22
13627
+ Name STRING 24,44
13628
+ CostType STRING 46,48
13629
+ Currency STRING 50,52 AUTOSET(model.parm("Currency"))
13630
+ END_DATA
13631
+
13632
+ END_BLOCK
13633
+
13634
+ //-------------------------------------------------------------
13635
+ //-- TERCEIRO BLOCO -> Dados de custo ---
13636
+ //-------------------------------------------------------------
13637
+ DEFINE_BLOCK
13638
+ BLOCK_IDENT Year
13639
+
13640
+ DEFINE_HEADER
13641
+ Year Blk ......1 ......2 ......3 ......4 ......5 ......6 ......7 ......8 ......9 .....10 .....11 .....12
13642
+ END_HEADER
13643
+
13644
+ DEFINE_MACRO
13645
+ VAR N 1,12
13646
+ END_MACRO
13647
+
13648
+ DEFINE_DATA
13649
+ Ano INTEGER 1,4
13650
+ Bloco INTEGER 6,8
13651
+ Dado$(N) REAL 9+8*($(N)-1),16+8*($(N)-1)
13652
+ END_DATA
13653
+
13654
+ END_BLOCK
13655
+
13656
+ END_MASK
13657
+
13658
+ //---------------------------------------------------------------------
13659
+ //---------------------------------------------------------------------
13660
+ DEFINE_MASK MIXROWDATA SDDP_ctrfme_V2
13661
+
13662
+ TOTAL_BLOCK 3
13663
+
13664
+ //-------------------------------------------------------------
13665
+ //-- PRIMEIRO BLOCO -> Identificacao da versao ---
13666
+ //-------------------------------------------------------------
13667
+ DEFINE_BLOCK
13668
+ BLOCK_IDENT $version=2
13669
+ BLOCK_LENGTH 1
13670
+ NEXT_BLOCK 2
13671
+
13672
+ DEFINE_DATA
13673
+ IdentBloco STRING 1,10 $version=2
13674
+ END_DATA
13675
+
13676
+ END_BLOCK
13677
+
13678
+ //-------------------------------------------------------------
13679
+ //-- SEGUNDO BLOCO -> Identificacao do Circuito ---
13680
+ //-------------------------------------------------------------
13681
+ DEFINE_BLOCK
13682
+ BLOCK_IDENT ****
13683
+ BLOCK_LENGTH 1
13684
+ NEXT_BLOCK 3
13685
+
13686
+ DEFINE_DATA
13687
+ IdentBloco STRING 1,12 ****_Planta:
13688
+ Num INTEGER 14,22
13689
+ Name STRING 24,44
13690
+ CostType STRING 46,48
13691
+ Currency STRING 50,52 AUTOSET(model.parm("Currency"))
13692
+ END_DATA
13693
+
13694
+ END_BLOCK
13695
+
13696
+ //-------------------------------------------------------------
13697
+ //-- TERCEIRO BLOCO -> Dados de custo ---
13698
+ //-------------------------------------------------------------
13699
+ DEFINE_BLOCK
13700
+ BLOCK_IDENT Year
13701
+
13702
+ DEFINE_HEADER
13703
+ Year Blk ......1 ......2 ......3 ......4 ......5 ......6 ......7 ......8 ......9 .....10 .....11 .....12
13704
+ END_HEADER
13705
+
13706
+ DEFINE_MACRO
13707
+ VAR N 1,12
13708
+ END_MACRO
13709
+
13710
+ DEFINE_DATA
13711
+ Ano INTEGER 1,4
13712
+ Bloco INTEGER 6,8
13713
+ Dado$(N) REAL 9+8*($(N)-1),16+8*($(N)-1)
13714
+ END_DATA
13715
+
13716
+ END_BLOCK
13717
+
13718
+ END_MASK
13719
+
13596
13720
  //---------------------------------------------------------------------
13597
13721
  //---------------------------------------------------------------------
13598
13722
  DEFINE_MASK MIXROWDATA SDDP_ccirse
@@ -13638,6 +13762,125 @@ END_DATA
13638
13762
 
13639
13763
  END_BLOCK
13640
13764
 
13765
+ END_MASK
13766
+ //---------------------------------------------------------------------
13767
+ //---------------------------------------------------------------------
13768
+ DEFINE_MASK MIXROWDATA SDDP_ccirse_V2
13769
+
13770
+ TOTAL_BLOCK 3
13771
+
13772
+ //-------------------------------------------------------------
13773
+ //-- PRIMEIRO BLOCO -> Identificacao da versao ---
13774
+ //-------------------------------------------------------------
13775
+ DEFINE_BLOCK
13776
+ BLOCK_IDENT $version=2
13777
+ BLOCK_LENGTH 1
13778
+ NEXT_BLOCK 2
13779
+
13780
+ DEFINE_DATA
13781
+ IdentBloco STRING 1,10 $version=2
13782
+ END_DATA
13783
+
13784
+ END_BLOCK
13785
+ //-------------------------------------------------------------
13786
+ //-- SEGUNDO BLOCO -> Identificacao do Circuito ---
13787
+ //-------------------------------------------------------------
13788
+ DEFINE_BLOCK
13789
+ BLOCK_IDENT ****
13790
+ BLOCK_LENGTH 1
13791
+ NEXT_BLOCK 3
13792
+
13793
+ DEFINE_DATA
13794
+ IdentBloco STRING 1,12 ****_Planta:
13795
+ Num INTEGER 14,22
13796
+ Name STRING 24,44
13797
+ CostType STRING 46,48
13798
+ Currency STRING 50,52 AUTOSET(model.parm("Currency"))
13799
+ END_DATA
13800
+
13801
+ END_BLOCK
13802
+ //-------------------------------------------------------------
13803
+ //-- TERCEIRO BLOCO -> Dados de Custo ---
13804
+ //-------------------------------------------------------------
13805
+ DEFINE_BLOCK
13806
+ BLOCK_IDENT YEAR
13807
+
13808
+ DEFINE_HEADER
13809
+ YEAR BLK 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52
13810
+ END_HEADER
13811
+
13812
+ DEFINE_MACRO
13813
+ VAR N 1,52
13814
+ END_MACRO
13815
+
13816
+ DEFINE_DATA
13817
+ Ano INTEGER 1,4
13818
+ Bloco INTEGER 6,8
13819
+ Dado$(N) REAL 9+8*($(N)-1),16+8*($(N)-1)
13820
+ END_DATA
13821
+
13822
+ END_BLOCK
13823
+
13824
+ END_MASK
13825
+
13826
+ //---------------------------------------------------------------------
13827
+ //---------------------------------------------------------------------
13828
+ DEFINE_MASK MIXROWDATA SDDP_ctrfse_V2
13829
+
13830
+ TOTAL_BLOCK 3
13831
+
13832
+ //-------------------------------------------------------------
13833
+ //-- PRIMEIRO BLOCO -> Identificacao da versao ---
13834
+ //-------------------------------------------------------------
13835
+ DEFINE_BLOCK
13836
+ BLOCK_IDENT $version=2
13837
+ BLOCK_LENGTH 1
13838
+ NEXT_BLOCK 2
13839
+
13840
+ DEFINE_DATA
13841
+ IdentBloco STRING 1,10 $version=2
13842
+ END_DATA
13843
+
13844
+ END_BLOCK
13845
+ //-------------------------------------------------------------
13846
+ //-- SEGUNDO BLOCO -> Identificacao do Circuito ---
13847
+ //-------------------------------------------------------------
13848
+ DEFINE_BLOCK
13849
+ BLOCK_IDENT ****
13850
+ BLOCK_LENGTH 1
13851
+ NEXT_BLOCK 3
13852
+
13853
+ DEFINE_DATA
13854
+ IdentBloco STRING 1,12 ****_Planta:
13855
+ Num INTEGER 14,22
13856
+ Name STRING 24,44
13857
+ CostType STRING 46,48
13858
+ Currency STRING 50,52 AUTOSET(model.parm("Currency"))
13859
+ END_DATA
13860
+
13861
+ END_BLOCK
13862
+ //-------------------------------------------------------------
13863
+ //-- TERCEIRO BLOCO -> Dados de Custo ---
13864
+ //-------------------------------------------------------------
13865
+ DEFINE_BLOCK
13866
+ BLOCK_IDENT YEAR
13867
+
13868
+ DEFINE_HEADER
13869
+ YEAR BLK 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52
13870
+ END_HEADER
13871
+
13872
+ DEFINE_MACRO
13873
+ VAR N 1,52
13874
+ END_MACRO
13875
+
13876
+ DEFINE_DATA
13877
+ Ano INTEGER 1,4
13878
+ Bloco INTEGER 6,8
13879
+ Dado$(N) REAL 9+8*($(N)-1),16+8*($(N)-1)
13880
+ END_DATA
13881
+
13882
+ END_BLOCK
13883
+
13641
13884
  END_MASK
13642
13885
  //---------------------------------------------------------------------
13643
13886
  //---------------------------------------------------------------------
@@ -14438,7 +14681,7 @@ HydroFrom STRING, 3
14438
14681
  HydroTo STRING, 4
14439
14682
  FlowMin REAL, 5 AUTOSET(model.parm("FlowMin"))
14440
14683
  FlowMax REAL, 6 AUTOSET(model.parm("FlowMax"))
14441
- TravelTime REAL, 7 AUTOSET(model.parm("TravelTime"))
14684
+ TravelTime INTEGER, 7 AUTOSET(model.parm("TravelTime"))
14442
14685
  Currency STRING, 8 AUTOSET(model.parm("Currency"))
14443
14686
  Disabled INTEGER, 9 AUTOSET(model.parm("Disabled"))
14444
14687
  END_DATA
@@ -15654,10 +15897,10 @@ R REAL 14 AUTOSET
15654
15897
  MeteringEnd INTEGER 15 AUTOSET(model.parm("MeteringEnd"))
15655
15898
  ReactivePowerFactorFrom REAL 16 AUTOSET
15656
15899
  ReactivePowerFactorTo REAL 17 AUTOSET
15657
- WheelingCostFromTo REAL 18 AUTOSET(model.parm("WheelingCostFromTo"))
15658
- WheelingCostToFrom REAL 19 AUTOSET(model.parm("WheelingCostToFrom"))
15659
- Currency STRING 20 AUTOSET(model.parm("Currency"))
15660
- ReserveMargin REAL 21 AUTOSET(model.parm("ReserveMargin"))
15900
+ WheelingCostFromTo REAL 18 AUTOSET
15901
+ WheelingCostToFrom REAL 19 AUTOSET
15902
+ Currency STRING 20 AUTOSET(model.parm("Currency"))
15903
+ ReserveMargin REAL 21 AUTOSET(model.parm("ReserveMargin"))
15661
15904
 
15662
15905
  END_DATA
15663
15906
 
@@ -15667,7 +15910,7 @@ DEFINE_MASK CSVDATA SDDP_mdclink
15667
15910
 
15668
15911
  DEFINE_HEADER
15669
15912
  $version=1
15670
- !Day,Month,Year,Code,Name,BusFrom,BusTo,Existing,Decommissioned,CapacityFromTo,CapacityToFrom,LossFactorFromTo,LossFactorToFrom,CapacityEmergencyFromTo,CapacityEmergencyToFrom,R,ReactivePowerFactorFrom,ReactivePowerFactorTo
15913
+ !Day,Month,Year,Code,Name,BusFrom,BusTo,Existing,Decommissioned,CapacityFromTo,CapacityToFrom,LossFactorFromTo,LossFactorToFrom,CapacityEmergencyFromTo,CapacityEmergencyToFrom,R,ReactivePowerFactorFrom,ReactivePowerFactorTo,WheelingCostFromTo,WheelingCostToFrom
15671
15914
  END_HEADER
15672
15915
 
15673
15916
  DEFINE_DATA
@@ -15689,6 +15932,8 @@ CapacityEmergencyToFrom REAL 15 AUTOSET
15689
15932
  R REAL 16 AUTOSET
15690
15933
  ReactivePowerFactorFrom REAL 17 AUTOSET
15691
15934
  ReactivePowerFactorTo REAL 18 AUTOSET
15935
+ WheelingCostFromTo REAL 19 AUTOSET
15936
+ WheelingCostToFrom REAL 20 AUTOSET
15692
15937
 
15693
15938
  END_DATA
15694
15939
  END_MASK
@@ -17718,6 +17963,69 @@ FlagScenario INTEGER 6 AUTOSET(model.parm("FlagScenario"))
17718
17963
  END_DATA
17719
17964
 
17720
17965
  END_MASK
17966
+
17967
+ //--------------------------------------------------------------------------------------------------
17968
+ // PSRStudy Identification and parameters
17969
+ //--------------------------------------------------------------------------------------------------
17970
+ DEFINE_MASK CSVDATA network-report
17971
+
17972
+ DEFINE_AUTOMATIC_INFO
17973
+ FILENAME psrnetwork-report.dat
17974
+ VERSION 2
17975
+ CONTEXT_READ network-report
17976
+ CONTEXT_WRITE network-report
17977
+ CLASSNAME PSRStudy
17978
+ MODEL NetworkReportConfiguration
17979
+ CREATE_OBJECTS TRUE
17980
+ MERGE_OBJECTS TRUE
17981
+ END_AUTOMATIC_INFO
17982
+
17983
+ DEFINE_DATA
17984
+ circuits INTEGER,1 AUTOSET(model.parm("circuits"))
17985
+ contingencies INTEGER,2 AUTOSET(model.parm("contingencies"))
17986
+ bridges INTEGER,3 AUTOSET(model.parm("bridges"))
17987
+ binary INTEGER,4 AUTOSET(model.parm("binary"))
17988
+ threshold REAL,5 AUTOSET(model.parm("threshold"))
17989
+ fix_first_block INTEGER,6 AUTOSET(model.parm("fix_first_block"))
17990
+ export_beta_matrix INTEGER,7 AUTOSET(model.parm("export_beta_matrix"))
17991
+ export_b_matrix INTEGER,8 AUTOSET(model.parm("export_b_matrix"))
17992
+ matrix_export_first_stage INTEGER,9 AUTOSET(model.parm("matrix_export_first_stage"))
17993
+ matrix_export_first_year INTEGER,10 AUTOSET(model.parm("matrix_export_first_year"))
17994
+ matrix_export_last_stage INTEGER,11 AUTOSET(model.parm("matrix_export_last_stage"))
17995
+ matrix_export_last_year INTEGER,12 AUTOSET(model.parm("matrix_export_last_year"))
17996
+ cirflw_check INTEGER,13 AUTOSET(model.parm("cirflw_check"))
17997
+ print_elements INTEGER,14 AUTOSET(model.parm("print_elements"))
17998
+ END_DATA
17999
+ DEFINE_HEADER
18000
+ $version=2
18001
+ !circuits,contingencies,bridges,binary,threshold,fix_first_block,export_beta_matrix,export_b_matrix,matrix_export_first_stage,matrix_export_first_year,matrix_export_last_stage,matrix_export_last_year,cirflw_check,print_elements
18002
+ END_HEADER
18003
+ END_MASK
18004
+ //--------------------------------------------------------------------------------------------------
18005
+ // PSRStudy Non indexed vectors
18006
+ //--------------------------------------------------------------------------------------------------
18007
+ DEFINE_MASK CSVDATA network-reportlist
18008
+
18009
+ DEFINE_AUTOMATIC_INFO
18010
+ FILENAME psrnetwork-reportlist.dat
18011
+ VERSION 1
18012
+ CONTEXT_READ network-report
18013
+ CONTEXT_WRITE network-report
18014
+ CLASSNAME PSRStudy
18015
+ MODEL NetworkReportConfiguration
18016
+ END_AUTOMATIC_INFO
18017
+
18018
+ DEFINE_DATA
18019
+ PSRStudy REFERENCE,1
18020
+ blocks INTEGER,2
18021
+ series INTEGER,3
18022
+ END_DATA
18023
+ DEFINE_HEADER
18024
+ $version=1
18025
+ !PSRStudy,blocks,series
18026
+ END_HEADER
18027
+ END_MASK
18028
+
17721
18029
  //---------------------------------------------------------------------
17722
18030
  //---------------------------------------------------------------------
17723
18031
  DEFINE_MASK ROWDATA SDDP_v10.3_cloads