inewave 1.2.2__py3-none-any.whl → 1.3.0__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.2.2"
+__version__ = "1.3.0"
 
 from . import newave  # noqa
 from . import nwlistcf  # noqa

inewave/nwlistop/__init__.py

@@ -12,6 +12,7 @@ from .ctermsin import Ctermsin  # noqa
 from .deficit import Def  # noqa
 from .defsin import Defsin  # noqa
 from .depminuh import Depminuh  # noqa
+from .desvuh import Desvuh  # noqa
 from .dfphauh import Dfphauh  # noqa
 from .dlppdfmax import Dlppdfmax  # noqa
 from .dlppdfmaxs import Dlppdfmaxs  # noqa
@@ -55,6 +56,9 @@ from .ghtotsin import Ghtotsin  # noqa
 from .gtert import Gtert  # noqa
 from .gttot import Gttot  # noqa
 from .gttotsin import Gttotsin  # noqa
+from .hjus import Hjus  # noqa
+from .hliq import Hliq  # noqa
+from .hmont import Hmont  # noqa
 from .intercambio import Intercambio  # noqa
 from .invade import Invade  # noqa
 from .invadem import Invadem  # noqa
@@ -85,3 +89,4 @@ from .vghminm import Vghminm  # noqa
 from .vghminsin import Vghminsin  # noqa
 from .vghminuh import Vghminuh  # noqa
 from .vturuh import Vturuh  # noqa
+from .vdesviouh import Vdesviouh  # noqa

inewave/nwlistop/desvuh.py

@@ -0,0 +1,21 @@
+from inewave.nwlistop.modelos.blocos.usina import Usina
+from inewave.nwlistop.modelos.arquivos.arquivousina import (
+    ArquivoUsina,
+)
+from inewave.nwlistop.modelos.desvuh import DesvuhAnos
+
+
+class Desvuh(ArquivoUsina):
+    """
+    Armazena os dados das saídas referentes à retirada de água por usina.
+
+    Esta classe lida com as informações de saída fornecidas pelo
+    NWLISTOP e reproduzidas nos `desvuh00x.out`, onde x varia conforme a
+    usina em questão.
+
+    """
+
+    BLOCKS = [
+        Usina,
+        DesvuhAnos,
+    ]

inewave/nwlistop/hjus.py

@@ -0,0 +1,21 @@
+from inewave.nwlistop.modelos.blocos.usina import Usina
+from inewave.nwlistop.modelos.arquivos.arquivousinapatamar import (
+    ArquivoUsinaPatamar,
+)
+from inewave.nwlistop.modelos.hjus import HjusAnos
+
+
+class Hjus(ArquivoUsinaPatamar):
+    """
+    Armazena os dados das saídas referentes à cota de jusante por usina.
+
+    Esta classe lida com as informações de saída fornecidas pelo
+    NWLISTOP e reproduzidas nos `hjus00x.out`, onde x varia conforme a
+    usina em questão.
+
+    """
+
+    BLOCKS = [
+        Usina,
+        HjusAnos,
+    ]

inewave/nwlistop/hliq.py

@@ -0,0 +1,21 @@
+from inewave.nwlistop.modelos.blocos.usina import Usina
+from inewave.nwlistop.modelos.arquivos.arquivousinapatamar import (
+    ArquivoUsinaPatamar,
+)
+from inewave.nwlistop.modelos.hliq import HliqAnos
+
+
+class Hliq(ArquivoUsinaPatamar):
+    """
+    Armazena os dados das saídas referentes à queda líquida por usina.
+
+    Esta classe lida com as informações de saída fornecidas pelo
+    NWLISTOP e reproduzidas nos `hliq00x.out`, onde x varia conforme a
+    usina em questão.
+
+    """
+
+    BLOCKS = [
+        Usina,
+        HliqAnos,
+    ]

inewave/nwlistop/hmont.py

@@ -0,0 +1,21 @@
+from inewave.nwlistop.modelos.blocos.usina import Usina
+from inewave.nwlistop.modelos.arquivos.arquivousina import (
+    ArquivoUsina,
+)
+from inewave.nwlistop.modelos.hmont import HmontAnos
+
+
+class Hmont(ArquivoUsina):
+    """
+    Armazena os dados das saídas referentes à cota de montante por usina.
+
+    Esta classe lida com as informações de saída fornecidas pelo
+    NWLISTOP e reproduzidas nos `hmont00x.out`, onde x varia conforme a
+    usina em questão.
+
+    """
+
+    BLOCKS = [
+        Usina,
+        HmontAnos,
+    ]

inewave/nwlistop/modelos/def.py

@@ -19,7 +19,7 @@ class DefAnos(ValoresSeriePatamar):
     HEADER_LINE = Line([IntegerField(4, 10)])
     DATA_LINE = Line(
         [
-            IntegerField(4, 1),
+            IntegerField(4, 2),
             LiteralField(5, 6),
         ]  # type: ignore
         + [

inewave/nwlistop/modelos/defsin.py

@@ -19,7 +19,7 @@ class DefAnos(ValoresSeriePatamar):
     HEADER_LINE = Line([IntegerField(4, 10)])
     DATA_LINE = Line(
         [
-            IntegerField(4, 1),
+            IntegerField(4, 2),
             LiteralField(5, 6),
         ]  # type: ignore
         + [

inewave/nwlistop/modelos/depminuh.py

@@ -19,7 +19,7 @@ class DepminAnos(ValoresSeriePatamar):
     HEADER_LINE = Line([IntegerField(4, 10)])
     DATA_LINE = Line(
         [  # type: ignore
-            IntegerField(4, 1),
+            IntegerField(4, 2),
             LiteralField(5, 6),
         ]
         + [FloatField(9, 14 + 9 * i, 2) for i in range(len(MESES_DF))]  # type: ignore

inewave/nwlistop/modelos/desvuh.py

@@ -0,0 +1,24 @@
+from inewave.config import MESES_DF
+
+from cfinterface.components.line import Line
+from cfinterface.components.integerfield import IntegerField
+from cfinterface.components.floatfield import FloatField
+
+from inewave.nwlistop.modelos.blocos.valoresserie import (
+    ValoresSerie,
+)
+
+
+class DesvuhAnos(ValoresSerie):
+    """
+    Bloco com as informações das tabelas de retirada de água
+    da usina por mês/ano de estudo.
+    """
+
+    HEADER_LINE = Line([IntegerField(4, 10)])
+    DATA_LINE = Line(
+        [  # type: ignore
+            IntegerField(4, 2),
+        ]
+        + [FloatField(9, 14 + 9 * i, 2) for i in range(len(MESES_DF))]  # type: ignore
+    )

inewave/nwlistop/modelos/dtbmax.py

@@ -19,7 +19,7 @@ class DtbmaxAnos(ValoresSeriePatamar):
     HEADER_LINE = Line([IntegerField(4, 10)])
     DATA_LINE = Line(
         [  # type: ignore
-            IntegerField(4, 1),
+            IntegerField(4, 2),
             LiteralField(5, 6),
         ]
         + [FloatField(9, 14 + 9 * i, 2) for i in range(len(MESES_DF))]  # type: ignore

inewave/nwlistop/modelos/dtbmin.py

@@ -19,7 +19,7 @@ class DtbminAnos(ValoresSeriePatamar):
     HEADER_LINE = Line([IntegerField(4, 10)])
     DATA_LINE = Line(
         [  # type: ignore
-            IntegerField(4, 1),
+            IntegerField(4, 2),
             LiteralField(5, 6),
         ]
         + [FloatField(9, 14 + 9 * i, 2) for i in range(len(MESES_DF))]  # type: ignore

inewave/nwlistop/modelos/dvazmax.py

@@ -19,7 +19,7 @@ class DvazmaxAnos(ValoresSeriePatamar):
     HEADER_LINE = Line([IntegerField(4, 10)])
     DATA_LINE = Line(
         [  # type: ignore
-            IntegerField(4, 1),
+            IntegerField(4, 2),
             LiteralField(5, 6),
         ]
         + [FloatField(9, 14 + 9 * i, 2) for i in range(len(MESES_DF))]  # type: ignore

inewave/nwlistop/modelos/excessin.py

@@ -18,7 +18,7 @@ class ExcesAnos(ValoresSeriePatamar):
     HEADER_LINE = Line([IntegerField(4, 10)])
     DATA_LINE = Line(
         [  # type: ignore
-            IntegerField(4, 1),
+            IntegerField(4, 2),
             LiteralField(5, 6),
         ]
         + [FloatField(8, 12 + 9 * i, 1) for i in range(len(MESES_DF))]  # type: ignore

inewave/nwlistop/modelos/fteolm.py

@@ -19,7 +19,7 @@ class FteolAnos(ValoresSeriePatamar):
     HEADER_LINE = Line([IntegerField(4, 10)])
     DATA_LINE = Line(
         [  # type: ignore
-            IntegerField(4, 1),
+            IntegerField(4, 2),
             LiteralField(5, 6),
         ]
         + [FloatField(8, 12 + 9 * i, 1) for i in range(len(MESES_DF))]  # type: ignore

inewave/nwlistop/modelos/fteolsin.py

@@ -19,7 +19,7 @@ class FteolAnos(ValoresSeriePatamar):
     HEADER_LINE = Line([IntegerField(4, 10)])
     DATA_LINE = Line(
         [  # type: ignore
-            IntegerField(4, 1),
+            IntegerField(4, 2),
             LiteralField(5, 6),
         ]
         + [FloatField(8, 12 + 9 * i, 1) for i in range(len(MESES_DF))]  # type: ignore

inewave/nwlistop/modelos/hjus.py

@@ -0,0 +1,26 @@
+from inewave.config import MESES_DF
+
+from cfinterface.components.line import Line
+from cfinterface.components.literalfield import LiteralField
+from cfinterface.components.integerfield import IntegerField
+from cfinterface.components.floatfield import FloatField
+
+from inewave.nwlistop.modelos.blocos.valoresseriepatamar import (
+    ValoresSeriePatamar,
+)
+
+
+class HjusAnos(ValoresSeriePatamar):
+    """
+    Bloco com as informações das tabelas de cota de jusante
+    da usina por mês/ano de estudo.
+    """
+
+    HEADER_LINE = Line([IntegerField(4, 10)])
+    DATA_LINE = Line(
+        [  # type: ignore
+            IntegerField(4, 2),
+            LiteralField(5, 6),
+        ]
+        + [FloatField(9, 14 + 9 * i, 2) for i in range(len(MESES_DF))]  # type: ignore
+    )

inewave/nwlistop/modelos/hliq.py

@@ -0,0 +1,26 @@
+from inewave.config import MESES_DF
+
+from cfinterface.components.line import Line
+from cfinterface.components.literalfield import LiteralField
+from cfinterface.components.integerfield import IntegerField
+from cfinterface.components.floatfield import FloatField
+
+from inewave.nwlistop.modelos.blocos.valoresseriepatamar import (
+    ValoresSeriePatamar,
+)
+
+
+class HliqAnos(ValoresSeriePatamar):
+    """
+    Bloco com as informações das tabelas de queda líquida
+    da usina por mês/ano de estudo.
+    """
+
+    HEADER_LINE = Line([IntegerField(4, 10)])
+    DATA_LINE = Line(
+        [  # type: ignore
+            IntegerField(4, 2),
+            LiteralField(5, 6),
+        ]
+        + [FloatField(9, 14 + 9 * i, 2) for i in range(len(MESES_DF))]  # type: ignore
+    )

inewave/nwlistop/modelos/hmont.py

@@ -0,0 +1,24 @@
+from inewave.config import MESES_DF
+
+from cfinterface.components.line import Line
+from cfinterface.components.integerfield import IntegerField
+from cfinterface.components.floatfield import FloatField
+
+from inewave.nwlistop.modelos.blocos.valoresserie import (
+    ValoresSerie,
+)
+
+
+class HmontAnos(ValoresSerie):
+    """
+    Bloco com as informações das tabelas de cota de montante
+    da usina por mês/ano de estudo.
+    """
+
+    HEADER_LINE = Line([IntegerField(4, 10)])
+    DATA_LINE = Line(
+        [  # type: ignore
+            IntegerField(4, 2),
+        ]
+        + [FloatField(15, 7 + 15 * i, 2) for i in range(len(MESES_DF))]  # type: ignore
+    )

inewave/nwlistop/modelos/vdesviouh.py

@@ -0,0 +1,26 @@
+from inewave.config import MESES_DF
+
+from cfinterface.components.line import Line
+from cfinterface.components.literalfield import LiteralField
+from cfinterface.components.integerfield import IntegerField
+from cfinterface.components.floatfield import FloatField
+
+from inewave.nwlistop.modelos.blocos.valoresseriepatamar import (
+    ValoresSeriePatamar,
+)
+
+
+class VdesviouhAnos(ValoresSeriePatamar):
+    """
+    Bloco com as informações das tabelas de volume desviado de água
+    da usina por mês/ano de estudo.
+    """
+
+    HEADER_LINE = Line([IntegerField(4, 10)])
+    DATA_LINE = Line(
+        [  # type: ignore
+            IntegerField(4, 2),
+            LiteralField(5, 6),
+        ]
+        + [FloatField(9, 14 + 9 * i, 2) for i in range(len(MESES_DF))]  # type: ignore
+    )

inewave/nwlistop/vdesviouh.py

@@ -0,0 +1,21 @@
+from inewave.nwlistop.modelos.blocos.usina import Usina
+from inewave.nwlistop.modelos.arquivos.arquivousinapatamar import (
+    ArquivoUsinaPatamar,
+)
+from inewave.nwlistop.modelos.vdesviouh import VdesviouhAnos
+
+
+class Vdesviouh(ArquivoUsinaPatamar):
+    """
+    Armazena os dados das saídas referentes ao desvio de água por usina.
+
+    Esta classe lida com as informações de saída fornecidas pelo
+    NWLISTOP e reproduzidas nos `vdesviouh00x.out`, onde x varia conforme a
+    usina em questão.
+
+    """
+
+    BLOCKS = [
+        Usina,
+        VdesviouhAnos,
+    ]

{inewave-1.2.2.dist-info → inewave-1.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: inewave
-Version: 1.2.2
+Version: 1.3.0
 Summary: Interface para arquivos do NEWAVE
 Home-page: https://github.com/rjmalves/inewave
 Author: Rogerio Alves

{inewave-1.2.2.dist-info → inewave-1.3.0.dist-info}/RECORD

@@ -3,7 +3,7 @@ examples/plot_dger.py,sha256=e8Qi-DEBmxgGBgfJfABqx39rThuRXQlMHTOfobT601U,1563
 examples/plot_modif.py,sha256=hqB3WRRYP4CBEvnnhrBwlbIrFWzkiHqgaXe76b3olzo,2735
 examples/plot_pmo.py,sha256=-NgaJnsr8N6-8DWWfSH8n8G8Ad9E0StFJBt21xwZxME,1473
 examples/plot_sistema.py,sha256=mM287WEkPV_5NCz-nB9kH9So9KOAbjBfBeB0PTVfHCA,2422
-inewave/__init__.py,sha256=q7DRiZIBKIri7fLQ7JQ159kbRe-la931_kCcGUoggxM,235
+inewave/__init__.py,sha256=eTS8Fr1-3DFVi2iOJdLZzAv3MEnGIjC1UHG-TKG-lS0,235
 inewave/config.py,sha256=fMgG2sqE_PNz30QCNxkgfPf78SEOAVfV07kGtO1bREE,1106
 inewave/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 inewave/_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -178,7 +178,7 @@ inewave/nwlistcf/modelos/caso.py,sha256=GpHC6OvGScBzLpdOMBm899RSHloqmwN4WyuYR_zv
 inewave/nwlistcf/modelos/estados.py,sha256=vQbsseWLT1pNIBupkW-xmVb0y2bUvU6rTBd5Mak6IZU,4300
 inewave/nwlistcf/modelos/nwlistcfdat.py,sha256=SWYHowkDisZ7aI7y6eqczlzGIckt5bz_TlIzwtSlnsU,2758
 inewave/nwlistcf/modelos/nwlistcfrel.py,sha256=ph3BBLU87pnOcyMl2yYIdV9tt8MuuVSCJT5gi5LMKc0,3239
-inewave/nwlistop/__init__.py,sha256=Ar2qkL7mPw5q6Hba82QK0Lk90uer1rrTY_bqw-11C7g,3136
+inewave/nwlistop/__init__.py,sha256=tXSZBCcw3GSaOAELLyorv9o0hh6UBn9Era9dkEdhUX4,3307
 inewave/nwlistop/cdef.py,sha256=2yrH-VxU4qj-xLhCZcxSB0eijH-wIsD4HewSDWjfrEE,464
 inewave/nwlistop/cdefsin.py,sha256=1NHcK1mcdtMKzw5hzcRfOOrgzL9EFlggZ0nB0EJlRwE,436
 inewave/nwlistop/cmarg.py,sha256=dQIlEpy-kRiWFZbZjF9aCJRHZ2iy0k4aIUkg98K33IQ,627
@@ -190,6 +190,7 @@ inewave/nwlistop/ctermsin.py,sha256=iah3KoOj70mBP4CoRhPV-6iImcnZLpCx94rmryQXYGM,
 inewave/nwlistop/deficit.py,sha256=t_VlTzm7mDwW6mW7ZFFngKq4NO_3B3_nRkgccgUwRAU,616
 inewave/nwlistop/defsin.py,sha256=n2GyohvR2E6oLJooi57A5oK50K_vy5QTHA8PCN5q0OM,437
 inewave/nwlistop/depminuh.py,sha256=JtyG6tcWE0r2ajNhiHYHNHm-kpWpRtCs46KNt5cQKNE,584
+inewave/nwlistop/desvuh.py,sha256=ZEXI5yd0eGCLa30Ys-0TRp_r8eLo-ifFwtLxuvZklJ0,538
 inewave/nwlistop/dfphauh.py,sha256=8gzx6QaZFBezV9HTRXdRPBdenbr4_zeFjuQ0bH76zIo,576
 inewave/nwlistop/dlppdfmax.py,sha256=XEEwJFgK8INUuI_kORwVdIVQawOuHu82-JUVnDMmRbc,612
 inewave/nwlistop/dlppdfmaxm.py,sha256=OGcoegQWiXjzW1Kqf5D6gUvAZCfPRr4A0TWNBWh_Hu0,669
@@ -234,6 +235,9 @@ inewave/nwlistop/ghtotsin.py,sha256=I8UcqrHxCDpOUBYTzEw70Fy6oBrtasOESpIpcamycXo,
 inewave/nwlistop/gtert.py,sha256=LVNDJxBSCimBInfplbKuTtHBzqQYPn6MoqAiO2AhH9w,666
 inewave/nwlistop/gttot.py,sha256=To7ZV_TRKa6MKr9MPltRooYUuVvfanFbGv8vZUjlGhY,612
 inewave/nwlistop/gttotsin.py,sha256=1o7NX1HDJorLq5ZXMy0Xmg8N6SPWS9Ums113yi9po6M,454
+inewave/nwlistop/hjus.py,sha256=Gq5dr4F23L6j0e3NYCp9RPihHB-7QNuf00VZRJu1-9g,547
+inewave/nwlistop/hliq.py,sha256=kgj31lcNLp7b9pXGnimkqhxRAYrws0tDkDCgcxb9RaY,546
+inewave/nwlistop/hmont.py,sha256=JWOAF1cuOLZ7D3Uq6zsRE7yKT3IU4-IqJ-2S4jQcN04,532
 inewave/nwlistop/intercambio.py,sha256=REZkNnLyPgrPNWRYrM9ICPzJuolutEdEdvqPRkNnMG8,659
 inewave/nwlistop/invade.py,sha256=7w6hkntY-gxXA68DRBF_FXFCHoMHT29T1jon_LcgSh4,521
 inewave/nwlistop/invadem.py,sha256=nE2hvGwSE7RwztVSj4Wvpr6kd6duqRem7AxEJoUuh7w,581
@@ -253,6 +257,7 @@ inewave/nwlistop/rhslpptb.py,sha256=irwQ5fLUlbv6FK2H9fm6NZtcYssrS7wPw1XCqPlYeoM,
 inewave/nwlistop/vagua.py,sha256=cEI5p75cfHsOp48LFUwBdPTf4boXglHIlIPpO9nqzcI,507
 inewave/nwlistop/varmpuh.py,sha256=BXLZW1DVZKx5TaOxVg7E8xummL-LWU52gZxyCc3kHsw,553
 inewave/nwlistop/varmuh.py,sha256=bYczgQGP9g1lQichNuNA_T9OUchZcTuWgqUHm2BdaK0,532
+inewave/nwlistop/vdesviouh.py,sha256=OyQzLE0UGz6fn79YGdv47T7JHbs_94vl3eZXBF9MBaE,572
 inewave/nwlistop/vento.py,sha256=yh7E238TjuLyNWPE5-rtbqnPD1ekKkcmFasEd7eFS0g,541
 inewave/nwlistop/vertuh.py,sha256=j3F5gyr11CbW09zLFXlrIJthWc87ufwh2D4dUGgnYug,550
 inewave/nwlistop/verturb.py,sha256=MJ0TXuNzMIMgK_6idHB6NrGox_13UAoXP1Yzx2qrVhM,518
@@ -275,9 +280,10 @@ inewave/nwlistop/modelos/coper.py,sha256=eSCgjH76Dv_3einSr3VAdymwTHg9uLgU2f1wOXx
 inewave/nwlistop/modelos/corteolm.py,sha256=AxZseSw2GfDXVmZ8J540_83ccfw6A8qcsfXyxPKG5vk,786
 inewave/nwlistop/modelos/cterm.py,sha256=ZcFrHtGi-eqixVOT9ag80kPQGG6rRkeKdMYO1T5Zg3A,659
 inewave/nwlistop/modelos/ctermsin.py,sha256=R-Z_TqNdumfbBMNP76LPGVw1fIELo8hu0Lql45kv0cI,619
-inewave/nwlistop/modelos/def.py,sha256=oz83i9QxRT38LATShfYPhPbyVUvecrdodsYdlErCm58,750
-inewave/nwlistop/modelos/defsin.py,sha256=oz83i9QxRT38LATShfYPhPbyVUvecrdodsYdlErCm58,750
-inewave/nwlistop/modelos/depminuh.py,sha256=68q8-powqyYaScZs9u_rsX2uCeI1qF7n7BnFhBT0rog,795
+inewave/nwlistop/modelos/def.py,sha256=g70qS0gdbbJE4m0qFgoWrDML9Fut4OT7F2j1oliHYOI,750
+inewave/nwlistop/modelos/defsin.py,sha256=g70qS0gdbbJE4m0qFgoWrDML9Fut4OT7F2j1oliHYOI,750
+inewave/nwlistop/modelos/depminuh.py,sha256=Z5ERrk3bYBUm2oVMefOJtMn2pw-HxR4QWPKIpreeiOE,795
+inewave/nwlistop/modelos/desvuh.py,sha256=NBtEr3El4tUgdkTqD9bAxZF2gLFibHiDe7OgNIUo3HI,661
 inewave/nwlistop/modelos/dflppdfmaxm.py,sha256=8v2KtPJqWRiea5HaBQr520MViojlR0rVr17GwJH_9Qo,800
 inewave/nwlistop/modelos/dflpptbmaxm.py,sha256=Cr2IqEdV178yXodLGaVrSGrEdsQfKATW4LijVCzTIlc,801
 inewave/nwlistop/modelos/dfphauh.py,sha256=RgZ7EdgtU-ZcbwtgnGoAM9rx-yIhVAuz6IfGK8IhH4A,785
@@ -285,9 +291,9 @@ inewave/nwlistop/modelos/dlppdfmax.py,sha256=EayazcORVobJWJFAGNqgAC1kUlXeNmqLN22
 inewave/nwlistop/modelos/dlppdfmaxs.py,sha256=tugA6Xw7OimcNU1R4yPyOmsDWHD9URsQXth_TFt5EDw,785
 inewave/nwlistop/modelos/dlpptbmax.py,sha256=8qnkG8Ux2Pp6cjosw3qaKMLms3cMlhHcN9dPbURd-Bc,785
 inewave/nwlistop/modelos/dlpptbmaxs.py,sha256=8qnkG8Ux2Pp6cjosw3qaKMLms3cMlhHcN9dPbURd-Bc,785
-inewave/nwlistop/modelos/dtbmax.py,sha256=pOXtpoxpGGfzu0nYIJj4y6M8t-60TT7Br2SL5YqFtqE,792
-inewave/nwlistop/modelos/dtbmin.py,sha256=pa95B05daVbkqJXOXBRagIh0dFNPaWjmsA44C-jRztc,792
-inewave/nwlistop/modelos/dvazmax.py,sha256=gB3B1rTPudYPvQP1uF_VU7cyBuS5Hr6m46cBB1vk9mI,787
+inewave/nwlistop/modelos/dtbmax.py,sha256=xBsfeohRvspF-lqPLWWLdXmxlUe-WX0km1V5lf-Jgl4,792
+inewave/nwlistop/modelos/dtbmin.py,sha256=TXB2T_y86UJ4kWVRg8eJ-m_d_ZVssngARtlT23v5jJ0,792
+inewave/nwlistop/modelos/dvazmax.py,sha256=vDTbMhk1gUfUv7OBuyNvF-715WXWh3Iaessk2297ruQ,787
 inewave/nwlistop/modelos/eaf.py,sha256=4UcXwLG0aesnR7mk7Vmip1fJaa3h3fTmEDsq-tLnxKU,653
 inewave/nwlistop/modelos/eafb.py,sha256=jWTjQK09JiEsKxXz9uyw8cWcmNuROfPTo9XgC7lOYBE,659
 inewave/nwlistop/modelos/eafbm.py,sha256=LZ8tUhqlS9NobhjnNzmk86eKCr0gA8i-ju7tvfN7xjI,675
@@ -303,9 +309,9 @@ inewave/nwlistop/modelos/evert.py,sha256=ARd3cDMF6dQxqjxu1joujVGWngrhDm330fku1db
 inewave/nwlistop/modelos/evertm.py,sha256=ARd3cDMF6dQxqjxu1joujVGWngrhDm330fku1db9efE,623
 inewave/nwlistop/modelos/evertsin.py,sha256=ARd3cDMF6dQxqjxu1joujVGWngrhDm330fku1db9efE,623
 inewave/nwlistop/modelos/exces.py,sha256=91Cy5gtgSMV8xPZngCoxExgPAJF7KTUOwE6bbABZMXU,739
-inewave/nwlistop/modelos/excessin.py,sha256=F4ZCuw-3vhsSRWY-mj2EuiPox80Rd3sb6Nf2RUKuxFE,739
-inewave/nwlistop/modelos/fteolm.py,sha256=dNU4bK1d2Ns2LZuTZcvIvVTP_CcXqbGMag21FLveZZ4,785
-inewave/nwlistop/modelos/fteolsin.py,sha256=dNU4bK1d2Ns2LZuTZcvIvVTP_CcXqbGMag21FLveZZ4,785
+inewave/nwlistop/modelos/excessin.py,sha256=91Cy5gtgSMV8xPZngCoxExgPAJF7KTUOwE6bbABZMXU,739
+inewave/nwlistop/modelos/fteolm.py,sha256=xjpxbF0q5mz3g8Qpl8KqmygahQcXVeQUMhH3Rs04r6w,785
+inewave/nwlistop/modelos/fteolsin.py,sha256=xjpxbF0q5mz3g8Qpl8KqmygahQcXVeQUMhH3Rs04r6w,785
 inewave/nwlistop/modelos/geol.py,sha256=gPPFGQVtCl-acIi8bJghL-3QIuVmwL1WkZ_0Xg2QwcY,735
 inewave/nwlistop/modelos/geolm.py,sha256=gPPFGQVtCl-acIi8bJghL-3QIuVmwL1WkZ_0Xg2QwcY,735
 inewave/nwlistop/modelos/geolsin.py,sha256=gPPFGQVtCl-acIi8bJghL-3QIuVmwL1WkZ_0Xg2QwcY,735
@@ -322,6 +328,9 @@ inewave/nwlistop/modelos/ghtotsin.py,sha256=dHzjjz9V5ySPRpgcnHT_TgU80MkGYh9usg_P
 inewave/nwlistop/modelos/gtert.py,sha256=TthiEYuNXkTZc4WTwRe1_lJrLMBCdjmk_NZ-blYKQ3Y,835
 inewave/nwlistop/modelos/gttot.py,sha256=sLN5kgg-MscLZ9IEMvcu9tzv2NZxWhuUUbXe_K-L8FM,743
 inewave/nwlistop/modelos/gttotsin.py,sha256=GzFH9TAOcPmM2Cu_qT6MqaJMuSbgKkKWL5jCnNjcLW0,744
+inewave/nwlistop/modelos/hjus.py,sha256=5gqFGbK1PmcBpFWtAC7aQId5RmdFJ8YrogL-SVnPTrE,771
+inewave/nwlistop/modelos/hliq.py,sha256=9f785iH2jK7OkPJdQF3Cos02V862zU4wmX-OyiPyNMs,770
+inewave/nwlistop/modelos/hmont.py,sha256=CAAARS7JHKfI-qk5loo4Dod1C1iJJwEv020ue7tyY40,660
 inewave/nwlistop/modelos/intercambio.py,sha256=l_2cNzLSu_S_lQoRxoNqrUHSEzFU6xXI6VATU9OXR2E,747
 inewave/nwlistop/modelos/invade.py,sha256=yfuEtYfsu6TGPpE13Gfq5Ob2UjcN7an8mUuieS8harg,623
 inewave/nwlistop/modelos/invadem.py,sha256=yfuEtYfsu6TGPpE13Gfq5Ob2UjcN7an8mUuieS8harg,623
@@ -341,6 +350,7 @@ inewave/nwlistop/modelos/rhslpptb.py,sha256=WdUlQ3YMTDTKt9ecTLmbFdv8lI_bGgcqo12A
 inewave/nwlistop/modelos/vagua.py,sha256=rYrFkODT9EjnwjwoxvuVb8LcFfJz8tYqmKzdUCx8be0,643
 inewave/nwlistop/modelos/varmpuh.py,sha256=tMQiMZ_yh5ojSUYURfbncsUKojRCfap28TeAPfPArMY,660
 inewave/nwlistop/modelos/varmuh.py,sha256=tMQiMZ_yh5ojSUYURfbncsUKojRCfap28TeAPfPArMY,660
+inewave/nwlistop/modelos/vdesviouh.py,sha256=R8xwud8Mcku9AP9ExovWto_1RIa4WUnx-RfmN-ST300,785
 inewave/nwlistop/modelos/vento.py,sha256=yYZuzyYpALphYPkzAr2y_NwZfVsRkSuwEQHdVcMwv0c,648
 inewave/nwlistop/modelos/vertuh.py,sha256=h25qttXICS0CMj3DwmFX1pjQwJ2RqHq1Gab-U2c8H5Q,771
 inewave/nwlistop/modelos/verturb.py,sha256=BpnJP__DG6SuNBFnh0GMIf_SVpEVIXPRoEYQOYLUbyY,652
@@ -404,6 +414,7 @@ tests/mocks/arquivos/cvar.py,sha256=6hPPE86nbWbMrl6NhKSFza8NYAF3eQbDDKAs3RvMzjI,
 tests/mocks/arquivos/deficit.py,sha256=QjHppQIFzuXv-2B2SDAyAy-jeVfR1C3b4_exaVBY9Fo,1729
 tests/mocks/arquivos/defsin.py,sha256=f96L0e5HbDLLmL7DM3orBnKzXTphKgecpqIHdxyW0po,1732
 tests/mocks/arquivos/depminuh.py,sha256=a2tkJ-Oxe51PN-ILGYCUmL9l3jOzzFM2xBO8HG4sIsk,1625
+tests/mocks/arquivos/desvuh.py,sha256=AxskQHivvWOqm-WadHO2Zg1nxdIj-btK2xWO5Nr0NAY,283211
 tests/mocks/arquivos/dfphauh.py,sha256=QdRgRt0QLl9QBmOs_uGL6cskXPnTFv5-4ZeKFKQgrBw,847164
 tests/mocks/arquivos/dger.py,sha256=FeiFcfbByHjOMbTUdD0ZwjJssAdSckgR8jit2UebYOQ,15257
 tests/mocks/arquivos/dlppdfmax.py,sha256=HSxmojQbIFGH47i1ywd4BA-Q5-k6hQDsQbkpm_WrqBc,1105161
@@ -463,6 +474,9 @@ tests/mocks/arquivos/ghtotsin.py,sha256=hOrytY-qBXvtaZxZF7wPLufKbwuvf_N1qcY8GChh
 tests/mocks/arquivos/gtert.py,sha256=rHInsbWU2h-zI5i8ToOH88N95O_K9FmoxCBskYPey3I,26457
 tests/mocks/arquivos/gttot.py,sha256=572Zi2L7mEDidulf9a1htX1fDoP7dWdh2YXrx6BvHpc,1105188
 tests/mocks/arquivos/gttotsin.py,sha256=GOp8GsPpqaT_uPMFq450hpgpeQBhpBqxMhnJMtzc-eU,1105191
+tests/mocks/arquivos/hjus.py,sha256=1y886amd5PhMm1kKHtlzvkL59Z1ffHhLrZoWX0meaIk,846407
+tests/mocks/arquivos/hliq.py,sha256=H0D_vAEdz-jtHYIx1II-wR2NVRiQCZ1Td-qqJWN7mVc,846407
+tests/mocks/arquivos/hmont.py,sha256=kjkdykXICkC_iUZ_c2p9uwFciBmhOK4ExjXUTQfvQ1g,425676
 tests/mocks/arquivos/intercambio.py,sha256=DGyMSgkcQNzvDM24mZXDD0QigiUn6oIDF1dFUYEAtKk,1087195
 tests/mocks/arquivos/invade.py,sha256=yU5kskkCXZbC1ZISNIsegtaliBgOVuCKDDdowxtXi7M,267122
 tests/mocks/arquivos/invadem.py,sha256=QZNQvnGta0JGDQYYchTPMw6JGLJWYOkz775K86Egp1o,267130
@@ -504,6 +518,7 @@ tests/mocks/arquivos/vagua.py,sha256=jD7bI1-aqTexcDmliIuUTZxM2XI8PBNzA7pC70LDn8Q
 tests/mocks/arquivos/varmpuh.py,sha256=JLCLfWsFvnGYmZflJAb9GH6zva3faAwFmzNghxbmnjg,283139
 tests/mocks/arquivos/varmuh.py,sha256=z4rcVPjlWWpLN0QKR32OWryLCewOQhwDhTJOpTzPw_Q,283209
 tests/mocks/arquivos/vazpast.py,sha256=bPEYXP2tWj2kjg1kvpZPtt7Qgv7l5QXpOuiqmMySBdg,32259
+tests/mocks/arquivos/vdesviouh.py,sha256=L98nSm2UmDat4wYcqmg1VcXWHN38aN2W0aD7TrWJj-o,847213
 tests/mocks/arquivos/vento.py,sha256=DwowZm0Y194zGdVnJlMVM0beUmil6Iay7zBdGBKieow,267101
 tests/mocks/arquivos/vertuh.py,sha256=zCQQ07BuZuqchBVCb50Xqt2auW81CIBfvmAm4xO7NDg,847200
 tests/mocks/arquivos/verturb.py,sha256=qq7Oyy9Mowmhj8Q1R9-g7wnfdarrEJhjH9KLPFhT3F4,267155
@@ -600,6 +615,7 @@ tests/nwlistop/test_ctermsin.py,sha256=ixZ47ML-UY2AubMSWIOgJeo_04sJjqNFBnRMaJi5j
 tests/nwlistop/test_deficit.py,sha256=6djIpZCMcS-M2rRlkiConl9TRbIx34hWbvpieD3zZrc,1173
 tests/nwlistop/test_defsin.py,sha256=7Hbt_rOqpKokQqpVY2mOa_V5zrfwV7Ikmq1TjD-KnKE,1087
 tests/nwlistop/test_depminuh.py,sha256=phvFnKoZvXclQQyFBw61SEkQtMzC2-ePo71AOEW7ETs,1218
+tests/nwlistop/test_desvuh.py,sha256=2Ikfbt71txo2-33lbKIFxBZYJviPSZ2WRnh3XGx7Mjc,1191
 tests/nwlistop/test_dfphauh.py,sha256=r-6C89sVFWdx4Ilo_QWzaFtVoYopVeE81mIQjYiB5ds,1200
 tests/nwlistop/test_dlppdfmax.py,sha256=aLqWtzwSmzUuDfOOR0od-5OZDMNJmMFydBcRELoJaB0,1222
 tests/nwlistop/test_dlppdfmaxm.py,sha256=Cnh4L_aRYv83euazrU3GE8VgWcWK37NYISY-zpn8d2o,1256
@@ -644,6 +660,9 @@ tests/nwlistop/test_ghtotsin.py,sha256=cm2dW62BpMVHL_7aNwpCRIwsCfMsjOuhmS--P0l03
 tests/nwlistop/test_gtert.py,sha256=wsJva6Gw5FYE9x-fCfYFXrMwSQ8OsUIK2FAULv2QZ-I,1174
 tests/nwlistop/test_gttot.py,sha256=1qa3sn3DXiyk6yBT8LrGJtLWfcBCNcESaktOtbl7O50,1194
 tests/nwlistop/test_gttotsin.py,sha256=Y35oTcQ_5VNes_tWPAvunrqm9dyRmKoZkV19uJpkeBM,1116
+tests/nwlistop/test_hjus.py,sha256=WpdfukgvtP456IXJgC6g-u2F2urURjH5iThjAD1GfRQ,1167
+tests/nwlistop/test_hliq.py,sha256=QoSV6QQIv7qWmunBdjqUiYPOtzHeVuDojTD_1ld9-ZY,1166
+tests/nwlistop/test_hmont.py,sha256=_F-vktAPC368xrQDYjpWrbuhTtNmPtHqsN_hd_F1Ryo,1180
 tests/nwlistop/test_intercambio.py,sha256=k2V46zDHUeF-jy0I_w4ItmP-b_HRpfpfGMic7nn4TT4,1364
 tests/nwlistop/test_invade.py,sha256=jG3FMvXrD8371P5dzWeZmy5OSTyyClMPolyFHI_z_-4,1087
 tests/nwlistop/test_invadem.py,sha256=nQLD9JdqTOg-7h2rkTGugFVBeadV5qzDKRKZE1Ijb34,1100
@@ -663,6 +682,7 @@ tests/nwlistop/test_rhslpptb.py,sha256=4L8Wp6KYxf_1vMM66M3CWqtVjLIz5O8UBiTiSsd5t
 tests/nwlistop/test_vagua.py,sha256=eP4xFhHoLy10xdQCPJvPzt0ILqDTKespLJSqA7gIqvA,1172
 tests/nwlistop/test_varmpuh.py,sha256=xTUUOMAia1pd_8SQ-ZHPTx8U315P94OrjoO4DAT7YGw,1203
 tests/nwlistop/test_varmuh.py,sha256=FHMDCeA2XqTrd3mAQ0aNWR5FUC7p3jmzG2TDX_1x7aE,1190
+tests/nwlistop/test_vdesviouh.py,sha256=x5QwrCWzJJGs04Y1pBOpZEacDlskvnhKCi2GtZ0niKY,1229
 tests/nwlistop/test_vento.py,sha256=2b5wicmEBAwP-gx4yeVFzV5hfObLo8nyM9swtEn81sk,1184
 tests/nwlistop/test_vertuh.py,sha256=53S511YSJ0Q2BFjj96TP-ucKItKbm5c33EHgfZLSzus,1188
 tests/nwlistop/test_verturb.py,sha256=UvCB5HsTQE08-j-jUGCJPKgL6VkDEzquDcrr6cObmsk,1196
@@ -676,8 +696,8 @@ tests/nwlistop/test_vghminm.py,sha256=jKaHNPUpNZQmgtZmYsMWbfv6HtxgYfZauf51tu0HY9
 tests/nwlistop/test_vghminsin.py,sha256=gexkeWoPcZlhtqJ2UpOHTWIfM5v8GB8Cm4MmvXdvoIo,1126
 tests/nwlistop/test_vghminuh.py,sha256=9Mjh7qHOSKO7Mt88TuCbvU1gJsPk6Sam0f9tL7DcgEs,1216
 tests/nwlistop/test_vturuh.py,sha256=wvQ9zq9nuHdt0CPNt3SkPKMGq5WHQs7nZUnRaY33ONQ,1190
-inewave-1.2.2.dist-info/LICENSE.md,sha256=0jOBL78mjzscN0-XI-6YtK1IqnODUbG85DaKAMH4XJ8,1070
-inewave-1.2.2.dist-info/METADATA,sha256=JCWIcOlst7emxe3vORrIn6NS36y2SWQLi4unJBT79t4,1958
-inewave-1.2.2.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-inewave-1.2.2.dist-info/top_level.txt,sha256=o3hXlvlgJI4qWYy-wVzUYago7roEBl3kP5IL3QR9L70,23
-inewave-1.2.2.dist-info/RECORD,,
+inewave-1.3.0.dist-info/LICENSE.md,sha256=0jOBL78mjzscN0-XI-6YtK1IqnODUbG85DaKAMH4XJ8,1070
+inewave-1.3.0.dist-info/METADATA,sha256=F4wFT0LBgNPmq3OO-NxMsUIVRiMbRcji4oMhshhK8hU,1958
+inewave-1.3.0.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+inewave-1.3.0.dist-info/top_level.txt,sha256=o3hXlvlgJI4qWYy-wVzUYago7roEBl3kP5IL3QR9L70,23
+inewave-1.3.0.dist-info/RECORD,,