inewave 1.10.4__tar.gz → 1.11.0__tar.gz

{inewave-1.10.4 → inewave-1.11.0}/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.11.0
+
+- Suporte ao processamento do arquivo `eliminacao_cortes.dat`
+- Atualização do arquivo `arquivos.dat` com as linhas adicionais relativas ao `volref_saz.dat` e `eliminacao_cortes.dat` 
+- Correção de tipagem estática para mypy
+- Adicionados mais exemplos para a documentação
+
 # 1.10.4
 
 - Correção na escrita do arquivo `ghmin.dat` em linhas relativas aos anos "POS" [#106](https://github.com/rjmalves/inewave/issues/106) (@joaoCalmon).

{inewave-1.10.4 → inewave-1.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: inewave
-Version: 1.10.4
+Version: 1.11.0
 Summary: inewave
 Project-URL: Documentation, https://rjmalves.github.io/inewave/
 Project-URL: Repository, https://github.com/rjmalves/inewave/

inewave-1.11.0/docs/source/referencia/newave/arquivos/eliminacao_cortes.rst

@@ -0,0 +1,13 @@
+.. _eliminacaocortes:
+
+===========================================================
+Parâmetros da Eliminação de Cortes (eliminacao_cortes.dat)
+===========================================================
+
+.. currentmodule:: inewave.newave.eliminacao_cortes
+
+As configurações da metodologia de eliminação de cortes do NEWAVE
+, localizadas no arquivo geralmente denominado eliminacao_cortes.dat, são armazenadas na classe:
+
+.. autoclass:: EliminacaoCortes
+   :members:

{inewave-1.10.4 → inewave-1.11.0}/docs/source/referencia/newave/index.rst

@@ -40,6 +40,7 @@ NEWAVE
    arquivos/vazoes
    arquivos/shist
    arquivos/selcor
+   arquivos/eliminacao_cortes
    arquivos/parp
    arquivos/parpeol
    arquivos/parpvaz

inewave-1.11.0/examples/libs/restricao-eletrica.csv

@@ -0,0 +1,68 @@
+&RE; cod_rest;  formula
+RE ;        1;   ger_usih(285) + ger_usih(287)
+RE ;       20;   1.0ener_interc(2,1) + 0.5ger_usih(66)
+RE ;       21;   1.0ener_interc(11,1) + ger_usih(261)+ ger_usih(257)
+RE ;       22;   1.0ener_interc(11,1) + 1.0ener_interc(3,1) + ger_usih(261)+ ger_usih(257)
+RE ;       23;   1.0ener_interc(11,1) + 1.0ener_interc(3,1) + 1.0ener_interc(4,1) + ger_usih(261)+ ger_usih(257)
+RE ;       10;   ger_usih(204) + ger_usih(284)
+ 
+&RE-HORIZ-PER; cod_rest; PerIni; PerFin
+RE-HORIZ-PER ;        1;2025/06;2025/07
+RE-HORIZ-PER ;       20;2025/06;2026/05
+RE-HORIZ-PER ;       21;2025/06;2026/05
+RE-HORIZ-PER ;       22;2025/06;2025/07
+RE-HORIZ-PER ;       23;2025/08;2026/05
+RE-HORIZ-PER ;       10;2025/06;2025/07
+ 
+&RE-LIM-FORM-PER-PAT; cod_rest;  PerIni;  PerFin;   Pat;    LimInf;  LimSup
+& Escoamento Madeira
+RE-LIM-FORM-PER-PAT ;        1; 2025/06; 2025/06;     1;   -1.1e30;  7359.87
+RE-LIM-FORM-PER-PAT ;        1; 2025/06; 2025/06;     2;   -1.1e30;  7359.87
+RE-LIM-FORM-PER-PAT ;        1; 2025/06; 2025/06;     3;   -1.1e30;  7359.87
+RE-LIM-FORM-PER-PAT ;        1; 2025/07; 2025/07;     1;   -1.1e30;  7406.33
+RE-LIM-FORM-PER-PAT ;        1; 2025/07; 2025/07;     2;   -1.1e30;  7406.33
+RE-LIM-FORM-PER-PAT ;        1; 2025/07; 2025/07;     3;   -1.1e30;  7406.33
+& Limite Sul-SE = Min (FSUL , RSE - 1/2 Itaipu) - valores de RSE:
+RE-LIM-FORM-PER-PAT ;       20; 2025/06; 2025/06;     1;   -1.1e30;  9145.00
+RE-LIM-FORM-PER-PAT ;       20; 2025/06; 2025/06;     2;   -1.1e30; 10195.00
+RE-LIM-FORM-PER-PAT ;       20; 2025/06; 2025/06;     3;   -1.1e30; 10355.00
+RE-LIM-FORM-PER-PAT ;       20; 2025/07; 2025/07;     1;   -1.1e30; 10200.00
+RE-LIM-FORM-PER-PAT ;       20; 2025/07; 2025/07;     2;   -1.1e30; 10200.00
+RE-LIM-FORM-PER-PAT ;       20; 2025/07; 2025/07;     3;   -1.1e30; 10675.00
+RE-LIM-FORM-PER-PAT ;       20; 2025/08; 2026/05;     1;   -1.1e30;  8000.00
+RE-LIM-FORM-PER-PAT ;       20; 2025/08; 2026/05;     2;   -1.1e30;  8000.00
+RE-LIM-FORM-PER-PAT ;       20; 2025/08; 2026/05;     3;   -1.1e30; 10900.00
+&  Limite Imperatriz - Sudeste = FNS - Lajeado - Peixe Angical - valores do FNS:
+RE-LIM-FORM-PER-PAT ;       21; 2025/06; 2025/06;     1;   -1.1e30;  3200.00
+RE-LIM-FORM-PER-PAT ;       21; 2025/06; 2025/06;     2;   -1.1e30;  3200.00
+RE-LIM-FORM-PER-PAT ;       21; 2025/06; 2025/06;     3;   -1.1e30;  5000.00
+RE-LIM-FORM-PER-PAT ;       21; 2025/07; 2025/07;     1;   -1.1e30;  3200.00
+RE-LIM-FORM-PER-PAT ;       21; 2025/07; 2025/07;     2;   -1.1e30;  5200.00
+RE-LIM-FORM-PER-PAT ;       21; 2025/07; 2025/07;     3;   -1.1e30;  5000.00
+RE-LIM-FORM-PER-PAT ;       21; 2025/08; 2026/05;     1;   -1.1e30;  5400.00
+RE-LIM-FORM-PER-PAT ;       21; 2025/08; 2026/05;     2;   -1.1e30;  5400.00
+RE-LIM-FORM-PER-PAT ;       21; 2025/08; 2026/05;     3;   -1.1e30;  5200.00
+& Limite FNS + FNESE = Limite 11-1 + Limite 3-1 + Lajeado + Peixe Angical 
+RE-LIM-FORM-PER-PAT ;       22; 2025/06; 2025/06;     1;   -1.1e30;  7700.00
+RE-LIM-FORM-PER-PAT ;       22; 2025/06; 2025/06;     2;   -1.1e30;  6129.00
+RE-LIM-FORM-PER-PAT ;       22; 2025/06; 2025/06;     3;   -1.1e30; 11200.00
+RE-LIM-FORM-PER-PAT ;       22; 2025/07; 2025/07;     1;   -1.1e30;  7700.00
+RE-LIM-FORM-PER-PAT ;       22; 2025/07; 2025/07;     2;   -1.1e30; 10175.00
+RE-LIM-FORM-PER-PAT ;       22; 2025/07; 2025/07;     3;   -1.1e30; 11200.00
+& Limite FNS + FNESE + XINGU->SE/CO +  = Limite 11-1 + Limite 3-1 + + Limite 4-1 + Lajeado + Peixe Angical 
+RE-LIM-FORM-PER-PAT ;       23; 2025/08; 2025/10;     1;   -1.1e30; 13800.00
+RE-LIM-FORM-PER-PAT ;       23; 2025/08; 2025/10;     2;   -1.1e30; 13200.00
+RE-LIM-FORM-PER-PAT ;       23; 2025/08; 2025/10;     3;   -1.1e30; 13800.00
+RE-LIM-FORM-PER-PAT ;       23; 2025/11; 2025/11;     1;   -1.1e30; 14800.00
+RE-LIM-FORM-PER-PAT ;       23; 2025/11; 2025/11;     2;   -1.1e30; 14200.00
+RE-LIM-FORM-PER-PAT ;       23; 2025/11; 2025/11;     3;   -1.1e30; 14800.00
+RE-LIM-FORM-PER-PAT ;       23; 2025/12; 2025/12;     1;   -1.1e30; 15800.00
+RE-LIM-FORM-PER-PAT ;       23; 2025/12; 2025/12;     2;   -1.1e30; 15200.00
+RE-LIM-FORM-PER-PAT ;       23; 2025/12; 2025/12;     3;   -1.1e30; 15800.00
+RE-LIM-FORM-PER-PAT ;       23; 2026/01; 2026/05;     1;   -1.1e30; 17000.00
+RE-LIM-FORM-PER-PAT ;       23; 2026/01; 2026/05;     2;   -1.1e30; 15800.00
+RE-LIM-FORM-PER-PAT ;       23; 2026/01; 2026/05;     3;   -1.1e30; 16800.00
+& Restricao de geracao Cachoeira Caldeirão + Ferreira Gomes
+RE-LIM-FORM-PER-PAT ;       10; 2025/06; 2025/07;     1;   -1.1e30;   400.00
+RE-LIM-FORM-PER-PAT ;       10; 2025/06; 2025/07;     2;   -1.1e30;   400.00
+RE-LIM-FORM-PER-PAT ;       10; 2025/06; 2025/07;     3;   -1.1e30;   400.00

inewave-1.11.0/examples/newave/manutt.dat

@@ -0,0 +1,115 @@
+EMPRESA          COD USINA           UNTDDMMAAAA DUR.    POT.
+XXAAAAAAAAAAA    XXXAAAAAAAAAAAAA    XXAXXXXXXXX XXX   XXXX.XX
+68PETROBRAS      211BAIXADA FLU       1 06082025  26    172.00
+68PETROBRAS      211BAIXADA FLU       2 06082025  26    172.00
+68PETROBRAS      211BAIXADA FLU       3 06082025  26    186.00
+68PETROBRAS       97CUBATAO           2 09082025  25     49.87
+92TERNIUM         65DO ATLAN_CSA      1 11122025   4    148.04
+68PETROBRAS       63IBIRITE           2 01102025  32     74.00
+30KARKEY KARA    245KARKEY 013        5 02112025   1     20.65
+30KARKEY KARA    245KARKEY 013        6 10112025   1     20.65
+30KARKEY KARA    246KARKEY 019        3 05102025   1     18.32
+30KARKEY KARA    246KARKEY 019        7 01082025   1      6.00
+68PETROBRAS      110N.PIRATININGA     1 01082025  15     96.41
+68PETROBRAS      110N.PIRATININGA     2 01082025  15     96.39
+68PETROBRAS      110N.PIRATININGA     3 01082025  17     96.91
+68PETROBRAS      110N.PIRATININGA     4 01082025  17     96.67
+27ELDORADO       229ONCA PINTADA      1 18102025   3     50.00
+20DIFERENCIAL    249PORSUD I          1 05102025   1     19.32
+20DIFERENCIAL    249PORSUD I          2 10102025   1     19.32
+20DIFERENCIAL    249PORSUD I          3 12102025   1     19.32
+20DIFERENCIAL    249PORSUD I          4 01102025   1     19.32
+20DIFERENCIAL    249PORSUD I          5 21112025   1     19.32
+20DIFERENCIAL    249PORSUD I          6 05112025   1     19.32
+20DIFERENCIAL    250PORSUD II         1 02102025   1     18.45
+20DIFERENCIAL    250PORSUD II         2 03102025   1     18.45
+20DIFERENCIAL    250PORSUD II         3 04102025   1     18.45
+20DIFERENCIAL    250PORSUD II         4 05102025   1     18.45
+20DIFERENCIAL    250PORSUD II         5 06102025   1      4.52
+68PETROBRAS       62SEROPEDICA        4 23112025  16     45.00
+68PETROBRAS       62SEROPEDICA        5 08112025  16     45.00
+68PETROBRAS       62SEROPEDICA        6 08112025  16     45.00
+68PETROBRAS       62SEROPEDICA        7 23112025  16     45.00
+68PETROBRAS       62SEROPEDICA        8 01082025  29     45.00
+68PETROBRAS       90TERMOMACAE        1 01082025  20     47.21
+68PETROBRAS       90TERMOMACAE        2 01082025  20     46.02
+68PETROBRAS       90TERMOMACAE        3 01082025  20     46.40
+68PETROBRAS       90TERMOMACAE        5 20102025  30     45.35
+68PETROBRAS       90TERMOMACAE        6 27102025  30     46.63
+68PETROBRAS       90TERMOMACAE        7 03112025  30     46.33
+68PETROBRAS       90TERMOMACAE        8 10112025  30     46.32
+68PETROBRAS       90TERMOMACAE        9 01102025  30     46.01
+68PETROBRAS       90TERMOMACAE       10 01112025  30     43.86
+68PETROBRAS       90TERMOMACAE       11 24112025  30     47.20
+68PETROBRAS       90TERMOMACAE       12 01122025  30     44.86
+68PETROBRAS       90TERMOMACAE       13 04082025  30     48.38
+68PETROBRAS       90TERMOMACAE       13 01102025  30     48.38
+68PETROBRAS       90TERMOMACAE       14 10092025  30     44.25
+68PETROBRAS       90TERMOMACAE       15 01082025  19     48.27
+68PETROBRAS       90TERMOMACAE       15 01102025  30     48.27
+68PETROBRAS       90TERMOMACAE       16 01082025  26     43.93
+68PETROBRAS       90TERMOMACAE       16 01102025  30     43.93
+68PETROBRAS       90TERMOMACAE       17 17102025  30     45.91
+68PETROBRAS       90TERMOMACAE       19 08122025  24     48.35
+68PETROBRAS       90TERMOMACAE       20 01102025  30     48.14
+68PETROBRAS       47TERMORIO          1 01082025  30    104.70
+68PETROBRAS       47TERMORIO          3 01082025  30    145.00
+68PETROBRAS       47TERMORIO          3 01102025  30    145.00
+68PETROBRAS       47TERMORIO          4 01102025  30    104.70
+68PETROBRAS       68TRES LAGOAS       1 01112025  30     58.39
+68PETROBRAS       68TRES LAGOAS       1 01122025  30     58.39
+68PETROBRAS       68TRES LAGOAS       3 01092025  30     57.32
+68PETROBRAS       68TRES LAGOAS       4 01092025  30     57.87
+68PETROBRAS       68TRES LAGOAS       6 01112025  30     57.32
+68PETROBRAS       64CANOAS            1 18082025  20    167.57
+68PETROBRAS       64CANOAS            2 18082025  20     81.00
+26ERB ARATING    106ERB CANDEIAS      1 04082025  19     16.79
+27MYRTOS         223PROSPERI III      1 21082025   3      9.33
+27MYRTOS         223PROSPERI III      1 01122025   2      9.33
+27MYRTOS         223PROSPERI III      2 25082025   3      9.33
+27MYRTOS         223PROSPERI III      2 04122025   2      9.33
+27MYRTOS         223PROSPERI III      3 14082025   3      9.33
+27MYRTOS         223PROSPERI III      3 13112025   2      9.33
+27MYRTOS         223PROSPERI III      4 11082025   3      9.33
+27MYRTOS         223PROSPERI III      4 10112025   2      9.33
+27MYRTOS         223PROSPERI III      5 18082025   3      9.33
+27MYRTOS         223PROSPERI III      5 06112025   2      9.33
+27MYRTOS         223PROSPERI III      6 04082025   3      9.33
+27MYRTOS         223PROSPERI III      6 03112025   2      9.33
+27IMETAME        147PROSPERIDADE      1 13102025   3      9.34
+27IMETAME        147PROSPERIDADE      2 08092025   3      9.34
+27IMETAME        147PROSPERIDADE      2 10122025   1      9.34
+27IMETAME        147PROSPERIDADE      3 15122025   3      9.34
+21SUAPE II       170SUAPE II          1 06092025   6     22.43
+21SUAPE II       170SUAPE II          2 06122025   2     22.43
+21SUAPE II       170SUAPE II          4 11102025   2     22.43
+21SUAPE II       170SUAPE II          6 11102025   2     22.43
+21SUAPE II       170SUAPE II          7 01112025   6     22.43
+21SUAPE II       170SUAPE II          8 27092025   2     22.43
+21SUAPE II       170SUAPE II         10 13122025   2     22.43
+21SUAPE II       170SUAPE II         13 04102025   2     22.43
+21SUAPE II       170SUAPE II         16 27092025   2     22.43
+21SUAPE II       170SUAPE II         17 23082025   2     22.43
+21SUAPE II       170SUAPE II         17 08122025   2     22.43
+68PETROBRAS       58TERMOCEARA        1 01112025  30     55.75
+68PETROBRAS       58TERMOCEARA        2 01112025  30     57.11
+68PETROBRAS       58TERMOCEARA        3 01112025  30     56.24
+68PETROBRAS       58TERMOCEARA        4 01112025  30     53.89
+68PETROBRAS       83VALE DO ACU       1 01092025  60    110.00
+37ELETRONORTE    201APARECIDA         1 10092025   3     40.00
+37ELETRONORTE    201APARECIDA         1 04112025   4     40.00
+37ELETRONORTE    201APARECIDA         2 24092025   3     40.00
+37ELETRONORTE    201APARECIDA         2 26112025   3     40.00
+37ELETRONORTE    201APARECIDA         3 12082025   4     43.00
+37ELETRONORTE    201APARECIDA         3 08102025   3     43.00
+37ELETRONORTE    201APARECIDA         3 09122025   4     43.00
+37ELETRONORTE    201APARECIDA         4 26082025   4     43.00
+37ELETRONORTE    201APARECIDA         4 28102025   4     43.00
+37ELETRONORTE    201APARECIDA         4 17122025   3     43.00
+37ELETRONORTE    140MAUA 3            1 07082025   4    189.55
+37ELETRONORTE    140MAUA 3            1 12112025   3    189.55
+37ELETRONORTE    140MAUA 3            2 06082025   1    189.55
+37ELETRONORTE    140MAUA 3            2 21102025   3    189.55
+37ELETRONORTE    140MAUA 3            3 01082025  10    211.65
+37ELETRONORTE    140MAUA 3            3 21102025   3    211.65
+37ELETRONORTE    140MAUA 3            3 12112025   3    211.65