diff --git a/.gitignore b/.gitignore index b2127c70f901f3f94062a67b0d6e2cd83a4cd430..8e8e2819574bb109d9e455eb1fec30bc6596dcba 100644 --- a/.gitignore +++ b/.gitignore @@ -126,3 +126,6 @@ docs/source/generated/ *.DS_Store *.zip + +# local version for user install +setup.py diff --git a/examples/simple_viewer.py b/examples/simple_viewer.py index ea0f702ce9473a62c8ccad782518e75c8eb13f0f..b6b17f59905e6d6847143f1d53c633788ac036bf 100644 --- a/examples/simple_viewer.py +++ b/examples/simple_viewer.py @@ -9,16 +9,17 @@ from finam.adapters import time, base from finam.core.schedule import Composition from finam.modules.visual import time_series from finam_mhm_module import Mhm - +from matplotlib import pyplot as plt def grid_select(grid): - return grid.get(col=3, row=5) + col, row = 3, 5 + return grid[col + row * 5] plot = time_series.TimeSeriesView( start=datetime(1990, 1, 1), step=timedelta(days=1), - inputs=["Linear (1)"], + inputs=["Runoff"], intervals=[1], ) @@ -28,6 +29,7 @@ composition = Composition([mhm, plot]) composition.initialize() grid_value = mhm.outputs["runoff"] >> base.GridToValue(func=grid_select) -grid_value >> time.LinearInterpolation() >> plot.inputs["Linear (1)"] +grid_value >> time.LinearInterpolation() >> plot.inputs["Runoff"] composition.run(datetime(1991, 1, 1)) +plt.show() diff --git a/src/finam_mhm_module/mhm.py b/src/finam_mhm_module/mhm.py index e5feadfdc4f54844662659bfe4ad9683841e34f7..0308ab5dd4dd84248582fd547b52df7f81eedb88 100644 --- a/src/finam_mhm_module/mhm.py +++ b/src/finam_mhm_module/mhm.py @@ -34,9 +34,12 @@ class Mhm(ATimeComponent): mp.run.prepare_domain() # set time year, month, day, hour = mp.run.current_time() + print("time", year, month, day, hour) + if hour == -1: + hour = 0 self._time = datetime(year=year, month=month, day=day, hour=hour) # get grid info - ncols, nrows, ncells, xll, yll, cell_size, no_data = mp.get.L1_domain_info() + ncols, nrows, ncells, xll, yll, cell_size, no_data = mp.get.l1_domain_info() self.no_data = no_data self.gridspec = GridSpec( ncols=ncols, nrows=nrows, cell_size=cell_size, xll=xll, yll=yll