inewave 1.6.0__py3-none-any.whl → 1.7.1__py3-none-any.whl

inewave/nwlistop/modelos/mediasusie.py

@@ -0,0 +1,52 @@
+# Imports de módulos externos
+from cfinterface.components.section import Section
+from typing import IO
+import pandas as pd  # type: ignore
+
+
+class TabelaMediasusie(Section):
+    """
+    Bloco com o conteúdo da tabela existente no arquivo `MEDIAS-USIE.CSV`.
+    """
+
+    def __init__(self, previous=None, next=None, data=None) -> None:
+        super().__init__(previous, next, data)
+
+    def __eq__(self, o: object) -> bool:
+        if not isinstance(o, TabelaMediasusie):
+            return False
+        bloco: TabelaMediasusie = o
+        if not all(
+            [
+                isinstance(self.data, pd.DataFrame),
+                isinstance(o.data, pd.DataFrame),
+            ]
+        ):
+            return False
+        else:
+            return self.data.equals(bloco.data)
+
+    # Override
+    def read(self, file: IO, *args, **kwargs):
+        tabela = pd.read_csv(file, skipinitialspace=True)
+        col_usi = "USIE_ext"
+        tabela = tabela.rename(columns={col_usi: "codigo_usina"})
+        tabela = tabela.loc[tabela["codigo_usina"] > 0]
+        cols = tabela.columns.tolist()
+        df = tabela.drop(columns=[cols[-1]])
+        cols_id = ["VAR", "codigo_usina"]
+        cols_estagios = [c for c in df.columns.tolist() if c not in cols_id]
+        df = df.melt(
+            id_vars=cols_id,
+            value_vars=cols_estagios,
+            var_name="estagio",
+            value_name="valor",
+        )
+        df["estagio"] = df["estagio"].astype(int)
+        df["estagio"] -= df["estagio"].min() - 1
+        df = df.pivot_table(
+            index=["estagio", "codigo_usina"],
+            columns="VAR",
+            values="valor",
+        ).reset_index()
+        self.data = df

inewave/nwlistop/modelos/mediasusih.py

@@ -0,0 +1,54 @@
+# Imports de módulos externos
+from cfinterface.components.section import Section
+from typing import IO
+import pandas as pd  # type: ignore
+
+
+class TabelaMediasusih(Section):
+    """
+    Bloco com o conteúdo da tabela existente no arquivo `MEDIAS-USIH.CSV`.
+    """
+
+    def __init__(self, previous=None, next=None, data=None) -> None:
+        super().__init__(previous, next, data)
+
+    def __eq__(self, o: object) -> bool:
+        if not isinstance(o, TabelaMediasusih):
+            return False
+        bloco: TabelaMediasusih = o
+        if not all(
+            [
+                isinstance(self.data, pd.DataFrame),
+                isinstance(o.data, pd.DataFrame),
+            ]
+        ):
+            return False
+        else:
+            return self.data.equals(bloco.data)
+
+    # Override
+    def read(self, file: IO, *args, **kwargs):
+        tabela = pd.read_csv(file, skipinitialspace=True)
+        col_usi = "USIH_ext"
+        tabela = tabela.rename(columns={col_usi: "codigo_usina"})
+        tabela = tabela.loc[tabela["codigo_usina"] > 0]
+        cols = tabela.columns.tolist()
+        df = tabela.drop(columns=[cols[-1]])
+        cols_id = ["VAR", "codigo_usina"]
+        cols_estagios = [c for c in df.columns.tolist() if c not in cols_id]
+        df = df.melt(
+            id_vars=cols_id,
+            value_vars=cols_estagios,
+            var_name="estagio",
+            value_name="valor",
+        )
+        df.loc[df["valor"] == "-   ", "valor"] = 0.0
+        df = df.astype({"valor": float})
+        df["estagio"] = df["estagio"].astype(int)
+        df["estagio"] -= df["estagio"].min() - 1
+        df = df.pivot_table(
+            index=["estagio", "codigo_usina"],
+            columns="VAR",
+            values="valor",
+        ).reset_index()
+        self.data = df

inewave/nwlistop/modelos/mediasusit.py

@@ -0,0 +1,52 @@
+# Imports de módulos externos
+from cfinterface.components.section import Section
+from typing import IO
+import pandas as pd  # type: ignore
+
+
+class TabelaMediasusit(Section):
+    """
+    Bloco com o conteúdo da tabela existente no arquivo `MEDIAS-USIT.CSV`.
+    """
+
+    def __init__(self, previous=None, next=None, data=None) -> None:
+        super().__init__(previous, next, data)
+
+    def __eq__(self, o: object) -> bool:
+        if not isinstance(o, TabelaMediasusit):
+            return False
+        bloco: TabelaMediasusit = o
+        if not all(
+            [
+                isinstance(self.data, pd.DataFrame),
+                isinstance(o.data, pd.DataFrame),
+            ]
+        ):
+            return False
+        else:
+            return self.data.equals(bloco.data)
+
+    # Override
+    def read(self, file: IO, *args, **kwargs):
+        tabela = pd.read_csv(file, skipinitialspace=True)
+        col_usi = "USIT_ext"
+        tabela = tabela.rename(columns={col_usi: "codigo_usina"})
+        tabela = tabela.loc[tabela["codigo_usina"] > 0]
+        cols = tabela.columns.tolist()
+        df = tabela.drop(columns=[cols[-1]])
+        cols_id = ["VAR", "codigo_usina"]
+        cols_estagios = [c for c in df.columns.tolist() if c not in cols_id]
+        df = df.melt(
+            id_vars=cols_id,
+            value_vars=cols_estagios,
+            var_name="estagio",
+            value_name="valor",
+        )
+        df["estagio"] = df["estagio"].astype(int)
+        df["estagio"] -= df["estagio"].min() - 1
+        df = df.pivot_table(
+            index=["estagio", "codigo_usina"],
+            columns="VAR",
+            values="valor",
+        ).reset_index()
+        self.data = df

{inewave-1.6.0.dist-info → inewave-1.7.1.dist-info}/METADATA

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

{inewave-1.6.0.dist-info → inewave-1.7.1.dist-info}/RECORD

@@ -3,12 +3,11 @@ 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=t5BxJAMPcrR_K374oQV8oKi2i8BKZJCW4PNz9Bq2Zsc,235
+inewave/__init__.py,sha256=RKIqXjzJU-KcoCkQJ6hjHpPBkZsFaa38Ugi9BP6m1zM,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
 inewave/_utils/formatacao.py,sha256=-bdNExSg2PGAq7fwMekoPbeLvGYiEjpCR_nlKAGF9xg,5930
-inewave/_utils/leituracsv.py,sha256=nbqC4ds-5LfK3MMm4aR2YMxM3DxGIMnN-9Xg9kkChBs,1529
 inewave/libs/__init__.py,sha256=Jz0qQ08srjYGvoynfro6m8fQYAKbnkj-VweNEu8JnVQ,161
 inewave/libs/eolica.py,sha256=YMO1_37PojeUeix-CtkYeba2z66aRkaRR6CE_Cn4sbs,13324
 inewave/libs/restricoes.py,sha256=9CkYGsg6fWSFS7RoyIqKlqxfaCwcNxFJrUS8Qknz4xg,16485
@@ -17,7 +16,7 @@ inewave/libs/modelos/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 inewave/libs/modelos/eolica.py,sha256=0bKVjGBYBJ5RuddyE72kbFjOxlrGvNC7Yj6Et9PHpjk,14151
 inewave/libs/modelos/restricoes.py,sha256=q5kPLJXmnI7pRoXM1OrBnSegCA0SJkSzOeQe2gY-yAk,19601
 inewave/libs/modelos/usinas_hidreletricas.py,sha256=4-fWBqlWj2GKKj5qm8zd0NbZb7sRZq-yHLVzQ99UZKU,19927
-inewave/newave/__init__.py,sha256=NOrBCrgNUSRlEV-LUp8mwUgRDZeOVI-Rx0GKQAwXB_U,1922
+inewave/newave/__init__.py,sha256=DfVbFSUh3o-1RNwYJLRhrij12wpUkbeDmGPYRFw0MSM,2290
 inewave/newave/abertura.py,sha256=LdSW9PrMDEG6LXgsRj4awui7R0bQqZLcHiXrfzpwiZs,361
 inewave/newave/adterm.py,sha256=83DR82nT0uqbMwWJ-hwQmmWb6l02iXQhKNabuod8y-g,1097
 inewave/newave/agrint.py,sha256=DmZ3ZBTVnaIUBkjrIC5h9ELMbECxJwF3G3Fr_xq7aWQ,2064
@@ -69,18 +68,19 @@ inewave/newave/parpvaz.py,sha256=uV-3GlUxLc50nJH8X1WjvUhzcCCTWmzYwcOYCzopceY,158
 inewave/newave/patamar.py,sha256=yvJmHMFuc8eB7w8sdnMyYU8ZUxUjGoPxqb3CjYP_Aj0,4371
 inewave/newave/penalid.py,sha256=BzpJADw24jsxV0UtemD8zUZOcduukV02qtVeIJeVmVQ,1234
 inewave/newave/perda.py,sha256=RBfGVQLTr1wJmUdO95md0XYaX_JE7VNmhsndT9ixpb0,364
-inewave/newave/pmo.py,sha256=MjHejFT5U96prZKaWSLFAVEM7hUabgumsMu_5piWz_8,16274
+inewave/newave/pmo.py,sha256=GrUCOeO04RNMJqiqAgOP07G_N3cJsp1pGGgyYSATiHA,19079
 inewave/newave/re.py,sha256=zQ1dP1c-QT6clQ_4aEJ6aLLT7GxaButZaTlWk4U5BGk,2038
 inewave/newave/ree.py,sha256=J7Bin2gCmYb9xyZrwLuLsbT4nnoaFRjYs-OTYo_U41g,1926
 inewave/newave/sar.py,sha256=7UE-KwSAh8jGo_pG2OHevCtaj5BCgmBo315k0X4LBg4,350
 inewave/newave/selcor.py,sha256=-YMIjBqx8mQhraggIJWUlrU_j_t3almRuc1SroebqCs,5411
 inewave/newave/shist.py,sha256=gkOd-I-n6DrTUP_9RBHWbCpoJ6S27B6dDYBhKjG8BOE,2492
-inewave/newave/sistema.py,sha256=_m5UUtP-_8zSeGkWGrVblMWHbX8JFTIRmq9mDVjM4tg,4595
+inewave/newave/sistema.py,sha256=KWWVjPfxOc0OONvsk7N0Pxd4jYZARSoxj6uO-Qv73Pc,4609
 inewave/newave/tecno.py,sha256=rLjYE-TS7G28xm8n4PKmNRfOK2a_BkNwgxMKOFrkwko,365
 inewave/newave/term.py,sha256=DLV37WHCHUpx4HPPAg2kflp1SKA3vgqsYpyWqYgMHVc,1360
 inewave/newave/vazaob.py,sha256=kL3sh8xm92iHz9M2uGG2W3NJfJY9rzHdmkdZWgfS3ug,1360
 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=6dCCVi4oSD_03vrypvlDXC1DgolFfoM7YnDmzXiaqFw,2347
 inewave/newave/vazpast.py,sha256=5kdkC-nqRLiEjsMq-jh693H2NGEdDE4Y-wMFmpE-evw,1197
 inewave/newave/volref_saz.py,sha256=TbQqIimcs35m74lRHkDOsFu6M_YVE0GJpUFIYJWdbc0,1241
@@ -136,7 +136,7 @@ inewave/newave/modelos/parpvaz.py,sha256=npnubBGthrac8uJ2tkkZruvhpuaI6zsLsymoGKY
 inewave/newave/modelos/patamar.py,sha256=P9uxFGqrv8uDuJYa5rCNtM9YfM9dc50lFRYAnRsIf94,21478
 inewave/newave/modelos/penalid.py,sha256=R4yUfP9hn9nUGCiQMBTe8ExvpZr080fbzz0gmwDLhZA,5663
 inewave/newave/modelos/perda.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-inewave/newave/modelos/pmo.py,sha256=xsZ2GWGgHTmXall8JIinrB_xi6szlXMAroie_nT0qZs,47016
+inewave/newave/modelos/pmo.py,sha256=XygOqrgLDxnkkOq_ZaKlX4N6d85bNj18Naj4w5O2u2I,55106
 inewave/newave/modelos/re.py,sha256=ZevREGtx584M0yPH3PC4_DqeH3PQsKM_VQCxbwTJlj0,6574
 inewave/newave/modelos/ree.py,sha256=IqNVcDpl5AomPhWV1306hq26xkR7sL5nSG8Y7EKXmJs,4406
 inewave/newave/modelos/sar.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -148,6 +148,7 @@ inewave/newave/modelos/term.py,sha256=AbtjuOcLbrQQAWFP1y0qE0xuU_RTNL3xH1L2z2tQq7
 inewave/newave/modelos/vazaob.py,sha256=Xvi-jCxhsj-ItCbZ7y3oJlahUwmGTJuAixs9zuRSbv0,2872
 inewave/newave/modelos/vazaof.py,sha256=NOVgu2PDEoUn9J9cvz9sB8kybT5a87rDHeEyuiq8WxU,2644
 inewave/newave/modelos/vazaos.py,sha256=hNH-XQJYrSThbb24JHOT70Zsd4JRDf4p43VgMYe48h4,2604
+inewave/newave/modelos/vazinat.py,sha256=j5MI04RTGtenaAzGZWUzsHjDhphcniyLc2YP8_Ty-p4,2857
 inewave/newave/modelos/vazoes.py,sha256=B5ZmgU-XkQ67L4RwBxGGqmUc3dYzgTZljb2nrHSzilQ,880
 inewave/newave/modelos/vazpast.py,sha256=vdVGQ_6puUo0hGbEKbbIzEMEWtwRQl6p-wNtxrJ9UoI,3442
 inewave/newave/modelos/volref_saz.py,sha256=-Lu7C6_0QDCDUVLnL4N2dLpCDauQH1YzexVxgSW5IdQ,3459
@@ -168,7 +169,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=f-Qx_5fK9wRQU_B290UySiHMQvrsKEmpynWUWtTWQjQ,4622
+inewave/nwlistop/__init__.py,sha256=k_cTXFTRK740C51DUZgaLuYICEeXnSBPe_WjLY4AyKY,4915
 inewave/nwlistop/c_v_rhq.py,sha256=PRglT0Bxot8LlQ0b04dtlXjw4O27a9ebzvabZX69PJc,554
 inewave/nwlistop/c_v_rhq_s.py,sha256=rpLfvDdvur4GNRJpA0koP1EW1WasZh68GIC-opSLdFY,448
 inewave/nwlistop/c_v_rhv.py,sha256=AuKpEP-naKv4u2ncK1DfzB6plubRitdMW-Aq-73uFFA,533
@@ -255,8 +256,15 @@ 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
-inewave/nwlistop/mediasmerc.py,sha256=zKP00r9uLWl3-Qk39axSvWzTLoiF4gVwy9QuyO8WDhk,1066
-inewave/nwlistop/mediassin.py,sha256=MyUYRLxOzEChjkNfcTBO-C-Mn0oAndVsFUDKZW9vias,1043
+inewave/nwlistop/mediasmerc.py,sha256=yO3fygWcDXZaVbwmuTFwbwPWjjVjYyhljiVvHzLoPcA,1002
+inewave/nwlistop/mediasree.py,sha256=z4Jz0VUWKVqU9nFFx3lZXUJeI2ACBRsFKk0EKOliM5A,973
+inewave/nwlistop/mediasrep.py,sha256=zoRh72-v7ds3D3rnfzLowP9GBE0qOjbcYI70UnYnVOc,1014
+inewave/nwlistop/mediasrhq.py,sha256=WOiHgHx8QEkbEIQvQjjC5fIJdsdsEQ7nONROPfHh1Uk,1018
+inewave/nwlistop/mediasrhv.py,sha256=qJKOGFgvd1f0411wnK2nRlWsXyobytsfUF1VaOaP9Pc,1018
+inewave/nwlistop/mediassin.py,sha256=B85SOLeSV-C51wOpEb3qBAgJI-54II_-ugxK9Nonkpc,936
+inewave/nwlistop/mediasusie.py,sha256=pKAC2Sx_F-bN2BRL0YEzRWcz9GAOoQJ-Gj1JR4qCH24,1022
+inewave/nwlistop/mediasusih.py,sha256=XmQzAvEzbImkB84uf2IzTeITRERzwFgRvkzh2hGFXGQ,976
+inewave/nwlistop/mediasusit.py,sha256=JlS9CzlWbgCtZqXon6PhO2OX9Y7QktFXUip0j1X7q9Q,976
 inewave/nwlistop/mercl.py,sha256=efvuBwhaiogiyIaAm3WwH52-oxyFLIHzb9wRyK3zP9c,559
 inewave/nwlistop/merclsin.py,sha256=fyb7iOVHWm8LGLocLtWl6lsTYp02xzZD-db4h4QWmcA,440
 inewave/nwlistop/mevmin.py,sha256=dqOepu3kwBaSUYWgl8N1RtRqFB2THrdwLsgmVHQFxqQ,534
@@ -383,8 +391,15 @@ inewave/nwlistop/modelos/hmont.py,sha256=CAAARS7JHKfI-qk5loo4Dod1C1iJJwEv020ue7t
 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
-inewave/nwlistop/modelos/mediasmerc.py,sha256=aWeHk-ZSVDB3DWGDb45Wmu-1ERS6XOICs702ceIUTgI,1562
-inewave/nwlistop/modelos/mediassin.py,sha256=saxyPR-zPA0NqglVIgpBuIduqHjzXMlePoI7gJTNUgE,1300
+inewave/nwlistop/modelos/mediasmerc.py,sha256=df8WZJC4ZduvsxZrV6Tu_fdnjHLsITIW7waEnS5AQG4,1718
+inewave/nwlistop/modelos/mediasree.py,sha256=rCSoR_g-fw8dNz7e4c9NfN5YohTMvcBrivS0aGULPVw,1686
+inewave/nwlistop/modelos/mediasrep.py,sha256=YpVgfU_B72vUch6XSTa279qkGDcHUsdLeZFBxjAm91g,1710
+inewave/nwlistop/modelos/mediasrhq.py,sha256=jusXeo1lrdLStGMahQAlH6gSMwwp17W3N_g6l5Xma6E,1710
+inewave/nwlistop/modelos/mediasrhv.py,sha256=51gzKp0J5OCcmohPfMhFGNcl2I4Y1cx99FKQFFWH7bc,1710
+inewave/nwlistop/modelos/mediassin.py,sha256=TW52hzYYv_YhGVEmgWE6rZwSb63HdZ0EOrhhig4JyFc,1609
+inewave/nwlistop/modelos/mediasusie.py,sha256=w9Za5iul5GRCPkEyYLL9KA0K_Fqumcml56HUmryAfjo,1699
+inewave/nwlistop/modelos/mediasusih.py,sha256=-P0hWrMDsi3eouig7IYSy4tx-EGRTM_pw19sHTLE1ZA,1793
+inewave/nwlistop/modelos/mediasusit.py,sha256=7P_VilUNWaPen9hjG6wKyiG-8PyrM249hqR5bl9i0T8,1699
 inewave/nwlistop/modelos/mercl.py,sha256=_TdhroXiZy_huTe_UCfMwkFLMJHi-sj1xcIHCHrzxl4,614
 inewave/nwlistop/modelos/merclsin.py,sha256=_TdhroXiZy_huTe_UCfMwkFLMJHi-sj1xcIHCHrzxl4,614
 inewave/nwlistop/modelos/mevmin.py,sha256=hy5OupmmPiNEgL392GwQ38dnOH2N2CNOWSjeRSlfcHo,673
@@ -591,7 +606,7 @@ tests/mocks/arquivos/perdfm.py,sha256=FzaJlwSXyAa6gyRzEVOg3b4h-fltHDmqCyxkdAzmIg
 tests/mocks/arquivos/perdfsin.py,sha256=jMhP-qdW9E0t4N6VOJnpE6KL6HlQN_Dra_meCi68FkE,267139
 tests/mocks/arquivos/pivarm.py,sha256=PGkPHgmJXErjDku5CO_MFCXMPgb-CjqGVDSmeZ-bOzI,425677
 tests/mocks/arquivos/pivarmincr.py,sha256=jdHu1xfI8xU2Eu5WRYaRK_OmNO2AVYQC-2FnZZu1A5M,14847
-tests/mocks/arquivos/pmo.py,sha256=NXsNl_WjP8Xy1jPPUvylBVJ621GYMCTT-0jM0oPYiRo,448364
+tests/mocks/arquivos/pmo.py,sha256=N-Moz6l6-5TgtYucXPEGTXiAH79Qd0Euu5uHA4xOIx0,655644
 tests/mocks/arquivos/qafluh.py,sha256=ado-zuW71uEHNLQrPIBu2ssLZ5ZhG9QQMQdyYSkRne8,283145
 tests/mocks/arquivos/qincruh.py,sha256=jRvjlyaGefwZKSA36QxdLUeeHP3Z0kC5omZ1mLk2Dns,283145
 tests/mocks/arquivos/re.py,sha256=AyVV_dNpv-finVzNyB3jk2sH0T23nND0EZWa_ug0o6o,1843
@@ -673,7 +688,7 @@ tests/newave/test_parpeol.py,sha256=ZY0DHp6OK41KKcHvCZT684gntmDPRTqfYPZfwzx7B7g,
 tests/newave/test_parpvaz.py,sha256=MC3GgqGgeGp9nZLbDOfSJegKyvQndFN2JFKto2zeObQ,5896
 tests/newave/test_patamar.py,sha256=zrDEAs5mYDkxQPY7rj6XHGcCkbCe078l7iOwyOCNNtE,6766
 tests/newave/test_penalid.py,sha256=zOBHPX1xjw6M256oW8UaJY3mJXmHwiw-tiXsolATZsk,1901
-tests/newave/test_pmo.py,sha256=OkvOqKBznAVz-7l9jaURCYy2WL10IPoSZ4iFNkhhgBg,13271
+tests/newave/test_pmo.py,sha256=NYqQrKVPDBbIVa3BEnaoq2xRj0y3iUZ6hoFygnLs5D8,15289
 tests/newave/test_re.py,sha256=8CIHTUEg2LP300HbYZGKGJpsYR6MSJGbFAHdMmgItxY,2754
 tests/newave/test_ree.py,sha256=bDsoaXdAhkwBlKGGTDith5C4oIY8LzGdqoJ5IZQEilI,1883
 tests/newave/test_selcor.py,sha256=ljd6vWl4SXAcz1GSC-bAeBEii9KCGUakIXrYFHU_jeg,3021
@@ -683,6 +698,7 @@ tests/newave/test_term.py,sha256=tcVcFAKD-3sB03CmGHvsGv-rWh1DeYb6nTzT0yAbXtc,223
 tests/newave/test_vazaob.py,sha256=PT7J_fsA3nnWGdVlan77xb7gnedP4WDXcGPUNbE7QrU,1855
 tests/newave/test_vazaof.py,sha256=5yqsK_i4vMsgW7Ply6F4zPGSrutN-fvm4Uon_mvgIDk,1881
 tests/newave/test_vazaos.py,sha256=2CJdr8jwBZ0oMfvoIssWvkY1z92FvuFnkv6zNqnOnNY,1857
+tests/newave/test_vazinat.py,sha256=MNdl6FhgT3AkbCDG4bUfZ_CoYo9fThBLEzn0FiNtHa8,1823
 tests/newave/test_vazoes.py,sha256=jAal6qJij2cYqC007q2dgXxPpbQLU7Ke3UOBep_RR3s,2790
 tests/newave/test_vazpast.py,sha256=6TjN9KY2CaCRdiZdvEvb48-4MjxtMHhBojav8ExfeQg,2343
 tests/newave/test_volrefsaz.py,sha256=uemmFNBRyelld3jfH5B8viUFDn0ixMnXxu4fpGxpQ9U,2305
@@ -779,8 +795,15 @@ tests/nwlistop/test_hmont.py,sha256=_F-vktAPC368xrQDYjpWrbuhTtNmPtHqsN_hd_F1Ryo,
 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
-tests/nwlistop/test_mediasmerc.py,sha256=mSUCwnej2enEiq_IbW2Gw347xcW6SDbglkYq_0ee9ZM,470
-tests/nwlistop/test_mediassin.py,sha256=-Dng6WbjwJnS6yBUXoZLW1EnYc5Xlo1WIRGG_v8yifQ,462
+tests/nwlistop/test_mediasmerc.py,sha256=wL6MfHSNLdHyPyA06bMbuh2F2KW8xPiV199IR0Ra600,388
+tests/nwlistop/test_mediasree.py,sha256=Dg6w4dUCkW8rjNea9PwTdBLtojuSXSoUnPZxYT0uYug,345
+tests/nwlistop/test_mediasrep.py,sha256=4i0PNyu3Ho3XgsBAcCKriRJ2FnrosFv3gErx0ABDHbk,342
+tests/nwlistop/test_mediasrhq.py,sha256=ssIaYR1421nlu13A2RrHzxwTKfnh2ShtK_r78ZfGmrM,342
+tests/nwlistop/test_mediasrhv.py,sha256=reS_Xo6inE8wtpXp6-5DhQfCm4kFXBy-SJ34soG5nyQ,341
+tests/nwlistop/test_mediassin.py,sha256=vxUlbM1nBBJzgTpEGYbP7uRKcUSHvt1BeZ5zJvkO7p8,344
+tests/nwlistop/test_mediasusie.py,sha256=5kA1qNa1i_lnW4rfFjUHUbIOjRwf_sQvIciDnlLKEgg,349
+tests/nwlistop/test_mediasusih.py,sha256=z_ymVAi3KnG292ekqpQJQhjLn6pywiXrHLsi9EvtS5M,352
+tests/nwlistop/test_mediasusit.py,sha256=9GbHb1nMeHIsKhvDe6SXSbVZqWKGOdHR4AzfWC4SdVg,352
 tests/nwlistop/test_mercl.py,sha256=ehP1uqZC9r1v1sCKYHQigkPLVMvClZjeos46Cec8SRI,1195
 tests/nwlistop/test_merclsin.py,sha256=88DjniR7akkEcDe8BdzdfbHVCcKTc2oVP5lkwGcaAwE,1117
 tests/nwlistop/test_mevmin.py,sha256=XvYY4r1nCbVpfvW67gOMQFw22ccZdv7tANhcl0QgM7A,1186
@@ -820,8 +843,8 @@ tests/nwlistop/test_vmort.py,sha256=KUqgO1HznEzu7TX5xu8wLhSl_sKSJteNfMd9zVcruls,
 tests/nwlistop/test_vmortm.py,sha256=re8ypER8xgRbgRdgBd1H97G1ebNxtYZn23_nBGyWwhU,1204
 tests/nwlistop/test_vmortsin.py,sha256=LvdpNPPZtnQWIxrLMUx_KIg6k22pOif6SzmRasAjquc,1113
 tests/nwlistop/test_vturuh.py,sha256=wvQ9zq9nuHdt0CPNt3SkPKMGq5WHQs7nZUnRaY33ONQ,1190
-inewave-1.6.0.dist-info/LICENSE.md,sha256=0jOBL78mjzscN0-XI-6YtK1IqnODUbG85DaKAMH4XJ8,1070
-inewave-1.6.0.dist-info/METADATA,sha256=3-olU1kdIw9HLBrDu5e4fcX_2l1qDTOk3S1mo0Q5nXs,1958
-inewave-1.6.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-inewave-1.6.0.dist-info/top_level.txt,sha256=o3hXlvlgJI4qWYy-wVzUYago7roEBl3kP5IL3QR9L70,23
-inewave-1.6.0.dist-info/RECORD,,
+inewave-1.7.1.dist-info/LICENSE.md,sha256=0jOBL78mjzscN0-XI-6YtK1IqnODUbG85DaKAMH4XJ8,1070
+inewave-1.7.1.dist-info/METADATA,sha256=7f6oZQvOdKI7WFJ2ykkVtEOPAz8TaBbzPFKlTuz3ayg,1958
+inewave-1.7.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+inewave-1.7.1.dist-info/top_level.txt,sha256=o3hXlvlgJI4qWYy-wVzUYago7roEBl3kP5IL3QR9L70,23
+inewave-1.7.1.dist-info/RECORD,,