diff --git a/docs/develop/datasets.rst b/docs/develop/datasets.rst index 27a19335..304fcb9e 100644 --- a/docs/develop/datasets.rst +++ b/docs/develop/datasets.rst @@ -82,9 +82,6 @@ Satellite Examples for reading satellite datasets can be found in the ``monetio/sat`` folder in the MONETIO repository `on GitHub `__. -While a part of the MONETIO repository, -the private MELODIES MONET readers are designated with prefix ``_`` -and suffix ``_mm``. Models ------ diff --git a/melodies_monet/driver.py b/melodies_monet/driver.py index 49f02894..d3aeb8da 100644 --- a/melodies_monet/driver.py +++ b/melodies_monet/driver.py @@ -254,7 +254,7 @@ def open_sat_obs(self, time_interval=None, control_dict=None): try: if self.sat_type == 'omps_l3': print('Reading OMPS L3') - self.obj = mio.sat._omps_l3_mm.open_dataset(self.file) + self.obj = mio.sat.omps_l3.open_dataset(self.file) elif self.sat_type == 'omps_nm': print('Reading OMPS_NM') if time_interval is not None: @@ -262,7 +262,7 @@ def open_sat_obs(self, time_interval=None, control_dict=None): else: flst = self.file - self.obj = mio.sat._omps_nadir_mm.read_OMPS_nm(flst) + self.obj = mio.sat.omps_nadir.read_OMPS_nm(flst) # couple of changes to move to reader self.obj = self.obj.swap_dims({'x':'time'}) # indexing needs @@ -278,7 +278,7 @@ def open_sat_obs(self, time_interval=None, control_dict=None): flst = tsub.subset_mopitt_l3(self.file,time_interval) else: flst = self.file - self.obj = mio.sat._mopitt_l3_mm.open_dataset(flst, ['column','pressure_surf','apriori_col', + self.obj = mio.sat.mopitt_l3.open_dataset(flst, ['column','pressure_surf','apriori_col', 'apriori_surf','apriori_prof','ak_col']) # Determine if monthly or daily product and set as attribute @@ -293,18 +293,18 @@ def open_sat_obs(self, time_interval=None, control_dict=None): flst = tsub.subset_MODIS_l2(self.file,time_interval) # self.obj = mio.sat._modis_l2_mm.read_mfdataset( # self.file, self.variable_dict, debug=self.debug) - self.obj = mio.sat._modis_l2_mm.read_mfdataset( + self.obj = mio.sat.modis_l2.read_mfdataset( flst, self.variable_dict, debug=self.debug) # self.obj = granules, an OrderedDict of Datasets, keyed by datetime_str, # with variables: Latitude, Longitude, Scan_Start_Time, parameters, ... elif self.sat_type == 'tropomi_l2_no2': #from monetio import tropomi_l2_no2 print('Reading TROPOMI L2 NO2') - self.obj = mio.sat._tropomi_l2_no2_mm.read_trpdataset( + self.obj = mio.sat.tropomi_l2_no2.read_trpdataset( self.file, self.variable_dict, debug=self.debug) elif "tempo_l2" in self.sat_type: print('Reading TEMPO L2') - self.obj = mio.sat._tempo_l2_no2_mm.open_dataset( + self.obj = mio.sat.tempo_l2_no2.open_dataset( self.file, self.variable_dict, debug=self.debug) else: print('file reader not implemented for {} observation'.format(self.sat_type)) diff --git a/melodies_monet/util/read_grid_util.py b/melodies_monet/util/read_grid_util.py index 88510473..012d92b4 100644 --- a/melodies_monet/util/read_grid_util.py +++ b/melodies_monet/util/read_grid_util.py @@ -3,7 +3,7 @@ import os import logging import xarray as xr -from monetio.sat._gridded_eos_mm import read_gridded_eos +from monetio.sat.gridded_eos import read_gridded_eos from .analysis_util import fill_date_template, find_file