psr-factory 5.0.0b21__py3-none-win_amd64.whl → 5.0.0b67__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 (34) hide show
  1. psr/execqueue/client.py +31 -10
  2. psr/execqueue/config.py +8 -0
  3. psr/execqueue/db.py +71 -9
  4. psr/execqueue/server.py +317 -41
  5. psr/execqueue/watcher.py +1 -1
  6. psr/factory/__init__.py +1 -1
  7. psr/factory/api.py +378 -130
  8. psr/factory/factory.dll +0 -0
  9. psr/factory/factory.pmd +118 -52
  10. psr/factory/factory.pmk +3044 -2223
  11. psr/factory/factorylib.py +30 -2
  12. psr/factory/samples/sddp_case01.py +3 -2
  13. psr/factory/samples/sddp_case21.py +3 -3
  14. psr/{cloud/version.py → outputs/__init__.py} +2 -2
  15. psr/outputs/outputs.py +179 -0
  16. psr/outputs/resample.py +289 -0
  17. psr/psrfcommon/psrfcommon.py +4 -1
  18. psr/runner/runner.py +67 -22
  19. {psr_factory-5.0.0b21.dist-info → psr_factory-5.0.0b67.dist-info}/METADATA +5 -15
  20. psr_factory-5.0.0b67.dist-info/RECORD +32 -0
  21. psr/cloud/__init__.py +0 -7
  22. psr/cloud/aws.py +0 -256
  23. psr/cloud/cloud.py +0 -1444
  24. psr/cloud/data.py +0 -127
  25. psr/cloud/desktop.py +0 -82
  26. psr/cloud/log.py +0 -40
  27. psr/cloud/status.py +0 -81
  28. psr/cloud/tempfile.py +0 -117
  29. psr/cloud/xml.py +0 -57
  30. psr/factory/libcurl-x64.dll +0 -0
  31. psr_factory-5.0.0b21.dist-info/RECORD +0 -40
  32. {psr_factory-5.0.0b21.dist-info → psr_factory-5.0.0b67.dist-info}/WHEEL +0 -0
  33. {psr_factory-5.0.0b21.dist-info → psr_factory-5.0.0b67.dist-info}/licenses/LICENSE.txt +0 -0
  34. {psr_factory-5.0.0b21.dist-info → psr_factory-5.0.0b67.dist-info}/top_level.txt +0 -0
psr/factory/factory.dll CHANGED
Binary file
psr/factory/factory.pmd CHANGED
@@ -2698,7 +2698,7 @@ DEFINE_MODEL MODL:Optgen_Configuracao
2698
2698
  VETOR INTEGER StageSeasonProfileMap INDEX DateStageSeasonProfileMap
2699
2699
  VETOR DATE DateStageSeasonDetailsMap
2700
2700
  VETOR INTEGER StageSeasonDetailsMap INDEX DateStageSeasonDetailsMap
2701
-
2701
+
2702
2702
  VETOR DATE DateStageSeasonMap
2703
2703
  VETOR INTEGER StageSeasonMap INDEX DateStageSeasonMap
2704
2704
  VETOR DATE DateDayTypicalDayMap
@@ -2784,6 +2784,17 @@ DEFINE_MODEL MODL:Optgen_Bateria
2784
2784
  VECTOR DATE DataPotenciaFirme
2785
2785
  VECTOR REAL PotenciaFirme INDEX DataPotenciaFirme
2786
2786
  END_MODEL
2787
+ //--------------------------------------------------------------------------------------------------
2788
+ // Modelo para Eficiencia Energetica
2789
+ //--------------------------------------------------------------------------------------------------
2790
+ DEFINE_MODEL MODL:Optgen_EE
2791
+ PARM INTEGER EnergiaFirmeUnit
2792
+ VECTOR DATE DataEnergiaFirme
2793
+ VECTOR REAL EnergiaFirme INDEX DataEnergiaFirme
2794
+ PARM INTEGER PotenciaFirmeUnit
2795
+ VECTOR DATE DataPotenciaFirme
2796
+ VECTOR REAL PotenciaFirme INDEX DataPotenciaFirme
2797
+ END_MODEL
2787
2798
 
2788
2799
  //--------------------------------------------------------------------------------------------------
2789
2800
  // Modelo para Projeto de Expansao
@@ -2823,6 +2834,9 @@ DEFINE_MODEL MODL:Optgen_ProjetoExpansao
2823
2834
  PARM REAL EmissionCost
2824
2835
  PARM INTEGER O&MVarFlag DEFAULT 0
2825
2836
 
2837
+ VECTOR INTEGER YearDegradationFactor
2838
+ VECTOR REAL DegradationFactor INDEX YearDegradationFactor
2839
+
2826
2840
  END_MODEL
2827
2841
  //--------------------------------------------------------------------------------------------------
2828
2842
  // Modelo para Cronograma de Desembolso
@@ -2980,7 +2994,7 @@ DEFINE_MODEL Optgen_DatParm_Config
2980
2994
  PARM INTEGER IniMonthTsk2
2981
2995
  PARM INTEGER InitialStageTsk2
2982
2996
  PARM INTEGER NumberStagesTsk2
2983
-
2997
+
2984
2998
  VECTOR INTEGER RollingHorizonYear
2985
2999
  VECTOR INTEGER RollingHorizonNumberOfYears
2986
3000
  VECTOR REAL RollingHorizonGAP
@@ -3083,6 +3097,7 @@ DEFINE_MODEL MODL:Optgen_Configuration_Keywords
3083
3097
  PARM INTEGER PFCA
3084
3098
  PARM INTEGER PFHR
3085
3099
  PARM INTEGER PFSC
3100
+ PARM INTEGER PFMR
3086
3101
  PARM INTEGER ALLO
3087
3102
  PARM INTEGER SCAL
3088
3103
  PARM REAL SCAK
@@ -3273,6 +3288,7 @@ DEFINE_MODEL MODL:Optmain_Options
3273
3288
  PARM INTEGER WSVF
3274
3289
  PARM INTEGER WSLX
3275
3290
  PARM INTEGER RFPR
3291
+ PARM INTEGER FRLX
3276
3292
  END_MODEL
3277
3293
 
3278
3294
  //--------------------------------------------------------------------------------------------------
@@ -4128,6 +4144,10 @@ END_MODEL
4128
4144
  //--------------------------------------------------------------------------------------------------
4129
4145
  DEFINE_MODEL MODL:SDDP_GroupSensitivity
4130
4146
  PARM INTEGER Status DEFAULT 0
4147
+
4148
+ VECTOR REFERENCE Elements PSRElement
4149
+ VECTOR STRING Keywords
4150
+ VECTOR REAL Factors
4131
4151
  END_MODEL
4132
4152
  //--------------------------------------------------------------------------------------------------
4133
4153
  // Modelo para cenario de sensibilidade
@@ -4193,12 +4213,12 @@ DEFINE_MODEL MODL:SDDP_V10.2_Demanda
4193
4213
  DIMENSION block
4194
4214
  VETOR DATE Data
4195
4215
  PARM INTEGER Elastico DEFAULT 0
4196
- PARM INTEGER IsFlexible DEFAULT 1
4216
+ PARM INTEGER IsFlexible
4197
4217
  PARM INTEGER Disabled DEFAULT 0
4198
4218
  VETOR REAL CoefVariation DIM(block) INDEX Data
4199
4219
  PARM REAL Duracao DIM(block)
4200
4220
 
4201
- VETOR DATE DataCorrelationInflow
4221
+ VETOR DATE DataCorrelationInflow @addyear_chronological
4202
4222
  VETOR REAL CorrelationInflow DIM(block) INDEX DataCorrelationInflow
4203
4223
 
4204
4224
  PARM REAL MaxShiftUp DEFAULT 0
@@ -4383,6 +4403,7 @@ DEFINE_MODEL MODL:SDDP_V10.2_Termica
4383
4403
  PARM INTEGER ComT DEFAULT 0
4384
4404
  PARM INTEGER ThermalType DEFAULT 0
4385
4405
 
4406
+ MERGE_MODEL Sddp_Georeference
4386
4407
  VETOR DATE Data @addyear_modification
4387
4408
  VETOR DATE DataCesp
4388
4409
  VETOR DATE DataG
@@ -4464,13 +4485,17 @@ END_MODEL
4464
4485
  DEFINE_MODEL MODL:SDDP_V10.2_Hidro
4465
4486
  DIMENSION block
4466
4487
  DIMENSION point 5
4467
- DIMENSION varpoint 1
4488
+ DIMENSION OxE_point 1
4489
+ DIMENSION SxQ_point 1
4490
+ DIMENSION HxP_point 1
4491
+ DIMENSION HxPC_point 1
4492
+ DIMENSION OxT_point 1
4468
4493
  DIMENSION month 12
4469
- DIMENSION reserve_max
4470
- DIMENSION reserve_price
4471
- DIMENSION group 1
4472
- DIMENSION polynomial 1
4473
-
4494
+ DIMENSION reserve_max
4495
+ DIMENSION reserve_price
4496
+ DIMENSION group 1
4497
+ DIMENSION polynomial 1
4498
+ MERGE_MODEL Sddp_Georeference
4474
4499
  VETOR DATE Data @addyear_modification
4475
4500
  VETOR INTEGER Existing INDEX Data DEFAULT 0
4476
4501
  VETOR INTEGER Unidades INDEX Data DEFAULT 1
@@ -4541,33 +4566,33 @@ DEFINE_MODEL MODL:SDDP_V10.2_Hidro
4541
4566
 
4542
4567
  //--- Outflow x Effic ---
4543
4568
  VECTOR DATE OxE_Date
4544
- VECTOR DATE OxE_EndDate INTERVAL OxE_Date
4545
- VECTOR REAL OxE_Outflow DIM(varpoint) INDEX OxE_Date
4546
- VECTOR REAL OxE_Efficiency DIM(varpoint) INDEX OxE_Date
4569
+ VECTOR DATE OxE_EndDate INTERVAL OxE_Date
4570
+ VECTOR REAL OxE_Outflow DIM(OxE_point) INDEX OxE_Date
4571
+ VECTOR REAL OxE_Efficiency DIM(OxE_point) INDEX OxE_Date
4547
4572
 
4548
4573
  //--- Storage x Max Turbining ---
4549
4574
  VECTOR DATE SxQ_Date
4550
- VECTOR DATE SxQ_EndDate INTERVAL SxQ_Date
4551
- VECTOR REAL SxQ_Storage DIM(varpoint) INDEX SxQ_Date
4552
- VECTOR REAL SxQ_MaxTurbining DIM(varpoint) INDEX SxQ_Date
4575
+ VECTOR DATE SxQ_EndDate INTERVAL SxQ_Date
4576
+ VECTOR REAL SxQ_Storage DIM(SxQ_point) INDEX SxQ_Date
4577
+ VECTOR REAL SxQ_MaxTurbining DIM(SxQ_point) INDEX SxQ_Date
4553
4578
 
4554
4579
  //--- Net Head x Power ---
4555
4580
  VECTOR DATE HxP_Date
4556
4581
  VECTOR DATE HxP_EndDate INTERVAL HxP_Date
4557
- VECTOR REAL NetHead DIM(varpoint) INDEX HxP_Date
4558
- VECTOR REAL Power DIM(varpoint) INDEX HxP_Date
4582
+ VECTOR REAL NetHead DIM(HxP_point) INDEX HxP_Date
4583
+ VECTOR REAL Power DIM(HxP_point) INDEX HxP_Date
4559
4584
 
4560
4585
  //--- Net Head x Production coefficient ---
4561
4586
  VECTOR DATE HxPC_Date
4562
4587
  VECTOR DATE HxPC_EndDate INTERVAL HxPC_Date
4563
- VECTOR REAL NetH DIM(varpoint) INDEX HxPC_Date
4564
- VECTOR REAL ProdCoef DIM(varpoint) INDEX HxPC_Date
4588
+ VECTOR REAL NetH DIM(HxPC_point) INDEX HxPC_Date
4589
+ VECTOR REAL ProdCoef DIM(HxPC_point) INDEX HxPC_Date
4565
4590
 
4566
4591
  //--- Outflow x Tailwater elevation (seasonal) ---
4567
4592
  VECTOR DATE OxT_Date
4568
- VECTOR DATE OxT_EndDate INTERVAL OxT_Date
4569
- VECTOR REAL OxT_Outflow_S DIM(varpoint) INDEX OxT_Date
4570
- VECTOR REAL OxT_Tail_S DIM(varpoint) INDEX OxT_Date
4593
+ VECTOR DATE OxT_EndDate INTERVAL OxT_Date
4594
+ VECTOR REAL OxT_Outflow_S DIM(OxT_point) INDEX OxT_Date
4595
+ VECTOR REAL OxT_Tail_S DIM(OxT_point) INDEX OxT_Date
4571
4596
 
4572
4597
  //--- Evaporation coefficient ---
4573
4598
  PARM REAL Evap DIM(month) DEFAULT 0
@@ -4717,6 +4742,7 @@ DEFINE_MODEL MODL:SDDP_V10.2_Gnd
4717
4742
  DIMENSION reserve_max
4718
4743
  DIMENSION reserve_price
4719
4744
 
4745
+ MERGE_MODEL Sddp_Georeference
4720
4746
  VETOR DATE Data @addyear_modification
4721
4747
  VETOR INTEGER Existing INDEX Data DEFAULT 0
4722
4748
  VETOR INTEGER Unidades INDEX Data DEFAULT 1
@@ -4776,6 +4802,7 @@ DEFINE_MODEL MODL:SDDP_Csp
4776
4802
  DIMENSION reserve_max
4777
4803
  DIMENSION reserve_price
4778
4804
 
4805
+ MERGE_MODEL Sddp_Georeference
4779
4806
  VETOR DATE Data @addyear_modification
4780
4807
  VETOR INTEGER Existing INDEX Data DEFAULT 0
4781
4808
  VETOR INTEGER Unidades INDEX Data DEFAULT 1
@@ -4863,8 +4890,8 @@ END_MODEL
4863
4890
  //--------------------------------------------------------------------------------------------------
4864
4891
  DEFINE_MODEL MODL:SDDP_V10.2_RestricaoGeracao
4865
4892
  MERGE_MODEL MODL:SDDP_V10.2_Restricao
4866
- PARM REAL Penalty
4867
- PARM STRING sign DEFAULT ":<:"
4893
+ PARM REAL Penalty DEFAULT -1
4894
+ PARM STRING sign DEFAULT "<"
4868
4895
  END_MODEL
4869
4896
  //--------------------------------------------------------------------------------------------------
4870
4897
  // Modelo de Restricao de Reserva de Geracao
@@ -4910,6 +4937,7 @@ DEFINE_MODEL MODL:SDDP_V10.2_PostoHidrologico
4910
4937
  VETOR DATE Data @chronological
4911
4938
  VETOR REAL Vazao INDEX Data
4912
4939
 
4940
+ PARM REFERENCE DownstreamStation PSRGaugingStation
4913
4941
  PARM INTEGER InflowResol DEFAULT 9
4914
4942
 
4915
4943
  //--- Parametros associados a representacao por autoregressao ---
@@ -5011,6 +5039,11 @@ DEFINE_MODEL MODL:SDDP_V10.2_Bateria
5011
5039
  VETOR REAL DischargeEffic INDEX Data DEFAULT 1
5012
5040
  VETOR REAL O&MCost INDEX Data DEFAULT 0
5013
5041
 
5042
+ VETOR REAL LossFactor INDEX Data DEFAULT 0
5043
+ PARM INTEGER LossFactorType DEFAULT 0
5044
+ PARM INTEGER BatteryCycleType DEFAULT 0
5045
+
5046
+
5014
5047
  MERGE_MODEL MODL:SDDP_GeneratorVoltageRegulator
5015
5048
  MERGE_MODEL MODL:SDDP_GeneratorOPFDeviation
5016
5049
 
@@ -5046,7 +5079,6 @@ DEFINE_MODEL MODL:SDDP_ConsumoCombustivel
5046
5079
  DIMENSION block
5047
5080
  DIMENSION segment
5048
5081
  VETOR DATE Data
5049
- VETOR REAL GerMax INDEX Data
5050
5082
  VETOR REAL O&MCost INDEX Data
5051
5083
  VETOR REAL G DIM(segment) INDEX Data
5052
5084
  VETOR REAL CTransp INDEX Data
@@ -5065,41 +5097,48 @@ END_MODEL
5065
5097
  // Modelo para Contrato de combustivel
5066
5098
  //--------------------------------------------------------------------------------------------------
5067
5099
  DEFINE_MODEL MODL:SDDP_ContratoCombustivel
5068
- DIMENSION block
5069
-
5070
- PARM INTEGER Type DEFAULT 0
5071
- PARM REAL MaxOfftakeRate DEFAULT -1
5072
- PARM REAL ContractedAmount DEFAULT -1
5073
- PARM REAL TakeOrPayAmount
5074
- PARM REAL ConsumedAmount DEFAULT 0
5075
- PARM REAL TakeOrPayCost DEFAULT 0
5076
- PARM REAL ExtraTakeOrPayCost DEFAULT 0
5077
- PARM DATE InitialDate
5078
- PARM DATE FinalDate
5079
- PARM INTEGER NumberRenewals DEFAULT 0
5080
- PARM REAL MaxTransferRenewal DEFAULT -1
5081
- PARM INTEGER UnitConsumedAmount DEFAULT 0
5082
- PARM REAL SpillagePen DEFAULT 0
5083
- PARM REAL MinOfftakeRate DEFAULT -1
5084
- PARM REAL MinOfftakeRatePen DEFAULT 0
5085
- PARM REAL MinOfftakeRateDay DEFAULT -1
5086
- PARM REAL MaxOfftakeRateDay DEFAULT -1
5087
-
5088
- VETOR DATE DataCost @chronological @addyear_chronological
5089
- VETOR REAL Cost INDEX DataCost
5100
+ DIMENSION block
5101
+
5102
+ PARM INTEGER Type DEFAULT 0
5103
+ PARM REAL MaxOfftakeRate DEFAULT -1
5104
+ PARM REAL ContractedAmount DEFAULT -1
5105
+ PARM REAL TakeOrPayAmount
5106
+ PARM REAL ConsumedAmount DEFAULT 0
5107
+ PARM REAL ExtraTakeOrPayCost DEFAULT 0
5108
+ PARM DATE InitialDate
5109
+ PARM DATE FinalDate
5110
+ PARM INTEGER NumberRenewals DEFAULT 0
5111
+ PARM REAL MaxTransferRenewal DEFAULT -1
5112
+ PARM INTEGER UnitConsumedAmount DEFAULT 0
5113
+ PARM REAL SpillagePen DEFAULT 0
5114
+ PARM REAL MinOfftakeRate DEFAULT -1
5115
+ PARM REAL MinOfftakeRatePen DEFAULT 0
5116
+ PARM REAL MinOfftakeRateDay DEFAULT -1
5117
+ PARM REAL MaxOfftakeRateDay DEFAULT -1
5118
+
5119
+ VETOR DATE DataCost @chronological @addyear_chronological
5120
+ VETOR REAL Cost INDEX DataCost
5090
5121
 
5091
5122
  VETOR DATE DataMaxOfftake @chronological @addyear_chronological
5092
5123
  VETOR REAL MaxOfftake DIM(block) INDEX DataMaxOfftake
5093
5124
 
5094
5125
  VETOR DATE DateMinOfftakeRateDayChro @chronological @addyear_chronological
5095
- VETOR REAL MinOfftakeRateDayChro INDEX DateMinOfftakeRateDayChro
5126
+ VETOR REAL MinOfftakeRateDayChro INDEX DateMinOfftakeRateDayChro
5096
5127
 
5097
5128
  VETOR DATE DateMaxOfftakeRateDayChro @chronological @addyear_chronological
5098
- VETOR REAL MaxOfftakeRateDayChro INDEX DateMaxOfftakeRateDayChro
5129
+ VETOR REAL MaxOfftakeRateDayChro INDEX DateMaxOfftakeRateDayChro
5130
+
5131
+ VETOR DATE DateMinOfftakeRatePerStageChro @chronological @addyear_chronological
5132
+ VETOR REAL MinOfftakeRatePerStageChro INDEX DateMinOfftakeRatePerStageChro
5099
5133
 
5100
5134
  VETOR DATE DataAvailability @chronological @addyear_chronological
5101
5135
  VETOR REAL Availability INDEX DataAvailability DEFAULT -1
5102
5136
 
5137
+ VETOR DATE DateTakeOrPayCost @addyear_modification
5138
+ VETOR REAL TakeOrPayCost INDEX DateTakeOrPayCost DEFAULT 0
5139
+
5140
+ VETOR REAL HourlyAvailability
5141
+
5103
5142
  END_MODEL
5104
5143
  //--------------------------------------------------------------------------------------------------
5105
5144
  // Modelo para Reservatorio de combustivel
@@ -5533,7 +5572,6 @@ DEFINE_MODEL MODL:SDDP_Execution_Options
5533
5572
  PARM INTEGER PENV
5534
5573
  PARM INTEGER PLSS
5535
5574
  PARM INTEGER ITAL
5536
- PARM INTEGER GSNP
5537
5575
  PARM INTEGER GSFI DEFAULT 0
5538
5576
  PARM INTEGER WMPS
5539
5577
  PARM INTEGER WSVF
@@ -5658,6 +5696,11 @@ DEFINE_MODEL MODL:SDDP_Execution_Options
5658
5696
  PARM INTEGER BLVP DEFAULT 0
5659
5697
  PARM INTEGER GAME
5660
5698
  PARM INTEGER TRUP
5699
+ PARM INTEGER HINS
5700
+ PARM INTEGER HOTM
5701
+ PARM INTEGER JRAS
5702
+ PARM INTEGER GEXC
5703
+ PARM INTEGER NETA
5661
5704
 
5662
5705
  PARM REAL NCPL_MIPR DEFAULT 0.005
5663
5706
  PARM REAL NCPL_LTOL
@@ -5925,6 +5968,14 @@ DEFINE_MODEL MODL:SDDP_Transformer
5925
5968
  VECTOR DATE DateCostToFrom @addyear_chronological
5926
5969
  VECTOR REAL CostToFrom DIM(block) INDEX DateCostToFrom
5927
5970
 
5971
+ PARM INTEGER MaxSecondaryReserveUnit
5972
+ PARM INTEGER HasMaxSecondaryReserve
5973
+ VETOR DATE DataMaxSecondaryReserve @chronological @addyear_chronological
5974
+ VETOR REAL MaxSecondaryReserve DIM(block) INDEX DataMaxSecondaryReserve
5975
+ PARM INTEGER HasPriceSecondaryReserve
5976
+ VETOR DATE DataPriceSecondaryReserve @chronological @addyear_chronological
5977
+ VETOR REAL PriceSecondaryReserve DIM(block) INDEX DataPriceSecondaryReserve
5978
+
5928
5979
  MERGE_MODEL MODL:SDDP_Asset
5929
5980
  END_MODEL
5930
5981
  //-----------------------------------------------
@@ -6063,6 +6114,8 @@ DEFINE_MODEL MODL:SDDP_HydroUnit
6063
6114
  VECTOR REAL MinGen INDEX Data
6064
6115
  VECTOR REAL MaxGen INDEX Data
6065
6116
 
6117
+ PARM REFERENCE ControlledBus PSRBus
6118
+
6066
6119
  MERGE_MODEL MODL:SDDP_GeneratorOPFDeviation
6067
6120
  MERGE_MODEL MODL:SDDP_GeneratorVoltageRegulator
6068
6121
  MERGE_MODEL MODL:SDDP_SyncGeneratorShortCircuit
@@ -6078,6 +6131,8 @@ DEFINE_MODEL MODL:SDDP_ThermUnit
6078
6131
  VECTOR REAL MinGen INDEX Data
6079
6132
  VECTOR REAL MaxGen INDEX Data
6080
6133
 
6134
+ PARM REFERENCE ControlledBus PSRBus
6135
+
6081
6136
  MERGE_MODEL MODL:SDDP_GeneratorOPFDeviation
6082
6137
  MERGE_MODEL MODL:SDDP_GeneratorVoltageRegulator
6083
6138
  MERGE_MODEL MODL:SDDP_SyncGeneratorShortCircuit
@@ -6092,6 +6147,8 @@ DEFINE_MODEL MODL:SDDP_GndUnit
6092
6147
  VECTOR INTEGER NumberOfUnits INDEX Data DEFAULT 1
6093
6148
  VECTOR REAL MaxGen INDEX Data
6094
6149
 
6150
+ PARM REFERENCE ControlledBus PSRBus
6151
+
6095
6152
  MERGE_MODEL MODL:SDDP_GeneratorOPFDeviation
6096
6153
  MERGE_MODEL MODL:SDDP_GeneratorVoltageRegulator
6097
6154
  MERGE_MODEL MODL:SDDP_SyncGeneratorShortCircuit
@@ -6330,7 +6387,7 @@ DEFINE_MODEL MODL:SDDP_LineShunt
6330
6387
  DIMENSION block
6331
6388
  VECTOR DATE Data @addyear_modification
6332
6389
  VECTOR INTEGER Existing INDEX Data DEFAULT 0
6333
- VECTOR INTEGER Decommissioned DEFAULT 0 INDEX Data
6390
+ VECTOR INTEGER Decommissioned DEFAULT 0 INDEX Data
6334
6391
  VECTOR REAL Gfrom INDEX Data DEFAULT 0
6335
6392
  VECTOR REAL Bfrom INDEX Data DEFAULT 0
6336
6393
  VECTOR REAL Gto INDEX Data DEFAULT 0
@@ -6371,6 +6428,8 @@ DEFINE_MODEL MODL:SDDP_SynchronousCompensator
6371
6428
  VECTOR DATE DateSetpoint
6372
6429
  VECTOR REAL Setpoint DIM(block) INDEX DateSetpoint
6373
6430
 
6431
+ PARM REFERENCE ControlledBus PSRBus
6432
+
6374
6433
  MERGE_MODEL MODL:SDDP_SyncVoltageRegulator
6375
6434
  MERGE_MODEL MODL:SDDP_SyncGeneratorShortCircuit
6376
6435
  END_MODEL
@@ -6412,6 +6471,8 @@ END_CLASS
6412
6471
  DEFINE_CLASS PSRGenerationOfferHydroPlant
6413
6472
  PARM INTEGER code @id
6414
6473
  PARM STRING name
6474
+ PARM INTEGER Disabled DEFAULT 0
6475
+ PARM INTEGER Unit DEFAULT 3
6415
6476
 
6416
6477
  VECTOR DATE Date @addyear_modification
6417
6478
  VECTOR REAL Price INDEX Date DEFAULT 0
@@ -6422,6 +6483,8 @@ END_CLASS
6422
6483
  DEFINE_CLASS PSRGenerationOfferThermalPlant
6423
6484
  PARM INTEGER code @id
6424
6485
  PARM STRING name
6486
+ PARM INTEGER Disabled DEFAULT 0
6487
+ PARM INTEGER Unit DEFAULT 3
6425
6488
 
6426
6489
  VECTOR DATE Date @addyear_modification
6427
6490
  VECTOR REAL Price INDEX Date DEFAULT 0
@@ -6432,6 +6495,8 @@ END_CLASS
6432
6495
  DEFINE_CLASS PSRGenerationOfferRenewablePlant
6433
6496
  PARM INTEGER code @id
6434
6497
  PARM STRING name
6498
+ PARM INTEGER Disabled DEFAULT 0
6499
+ PARM INTEGER Unit DEFAULT 3
6435
6500
 
6436
6501
  VECTOR DATE Date @addyear_modification
6437
6502
  VECTOR REAL Price INDEX Date DEFAULT 0
@@ -6496,6 +6561,7 @@ DEFINE_MODEL MODL:TSL_Configuration
6496
6561
  PARM INTEGER FlagWindCorrection
6497
6562
  PARM INTEGER FlagAirDensity
6498
6563
  PARM INTEGER FlagTurbineSmooth
6564
+ PARM INTEGER ConsiderFirstPlantOnly
6499
6565
 
6500
6566
  PARM INTEGER InitialYear
6501
6567
  PARM INTEGER FinalYear