Skip to content

Move all io to io folders #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 22, 2021
Merged

Move all io to io folders #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5eec116
Move all io to io folders
ssolson Jul 21, 2021
285d486
Update calls to io
ssolson Jul 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions examples/SWAN_example.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

130 changes: 65 additions & 65 deletions examples/cdip_example.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

203 changes: 104 additions & 99 deletions examples/environmental_contours.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions examples/loads_example.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions examples/power_example.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions examples/qc_example.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 10 additions & 12 deletions examples/river_example.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 19 additions & 15 deletions examples/tidal_example.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions examples/wave_example.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions examples/wecsim_example.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions mhkit/river/io/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from mhkit.river.io import usgs
0 mhkit/river/io.py → mhkit/river/io/usgs.py
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions mhkit/tests/test_river.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,14 +241,14 @@ def tearDownClass(self):

def test_load_usgs_data_instantaneous(self):
file_name = join(datadir, 'USGS_08313000_Jan2019_instantaneous.json')
data = river.io.read_usgs_file(file_name)
data = river.io.usgs.read_usgs_file(file_name)

self.assertEqual(data.columns, ['Discharge, cubic feet per second'])
self.assertEqual(data.shape, (2972, 1)) # 4 data points are missing

def test_load_usgs_data_daily(self):
file_name = join(datadir, 'USGS_08313000_Jan2019_daily.json')
data = river.io.read_usgs_file(file_name)
data = river.io.usgs.read_usgs_file(file_name)

expected_index = pd.date_range('2019-01-01', '2019-01-31', freq='D')
self.assertEqual(data.columns, ['Discharge, cubic feet per second'])
Expand All @@ -257,7 +257,7 @@ def test_load_usgs_data_daily(self):


def test_request_usgs_data_daily(self):
data=river.io.request_usgs_data(station="15515500",
data=river.io.usgs.request_usgs_data(station="15515500",
parameter='00060',
start_date='2009-08-01',
end_date='2009-08-10',
Expand All @@ -267,7 +267,7 @@ def test_request_usgs_data_daily(self):


def test_request_usgs_data_instant(self):
data=river.io.request_usgs_data(station="15515500",
data=river.io.usgs.request_usgs_data(station="15515500",
parameter='00060',
start_date='2009-08-01',
end_date='2009-08-10',
Expand Down
6 changes: 3 additions & 3 deletions mhkit/tests/test_tidal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ def tearDownClass(self):

def test_load_noaa_data(self):
file_name = join(datadir, 's08010.json')
data, metadata = tidal.io.read_noaa_json(file_name)
data, metadata = tidal.io.noaa.read_noaa_json(file_name)
self.assertTrue(np.all(data.columns == ['s','d','b']) )
self.assertEqual(data.shape, (18890, 3))

def test_request_noaa_data(self):
data, metadata = tidal.io.request_noaa_data(station='s08010', parameter='currents',
data, metadata = tidal.io.noaa.request_noaa_data(station='s08010', parameter='currents',
start_date='20180101', end_date='20180102',
proxy=None, write_json=None)
self.assertTrue(np.all(data.columns == ['s','d','b']) )
Expand All @@ -39,7 +39,7 @@ class TestResource(unittest.TestCase):
@classmethod
def setUpClass(self):
file_name = join(datadir, 's08010.json')
self.data, self.metadata = tidal.io.read_noaa_json(file_name)
self.data, self.metadata = tidal.io.noaa.read_noaa_json(file_name)
self.data.s = self.data.s / 100. # convert to m/s


Expand Down
1 change: 1 addition & 0 deletions mhkit/tidal/io/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from mhkit.tidal.io import noaa
0 mhkit/tidal/io.py → mhkit/tidal/io/noaa.py
View file
Open in desktop
File renamed without changes.