psr-factory 4.1.0b2__py3-none-win_amd64.whl → 4.1.0b4__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.
psr/factory/factory.pmk CHANGED
@@ -6442,6 +6442,9 @@ RelCrit REAL,2
6442
6442
  END_DATA
6443
6443
  END_MASK
6444
6444
 
6445
+ //---------------------------------------------------------------------
6446
+ // Horizonte Rolante
6447
+ //---------------------------------------------------------------------
6445
6448
  DEFINE_MASK CSVDATA OPTGEN_dathzn
6446
6449
 
6447
6450
  DEFINE_HEADER
@@ -6472,7 +6475,22 @@ SensitivityGroup STRING,3
6472
6475
  Active INTEGER,4
6473
6476
  Serie INTEGER,5
6474
6477
  END_DATA
6478
+ END_MASK
6479
+
6480
+ //---------------------------------------------------------------------
6481
+ // Chronological GAP
6482
+ //---------------------------------------------------------------------
6483
+ DEFINE_MASK CSVDATA OPTGEN_dattgyear
6475
6484
 
6485
+ DEFINE_HEADER
6486
+ !year,GAP(%),TimeLimit(s)
6487
+ END_HEADER
6488
+
6489
+ DEFINE_DATA
6490
+ InitialYear INTEGER,1
6491
+ GAP REAL,2
6492
+ TimeLimit INTEGER,3
6493
+ END_DATA
6476
6494
  END_MASK
6477
6495
  //---------------------------------------------------------------------
6478
6496
  //---------------------------------------------------------------------
@@ -6574,6 +6592,7 @@ END_MASK
6574
6592
  DEFINE_MASK CSVDATA Optmain_Prec
6575
6593
 
6576
6594
  DEFINE_HEADER
6595
+ $version=1
6577
6596
  !PrecName,SolName,DelayMin,DelayMax
6578
6597
  END_HEADER
6579
6598
  DEFINE_DATA
@@ -6609,6 +6628,397 @@ SetName STRING,1
6609
6628
  Solicitation STRING,2
6610
6629
  END_DATA
6611
6630
  END_MASK
6631
+
6632
+ //--------------------------------------------------------------------------------------------------
6633
+ // OptMain V2 - PSRMaintenanceSolicitation Identification and parameters
6634
+ //--------------------------------------------------------------------------------------------------
6635
+ DEFINE_MASK CSVDATA Optmain_optmcfg_v3
6636
+
6637
+ DEFINE_AUTOMATIC_INFO
6638
+ FILENAME optmcfg.dat
6639
+ VERSION 3
6640
+ CONTEXT_READ optmain
6641
+ CONTEXT_WRITE optmain
6642
+ CLASSNAME PSRMaintenanceSolicitation
6643
+ MODEL PSRMaintenanceSolicitation
6644
+ CREATE_OBJECTS TRUE
6645
+ END_AUTOMATIC_INFO
6646
+
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
+ FixOuter INTEGER,15 AUTOSET(model.parm("FixOuter"))
6663
+ Plant REFERENCE,16 AUTOSET(model.parm("Plant"))
6664
+ END_DATA
6665
+ DEFINE_HEADER
6666
+ $version=3
6667
+ !Name,UnitCode,MinDateDay,MinDateMonth,MinDateYear,MaxDateDay,MaxDateMonth,MaxDateYear,Duration,PrefDateDay,PrefDateMonth,PrefDateYear,Score,Fix,FixOuter,Plant
6668
+ END_HEADER
6669
+ END_MASK
6670
+ //--------------------------------------------------------------------------------------------------
6671
+ // OptMain V2 - PSRMaintenanceExclusive Identification and parameters
6672
+ //--------------------------------------------------------------------------------------------------
6673
+ DEFINE_MASK CSVDATA Optmain_optmexcl_v3
6674
+
6675
+ DEFINE_AUTOMATIC_INFO
6676
+ FILENAME optmexcl.dat
6677
+ VERSION 3
6678
+ CONTEXT_READ optmain
6679
+ CONTEXT_WRITE optmain
6680
+ CLASSNAME PSRMaintenanceExclusive
6681
+ MODEL PSRMaintenanceExclusive
6682
+ CREATE_OBJECTS TRUE
6683
+ END_AUTOMATIC_INFO
6684
+
6685
+ DEFINE_DATA
6686
+ SetName STRING,1 AUTOSET(model.parm("SetName"))
6687
+ END_DATA
6688
+ DEFINE_HEADER
6689
+ $version=3
6690
+ !SetName
6691
+ END_HEADER
6692
+ END_MASK
6693
+ //--------------------------------------------------------------------------------------------------
6694
+ // OptMain V2 - PSRMaintenanceExclusive Non indexed vectors
6695
+ //--------------------------------------------------------------------------------------------------
6696
+ DEFINE_MASK CSVDATA Optmain_optmexclv
6697
+
6698
+ DEFINE_AUTOMATIC_INFO
6699
+ FILENAME optmexclv.dat
6700
+ VERSION 1
6701
+ CONTEXT_READ optmain
6702
+ CONTEXT_WRITE optmain
6703
+ CLASSNAME PSRMaintenanceExclusive
6704
+ MODEL PSRMaintenanceExclusive
6705
+ END_AUTOMATIC_INFO
6706
+
6707
+ DEFINE_DATA
6708
+ PSRMaintenanceExclusive REFERENCE,1
6709
+ PlantsThermal REFERENCE,2
6710
+ PlantsHydro REFERENCE,3
6711
+ PlantsGnd REFERENCE,4
6712
+ END_DATA
6713
+ DEFINE_HEADER
6714
+ $version=1
6715
+ !PSRMaintenanceExclusive,PlantsThermal,PlantsHydro,PlantsGnd
6716
+ END_HEADER
6717
+ END_MASK
6718
+ //--------------------------------------------------------------------------------------------------
6719
+ // OptMain V2 - PSRMaintenanceShared Identification and parameters
6720
+ //--------------------------------------------------------------------------------------------------
6721
+ DEFINE_MASK CSVDATA Optmain_optmshr_v3
6722
+
6723
+ DEFINE_AUTOMATIC_INFO
6724
+ FILENAME optmshr.dat
6725
+ VERSION 3
6726
+ CONTEXT_READ optmain
6727
+ CONTEXT_WRITE optmain
6728
+ CLASSNAME PSRMaintenanceShared
6729
+ MODEL PSRMaintenanceShared
6730
+ CREATE_OBJECTS TRUE
6731
+ END_AUTOMATIC_INFO
6732
+
6733
+ DEFINE_DATA
6734
+ SetName STRING,1 AUTOSET(model.parm("SetName"))
6735
+ END_DATA
6736
+ DEFINE_HEADER
6737
+ $version=3
6738
+ !SetName
6739
+ END_HEADER
6740
+ END_MASK
6741
+ //--------------------------------------------------------------------------------------------------
6742
+ // OptMain V2 - PSRMaintenanceShared Non indexed vectors
6743
+ //--------------------------------------------------------------------------------------------------
6744
+ DEFINE_MASK CSVDATA Optmain_optmshrv
6745
+
6746
+ DEFINE_AUTOMATIC_INFO
6747
+ FILENAME optmshrv.dat
6748
+ VERSION 1
6749
+ CONTEXT_READ optmain
6750
+ CONTEXT_WRITE optmain
6751
+ CLASSNAME PSRMaintenanceShared
6752
+ MODEL PSRMaintenanceShared
6753
+ END_AUTOMATIC_INFO
6754
+
6755
+ DEFINE_DATA
6756
+ PSRMaintenanceShared REFERENCE,1
6757
+ PlantsThermal REFERENCE,2
6758
+ PlantsHydro REFERENCE,3
6759
+ PlantsGnd REFERENCE,4
6760
+ END_DATA
6761
+ DEFINE_HEADER
6762
+ $version=1
6763
+ !PSRMaintenanceShared,PlantsThermal,PlantsHydro,PlantsGnd
6764
+ END_HEADER
6765
+ END_MASK
6766
+ //--------------------------------------------------------------------------------------------------
6767
+ // OptMain V2 - PSRMaintenanceAssociation Identification and parameters
6768
+ //--------------------------------------------------------------------------------------------------
6769
+ DEFINE_MASK CSVDATA Optmain_optmass_v2
6770
+
6771
+ DEFINE_AUTOMATIC_INFO
6772
+ FILENAME optmass.dat
6773
+ VERSION 2
6774
+ CONTEXT_READ optmain
6775
+ CONTEXT_WRITE optmain
6776
+ CLASSNAME PSRMaintenanceAssociation
6777
+ MODEL PSRMaintenanceAssociation
6778
+ CREATE_OBJECTS TRUE
6779
+ END_AUTOMATIC_INFO
6780
+
6781
+ DEFINE_DATA
6782
+ SetName STRING,1 AUTOSET(model.parm("SetName"))
6783
+ END_DATA
6784
+ DEFINE_HEADER
6785
+ $version=2
6786
+ !SetName
6787
+ END_HEADER
6788
+ END_MASK
6789
+ //--------------------------------------------------------------------------------------------------
6790
+ // OptMain V2 - PSRMaintenanceAssociation Non indexed vectors
6791
+ //--------------------------------------------------------------------------------------------------
6792
+ DEFINE_MASK CSVDATA Optmain_optmassv
6793
+
6794
+ DEFINE_AUTOMATIC_INFO
6795
+ FILENAME optmassv.dat
6796
+ VERSION 1
6797
+ CONTEXT_READ optmain
6798
+ CONTEXT_WRITE optmain
6799
+ CLASSNAME PSRMaintenanceAssociation
6800
+ MODEL PSRMaintenanceAssociation
6801
+ END_AUTOMATIC_INFO
6802
+
6803
+ DEFINE_DATA
6804
+ PSRMaintenanceAssociation REFERENCE,1
6805
+ Solicitations REFERENCE,2
6806
+ END_DATA
6807
+ DEFINE_HEADER
6808
+ $version=1
6809
+ !PSRMaintenanceAssociation,Solicitations
6810
+ END_HEADER
6811
+ END_MASK
6812
+ //--------------------------------------------------------------------------------------------------
6813
+ // OptMain V2 - PSRMaintenanceExclusiveSol Identification and parameters
6814
+ //--------------------------------------------------------------------------------------------------
6815
+ DEFINE_MASK CSVDATA Optmain_optmexcls_v2
6816
+
6817
+ DEFINE_AUTOMATIC_INFO
6818
+ FILENAME optmexcls.dat
6819
+ VERSION 2
6820
+ CONTEXT_READ optmain
6821
+ CONTEXT_WRITE optmain
6822
+ CLASSNAME PSRMaintenanceExclusiveSol
6823
+ MODEL PSRMaintenanceExclusiveSol
6824
+ CREATE_OBJECTS TRUE
6825
+ END_AUTOMATIC_INFO
6826
+
6827
+ DEFINE_DATA
6828
+ SetName STRING,1 AUTOSET(model.parm("SetName"))
6829
+ END_DATA
6830
+ DEFINE_HEADER
6831
+ $version=2
6832
+ !SetName
6833
+ END_HEADER
6834
+ END_MASK
6835
+ //--------------------------------------------------------------------------------------------------
6836
+ // OptMain V2 - PSRMaintenanceExclusiveSol Non indexed vectors
6837
+ //--------------------------------------------------------------------------------------------------
6838
+ DEFINE_MASK CSVDATA Optmain_optmexclsv
6839
+
6840
+ DEFINE_AUTOMATIC_INFO
6841
+ FILENAME optmexclsv.dat
6842
+ VERSION 1
6843
+ CONTEXT_READ optmain
6844
+ CONTEXT_WRITE optmain
6845
+ CLASSNAME PSRMaintenanceExclusiveSol
6846
+ MODEL PSRMaintenanceExclusiveSol
6847
+ END_AUTOMATIC_INFO
6848
+
6849
+ DEFINE_DATA
6850
+ PSRMaintenanceExclusiveSol REFERENCE,1
6851
+ Solicitations REFERENCE,2
6852
+ END_DATA
6853
+ DEFINE_HEADER
6854
+ $version=1
6855
+ !PSRMaintenanceExclusiveSol,Solicitations
6856
+ END_HEADER
6857
+ END_MASK
6858
+ //--------------------------------------------------------------------------------------------------
6859
+ // OptMain V2 - PSRPlant Vectors indexed by RestDate
6860
+ //--------------------------------------------------------------------------------------------------
6861
+ DEFINE_MASK CSVDATA Optmain_optmstgcstr
6862
+ DEFINE_AUTOMATIC_INFO
6863
+ FILENAME optmstgcstr.dat
6864
+ VERSION 1
6865
+ CONTEXT_READ optmain
6866
+ CONTEXT_WRITE optmain
6867
+ CLASSNAME PSRPlant
6868
+ MODEL StageCstr
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
+ // OptMain V2 - PSRSystem Vectors indexed by MinResDate
6883
+ //--------------------------------------------------------------------------------------------------
6884
+ DEFINE_MASK CSVDATA Optmain_optmresmin_v2
6885
+ DEFINE_AUTOMATIC_INFO
6886
+ FILENAME optmresmin.dat
6887
+ VERSION 2
6888
+ CONTEXT_READ optmain
6889
+ CONTEXT_WRITE optmain
6890
+ CLASSNAME PSRSystem
6891
+ MODEL MinRes
6892
+ END_AUTOMATIC_INFO
6893
+
6894
+ DEFINE_DATA
6895
+ PSRSystem REFERENCE,1
6896
+ MinResDate DATE,2 YYYY/MM/DD AUTOSET
6897
+ MinimumReserve REAL,3 AUTOSET
6898
+ END_DATA
6899
+ DEFINE_HEADER
6900
+ $version=2
6901
+ !PSRSystem,MinResDate,MinimumReserve
6902
+ END_HEADER
6903
+ END_MASK
6904
+ //--------------------------------------------------------------------------------------------------
6905
+ // OptMain V2 - PSRSystem Non indexed vectors
6906
+ //--------------------------------------------------------------------------------------------------
6907
+ DEFINE_MASK CSVDATA Optmain_optmload_v2
6908
+
6909
+ DEFINE_AUTOMATIC_INFO
6910
+ FILENAME optmload.dat
6911
+ VERSION 2
6912
+ CONTEXT_READ optmain
6913
+ CONTEXT_WRITE optmain
6914
+ CLASSNAME PSRSystem
6915
+ MODEL InstDem
6916
+ END_AUTOMATIC_INFO
6917
+
6918
+ DEFINE_DATA
6919
+ PSRSystem REFERENCE,1
6920
+ InstantDemand REAL,2
6921
+ END_DATA
6922
+ DEFINE_HEADER
6923
+ $version=2
6924
+ !PSRSystem,InstantDemand
6925
+ END_HEADER
6926
+ END_MASK
6927
+ //--------------------------------------------------------------------------------------------------
6928
+ // OptMain V2 - PSRMaintenancePrecedence Identification and parameters
6929
+ //--------------------------------------------------------------------------------------------------
6930
+ DEFINE_MASK CSVDATA Optmain_optmprec_v2
6931
+
6932
+ DEFINE_AUTOMATIC_INFO
6933
+ FILENAME optmprec.dat
6934
+ VERSION 2
6935
+ CONTEXT_READ optmain
6936
+ CONTEXT_WRITE optmain
6937
+ CLASSNAME PSRMaintenancePrecedence
6938
+ MODEL PSRMaintenancePrecedence
6939
+ CREATE_OBJECTS TRUE
6940
+ END_AUTOMATIC_INFO
6941
+
6942
+ DEFINE_DATA
6943
+ PrecName STRING,1 AUTOSET(model.parm("PrecName"))
6944
+ END_DATA
6945
+ DEFINE_HEADER
6946
+ $version=2
6947
+ !PrecName
6948
+ END_HEADER
6949
+ END_MASK
6950
+ //--------------------------------------------------------------------------------------------------
6951
+ // OptMain V2 - PSRMaintenancePrecedence Non indexed vectors
6952
+ //--------------------------------------------------------------------------------------------------
6953
+ DEFINE_MASK CSVDATA Optmain_optmprecv
6954
+
6955
+ DEFINE_AUTOMATIC_INFO
6956
+ FILENAME optmprecv.dat
6957
+ VERSION 1
6958
+ CONTEXT_READ optmain
6959
+ CONTEXT_WRITE optmain
6960
+ CLASSNAME PSRMaintenancePrecedence
6961
+ MODEL PSRMaintenancePrecedence
6962
+ END_AUTOMATIC_INFO
6963
+
6964
+ DEFINE_DATA
6965
+ PSRMaintenancePrecedence REFERENCE,1
6966
+ DelayMin INTEGER,2
6967
+ DelayMax INTEGER,3
6968
+ Solicitations REFERENCE,4
6969
+ END_DATA
6970
+ DEFINE_HEADER
6971
+ $version=1
6972
+ !PSRMaintenancePrecedence,DelayMin,DelayMax,Solicitations
6973
+ END_HEADER
6974
+ END_MASK
6975
+ //--------------------------------------------------------------------------------------------------
6976
+ // OptMain V2 - PSRPlant Non indexed vectors
6977
+ //--------------------------------------------------------------------------------------------------
6978
+ DEFINE_MASK CSVDATA Optmain_optmuntfct_v2
6979
+
6980
+ DEFINE_AUTOMATIC_INFO
6981
+ FILENAME optmuntfct.dat
6982
+ VERSION 2
6983
+ CONTEXT_READ optmain
6984
+ CONTEXT_WRITE optmain
6985
+ CLASSNAME PSRPlant
6986
+ MODEL UnitFactors
6987
+ END_AUTOMATIC_INFO
6988
+
6989
+ DEFINE_DATA
6990
+ PSRPlant REFERENCE,1
6991
+ UnitFactors REAL,2
6992
+ END_DATA
6993
+ DEFINE_HEADER
6994
+ $version=2
6995
+ !PSRPlant,UnitFactors
6996
+ END_HEADER
6997
+ END_MASK
6998
+ //--------------------------------------------------------------------------------------------------
6999
+ // OptMain V2 - PSRPlant Non indexed vectors
7000
+ //--------------------------------------------------------------------------------------------------
7001
+ DEFINE_MASK CSVDATA Optmain_optmuntcod_v2
7002
+
7003
+ DEFINE_AUTOMATIC_INFO
7004
+ FILENAME optmuntcod.dat
7005
+ VERSION 2
7006
+ CONTEXT_READ optmain
7007
+ CONTEXT_WRITE optmain
7008
+ CLASSNAME PSRPlant
7009
+ MODEL UnitCodes
7010
+ END_AUTOMATIC_INFO
7011
+
7012
+ DEFINE_DATA
7013
+ PSRPlant REFERENCE,1
7014
+ UnitCodes INTEGER,2
7015
+ END_DATA
7016
+ DEFINE_HEADER
7017
+ $version=2
7018
+ !PSRPlant,UnitCodes
7019
+ END_HEADER
7020
+ END_MASK
7021
+
6612
7022
  DEFINE_MASK CSVDATA Reliability_Generation
6613
7023
  DEFINE_HEADER
6614
7024
  Barra, Sis, Tp, Cod, Nome, Uni, Pmn, Pmx, Qmn, Qmx, tx.Falha, tx.Retor
@@ -7643,7 +8053,7 @@ END_MASK
7643
8053
  DEFINE_MASK ROWDATA SDDP_v10.2_chidro
7644
8054
 
7645
8055
  DEFINE_HEADER
7646
- !NUM ...Nombre... .PV. .VAA .TAA #Uni Tipo ....Pot .FPMed. .QMin.. .QMax.. .VMin.. .VMax.. .VInic. Min.V+T ..VNC.. ..ICP.. ...IH.. ..FP1.. ..Vol1. ..FP2.. ..Vol2. ..FP3.. ..Vol3. ..FP4.. ..Vol4. ..FP5.. ..Vol5. .Area1. ..Vol1. .Area2. ..Vol2. .Area3. ..Vol3. .Area4. ..Vol4. .Area5. ..Vol5. .Filt1. ..Vol1. .Filt2. ..Vol2. .Filt3. ..Vol3. .Filt4. ..Vol4. .Filt5. ..Vol5. .Cota1. .Vol1.. .Cota2. .Vol2.. .Cota3. .Vol3.. .Cota4. .Vol4.. .Cota5. .Vol5.. .Ev1 .Ev2 .Ev3 .Ev4 .Ev5 .Ev6 .Ev7 .Ev8 .Ev9 Ev10 Ev11 Ev12 tini tfil .faa tare .varea. tfil .vfiltr F.Reg.. pVar .ICV C.Vert. sfal Cos.O&M Irxh RendT&G .EA. Niv.Jus I JuAr I .TurIn1 .TotIn1 .TurIn2 .TotIn2 .TurIn3 .TotIn3 .TurIn4 .TotIn4 .TurIn5 .TotIn5 H V .CFuga1 ..Def1. .CFuga2 ..Def2. .CFuga3 ..Def3. .CFuga4 ..Def4. .CFuga5 ..Def5. E PHidTur PHidVer sv st OpMd IrrR IfTp ForFill ForDraw ForPenT ForPen.
8056
+ !NUM ...Nombre... .PV. .VAA .TAA #Uni Tipo ....Pot .FPMed. .QMin.. .QMax.. .VMin.. .VMax.. .VInic. Min.V+T ..VNC.. ..ICP.. ...IH.. ..FP1.. ..Vol1. ..FP2.. ..Vol2. ..FP3.. ..Vol3. ..FP4.. ..Vol4. ..FP5.. ..Vol5. .Area1. ..Vol1. .Area2. ..Vol2. .Area3. ..Vol3. .Area4. ..Vol4. .Area5. ..Vol5. .Filt1. ..Vol1. .Filt2. ..Vol2. .Filt3. ..Vol3. .Filt4. ..Vol4. .Filt5. ..Vol5. .Cota1. .Vol1.. .Cota2. .Vol2.. .Cota3. .Vol3.. .Cota4. .Vol4.. .Cota5. .Vol5.. .Ev1 .Ev2 .Ev3 .Ev4 .Ev5 .Ev6 .Ev7 .Ev8 .Ev9 Ev10 Ev11 Ev12 tini tfil .faa tare .varea. tfil .vfiltr F.Reg.. pVar .ICV C.Vert. sfal Cos.O&M Irxh RendT&G .EA. Niv.Jus I JuAr I .TurIn1 .TotIn1 .TurIn2 .TotIn2 .TurIn3 .TotIn3 .TurIn4 .TotIn4 .TurIn5 .TotIn5 H V .CFuga1 ..Def1. .CFuga2 ..Def2. .CFuga3 ..Def3. .CFuga4 ..Def4. .CFuga5 ..Def5. E PHidTur PHidVer sv st OpMd IrrR IfTp ForFill ForDraw ForPenT ForPen. .MinGen
7647
8057
  END_HEADER
7648
8058
 
7649
8059
  DEFINE_MACRO
@@ -7717,8 +8127,9 @@ IrrigationDchr INTEGER 820 823 AUTOSET(model.
7717
8127
  InfiltType INTEGER 825 828 AUTOSET(model.parm("InfiltType"))
7718
8128
  ForebayFillUp REAL 830 836 AUTOSET(model.parm("ForebayFillUp"))
7719
8129
  ForebayDrawDown REAL 838 844 AUTOSET(model.parm("ForebayDrawDown"))
7720
- ForebayPenType INTEGER 846 849 AUTOSET(model.parm("ForebayPenType"))
7721
- ForebayPen REAL 851 857 AUTOSET(model.parm("ForebayPen"))
8130
+ ForebayPenType INTEGER 846 852 AUTOSET(model.parm("ForebayPenType"))
8131
+ ForebayPen REAL 854 860 AUTOSET(model.parm("ForebayPen"))
8132
+ MinGen REAL 862 868 AUTOSET
7722
8133
 
7723
8134
  END_DATA
7724
8135
 
@@ -9829,7 +10240,7 @@ DEFINE_BLOCK
9829
10240
  BLOCK_IDENT Num
9830
10241
 
9831
10242
  DEFINE_HEADER
9832
- !NUM ...Nombre... .PV. .VAA .TAA #Uni Tipo ....Pot .FPMed. .QMin.. .QMax.. .VMin.. .VMax.. .VInic. Min.V+T ..VNC.. ..ICP.. ...IH.. ..FP1.. ..Vol1. ..FP2.. ..Vol2. ..FP3.. ..Vol3. ..FP4.. ..Vol4. ..FP5.. ..Vol5. .Area1. ..Vol1. .Area2. ..Vol2. .Area3. ..Vol3. .Area4. ..Vol4. .Area5. ..Vol5. .Filt1. ..Vol1. .Filt2. ..Vol2. .Filt3. ..Vol3. .Filt4. ..Vol4. .Filt5. ..Vol5. .Cota1. .Vol1.. .Cota2. .Vol2.. .Cota3. .Vol3.. .Cota4. .Vol4.. .Cota5. .Vol5.. .Ev1 .Ev2 .Ev3 .Ev4 .Ev5 .Ev6 .Ev7 .Ev8 .Ev9 Ev10 Ev11 Ev12 tini tfil .faa tare .varea. tfil .vfiltr F.Reg.. pVar .ICV C.Vert. sfal Cos.O&M Irxh RendT&G .EA. Niv.Jus I JuAr I .TurIn1 .TotIn1 .TurIn2 .TotIn2 .TurIn3 .TotIn3 .TurIn4 .TotIn4 .TurIn5 .TotIn5 H V .CFuga1 ..Def1. .CFuga2 ..Def2. .CFuga3 ..Def3. .CFuga4 ..Def4. .CFuga5 ..Def5. E
10243
+ !NUM ...Nombre... .PV. .VAA .TAA #Uni Tipo ....Pot .FPMed. .QMin.. .QMax.. .VMin.. .VMax.. .VInic. Min.V+T ..VNC.. ..ICP.. ...IH.. ..FP1.. ..Vol1. ..FP2.. ..Vol2. ..FP3.. ..Vol3. ..FP4.. ..Vol4. ..FP5.. ..Vol5. .Area1. ..Vol1. .Area2. ..Vol2. .Area3. ..Vol3. .Area4. ..Vol4. .Area5. ..Vol5. .Filt1. ..Vol1. .Filt2. ..Vol2. .Filt3. ..Vol3. .Filt4. ..Vol4. .Filt5. ..Vol5. .Cota1. .Vol1.. .Cota2. .Vol2.. .Cota3. .Vol3.. .Cota4. .Vol4.. .Cota5. .Vol5.. .Ev1 .Ev2 .Ev3 .Ev4 .Ev5 .Ev6 .Ev7 .Ev8 .Ev9 Ev10 Ev11 Ev12 tini tfil .faa tare .varea. tfil .vfiltr F.Reg.. pVar .ICV C.Vert. sfal Cos.O&M Irxh RendT&G .EA. Niv.Jus I JuAr I .TurIn1 .TotIn1 .TurIn2 .TotIn2 .TurIn3 .TotIn3 .TurIn4 .TotIn4 .TurIn5 .TotIn5 H V .CFuga1 ..Def1. .CFuga2 ..Def2. .CFuga3 ..Def3. .CFuga4 ..Def4. .CFuga5 ..Def5. E .MinGen
9833
10244
  END_HEADER
9834
10245
 
9835
10246
  DEFINE_MACRO
@@ -9858,6 +10269,7 @@ TotIn($(P)) REAL 619+(16*$(P)),626+(16*$(P)) AUTOSET
9858
10269
  OxT_Tail($(P)) REAL 695+(16*$(P)) 701+(16*$(P)) AUTOSET
9859
10270
  OxT_Outflow($(P)) REAL 703+(16*$(P)) 709+(16*$(P)) AUTOSET
9860
10271
  Eaflu INTEGER 791 791 AUTOSET
10272
+ MinGen REAL 793 799 AUTOSET
9861
10273
  END_DATA
9862
10274
 
9863
10275
  END_BLOCK
@@ -11122,6 +11534,98 @@ END_BLOCK
11122
11534
 
11123
11535
  END_MASK
11124
11536
 
11537
+ //---------------------------------------------------------------------
11538
+ //---------------------------------------------------------------------
11539
+ DEFINE_MASK MIXROWDATA SDDP_v10.2_mntbme
11540
+
11541
+ TOTAL_BLOCK 2
11542
+
11543
+ //-------------------------------------------------------------
11544
+ //-- PRIMEIRO BLOCO -> Identificacao da Usina ---
11545
+ //-------------------------------------------------------------
11546
+ DEFINE_BLOCK
11547
+ BLOCK_IDENT ****
11548
+ BLOCK_LENGTH 1
11549
+ NEXT_BLOCK 2
11550
+
11551
+ DEFINE_DATA
11552
+ IdentBloco STRING 1,12 ****_Planta:
11553
+ Num INTEGER 14,17
11554
+ Nome STRING 19,30
11555
+ IdentPenal STRING 32,37 Penal:
11556
+ MinTurbiningPenalty REAL 42,50 AUTOSET(model.parm("MinTurbiningPenalty"))
11557
+ END_DATA
11558
+
11559
+ END_BLOCK
11560
+ //-------------------------------------------------------------
11561
+ //-- SEGUNDO BLOCO -> Dados ---
11562
+ //-------------------------------------------------------------
11563
+ DEFINE_BLOCK
11564
+ BLOCK_IDENT Year
11565
+
11566
+ DEFINE_HEADER
11567
+ A~no ......1 ......2 ......3 ......4 ......5 ......6 ......7 ......8 ......9 .....10 .....11 .....12
11568
+ END_HEADER
11569
+
11570
+ DEFINE_MACRO
11571
+ VAR N 1,12
11572
+ END_MACRO
11573
+
11574
+ DEFINE_DATA
11575
+ Ano INTEGER 1,4
11576
+ Dado$(N) REAL 5+8*($(N)-1),12+8*($(N)-1)
11577
+ END_DATA
11578
+
11579
+ END_BLOCK
11580
+
11581
+ END_MASK
11582
+
11583
+ //---------------------------------------------------------------------
11584
+ //---------------------------------------------------------------------
11585
+ DEFINE_MASK MIXROWDATA SDDP_v10.2_mntbse
11586
+
11587
+ TOTAL_BLOCK 2
11588
+
11589
+ //-------------------------------------------------------------
11590
+ //-- PRIMEIRO BLOCO -> Identificacao da Usina ---
11591
+ //-------------------------------------------------------------
11592
+ DEFINE_BLOCK
11593
+ BLOCK_IDENT ****
11594
+ BLOCK_LENGTH 1
11595
+ NEXT_BLOCK 2
11596
+
11597
+ DEFINE_DATA
11598
+ IdentBloco STRING 1,12 ****_Planta:
11599
+ Num INTEGER 14,17
11600
+ Nome STRING 19,30
11601
+ IdentPenal STRING 32,37 Penal:
11602
+ MinTurbiningPenalty REAL 42,50 AUTOSET(model.parm("MinTurbiningPenalty"))
11603
+ END_DATA
11604
+
11605
+ END_BLOCK
11606
+ //-------------------------------------------------------------
11607
+ //-- SEGUNDO BLOCO -> Dados ---
11608
+ //-------------------------------------------------------------
11609
+ DEFINE_BLOCK
11610
+ BLOCK_IDENT Year
11611
+
11612
+ DEFINE_HEADER
11613
+ A~no ......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
11614
+ END_HEADER
11615
+
11616
+ DEFINE_MACRO
11617
+ VAR N 1,52
11618
+ END_MACRO
11619
+
11620
+ DEFINE_DATA
11621
+ Ano INTEGER 1,4
11622
+ Dado$(N) REAL 5+8*($(N)-1),12+8*($(N)-1)
11623
+ END_DATA
11624
+
11625
+ END_BLOCK
11626
+
11627
+ END_MASK
11628
+
11125
11629
  //---------------------------------------------------------------------
11126
11630
  //---------------------------------------------------------------------
11127
11631
  DEFINE_MASK MIXROWDATA SDDP_v10.2_mxtbme
@@ -11669,7 +12173,7 @@ MaxReactivePower REAL,21 AUTOSET
11669
12173
  ReactivePowerFactor REAL,22 AUTOSET
11670
12174
  GenDev REAL,23 AUTOSET
11671
12175
  MaxDev REAL,24 AUTOSET
11672
- DevOpt REAL,25 AUTOSET(model.parm("DevOpt"))
12176
+ DevOpt INTEGER,25 AUTOSET(model.parm("DevOpt"))
11673
12177
 
11674
12178
  END_DATA
11675
12179
 
@@ -13839,7 +14343,7 @@ MaxReactivePower REAL,15 AUTOSET
13839
14343
  ReactivePowerFactor REAL,16 AUTOSET
13840
14344
  GenDev REAL,17 AUTOSET
13841
14345
  MaxDev REAL,18 AUTOSET
13842
- DevOpt INTEGER,19 AUTOSET
14346
+ DevOpt INTEGER,19 AUTOSET(model.parm("DevOpt"))
13843
14347
  END_DATA
13844
14348
  END_MASK
13845
14349
  //---------------------------------------------------------------------
@@ -13855,7 +14359,7 @@ Code INTEGER,2
13855
14359
  Name STRING,3
13856
14360
  Bus INTEGER,4
13857
14361
  Existing INTEGER,5 AUTOSET
13858
- NumberOfUnits INTEGER,6 AUTOSET
14362
+ Unidades INTEGER,6 AUTOSET
13859
14363
  PotInst REAL,7 AUTOSET
13860
14364
  SM REAL,8 AUTOSET
13861
14365
  Efficiency REAL,9 AUTOSET
@@ -13869,7 +14373,6 @@ MaxDev REAL,16 AUTOSET
13869
14373
  END_DATA
13870
14374
  END_MASK
13871
14375
 
13872
-
13873
14376
  //---------------------------------------------------------------------
13874
14377
  //---------------------------------------------------------------------
13875
14378
  DEFINE_MASK CSVDATA SDDP_polca
@@ -13888,7 +14391,6 @@ A4 REAL, 7
13888
14391
  END_DATA
13889
14392
  END_MASK
13890
14393
 
13891
-
13892
14394
  //---------------------------------------------------------------------
13893
14395
  //---------------------------------------------------------------------
13894
14396
  DEFINE_MASK CSVDATA SDDP_hidtrb
@@ -13915,7 +14417,7 @@ HydroFrom STRING, 3
13915
14417
  HydroTo STRING, 4
13916
14418
  FlowMin REAL, 5 AUTOSET(model.parm("FlowMin"))
13917
14419
  FlowMax REAL, 6 AUTOSET(model.parm("FlowMax"))
13918
- TravelTime INTEGER, 7 AUTOSET(model.parm("TravelTime"))
14420
+ TravelTime REAL, 7 AUTOSET(model.parm("TravelTime"))
13919
14421
  Currency STRING, 8 AUTOSET(model.parm("Currency"))
13920
14422
  Disabled INTEGER, 9 AUTOSET(model.parm("Disabled"))
13921
14423
  END_DATA
@@ -14368,11 +14870,14 @@ name STRING,2
14368
14870
  unit STRING,3 AUTOSET(model.parm("unit"))
14369
14871
  resol INTEGER,4 AUTOSET(model.parm("resol"))
14370
14872
  type INTEGER,5 AUTOSET(model.parm("type"))
14371
- cost REAL,6 AUTOSET(model.parm("cost"))
14873
+ type INTEGER,6 AUTOSET(model.parm("UseCostAndBounds"))
14874
+ cost REAL,7 AUTOSET(model.parm("cost"))
14875
+ cost REAL,8 AUTOSET(model.parm("UpperBound"))
14876
+ cost REAL,9 AUTOSET(model.parm("LowerBound"))
14372
14877
  END_DATA
14373
14878
  DEFINE_HEADER
14374
14879
  $version=1
14375
- !code,name,unit,resol,type,cost
14880
+ !code,name,unit,resol,type,UseCostAndBounds,cost,UpperBound,LowerBound
14376
14881
  END_HEADER
14377
14882
  END_MASK
14378
14883
  //---------------------------------------------------------------------
@@ -14559,13 +15064,12 @@ DEFINE_MASK CSVDATA SDDP_darea
14559
15064
 
14560
15065
  DEFINE_HEADER
14561
15066
  $version=2
14562
- !Code,Name,SystemCode
15067
+ !Code,Name
14563
15068
  END_HEADER
14564
15069
 
14565
15070
  DEFINE_DATA
14566
15071
  Code INTEGER 1
14567
15072
  Name STRING 2
14568
- SystemCode INTEGER 3
14569
15073
  END_DATA
14570
15074
 
14571
15075
  END_MASK
@@ -15058,7 +15562,7 @@ DEFINE_MASK CSVDATA SDDP_dflowcontroller
15058
15562
 
15059
15563
  DEFINE_HEADER
15060
15564
  $version=1
15061
- !Code,Name,CircuitCode,ControlType,DeviceType,Location,Existing,Decommissioned,Xmin,Xmax,Rating,EmergencyRating,OutageProbability
15565
+ !Code,Name,CircuitCode,ControlType,DeviceType,Location,Existing,Decommissioned,Xmin,Xmax,Rating,EmergencyRating,MaxPower,OutageProbability
15062
15566
  END_HEADER
15063
15567
 
15064
15568
  DEFINE_DATA
@@ -15074,7 +15578,8 @@ Xmin REAL 9 AUTOSET
15074
15578
  Xmax REAL 10 AUTOSET
15075
15579
  Rn REAL 11 AUTOSET
15076
15580
  Re REAL 12 AUTOSET
15077
- Prob REAL 13 AUTOSET
15581
+ MaxPower REAL 13 AUTOSET
15582
+ Prob REAL 14 AUTOSET
15078
15583
  END_DATA
15079
15584
 
15080
15585
  END_MASK
@@ -15083,7 +15588,7 @@ DEFINE_MASK CSVDATA SDDP_mflowcontroller
15083
15588
 
15084
15589
  DEFINE_HEADER
15085
15590
  $version=1
15086
- !Day,Month,Year,Code,Name,CircuitCode,Existing,Decommissioned,Xmin,Xmax,Rating,EmergencyRating,OutageProbability
15591
+ !Day,Month,Year,Code,Name,CircuitCode,Existing,Decommissioned,Xmin,Xmax,Rating,EmergencyRating,MaxPower,OutageProbability
15087
15592
  END_HEADER
15088
15593
 
15089
15594
  DEFINE_DATA
@@ -15099,7 +15604,8 @@ Xmin REAL 9 AUTOSET
15099
15604
  Xmax REAL 10 AUTOSET
15100
15605
  Rn REAL 11 AUTOSET
15101
15606
  Re REAL 12 AUTOSET
15102
- Prob REAL 13 AUTOSET
15607
+ MaxPower REAL 13 AUTOSET
15608
+ Prob REAL 14 AUTOSET
15103
15609
  END_DATA
15104
15610
 
15105
15611
  END_MASK
@@ -15752,9 +16258,9 @@ END_DATA
15752
16258
  END_MASK
15753
16259
  //---------------------------------------------------------------------
15754
16260
  //---------------------------------------------------------------------
15755
- DEFINE_MASK CSVDATA SDDP_areatransf
16261
+ DEFINE_MASK CSVDATA SDDP_areamintransf
15756
16262
  DEFINE_AUTOMATIC_INFO
15757
- FILENAME areatransf.dat
16263
+ FILENAME areamintransf.dat
15758
16264
  VERSION 1
15759
16265
  CONTEXT_READ sddpac
15760
16266
  CONTEXT_WRITE sddpac
@@ -15764,15 +16270,38 @@ ATTRIBUTE_ID code
15764
16270
  END_AUTOMATIC_INFO
15765
16271
 
15766
16272
  DEFINE_DATA
15767
- code REFERENCE 1
15768
- DateTransfer DATE 2 YYYY/MM/DD AUTOSET
15769
- block INTEGER 3
15770
- MaxImport REAL 4
15771
- MaxExport REAL 5
16273
+ code REFERENCE 1
16274
+ DateMinTransfer DATE 2 YYYY/MM/DD AUTOSET
16275
+ block INTEGER 3
16276
+ MinTransfer REAL 4
16277
+ END_DATA
16278
+ DEFINE_HEADER
16279
+ $version=1
16280
+ !code,Date,block,MinTransfer
16281
+ END_HEADER
16282
+ END_MASK
16283
+ //---------------------------------------------------------------------
16284
+ //---------------------------------------------------------------------
16285
+ DEFINE_MASK CSVDATA SDDP_areamaxtransf
16286
+ DEFINE_AUTOMATIC_INFO
16287
+ FILENAME areamaxtransf.dat
16288
+ VERSION 1
16289
+ CONTEXT_READ sddpac
16290
+ CONTEXT_WRITE sddpac
16291
+ CLASSNAME PSRArea
16292
+ MODEL MODL:SDDP_Area
16293
+ ATTRIBUTE_ID code
16294
+ END_AUTOMATIC_INFO
16295
+
16296
+ DEFINE_DATA
16297
+ code REFERENCE 1
16298
+ DateMaxTransfer DATE 2 YYYY/MM/DD AUTOSET
16299
+ block INTEGER 3
16300
+ MaxTransfer REAL 4
15772
16301
  END_DATA
15773
16302
  DEFINE_HEADER
15774
16303
  $version=1
15775
- !code,Date,block,MinImport,MaxExport
16304
+ !code,Date,block,MaxTransfer
15776
16305
  END_HEADER
15777
16306
  END_MASK
15778
16307
  //---------------------------------------------------------------------
@@ -16279,6 +16808,30 @@ $version=1
16279
16808
  !code,Date,block,MinFlow,MaxFlow,MinFlowEmergency,MaxFlowEmergency
16280
16809
  END_HEADER
16281
16810
  END_MASK
16811
+ //---------------------------------------------------------------------
16812
+ //---------------------------------------------------------------------
16813
+ DEFINE_MASK CSVDATA SDDP_dcbusvolt
16814
+ DEFINE_AUTOMATIC_INFO
16815
+ FILENAME dcbusvolt.dat
16816
+ VERSION 1
16817
+ CONTEXT_READ sddpac
16818
+ CONTEXT_WRITE sddpac
16819
+ CLASSNAME PSRBusDC
16820
+ MODEL MODL:SDDP_DCBus
16821
+ ATTRIBUTE_ID code
16822
+ END_AUTOMATIC_INFO
16823
+
16824
+ DEFINE_DATA
16825
+ code REFERENCE 1
16826
+ DateVolt DATE 2 YYYY/MM/DD AUTOSET
16827
+ block INTEGER 3
16828
+ Volt REAL 4
16829
+ END_DATA
16830
+ DEFINE_HEADER
16831
+ $version=1
16832
+ !code,Date,block,Volt
16833
+ END_HEADER
16834
+ END_MASK
16282
16835
 
16283
16836
  //---------------------------------------------------------------------
16284
16837
  //---------------------------------------------------------------------