diff --git a/setup.cfg b/setup.cfg index bd45d72..190da85 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = pyaro_readers -version = 0.0.10.dev4 +version = 0.0.10.dev5 author = MET Norway description = implementations of pyaerocom reading plugings using pyaro as interface long_description = file: README.md diff --git a/src/pyaro_readers/harpreader/harpreader.py b/src/pyaro_readers/harpreader/harpreader.py index 4116667..78ee631 100644 --- a/src/pyaro_readers/harpreader/harpreader.py +++ b/src/pyaro_readers/harpreader/harpreader.py @@ -73,6 +73,9 @@ def __init__( else: self._files.append(file) + def read(self): + """reading method""" + bar = tqdm(total=len(self._files)) for f_idx, _file in enumerate(self._files): @@ -84,7 +87,7 @@ def __init__( # skip coordinate names if _var in self.COORD_NAMES: continue - if vars_to_read is not None and _var not in vars_to_read: + if self._vars_to_read is not None and _var not in self._vars_to_read: logger.info(f"Skipping {_var}") continue if _var not in self._data: @@ -238,3 +241,6 @@ def description(self): def url(self): return "https://github.com/metno/pyaro-readers" + + def read(self): + return self.reader_class().read() diff --git a/tests/test_HARPReader.py b/tests/test_HARPReader.py index 2820d62..d70decc 100644 --- a/tests/test_HARPReader.py +++ b/tests/test_HARPReader.py @@ -15,7 +15,7 @@ class TestHARPReader(unittest.TestCase): ) testdata_dir = ( - "/lustre/storeB/project/aerocom/aerocom1/AEROCOM_OBSDATA/CNEMC/aggregated/" + "/lustre/storeB/project/aerocom/aerocom1/AEROCOM_OBSDATA/SINCA/aggregated/" ) test_vars = ["PM10_density", "CO_volume_mixing_ratio", "PM2p5_density"] test_units = ["ug m-3", "ppm", "ug m-3"] @@ -26,6 +26,7 @@ def test_1read(self): self.file, vars_to_read=self.test_vars, ) as ts: + ts.read() for _v_idx, var in enumerate(self.test_vars): data = ts.data(var) self.assertGreater(len(data), 10000) @@ -44,6 +45,7 @@ def test_2open_directory(self): with pyaro.open_timeseries( self.engine, self.testdata_dir, filters=[], vars_to_read=self.test_vars ) as ts: + ts.read() for _v_idx, var in enumerate(self.test_vars): data = ts.data(var) assert isinstance(data.units, str)