Skip to content

Commit

Permalink
Merge branch 'noaa-ocs-modeling:main' into bug/lon_lat_switched_in_ca…
Browse files Browse the repository at this point in the history 
…ll_to_haversine
  • Loading branch information
@SanderHulst
SanderHulst authored Aug 31, 2023
2 parents 25915f2 + f51aa04 commit 98b892d
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 37 deletions.
16 changes: 10 additions & 6 deletions .github/workflows/quick_test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: clone repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: install Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.x'
- name: load cached Python installation
id: cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ env.pythonLocation }}
key: lint-${{ runner.os }}-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}
Expand All @@ -40,12 +42,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: clone repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: install Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.x'
- name: load cached Python installation
id: cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ env.pythonLocation }}
key: test-${{ runner.os }}-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}
Expand Down
24 changes: 14 additions & 10 deletions .github/workflows/tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: clone repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: install Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.x'
- name: load cached Python installation
id: cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ env.pythonLocation }}
key: lint-${{ runner.os }}-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}
Expand All @@ -44,20 +46,20 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest, macos-latest ]
python-version: [ '3.8', '3.9', '3.x' ]
python-version: [ '3.8', '3.9', '3.10', '3.x' ]
exclude:
- os: macos-latest
python-version: '3.x'
steps:
- name: clone repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: install Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: load cached Python installation
id: cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ env.pythonLocation }}
key: test-${{ runner.os }}-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}
Expand All @@ -82,12 +84,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: clone repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: install Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: '3.x'
- name: load cached Python installation
id: cache
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ env.pythonLocation }}
key: test-${{ runner.os }}-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}
Expand Down
2 changes: 2 additions & 0 deletions adcircpy/forcing/winds/best_track.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ def __init__(
interval_seconds: int = None,
start_date: datetime = None,
end_date: datetime = None,
*args,
**kwargs,
):
if nws is None:
nws = 20
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ appdirs = '*'
geopandas = '<0.11'
haversine = '*'
matplotlib = '*'
netCDF4 = '<1.6'
netCDF4 = '*'
numpy = '*'
pandas = '*'
paramiko = '*'
Expand Down
32 changes: 16 additions & 16 deletions tests/data/reference/test_Stations/stations_1.fort.15
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
-75.74669647216797 36.18330001831055 ! 8651370
-75.54818725585938 35.79568862915039 ! 8652587
-75.70419311523438 35.20861053466797 ! 8654467
-76.67066192626953 34.71733093261719 ! 8656483
-77.95361328125 34.227500915527344 ! 8658120
-77.78668975830078 34.21331024169922 ! 8658163
-78.91638946533203 33.65549850463867 ! 8661070
-79.9236068725586 32.78083038330078 ! 8665530
-80.90303039550781 32.034690856933594 ! 8670870
-79.9236068725586 32.78083038330078 ! 8665530
-77.78668975830078 34.21331024169922 ! 8658163
-78.91638946533203 33.65555953979492 ! 8661070
-76.67066192626953 34.71733093261719 ! 8656483
-79.70670318603516 32.8567008972168 ! 8664941
-80.46499633789062 32.34000015258789 ! 8668498
-78.50669860839844 33.8650016784668 ! 8659897
Expand All @@ -16,12 +16,12 @@
-75.74669647216797 36.18330001831055 ! 8651370
-75.54818725585938 35.79568862915039 ! 8652587
-75.70419311523438 35.20861053466797 ! 8654467
-76.67066192626953 34.71733093261719 ! 8656483
-77.95361328125 34.227500915527344 ! 8658120
-77.78668975830078 34.21331024169922 ! 8658163
-78.91638946533203 33.65549850463867 ! 8661070
-79.9236068725586 32.78083038330078 ! 8665530
-80.90303039550781 32.034690856933594 ! 8670870
-79.9236068725586 32.78083038330078 ! 8665530
-77.78668975830078 34.21331024169922 ! 8658163
-78.91638946533203 33.65555953979492 ! 8661070
-76.67066192626953 34.71733093261719 ! 8656483
-79.70670318603516 32.8567008972168 ! 8664941
-80.46499633789062 32.34000015258789 ! 8668498
-78.50669860839844 33.8650016784668 ! 8659897
Expand All @@ -30,12 +30,12 @@
-75.74669647216797 36.18330001831055 ! 8651370
-75.54818725585938 35.79568862915039 ! 8652587
-75.70419311523438 35.20861053466797 ! 8654467
-76.67066192626953 34.71733093261719 ! 8656483
-77.95361328125 34.227500915527344 ! 8658120
-77.78668975830078 34.21331024169922 ! 8658163
-78.91638946533203 33.65549850463867 ! 8661070
-79.9236068725586 32.78083038330078 ! 8665530
-80.90303039550781 32.034690856933594 ! 8670870
-79.9236068725586 32.78083038330078 ! 8665530
-77.78668975830078 34.21331024169922 ! 8658163
-78.91638946533203 33.65555953979492 ! 8661070
-76.67066192626953 34.71733093261719 ! 8656483
-79.70670318603516 32.8567008972168 ! 8664941
-80.46499633789062 32.34000015258789 ! 8668498
-78.50669860839844 33.8650016784668 ! 8659897
Expand All @@ -44,12 +44,12 @@
-75.74669647216797 36.18330001831055 ! 8651370
-75.54818725585938 35.79568862915039 ! 8652587
-75.70419311523438 35.20861053466797 ! 8654467
-76.67066192626953 34.71733093261719 ! 8656483
-77.95361328125 34.227500915527344 ! 8658120
-77.78668975830078 34.21331024169922 ! 8658163
-78.91638946533203 33.65549850463867 ! 8661070
-79.9236068725586 32.78083038330078 ! 8665530
-80.90303039550781 32.034690856933594 ! 8670870
-79.9236068725586 32.78083038330078 ! 8665530
-77.78668975830078 34.21331024169922 ! 8658163
-78.91638946533203 33.65555953979492 ! 8661070
-76.67066192626953 34.71733093261719 ! 8656483
-79.70670318603516 32.8567008972168 ! 8664941
-80.46499633789062 32.34000015258789 ! 8668498
-78.50669860839844 33.8650016784668 ! 8659897
Expand Down
8 changes: 4 additions & 4 deletions tests/data/reference/test_Stations/stations_2.fort.15
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
-75.74669647216797 36.18330001831055 ! 8651370
-75.54818725585938 35.79568862915039 ! 8652587
-75.70419311523438 35.20861053466797 ! 8654467
-76.67066192626953 34.71733093261719 ! 8656483
-77.95361328125 34.227500915527344 ! 8658120
-77.78668975830078 34.21331024169922 ! 8658163
-78.91638946533203 33.65549850463867 ! 8661070
-79.9236068725586 32.78083038330078 ! 8665530
-80.90303039550781 32.034690856933594 ! 8670870
-79.9236068725586 32.78083038330078 ! 8665530
-77.78668975830078 34.21331024169922 ! 8658163
-78.91638946533203 33.65555953979492 ! 8661070
-76.67066192626953 34.71733093261719 ! 8656483
-79.70670318603516 32.8567008972168 ! 8664941
-80.46499633789062 32.34000015258789 ! 8668498
-78.50669860839844 33.8650016784668 ! 8659897
Expand Down

0 comments on commit 98b892d

Please sign in to comment.