Bump version, update grib apis to use s3

mpiannucci · Jan 3, 2023 · 5614141 · 5614141
1 parent 2741c82
commit 5614141
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup
 
 setup(name='surfpy',
-      version='0.97.3',
+      version='0.98.0',
       description='Wave and weather tools written in pure python',
       url='https://github.com/mpiannucci/surfpy',
       author='Matthew Iannucci',

diff --git a/surfpy/wavemodel.py b/surfpy/wavemodel.py
@@ -11,8 +11,8 @@
 
 class WaveModel(NOAAModel):
 
-    # https://nomads.ncep.noaa.gov/pub/data/nccf/com/gfs/prod/gfs.20210324/06/wave/gridded/gfswave.t06z.atlocn.0p16.f006.grib2
-    _base_gfs_wave_grib_url = 'https://nomads.ncep.noaa.gov/pub/data/nccf/com/gfs/prod/gfs.{0}/{3}/wave/gridded/{1}.t{3}z.{2}.f{4}.grib2'
+    # https://noaa-gfs-bdp-pds.s3.amazonaws.com/gfs.20230101/18/wave/gridded/gfswave.t18z.atlocn.0p16.f064.grib2
+    _base_gfs_wave_grib_url = 'https://noaa-gfs-bdp-pds.s3.amazonaws.com/gfs.{0}/{3}/wave/gridded/{1}.t{3}z.{2}.f{4}.grib2'
 
     def create_grib_url(self, time_index):
         model_run_time = self.latest_model_time()

diff --git a/surfpy/weathermodel.py b/surfpy/weathermodel.py
@@ -10,7 +10,6 @@
 class GFSModel(NOAAModel):
 
     _base_gfs_grib_url = 'https://nomads.ncep.noaa.gov/cgi-bin/filter_{0}.pl?file=gfs.t{1}z.pgrb2.{2}.f{3}&lev_10_m_above_ground=on&var_GUST=on&var_PRES=on&var_TMP=on&var_UGRD=on&var_VGRD=on&subregion=&leftlon={4}&rightlon={5}&toplat={6}&bottomlat={7}&dir=%2Fgfs.{8}%2F{1}'
-    _base_gfs_netcdf_url = 'https://nomads.ncep.noaa.gov/dods/{0}/gfs{1}/{0}_{2}'
 
     def create_grib_url(self, time_index):
         # TODO: Update this to use the new schema and match wavemodel.py