inewave 1.2.1__tar.gz → 1.3.0__tar.gz

{inewave-1.2.1/inewave.egg-info → inewave-1.3.0}/PKG-INFO

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

{inewave-1.2.1 → inewave-1.3.0}/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.1"
+__version__ = "1.3.0"
 
 from . import newave  # noqa
 from . import nwlistcf  # noqa

inewave-1.3.0/inewave/_utils/formatacao.py

@@ -0,0 +1,203 @@
+import numpy as np  # type: ignore
+import pandas as pd  # type: ignore
+from datetime import datetime
+from inewave.config import MESES_DF
+from typing import List
+
+__COLS_IDENTIFICACAO = ["data", "ano", "serie", "patamar", "classe"]
+
+
+def __formata_df_meses_para_datas_serie(df: pd.DataFrame) -> pd.DataFrame:
+    anos = np.array(df["ano"].unique().tolist())
+    series = np.array(df["serie"].unique().tolist())
+    n_series = len(series)
+    datas_df = []
+    series_df = []
+    for a in anos:
+        datas_df.append(
+            np.tile(
+                pd.date_range(
+                    datetime(year=a, month=1, day=1),
+                    datetime(year=a, month=12, day=1),
+                    freq="MS",
+                ).to_numpy(),
+                n_series,
+            ),
+        )
+        series_df.append(np.repeat(series, 12))
+    valores = []
+    for a in anos:
+        valores.append(
+            df.loc[
+                (df["ano"] == a),
+                MESES_DF,
+            ]
+            .to_numpy()
+            .flatten()
+        )
+    df_formatado = pd.DataFrame(
+        data={
+            "data": np.concatenate(datas_df),
+            "serie": np.concatenate(series_df),
+            "valor": np.concatenate(valores),
+        }
+    )
+    return df_formatado
+
+
+def __formata_df_meses_para_datas_serie_patamar(
+    df: pd.DataFrame,
+) -> pd.DataFrame:
+    anos = np.array(df["ano"].unique().tolist())
+    series = np.array(df["serie"].unique().tolist())
+    patamares = np.array(df["patamar"].unique().tolist())
+    n_series = len(series)
+    n_patamares = len(patamares)
+    datas_df = []
+    patamares_df = []
+    series_df = []
+    for a in anos:
+        datas_df.append(
+            np.tile(
+                pd.date_range(
+                    datetime(year=a, month=1, day=1),
+                    datetime(year=a, month=12, day=1),
+                    freq="MS",
+                ).to_numpy(),
+                n_series * n_patamares,
+            ),
+        )
+        patamares_df.append(np.tile(np.repeat(patamares, 12), n_series))
+        series_df.append(np.repeat(series, 12 * n_patamares))
+
+    valores = []
+    for a in anos:
+        valores.append(
+            df.loc[
+                (df["ano"] == a),
+                MESES_DF,
+            ]
+            .to_numpy()
+            .flatten()
+        )
+    df_formatado = pd.DataFrame(
+        data={
+            "data": np.concatenate(datas_df),
+            "patamar": np.concatenate(patamares_df),
+            "serie": np.concatenate(series_df),
+            "valor": np.concatenate(valores),
+        }
+    )
+    return df_formatado
+
+
+def __formata_df_meses_para_datas_classetermica_serie_patamar(
+    df: pd.DataFrame,
+) -> pd.DataFrame:
+    anos = np.array(df["ano"].unique().tolist())
+    classes = np.array(df["classe"].unique().tolist())
+    series = np.array(df["serie"].unique().tolist())
+    patamares = np.array(df["patamar"].unique().tolist())
+    n_classes = len(classes)
+    n_series = len(series)
+    n_patamares = len(patamares)
+    datas_df = []
+    classes_df = []
+    series_df = []
+    patamares_df = []
+    for a in anos:
+        datas_df.append(
+            np.tile(
+                pd.date_range(
+                    datetime(year=a, month=1, day=1),
+                    datetime(year=a, month=12, day=1),
+                    freq="MS",
+                ).to_numpy(),
+                n_classes * n_series * n_patamares,
+            ),
+        )
+        classes_df.append(np.repeat(classes, 12 * n_series * n_patamares))
+        patamares_df.append(
+            np.tile(np.repeat(patamares, 12), n_classes * n_series)
+        )
+        series_df.append(
+            np.tile(np.repeat(series, 12 * n_patamares), n_classes)
+        )
+    valores = []
+    for a in anos:
+        valores.append(
+            df.loc[
+                (df["ano"] == a),
+                MESES_DF,
+            ]
+            .to_numpy()
+            .flatten()
+        )
+    df_formatado = pd.DataFrame(
+        data={
+            "classe": np.concatenate(classes_df),
+            "data": np.concatenate(datas_df),
+            "patamar": np.concatenate(patamares_df),
+            "serie": np.concatenate(series_df),
+            "valor": np.concatenate(valores),
+        }
+    )
+    return df_formatado[["classe", "data", "patamar", "serie", "valor"]]
+
+
+def formata_df_meses_para_datas_nwlistop(df: pd.DataFrame) -> pd.DataFrame:
+    colunas_df = df.columns.tolist()
+    colunas_identificacao = tuple(
+        [c for c in colunas_df if c in __COLS_IDENTIFICACAO]
+    )
+    mapa_formatacao = {
+        ("ano", "serie"): __formata_df_meses_para_datas_serie,
+        (
+            "ano",
+            "serie",
+            "patamar",
+        ): __formata_df_meses_para_datas_serie_patamar,
+        (
+            "ano",
+            "classe",
+            "serie",
+            "patamar",
+        ): __formata_df_meses_para_datas_classetermica_serie_patamar,
+    }
+    return mapa_formatacao[colunas_identificacao](df)
+
+
+def prepara_vetor_anos_tabela(anos: List[str]) -> List[datetime]:
+    # Se tem pré, substitui por 0001
+    # Se tem pós, substitui por 9999
+    # Repete os valores existentes 12 vezes
+    anos_convertidos: List[int] = []
+    for a in anos:
+        if a == "PRE":
+            a_convertido = 1
+        elif a == "POS":
+            a_convertido = 9999
+        else:
+            a_convertido = int(a)
+        anos_convertidos.append(a_convertido)
+
+    anos_array = np.array(anos_convertidos).repeat(len(MESES_DF))
+    meses = np.tile(np.arange(1, 13), len(anos))
+    return [
+        datetime(year=a, month=m, day=1) for a, m in zip(anos_array, meses)
+    ]
+
+
+def repete_vetor(
+    valores: list, n_repeticoes: int = len(MESES_DF)
+) -> np.ndarray:
+    return np.array(valores).repeat(n_repeticoes)
+
+
+def prepara_valor_ano(ano: int) -> str:
+    if ano == 1:
+        return "PRE"
+    elif ano == 9999:
+        return "POS"
+    else:
+        return str(ano)

{inewave-1.2.1 → inewave-1.3.0}/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-1.3.0/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-1.3.0/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-1.3.0/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-1.3.0/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-1.2.1 → inewave-1.3.0}/inewave/nwlistop/modelos/cmarg.py

@@ -17,7 +17,7 @@ class CmargsAnos(ValoresSeriePatamar):
     HEADER_LINE = Line([IntegerField(4, 10)])
     DATA_LINE = Line(
         [  # type: ignore
-            IntegerField(4, 1),
+            IntegerField(4, 2),
             IntegerField(2, 9),
         ]
         + [FloatField(8, 15 + 9 * i, 2) for i in range(len(MESES_DF))]  # type: ignore

{inewave-1.2.1 → inewave-1.3.0}/inewave/nwlistop/modelos/corteolm.py

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

{inewave-1.2.1 → inewave-1.3.0}/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-1.2.1 → inewave-1.3.0}/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-1.2.1 → inewave-1.3.0}/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-1.3.0/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-1.2.1 → inewave-1.3.0}/inewave/nwlistop/modelos/dflppdfmaxm.py

@@ -20,7 +20,7 @@ class DLPPdfmaxmAnos(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-1.2.1 → inewave-1.3.0}/inewave/nwlistop/modelos/dflpptbmaxm.py

@@ -20,7 +20,7 @@ class DLPPdfmaxmAnos(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-1.2.1 → inewave-1.3.0}/inewave/nwlistop/modelos/dfphauh.py

@@ -19,7 +19,7 @@ class DfphauhAnos(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-1.2.1 → inewave-1.3.0}/inewave/nwlistop/modelos/dlppdfmax.py

@@ -20,7 +20,7 @@ class DLPPdfmaxAnos(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-1.2.1 → inewave-1.3.0}/inewave/nwlistop/modelos/dlppdfmaxs.py

@@ -20,7 +20,7 @@ class DLPPdfmaxAnos(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-1.2.1 → inewave-1.3.0}/inewave/nwlistop/modelos/dlpptbmax.py

@@ -20,7 +20,7 @@ class DLPPtbmaxAnos(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-1.2.1 → inewave-1.3.0}/inewave/nwlistop/modelos/dlpptbmaxs.py

@@ -20,7 +20,7 @@ class DLPPtbmaxAnos(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-1.2.1 → inewave-1.3.0}/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-1.2.1 → inewave-1.3.0}/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-1.2.1 → inewave-1.3.0}/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-1.2.1 → inewave-1.3.0}/inewave/nwlistop/modelos/exces.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-1.2.1 → inewave-1.3.0}/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-1.2.1 → inewave-1.3.0}/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-1.2.1 → inewave-1.3.0}/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-1.2.1 → inewave-1.3.0}/inewave/nwlistop/modelos/geol.py

@@ -18,7 +18,7 @@ class GEAnos(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-1.2.1 → inewave-1.3.0}/inewave/nwlistop/modelos/geolm.py

@@ -18,7 +18,7 @@ class GEAnos(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-1.2.1 → inewave-1.3.0}/inewave/nwlistop/modelos/geolsin.py

@@ -18,7 +18,7 @@ class GEAnos(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-1.2.1 → inewave-1.3.0}/inewave/nwlistop/modelos/ghiduh.py

@@ -19,7 +19,7 @@ class GhidAnos(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-1.2.1 → inewave-1.3.0}/inewave/nwlistop/modelos/ghmax.py

@@ -19,7 +19,7 @@ class GHAnos(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-1.2.1 → inewave-1.3.0}/inewave/nwlistop/modelos/ghmaxm.py

@@ -19,7 +19,7 @@ class GHAnos(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-1.2.1 → inewave-1.3.0}/inewave/nwlistop/modelos/ghmaxmr.py

@@ -19,7 +19,7 @@ class GHAnos(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-1.2.1 → inewave-1.3.0}/inewave/nwlistop/modelos/ghmaxr.py

@@ -19,7 +19,7 @@ class GHAnos(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-1.2.1 → inewave-1.3.0}/inewave/nwlistop/modelos/ghmaxrsin.py

@@ -19,7 +19,7 @@ class GHAnos(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-1.2.1 → inewave-1.3.0}/inewave/nwlistop/modelos/ghmaxsin.py

@@ -19,7 +19,7 @@ class GHAnos(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-1.2.1 → inewave-1.3.0}/inewave/nwlistop/modelos/ghtot.py

@@ -19,7 +19,7 @@ class GHAnos(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