psr-factory 5.0.0b1__py3-none-win_amd64.whl → 5.0.0b3__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 (18) hide show
  1. psr/cloud/aws.py +256 -0
  2. psr/cloud/cloud.py +45 -14
  3. psr/cloud/data.py +18 -1
  4. psr/cloud/version.py +1 -1
  5. psr/cloud/xml.py +2 -0
  6. psr/factory/__init__.py +1 -1
  7. psr/factory/factory.dll +0 -0
  8. psr/factory/factory.pmd +159 -39
  9. psr/factory/factory.pmk +34 -52
  10. psr/factory/libcurl-x64.dll +0 -0
  11. psr/factory/samples/sddp_sample_case01.py +164 -0
  12. psr/factory/samples/sddp_sample_case21.py +241 -0
  13. psr/runner/runner.py +30 -30
  14. {psr_factory-5.0.0b1.dist-info → psr_factory-5.0.0b3.dist-info}/METADATA +8 -3
  15. {psr_factory-5.0.0b1.dist-info → psr_factory-5.0.0b3.dist-info}/RECORD +18 -15
  16. {psr_factory-5.0.0b1.dist-info → psr_factory-5.0.0b3.dist-info}/WHEEL +0 -0
  17. {psr_factory-5.0.0b1.dist-info → psr_factory-5.0.0b3.dist-info}/licenses/LICENSE.txt +0 -0
  18. {psr_factory-5.0.0b1.dist-info → psr_factory-5.0.0b3.dist-info}/top_level.txt +0 -0
psr/factory/factory.pmd CHANGED
@@ -926,8 +926,10 @@ DEFINE_MODEL MODL:Coral_Configuration
926
926
  PARM INTEGER FlagContingencyCircuits
927
927
  PARM INTEGER FlagCommitment
928
928
  PARM INTEGER PseudoSequential
929
+ PARM INTEGER Sequential
929
930
  PARM INTEGER MaxInterval
930
931
  PARM INTEGER PrintStates
932
+ PARM INTEGER MaxContingencyCircuits
931
933
  VECTOR INTEGER SelectedBlocks
932
934
  PARM REAL CVAR_Alpha
933
935
  PARM REAL CVAR_Lambda
@@ -2238,7 +2240,6 @@ DEFINE_MODEL MODL:OPTFLOW_Options
2238
2240
  PARM REAL DTOL_CLSH
2239
2241
  PARM REAL DTOL_TDIS
2240
2242
  PARM REAL DTOL_PRTQ
2241
- PARM INTEGER DCNV_DGSH
2242
2243
  PARM INTEGER DCNV_SLCK
2243
2244
  PARM INTEGER DOBJ_ASHN
2244
2245
  PARM INTEGER DOBJ_LSHD
@@ -2307,6 +2308,85 @@ DEFINE_MODEL MODL:OPTFLOW_Options
2307
2308
 
2308
2309
  END_MODEL
2309
2310
 
2311
+ DEFINE_MODEL MODL:OPTVAR_Options
2312
+
2313
+ //--------------------------------------
2314
+ //--- Execution options ---
2315
+ //--------------------------------------
2316
+ // DCNV_SSIS = []
2317
+ // PARM REAL DCNV_SIMS
2318
+
2319
+ PARM REAL DCNV_FEAS
2320
+ PARM REAL DCNV_DGMW
2321
+ PARM REAL DCNV_DEVF
2322
+ PARM REAL DCNV_DEVX
2323
+ PARM REAL DCNV_TRVN
2324
+ PARM REAL DCNV_TRVX
2325
+ PARM REAL DTOL_CDEF
2326
+ PARM REAL OPTV_PHCT
2327
+ PARM INTEGER DCNV_MXIT
2328
+ PARM INTEGER DCNV_EMCB
2329
+ PARM INTEGER DCNV_EMRG
2330
+ PARM INTEGER DCNV_MXRS
2331
+ PARM INTEGER DCNV_SCTG
2332
+ PARM INTEGER DCNV_QINJ
2333
+ PARM INTEGER DCNV_BMON
2334
+ PARM INTEGER DCNV_CMON
2335
+ PARM INTEGER DCNV_PLAN
2336
+ PARM INTEGER DCNV_OPDF
2337
+ PARM INTEGER DCON_QGEN
2338
+ PARM INTEGER DCON_SHNT
2339
+ PARM INTEGER DCON_TAPC
2340
+ PARM INTEGER DCON_PHSS
2341
+ PARM INTEGER DCON_CAPS
2342
+ PARM INTEGER DCON_ADSP
2343
+ PARM INTEGER DCON_CTAP
2344
+ PARM INTEGER DCON_QSIN
2345
+ PARM INTEGER DCON_QCER
2346
+ PARM INTEGER DCCT_QGEN
2347
+ PARM INTEGER DCCT_SHNT
2348
+ PARM INTEGER DCCT_TAPC
2349
+ PARM INTEGER DCCT_PHSS
2350
+ PARM INTEGER DCCT_CAPS
2351
+ PARM INTEGER DCCT_ADSP
2352
+ PARM INTEGER DCCT_CTAP
2353
+ PARM INTEGER DCCT_QSIN
2354
+ PARM INTEGER DCCT_QCER
2355
+ PARM INTEGER DCNS_FLMW
2356
+ PARM INTEGER DCNS_FMVA
2357
+ PARM INTEGER DCNS_SUMC
2358
+ PARM INTEGER DREP_RBAR
2359
+ PARM INTEGER DREP_RLIN
2360
+ PARM INTEGER DREP_RGER
2361
+ PARM INTEGER DREP_RVAR
2362
+ PARM INTEGER DREP_RSHC
2363
+ PARM INTEGER DREP_CONV
2364
+ PARM INTEGER DREP_LINK
2365
+ PARM INTEGER DGRF_BINI
2366
+ PARM INTEGER OPTV_SELC
2367
+ PARM INTEGER OPTV_PHMI
2368
+ PARM INTEGER OPTV_PHTC
2369
+
2370
+ //--------------------------------------
2371
+ //--- Additional execution options ---
2372
+ //--------------------------------------
2373
+ PARM REAL PHED_MAVA
2374
+ PARM REAL PHED_STEP
2375
+ PARM REAL PHED_STQD
2376
+ PARM REAL OPTV_DSCT
2377
+ PARM INTEGER DREP_OPFR
2378
+ PARM INTEGER DREP_DEBG
2379
+ PARM INTEGER PHED_UPDS
2380
+ PARM INTEGER PHED_UPDP
2381
+ PARM INTEGER PHED_UPLP
2382
+ PARM INTEGER PHED_MAVG
2383
+ PARM INTEGER OPTV_DSMI
2384
+ PARM INTEGER OPTV_DSTC
2385
+ PARM INTEGER DCNV_DGSH
2386
+ PARM INTEGER DCNV_PHSC
2387
+
2388
+ END_MODEL
2389
+
2310
2390
  DEFINE_MODEL MODL:NETPLAN_V5.0_TransmissionConstants
2311
2391
 
2312
2392
  //--------------------------------------
@@ -2348,6 +2428,7 @@ DEFINE_MODEL MODL:NETPLAN_V5.0_TransmissionConstants
2348
2428
  END_MODEL
2349
2429
 
2350
2430
 
2431
+
2351
2432
  //--------------------------------------
2352
2433
  //--- Modelo de Barra ---
2353
2434
  //--------------------------------------
@@ -3006,6 +3087,7 @@ DEFINE_MODEL MODL:Optgen_Configuration_Keywords
3006
3087
  PARM INTEGER FSCN
3007
3088
  PARM INTEGER RMET
3008
3089
  PARM REAL MXPF
3090
+ PARM INTEGER FOPT
3009
3091
  END_MODEL
3010
3092
 
3011
3093
 
@@ -3114,7 +3196,7 @@ END_CLASS
3114
3196
  //--------------------------------------------------------------------------------------------------
3115
3197
  DEFINE_CLASS PSRMaintenanceAssociation
3116
3198
  PARM STRING SetName @id
3117
- VECTOR REFERENCE Solicitations
3199
+ VECTOR REFERENCE Solicitations PSRMaintenanceSolicitation
3118
3200
  END_CLASS
3119
3201
 
3120
3202
  //--------------------------------------------------------------------------------------------------
@@ -3122,15 +3204,15 @@ END_CLASS
3122
3204
  //--------------------------------------------------------------------------------------------------
3123
3205
  DEFINE_CLASS PSRMaintenanceExclusiveSol
3124
3206
  PARM STRING SetName @id
3125
- VECTOR REFERENCE Solicitations
3207
+ VECTOR REFERENCE Solicitations PSRMaintenanceSolicitation
3126
3208
  END_CLASS
3127
3209
 
3128
3210
  //--------------------------------------------------------------------------------------------------
3129
3211
  // Modelo para Periodos Restritos
3130
3212
  //--------------------------------------------------------------------------------------------------
3131
3213
  MERGE_CLASS PSRPlant StageCstr
3132
- VECTOR DATE RestDate
3133
- VECTOR INTEGER RestrictedStages INDEX RestDate
3214
+ VECTOR DATE InitialDateRestricted
3215
+ VECTOR DATE EndDateRestricted INTERVAL InitialDateRestricted
3134
3216
  END_CLASS
3135
3217
 
3136
3218
  //--------------------------------------------------------------------------------------------------
@@ -3182,6 +3264,7 @@ DEFINE_MODEL MODL:Optmain_Options
3182
3264
  PARM INTEGER TUNE
3183
3265
  PARM INTEGER NCVR
3184
3266
  PARM INTEGER WSVF
3267
+ PARM INTEGER WSLX
3185
3268
  END_MODEL
3186
3269
 
3187
3270
  //--------------------------------------------------------------------------------------------------
@@ -4344,11 +4427,11 @@ DEFINE_MODEL MODL:SDDP_V10.2_Termica
4344
4427
  VETOR DATE DataPriceSecondaryReserve @chronological @addyear_chronological
4345
4428
  VETOR REAL PriceSecondaryReserve DIM(block) INDEX DataPriceSecondaryReserve
4346
4429
 
4347
- VETOR DATE DataMaxSecondaryPerReserve
4430
+ VETOR DATE DataMaxSecondaryPerReserve @chronological @addyear_chronological
4348
4431
  VETOR REAL MaxSecondaryPerReserve DIM(reserve_max,block) INDEX DataMaxSecondaryPerReserve
4349
4432
  PARM REFERENCE ReserveOfMaxSecondaryPerReserve DIM(reserve_max)
4350
4433
 
4351
- VETOR DATE DataPriceSecondaryPerReserve
4434
+ VETOR DATE DataPriceSecondaryPerReserve @chronological @addyear_chronological
4352
4435
  VETOR REAL PriceSecondaryPerReserve DIM(reserve_price,block) INDEX DataPriceSecondaryPerReserve
4353
4436
  PARM REFERENCE ReserveOfPriceSecondaryPerReserve DIM(reserve_price)
4354
4437
 
@@ -4542,16 +4625,16 @@ DEFINE_MODEL MODL:SDDP_V10.2_Hidro
4542
4625
  PARM REAL InitialValueDeadStorage
4543
4626
 
4544
4627
  PARM INTEGER MaxSecondaryReserveUnit
4545
- VETOR DATE DataMaxSecondaryReserve
4628
+ VETOR DATE DataMaxSecondaryReserve @chronological @addyear_chronological
4546
4629
  VETOR REAL MaxSecondaryReserve DIM(block) INDEX DataMaxSecondaryReserve
4547
- VETOR DATE DataPriceSecondaryReserve
4630
+ VETOR DATE DataPriceSecondaryReserve @chronological @addyear_chronological
4548
4631
  VETOR REAL PriceSecondaryReserve DIM(block) INDEX DataPriceSecondaryReserve
4549
4632
 
4550
- VETOR DATE DataMaxSecondaryPerReserve
4633
+ VETOR DATE DataMaxSecondaryPerReserve @chronological @addyear_chronological
4551
4634
  VETOR REAL MaxSecondaryPerReserve DIM(reserve_max,block) INDEX DataMaxSecondaryPerReserve
4552
4635
  PARM REFERENCE ReserveOfMaxSecondaryPerReserve DIM(reserve_max)
4553
4636
 
4554
- VETOR DATE DataPriceSecondaryPerReserve
4637
+ VETOR DATE DataPriceSecondaryPerReserve @chronological @addyear_chronological
4555
4638
  VETOR REAL PriceSecondaryPerReserve DIM(reserve_price,block) INDEX DataPriceSecondaryPerReserve
4556
4639
  PARM REFERENCE ReserveOfPriceSecondaryPerReserve DIM(reserve_price)
4557
4640
 
@@ -4581,6 +4664,10 @@ DEFINE_MODEL MODL:SDDP_V10.2_Hidro
4581
4664
  PARM REAL TurbRampDown // Turbining Ramp Down
4582
4665
  PARM REAL SpilRampUp // Spilling Ramp Up
4583
4666
  PARM REAL SpilRampDown // Spilling Ramp Down
4667
+ PARM REAL ForebayRampUp // Forebay Ramp Up
4668
+ PARM REAL ForebayRampDown // Forebay Ramp Down
4669
+ PARM REAL ForebayRampUpDay // Forebay Ramp Up (Day)
4670
+ PARM REAL ForebayRampDownDay // Forebay Ramp Down (Day)
4584
4671
  PARM INTEGER TravelTimeTurb // Water Travel Time Turbining
4585
4672
  PARM INTEGER TravelTimeSpil // Water Travel Time Spilling
4586
4673
  PARM REAL RampUp
@@ -4612,7 +4699,7 @@ DEFINE_MODEL MODL:SDDP_V10.2_Hidro
4612
4699
  PARM REAL LGC_Premium
4613
4700
  PARM REAL LGC_InitialAccumulatedGeneration
4614
4701
 
4615
- VETOR DATE LGC_Data
4702
+ VETOR DATE LGC_Data @chronological @addyear_chronological
4616
4703
  VETOR REAL LGC_MonthlyPremium INDEX LGC_Data
4617
4704
 
4618
4705
  PARM REFERENCE MinimumGenerationTimeSeries PSRTimeSeries
@@ -4652,22 +4739,22 @@ DEFINE_MODEL MODL:SDDP_V10.2_Gnd
4652
4739
 
4653
4740
  //--- Secondary reserve offer ---
4654
4741
  PARM INTEGER MaxSecondaryReserveUnit
4655
- VETOR DATE DataMaxSecondaryReserve
4742
+ VETOR DATE DataMaxSecondaryReserve @chronological @addyear_chronological
4656
4743
  VETOR REAL MaxSecondaryReserve DIM(block) INDEX DataMaxSecondaryReserve
4657
- VETOR DATE DataPriceSecondaryReserve
4744
+ VETOR DATE DataPriceSecondaryReserve @chronological @addyear_chronological
4658
4745
  VETOR REAL PriceSecondaryReserve DIM(block) INDEX DataPriceSecondaryReserve
4659
4746
 
4660
- VETOR DATE DataMaxSecondaryPerReserve
4747
+ VETOR DATE DataMaxSecondaryPerReserve @chronological @addyear_chronological
4661
4748
  VETOR REAL MaxSecondaryPerReserve DIM(reserve_max,block) INDEX DataMaxSecondaryPerReserve
4662
4749
  PARM REFERENCE ReserveOfMaxSecondaryPerReserve DIM(reserve_max)
4663
4750
 
4664
- VETOR DATE DataPriceSecondaryPerReserve
4751
+ VETOR DATE DataPriceSecondaryPerReserve @chronological @addyear_chronological
4665
4752
  VETOR REAL PriceSecondaryPerReserve DIM(reserve_price,block) INDEX DataPriceSecondaryPerReserve
4666
4753
  PARM REFERENCE ReserveOfPriceSecondaryPerReserve DIM(reserve_price)
4667
4754
  END_MODEL
4668
4755
  DEFINE_MODEL MODL:SDDP_PostoMedicaoGnd
4669
4756
  PARM INTEGER TechType DEFAULT 0
4670
- PARM INTEGER SourceType DEFAULT 0
4757
+ PARM INTEGER SourceType DEFAULT 1
4671
4758
 
4672
4759
  DIMENSION block
4673
4760
  //--- Cenarios de geracao por bloco ---
@@ -4707,16 +4794,16 @@ DEFINE_MODEL MODL:SDDP_Csp
4707
4794
 
4708
4795
  //--- Secondary reserve offer ---
4709
4796
  PARM INTEGER MaxSecondaryReserveUnit
4710
- VETOR DATE DataMaxSecondaryReserve
4797
+ VETOR DATE DataMaxSecondaryReserve @chronological @addyear_chronological
4711
4798
  VETOR REAL MaxSecondaryReserve DIM(block) INDEX DataMaxSecondaryReserve
4712
- VETOR DATE DataPriceSecondaryReserve
4799
+ VETOR DATE DataPriceSecondaryReserve @chronological @addyear_chronological
4713
4800
  VETOR REAL PriceSecondaryReserve DIM(block) INDEX DataPriceSecondaryReserve
4714
4801
 
4715
- VETOR DATE DataMaxSecondaryPerReserve
4802
+ VETOR DATE DataMaxSecondaryPerReserve @chronological @addyear_chronological
4716
4803
  VETOR REAL MaxSecondaryPerReserve DIM(reserve_max,block) INDEX DataMaxSecondaryPerReserve
4717
4804
  PARM REFERENCE ReserveOfMaxSecondaryPerReserve DIM(reserve_max)
4718
4805
 
4719
- VETOR DATE DataPriceSecondaryPerReserve
4806
+ VETOR DATE DataPriceSecondaryPerReserve @chronological @addyear_chronological
4720
4807
  VETOR REAL PriceSecondaryPerReserve DIM(reserve_price,block) INDEX DataPriceSecondaryPerReserve
4721
4808
  PARM REFERENCE ReserveOfPriceSecondaryPerReserve DIM(reserve_price)
4722
4809
  END_MODEL
@@ -4753,7 +4840,7 @@ END_MODEL
4753
4840
  DEFINE_MODEL MODL:SDDP_V10.2_Restricao
4754
4841
  DIMENSION block
4755
4842
 
4756
- VETOR DATE Data
4843
+ VETOR DATE Data @chronological @addyear_chronological
4757
4844
  VETOR REAL Restricao DIM(block) INDEX Data
4758
4845
  END_MODEL
4759
4846
  //--------------------------------------------------------------------------------------------------
@@ -4869,7 +4956,7 @@ DEFINE_MODEL MODL:SDDP_V10.2_NoGas
4869
4956
  VETOR REAL ProdCost INDEX Data
4870
4957
 
4871
4958
  //--- Custo de producao em informacao cronologica
4872
- VETOR DATE DataChroProdCost
4959
+ VETOR DATE DataChroProdCost @chronological @addyear_chronological
4873
4960
  VETOR REAL ChroProdCost DIM(block) INDEX DataChroProdCost
4874
4961
  END_MODEL
4875
4962
  //--------------------------------------------------------------------------------------------------
@@ -4928,16 +5015,16 @@ DEFINE_MODEL MODL:SDDP_V10.2_Bateria
4928
5015
 
4929
5016
  //--- Secondary reserve offer ---
4930
5017
  PARM INTEGER MaxSecondaryReserveUnit
4931
- VETOR DATE DataMaxSecondaryReserve
5018
+ VETOR DATE DataMaxSecondaryReserve @chronological @addyear_chronological
4932
5019
  VETOR REAL MaxSecondaryReserve DIM(block) INDEX DataMaxSecondaryReserve
4933
- VETOR DATE DataPriceSecondaryReserve
5020
+ VETOR DATE DataPriceSecondaryReserve @chronological @addyear_chronological
4934
5021
  VETOR REAL PriceSecondaryReserve DIM(block) INDEX DataPriceSecondaryReserve
4935
5022
 
4936
- VETOR DATE DataMaxSecondaryPerReserve
5023
+ VETOR DATE DataMaxSecondaryPerReserve @chronological @addyear_chronological
4937
5024
  VETOR REAL MaxSecondaryPerReserve DIM(reserve_max,block) INDEX DataMaxSecondaryPerReserve
4938
5025
  PARM REFERENCE ReserveOfMaxSecondaryPerReserve DIM(reserve_max)
4939
5026
 
4940
- VETOR DATE DataPriceSecondaryPerReserve
5027
+ VETOR DATE DataPriceSecondaryPerReserve @chronological @addyear_chronological
4941
5028
  VETOR REAL PriceSecondaryPerReserve DIM(reserve_price,block) INDEX DataPriceSecondaryPerReserve
4942
5029
  PARM REFERENCE ReserveOfPriceSecondaryPerReserve DIM(reserve_price)
4943
5030
 
@@ -4989,7 +5076,7 @@ DEFINE_MODEL MODL:SDDP_ContratoCombustivel
4989
5076
  PARM REAL MinOfftakeRateDay
4990
5077
  PARM REAL MaxOfftakeRateDay
4991
5078
 
4992
- VETOR DATE DataCost
5079
+ VETOR DATE DataCost @chronological @addyear_chronological
4993
5080
  VETOR REAL Cost INDEX DataCost
4994
5081
 
4995
5082
  VETOR DATE DataMaxOfftake @chronological @addyear_chronological
@@ -5001,7 +5088,7 @@ DEFINE_MODEL MODL:SDDP_ContratoCombustivel
5001
5088
  VETOR DATE DateMaxOfftakeRateDayChro @chronological @addyear_chronological
5002
5089
  VETOR REAL MaxOfftakeRateDayChro INDEX DateMaxOfftakeRateDayChro
5003
5090
 
5004
- VETOR DATE DataAvailability
5091
+ VETOR DATE DataAvailability @chronological @addyear_chronological
5005
5092
  VETOR REAL Availability INDEX DataAvailability
5006
5093
 
5007
5094
  END_MODEL
@@ -5016,10 +5103,10 @@ DEFINE_MODEL MODL:SDDP_ReservatorioCombustivel
5016
5103
  PARM REAL MaxWithdrawal
5017
5104
  VETOR REAL MaxCapacity INDEX Data
5018
5105
 
5019
- VETOR DATE DataChroMaxInjection
5106
+ VETOR DATE DataChroMaxInjection @chronological @addyear_chronological
5020
5107
  VETOR REAL ChroMaxInjection DIM(block) INDEX DataChroMaxInjection
5021
5108
 
5022
- VETOR DATE DataChroMaxWithdrawal
5109
+ VETOR DATE DataChroMaxWithdrawal @chronological @addyear_chronological
5023
5110
  VETOR REAL ChroMaxWithdrawal DIM(block) INDEX DataChroMaxWithdrawal
5024
5111
  END_MODEL
5025
5112
  //--------------------------------------------------------------------------------------------------
@@ -5050,7 +5137,7 @@ DEFINE_MODEL MODL:SDDP_EmissaoGas
5050
5137
  DIMENSION plant AUTOSET(serialized_size(plants))
5051
5138
  PARM STRING Unit
5052
5139
 
5053
- VETOR DATE DateCoefEmission
5140
+ VETOR DATE DateCoefEmission @chronological @addyear_chronological
5054
5141
  VETOR REAL CoefEmission DIM(plant) INDEX DateCoefEmission
5055
5142
 
5056
5143
  VETOR DATE DateConstraint
@@ -5058,7 +5145,7 @@ DEFINE_MODEL MODL:SDDP_EmissaoGas
5058
5145
  VETOR REAL Quota INDEX DateConstraint
5059
5146
  VETOR REAL Penalty INDEX DateConstraint
5060
5147
 
5061
- VETOR DATE DateEmissionCost
5148
+ VETOR DATE DateEmissionCost @chronological @addyear_chronological
5062
5149
  VETOR REAL EmissionCost INDEX DateEmissionCost
5063
5150
 
5064
5151
  END_MODEL
@@ -5074,7 +5161,7 @@ DEFINE_MODEL MODL:SDDP_RestricaoGenerica
5074
5161
  PARM INTEGER PenType
5075
5162
  PARM DATE InitialDate
5076
5163
  PARM DATE FinalDate
5077
- VETOR DATE Data
5164
+ VETOR DATE Data @chronological @addyear_chronological
5078
5165
  VETOR REAL RHS INDEX Data
5079
5166
  VETOR REAL Coefficients
5080
5167
  VETOR STRING Variables
@@ -5101,17 +5188,17 @@ END_MODEL
5101
5188
  DEFINE_MODEL MODL:SDDP_ConjuntoReservatorios
5102
5189
  PARM INTEGER MinimumEnergyUnit
5103
5190
  PARM REAL MinimumEnergyPenalty
5104
- VETOR DATE DataMinimumEnergy
5191
+ VETOR DATE DataMinimumEnergy @chronological @addyear_chronological
5105
5192
  VETOR REAL MinimumEnergy INDEX DataMinimumEnergy
5106
5193
 
5107
5194
  PARM INTEGER FloodControlUnit
5108
5195
  PARM REAL FloodControlPenalty
5109
- VETOR DATE DataFloodControl
5196
+ VETOR DATE DataFloodControl @chronological @addyear_chronological
5110
5197
  VETOR REAL FloodControl INDEX DataFloodControl
5111
5198
 
5112
5199
  PARM INTEGER AlertEnergyUnit
5113
5200
  PARM REAL AlertEnergyPenalty
5114
- VETOR DATE DataAlertEnergy
5201
+ VETOR DATE DataAlertEnergy @chronological @addyear_chronological
5115
5202
  VETOR REAL AlertEnergy INDEX DataAlertEnergy
5116
5203
  END_MODEL
5117
5204
  //--------------------------------------------------------------------------------------------------
@@ -5281,11 +5368,11 @@ DEFINE_MODEL MODL:SDDP_WaterWay
5281
5368
  PARM STRING Currency
5282
5369
  PARM REAL FlowMinimumPenalty
5283
5370
  PARM REAL FlowMin
5284
- VETOR DATE DataFlowMinimum
5371
+ VETOR DATE DataFlowMinimum @chronological @addyear_chronological
5285
5372
  VETOR REAL FlowMinimum INDEX DataFlowMinimum
5286
5373
  PARM REAL FlowMaximumPenalty
5287
5374
  PARM REAL FlowMax
5288
- VETOR DATE DataFlowMaximum
5375
+ VETOR DATE DataFlowMaximum @chronological @addyear_chronological
5289
5376
  VETOR REAL FlowMaximum INDEX DataFlowMaximum
5290
5377
  PARM INTEGER TravelTime
5291
5378
  PARM INTEGER Disabled
@@ -5560,6 +5647,8 @@ DEFINE_MODEL MODL:SDDP_Execution_Options
5560
5647
  PARM INTEGER FCFO
5561
5648
  PARM INTEGER HYRM
5562
5649
  PARM INTEGER BLVP
5650
+ PARM INTEGER GAME
5651
+ PARM INTEGER TRUP
5563
5652
 
5564
5653
  PARM REAL NCPL_MIPR
5565
5654
  PARM REAL NCPL_LTOL
@@ -6050,6 +6139,10 @@ DEFINE_MODEL MODL:SDDP_FlowController
6050
6139
  PARM INTEGER FlowControlType
6051
6140
  PARM INTEGER DeviceType
6052
6141
 
6142
+ //--- Status do circuito para cada patamar ---
6143
+ VETOR DATE DateStatus @addyear_fullmodification
6144
+ VETOR INTEGER Status DIM(block) INDEX DateStatus
6145
+
6053
6146
  //--- Bypass do controlador para cada patamar ---
6054
6147
  VETOR DATE DateBypass
6055
6148
  VETOR INTEGER Bypass DIM(block) INDEX DateBypass
@@ -6896,6 +6989,33 @@ DEFINE_MODEL MODL:ePSR_Shunt
6896
6989
  VETOR INTEGER Num INDEX DtV
6897
6990
  END_MODEL
6898
6991
  //--------------------------------------------------------------------------------------------------
6992
+ // Modelo de Bateria
6993
+ //--------------------------------------------------------------------------------------------------
6994
+ DEFINE_MODEL MODL:ePSR_Bateria
6995
+ MERGE_MODEL MODL:ePSR_Element
6996
+
6997
+ VETOR DATE DtV
6998
+ VETOR REAL AMn INDEX DtV
6999
+ VETOR REAL AMx INDEX DtV
7000
+ VETOR REAL AIn INDEX DtV
7001
+ VETOR REAL Pot INDEX DtV
7002
+ VETOR REAL TMxR INDEX DtV
7003
+ VETOR REAL ECar INDEX DtV
7004
+ VETOR REAL EDes INDEX DtV
7005
+ VETOR REAL RCar INDEX DtV
7006
+ VETOR REAL RDes INDEX DtV
7007
+ VETOR STRING OM INDEX DtV
7008
+ VETOR INTEGER Dsc INDEX DtV
7009
+ VETOR INTEGER FlgExc INDEX DtV
7010
+ VETOR INTEGER CancInc INDEX DtV
7011
+ VETOR INTEGER CancAlt INDEX DtV
7012
+
7013
+ PARM STRING TpSht
7014
+ PARM STRING TpCtl
7015
+ VETOR REAL Pot INDEX DtV
7016
+ VETOR INTEGER Num INDEX DtV
7017
+ END_MODEL
7018
+ //--------------------------------------------------------------------------------------------------
6899
7019
  // Modelo de Compensador Sincrono
6900
7020
  //--------------------------------------------------------------------------------------------------
6901
7021
  DEFINE_MODEL MODL:ePSR_CompensadorSincrono
psr/factory/factory.pmk CHANGED
@@ -6849,30 +6849,6 @@ $version=1
6849
6849
  END_HEADER
6850
6850
  END_MASK
6851
6851
  //--------------------------------------------------------------------------------------------------
6852
- // OptMain V2 - PSRPlant Vectors indexed by RestDate
6853
- //--------------------------------------------------------------------------------------------------
6854
- DEFINE_MASK CSVDATA Optmain_optmstgcstr
6855
- DEFINE_AUTOMATIC_INFO
6856
- FILENAME optmstgcstr.dat
6857
- VERSION 1
6858
- CONTEXT_READ optmain
6859
- CONTEXT_WRITE optmain
6860
- CLASSNAME PSRPlant
6861
- MODEL StageCstr
6862
- MERGE_OBJECTS TRUE
6863
- END_AUTOMATIC_INFO
6864
-
6865
- DEFINE_DATA
6866
- PSRPlant REFERENCE,1
6867
- RestDate DATE,2 YYYY/MM/DD AUTOSET
6868
- RestrictedStages INTEGER,3 AUTOSET
6869
- END_DATA
6870
- DEFINE_HEADER
6871
- $version=1
6872
- !PSRPlant,RestDate,RestrictedStages
6873
- END_HEADER
6874
- END_MASK
6875
- //--------------------------------------------------------------------------------------------------
6876
6852
  // OptMain V2 - PSRSystem Vectors indexed by MinResDate
6877
6853
  //--------------------------------------------------------------------------------------------------
6878
6854
  DEFINE_MASK CSVDATA Optmain_optmresmin_v2
@@ -6897,31 +6873,6 @@ $version=2
6897
6873
  END_HEADER
6898
6874
  END_MASK
6899
6875
  //--------------------------------------------------------------------------------------------------
6900
- // OptMain V2 - PSRSystem Non indexed vectors
6901
- //--------------------------------------------------------------------------------------------------
6902
- DEFINE_MASK CSVDATA Optmain_optmload_v2
6903
-
6904
- DEFINE_AUTOMATIC_INFO
6905
- FILENAME optmload.dat
6906
- VERSION 2
6907
- CONTEXT_READ optmain
6908
- CONTEXT_WRITE optmain
6909
- CLASSNAME PSRSystem
6910
- MODEL InstDem
6911
- MERGE_OBJECTS TRUE
6912
- END_AUTOMATIC_INFO
6913
-
6914
- DEFINE_DATA
6915
- PSRSystem REFERENCE,1
6916
- InstantDemandDate DATE,2 YYYY/MM/DD AUTOSET
6917
- InstantDemand REAL,3 AUTOSET
6918
- END_DATA
6919
- DEFINE_HEADER
6920
- $version=2
6921
- !PSRSystem,InstantDemandDate,InstantDemand
6922
- END_HEADER
6923
- END_MASK
6924
- //--------------------------------------------------------------------------------------------------
6925
6876
  // OptMain V2 - PSRMaintenancePrecedence Identification and parameters
6926
6877
  //--------------------------------------------------------------------------------------------------
6927
6878
  DEFINE_MASK CSVDATA Optmain_optmprec_v2
@@ -6982,6 +6933,7 @@ CONTEXT_WRITE optmain
6982
6933
  CLASSNAME PSRPlant
6983
6934
  MODEL UnitFactors
6984
6935
  MERGE_OBJECTS TRUE
6936
+ VECTOR_OBJECTS TRUE
6985
6937
  END_AUTOMATIC_INFO
6986
6938
 
6987
6939
  DEFINE_DATA
@@ -7006,6 +6958,7 @@ CONTEXT_WRITE optmain
7006
6958
  CLASSNAME PSRPlant
7007
6959
  MODEL UnitCodes
7008
6960
  MERGE_OBJECTS TRUE
6961
+ VECTOR_OBJECTS TRUE
7009
6962
  END_AUTOMATIC_INFO
7010
6963
 
7011
6964
  DEFINE_DATA
@@ -7043,6 +6996,30 @@ $version=1
7043
6996
  END_HEADER
7044
6997
  END_MASK
7045
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
7046
7023
  DEFINE_MASK CSVDATA Reliability_Generation
7047
7024
  DEFINE_HEADER
7048
7025
  Barra, Sis, Tp, Cod, Nome, Uni, Pmn, Pmx, Qmn, Qmx, tx.Falha, tx.Retor
@@ -12954,7 +12931,7 @@ DEFINE_MASK CSVDATA SDDP_v14.0_opechd
12954
12931
 
12955
12932
  DEFINE_HEADER
12956
12933
  $version=1
12957
- !Code,Name........,TurbiningTravelTime,SpillingTravelTime,DischargeRampUp,DischargeRampDown,RampUp,RampDown,Commitment,StartupCost,MaxStartup,TurbRampUp,TurbRampDown,SpilRampUp,SpilRampDown
12934
+ !Code,Name........,TurbiningTravelTime,SpillingTravelTime,DischargeRampUp,DischargeRampDown,RampUp,RampDown,Commitment,StartupCost,MaxStartup,TurbRampUp,TurbRampDown,SpilRampUp,SpilRampDown,ForebayRampUp,ForebayRampDown,ForebayRampUpDay,ForebayRampDownDay
12958
12935
  END_HEADER
12959
12936
 
12960
12937
  DEFINE_DATA
@@ -12973,6 +12950,10 @@ TurbRampUp REAL,12 AUTOSET(model.parm("TurbRampUp"))
12973
12950
  TurbRampDown REAL,13 AUTOSET(model.parm("TurbRampDown"))
12974
12951
  SpilRampUp REAL,14 AUTOSET(model.parm("SpilRampUp"))
12975
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"))
12976
12957
  END_DATA
12977
12958
 
12978
12959
  END_MASK
@@ -17990,12 +17971,13 @@ DEFINE_MASK CSVDATA network-report
17990
17971
 
17991
17972
  DEFINE_AUTOMATIC_INFO
17992
17973
  FILENAME psrnetwork-report.dat
17993
- VERSION 1
17974
+ VERSION 2
17994
17975
  CONTEXT_READ network-report
17995
17976
  CONTEXT_WRITE network-report
17996
17977
  CLASSNAME PSRStudy
17997
17978
  MODEL NetworkReportConfiguration
17998
17979
  CREATE_OBJECTS TRUE
17980
+ MERGE_OBJECTS TRUE
17999
17981
  END_AUTOMATIC_INFO
18000
17982
 
18001
17983
  DEFINE_DATA
@@ -18015,7 +17997,7 @@ cirflw_check INTEGER,13 AUTOSET(model.parm("cirflw_check"))
18015
17997
  print_elements INTEGER,14 AUTOSET(model.parm("print_elements"))
18016
17998
  END_DATA
18017
17999
  DEFINE_HEADER
18018
- $version=1
18000
+ $version=2
18019
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
18020
18002
  END_HEADER
18021
18003
  END_MASK
psr/factory/libcurl-x64.dll CHANGED
Binary file