inewave 1.10.0__py3-none-any.whl → 1.10.2__py3-none-any.whl

inewave/__init__.py

@@ -6,7 +6,7 @@ inewave é um módulo em Python para manipulação dos arquivos de entrada
 e saída do NEWAVE.
 """
 
-__version__ = "1.10.0"
+__version__ = "1.10.2"
 
 from . import newave  # noqa
 from . import nwlistcf  # noqa

inewave/newave/modelos/blocos/versaomodelo.py

@@ -1,9 +1,7 @@
-from cfinterface.components.block import Block
-from cfinterface.components.literalfield import LiteralField
-from cfinterface.components.line import Line
-
 from typing import IO, List
 
+from cfinterface.components.block import Block
+
 
 class VersaoModelo(Block):
     """
@@ -26,8 +24,7 @@ class VersaoModelo(Block):
 
     def read(self, file: IO, *args, **kwargs):
         linha = file.readline()
-        modelo_linha = Line([LiteralField(size=12, starting_position=29)])
-        self.data = modelo_linha.read(linha)[0]
+        self.data = linha.split("Versao")[1].strip().split(" ")[0]
 
 
 class VersaoModeloLibs(Block):
@@ -51,5 +48,4 @@ class VersaoModeloLibs(Block):
 
     def read(self, file: IO, *args, **kwargs):
         linha = file.readline()
-        modelo_linha = Line([LiteralField(size=20, starting_position=12)])
-        self.data = modelo_linha.read(linha)[0]
+        self.data = linha.split("NEWAVE -")[1].strip().split(" ")[0]

inewave/newave/modelos/cadic.py

@@ -35,7 +35,7 @@ class BlocoCargasAdicionais(Section):
         super().__init__(previous, next, data)
         self.__linha_subsis = Line([
             IntegerField(3, 1),
-            LiteralField(10, 6),
+            LiteralField(10, 5),
             LiteralField(12, 21),
         ])
         campo_ano: List[Field] = [LiteralField(4, 0)]

inewave/newave/modelos/dger.py

@@ -1074,7 +1074,7 @@ class BlocoVolInicialSubsistema(Section):
         return self.data[1:]
 
     @valores.setter
-    def valores(self, v: List[float]):
+    def valores(self, v: List[Optional[float]]):
         self.data = [self.data[0]] + v
 
 

inewave/newave/modelos/sistema.py

@@ -509,7 +509,7 @@ class BlocoGeracaoUsinasNaoSimuladas(Section):
         self.__linha_subsis = Line([
             IntegerField(3, 1),
             IntegerField(3, 6),
-            LiteralField(3, 11),
+            LiteralField(8, 11),
         ])
 
         campo_ano: List[Field] = [IntegerField(4, 0)]

inewave/newave/vazpast.py

@@ -1,8 +1,9 @@
-from inewave.newave.modelos.vazpast import BlocoVazPast
+from typing import Optional, TypeVar
 
-from cfinterface.files.sectionfile import SectionFile
-from typing import TypeVar, Optional
 import pandas as pd  # type: ignore
+from cfinterface.files.sectionfile import SectionFile
+
+from inewave.newave.modelos.vazpast import BlocoVazPast
 
 
 class Vazpast(SectionFile):
@@ -24,7 +25,7 @@ class Vazpast(SectionFile):
         """
         Tabela com a tendência hidrológica por UHE.
 
-        - codigo_usina (`int`)
+        - codigo_posto (`int`)
         - nome_usina (`str`)
         - mes (`int`)
         - valor (`float`)

inewave/nwlistop/modelos/nwlistopdat.py

@@ -1,8 +1,9 @@
-from cfinterface.components.section import Section
-from cfinterface.components.line import Line
+from typing import IO, Any, Dict, List
+
 from cfinterface.components.integerfield import IntegerField
+from cfinterface.components.line import Line
 from cfinterface.components.literalfield import LiteralField
-from typing import List, Dict, IO, Any
+from cfinterface.components.section import Section
 
 
 class BlocoDadosNwlistop(Section):
@@ -25,19 +26,15 @@ class BlocoDadosNwlistop(Section):
     def __init__(self, previous=None, next=None, data=None) -> None:
         super().__init__(previous, next, data)
         self.__linha_opcao = Line([IntegerField(1, 1)])
-        self.__linha_arquivo = Line(
-            [LiteralField(29, 0), LiteralField(40, 30)]
-        )
-        self.__linha_series_op1 = Line(
-            [IntegerField(4, 1), IntegerField(4, 6)]
-        )
+        self.__linha_arquivo = Line([LiteralField(29, 0), LiteralField(40, 30)])
+        self.__linha_series_op1 = Line([IntegerField(4, 1), IntegerField(4, 6)])
         self.__linha_periodos = Line([IntegerField(3, 1), IntegerField(3, 5)])
-        self.__linha_variaveis_op2 = Line(
-            [IntegerField(2, 1 + 3 * i) for i in range(21)]
-        )
-        self.__linha_uhes_op2 = Line(
-            [IntegerField(3, 1 + 4 * i) for i in range(16)]
-        )
+        self.__linha_variaveis_op2 = Line([
+            IntegerField(2, 1 + 3 * i) for i in range(21)
+        ])
+        self.__linha_uhes_op2 = Line([
+            IntegerField(3, 1 + 4 * i) for i in range(16)
+        ])
         self.data: Dict[str, Any] = {}
         self.__comentarios: List[List[str]] = []
 
@@ -45,12 +42,10 @@ class BlocoDadosNwlistop(Section):
         if not isinstance(o, BlocoDadosNwlistop):
             return False
         bloco: BlocoDadosNwlistop = o
-        if not all(
-            [
-                isinstance(self.data, dict),
-                isinstance(o.data, dict),
-            ]
-        ):
+        if not all([
+            isinstance(self.data, dict),
+            isinstance(o.data, dict),
+        ]):
             return False
         else:
             return self.data == bloco.data
@@ -162,7 +157,7 @@ class BlocoDadosNwlistop(Section):
         for c in self.__comentarios[1]:
             file.write(c)
         # Escreve as séries
-        file.write(self.__linha_periodos.write(self.data["series"]))
+        file.write(self.__linha_series_op1.write(self.data["series"]))
 
     # Override
     def __write_op2(self, file: IO, *args, **kwargs):
@@ -178,17 +173,17 @@ class BlocoDadosNwlistop(Section):
         for c in self.__comentarios[1]:
             file.write(c)
         # Escreve as séries
-        file.write(self.__linha_periodos.write(self.data["variaveis_ree"]))
+        file.write(self.__linha_variaveis_op2.write(self.data["variaveis_ree"]))
         # Escreve as linhas de cabeçalho para variáveis individualizadas
         for c in self.__comentarios[2]:
             file.write(c)
         # Escreve as séries
-        file.write(self.__linha_periodos.write(self.data["variaveis_uhe"]))
+        file.write(self.__linha_variaveis_op2.write(self.data["variaveis_uhe"]))
         # Escreve as linhas de cabeçalho para usinas
         for c in self.__comentarios[3]:
             file.write(c)
         # Escreve as séries
-        file.write(self.__linha_periodos.write(self.data["uhes"]))
+        file.write(self.__linha_uhes_op2.write(self.data["uhes"]))
 
     # Override
     def __write_op4(self, file: IO, *args, **kwargs):

{inewave-1.10.0.dist-info → inewave-1.10.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: inewave
-Version: 1.10.0
+Version: 1.10.2
 Summary: inewave
 Project-URL: Documentation, https://rjmalves.github.io/inewave/
 Project-URL: Repository, https://github.com/rjmalves/inewave/
@@ -67,7 +67,7 @@ O inewave oferece:
 
 ## Instalação
 
-O inewave é compatível com versões de Python >= 3.8.
+O inewave é compatível com versões de Python >= 3.10.
 
 É possível instalar a versão distribuída oficialmente com pip:
 

{inewave-1.10.0.dist-info → inewave-1.10.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-inewave/__init__.py,sha256=IdXAvcSvBKOOQCw_kkPbc1IC1KW6qTN8Hzwhq3M5f-Q,236
+inewave/__init__.py,sha256=fvATv_T-Ej_ViYCGhjQzMmlVjKBnjgC2joGAze6aajc,236
 inewave/config.py,sha256=fMgG2sqE_PNz30QCNxkgfPf78SEOAVfV07kGtO1bREE,1106
 inewave/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 inewave/_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -84,7 +84,7 @@ inewave/newave/vazaof.py,sha256=9FBx7H81EkK0QluWhrgYA1UQRSJ-20wimh-0qM4QG-s,1282
 inewave/newave/vazaos.py,sha256=A4eH13NMgvxuMTxZ96yiXhB20uVCsGHCSInI9rIMG3o,1289
 inewave/newave/vazinat.py,sha256=41ziSA8l9BNCPcF7RuCCr_4UzIaTrsR9qAfPVUuJxqI,1304
 inewave/newave/vazoes.py,sha256=7baWSre6vToqNWj8YJdq_2vZ5xmFon_egazQW1M8Yew,2373
-inewave/newave/vazpast.py,sha256=5kdkC-nqRLiEjsMq-jh693H2NGEdDE4Y-wMFmpE-evw,1197
+inewave/newave/vazpast.py,sha256=NYjWpWgVaZ51UEC7lxDMBW16yXTykyvnNISd7uKbe_I,1198
 inewave/newave/volref_saz.py,sha256=TbQqIimcs35m74lRHkDOsFu6M_YVE0GJpUFIYJWdbc0,1241
 inewave/newave/modelos/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 inewave/newave/modelos/abertura.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -95,7 +95,7 @@ inewave/newave/modelos/avl_cortesfpha_nwv.py,sha256=9lZCfXgkntDpVO_1_yHW1WR6u001
 inewave/newave/modelos/avl_desvfpha_s.py,sha256=SoR5bj4wDpUe4NyGtgT6Kn8g1QbBSl_bAY9qpv6bgmA,3277
 inewave/newave/modelos/avl_desvfpha_v_q.py,sha256=aDz2EVO_bHQJJKez8uTpzle-GFT_nlnOCpHcK7b3iCA,3198
 inewave/newave/modelos/bid.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-inewave/newave/modelos/cadic.py,sha256=l-6NEGkJYDMDVcfxxdmabkhVJWIRH-huXJDN20V0jMU,5563
+inewave/newave/modelos/cadic.py,sha256=zKOkyoU-CqFLSEe2KPJJvDkE4zLFAg60OHwY0GEY2Kc,5563
 inewave/newave/modelos/caso.py,sha256=6U12tnNL0ChfnfjFKg3OyEV1ML-_--9AMXqzCGHfFiY,2094
 inewave/newave/modelos/clasgas.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 inewave/newave/modelos/clast.py,sha256=ry3masYiPhtXojDMnOJBTux0_CqzLc2S0K151nKxBlE,7543
@@ -105,7 +105,7 @@ inewave/newave/modelos/cortes.py,sha256=csy2I9o_TkQx8t4E3ugPndwRJJFIZIwusQiBswa3
 inewave/newave/modelos/cortesh.py,sha256=ayA-zWiBQ3o77J_wqehgODhl9wjeold84bYsKmKs-6g,31154
 inewave/newave/modelos/curva.py,sha256=bkxFD8_zhnMe-cBw61C9T4unWLnVfspNnjHTnUG7NVo,13680
 inewave/newave/modelos/cvar.py,sha256=Wu_qilEvzjT9MCoelMmiDztu9-yTI0eAC2fQMMN2E2M,7489
-inewave/newave/modelos/dger.py,sha256=2zVnAE0p8hlBtM_nt18gCJWXUaCvBqeNWpmtxR63Cj0,141663
+inewave/newave/modelos/dger.py,sha256=-aUJ-S0j15q1RVbAyq-bWB0F9YfXGoNe1Vsy7hH78Ew,141673
 inewave/newave/modelos/dsvagua.py,sha256=G_4PKZcQCF_vZMrBqQcnpH54edXhSEyDlHNy4aZoiIk,5592
 inewave/newave/modelos/eafpast.py,sha256=HFKpsMyoLGwQly95uHhsK2wnrBwL7v8auzaa-UbgP5k,3322
 inewave/newave/modelos/eco_fpha.py,sha256=q-b-ShvAW-RDpr7xlmhBvM9ixWF9DxqFvhxApA7oGdo,1646
@@ -144,7 +144,7 @@ inewave/newave/modelos/ree.py,sha256=6VaJhSKutVlaPtQDTZcf1S7JHR0hNhEsPgsh_MzyegA
 inewave/newave/modelos/sar.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 inewave/newave/modelos/selcor.py,sha256=v2ASlI61CKebh5eCOeA5Ce3GLzFDAYJ9Bsm0whKqq-4,2069
 inewave/newave/modelos/shist.py,sha256=wy_E1onlbfrCFvWcpNhnUt3WAGmPJ2FSUbkywvH1b2c,3376
-inewave/newave/modelos/sistema.py,sha256=qnB_8gOba4jciou53KjR03q4fBCANKKCnQS5lhqs0IA,23091
+inewave/newave/modelos/sistema.py,sha256=T6FYm05CkNzhwzjx_8O5cJwGvAoSRmHJYf41neDs7Eg,23091
 inewave/newave/modelos/tecno.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 inewave/newave/modelos/term.py,sha256=cL5356rYRHPf1zsXzoGzrPa1MtncMAOhwP-U27s2o8E,4760
 inewave/newave/modelos/vazaob.py,sha256=_G5Kd1PD7C5DU2aV_Xam67GpaqJTEvXCWuhiAO_POyw,2901
@@ -158,7 +158,7 @@ inewave/newave/modelos/arquivoscsv/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQe
 inewave/newave/modelos/arquivoscsv/arquivocsv.py,sha256=97HYqHCPo9T1K35x19ILV6mxwDeXgVdbDNULrZha5VI,1659
 inewave/newave/modelos/blocos/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 inewave/newave/modelos/blocos/tabelacsv.py,sha256=1MHxVBNW_SypjMC8nm24FkFvVGtUgnXguxq8V48zZOI,2131
-inewave/newave/modelos/blocos/versaomodelo.py,sha256=fjmw8Tf8T7sW82kK-1JYL7Hq5Rn2geDV9-DJi_IIeUU,1577
+inewave/newave/modelos/blocos/versaomodelo.py,sha256=xpATfrTZse-UychyrlrCJ2NRj5bx0HmEXU9xCOJlUMs,1361
 inewave/nwlistcf/__init__.py,sha256=NVTYQl6Gh_BbtXuoORDoY4XeFYVwoMzZVr3Ddou7ME4,218
 inewave/nwlistcf/arquivos.py,sha256=JaUlJ2Aw6sM2H1BEwSQb5J9ywMfq5r4GZXRJSA1N8s0,6739
 inewave/nwlistcf/caso.py,sha256=cahc8MmggJbHWj3FGXKQwt3IIi0W84S1Ut8O3C-QaGM,970
@@ -451,7 +451,7 @@ inewave/nwlistop/modelos/merclsin.py,sha256=arrMiDrPb3z7CqoT0ndCW0GZgJec6oa0by3y
 inewave/nwlistop/modelos/mevmin.py,sha256=xv2rpx4GqK3fs_b9F8fNcwepmkqZkFw6lhheAghRZj0,693
 inewave/nwlistop/modelos/mevminm.py,sha256=xv2rpx4GqK3fs_b9F8fNcwepmkqZkFw6lhheAghRZj0,693
 inewave/nwlistop/modelos/mevminsin.py,sha256=xv2rpx4GqK3fs_b9F8fNcwepmkqZkFw6lhheAghRZj0,693
-inewave/nwlistop/modelos/nwlistopdat.py,sha256=CLteMOIPb7hOMYDhxZ_dXrWHoKVKOsCyyZttGcI5C1Y,6989
+inewave/nwlistop/modelos/nwlistopdat.py,sha256=svwmrXzLZjN5yD1UUWyUEsNlSUiwWah7N1lCHQvNQs8,6924
 inewave/nwlistop/modelos/perdf.py,sha256=HGMOZGIJLbfLSMin-K_5wzGUsUInA--KShyaTkv0Whc,638
 inewave/nwlistop/modelos/perdfm.py,sha256=HGMOZGIJLbfLSMin-K_5wzGUsUInA--KShyaTkv0Whc,638
 inewave/nwlistop/modelos/perdfsin.py,sha256=HGMOZGIJLbfLSMin-K_5wzGUsUInA--KShyaTkv0Whc,638
@@ -539,7 +539,7 @@ inewave/nwlistop/modelos/blocos/usina.py,sha256=cQvLVtG1NC8y4lP_to6-YjAKQRGRlaxO
 inewave/nwlistop/modelos/blocos/valoresclassetermicaseriepatamar.py,sha256=0LV0JMFoiuNEQ3n-XVfG2T0sIq_33bnCt6gmwPOTql8,3283
 inewave/nwlistop/modelos/blocos/valoresserie.py,sha256=Q88QBoI3zyU7y0AvHBeSqDBEVAkb3rAa3XpxA51NbF8,2143
 inewave/nwlistop/modelos/blocos/valoresseriepatamar.py,sha256=xnRdor-_2VyR5EbWNSzU_hbABJFtfgKGlznbcRaslGg,2589
-inewave-1.10.0.dist-info/METADATA,sha256=EWQpDolZcEpzFk2fH6mT1dg6zSpkdtscFG59SjT2PHU,3742
-inewave-1.10.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-inewave-1.10.0.dist-info/licenses/LICENSE.md,sha256=0jOBL78mjzscN0-XI-6YtK1IqnODUbG85DaKAMH4XJ8,1070
-inewave-1.10.0.dist-info/RECORD,,
+inewave-1.10.2.dist-info/METADATA,sha256=vAZzf_juRHFDT3Dyo4OGAjxz3oP-KQdK9tj8QUULvcI,3743
+inewave-1.10.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+inewave-1.10.2.dist-info/licenses/LICENSE.md,sha256=0jOBL78mjzscN0-XI-6YtK1IqnODUbG85DaKAMH4XJ8,1070
+inewave-1.10.2.dist-info/RECORD,,