Skip to content

Commit

Permalink
Merge pull request #12 from tsutterley/development
Browse files Browse the repository at this point in the history
update grid file for TPX09-atlas-v2
  • Loading branch information
tsutterley authored Aug 11, 2020
2 parents a89f952 + 9c3e49b commit 064b98a
Show file tree
Hide file tree
Showing 13 changed files with 31 additions and 16 deletions.
23 changes: 19 additions & 4 deletions Plot Antarctic Tidal Currents.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -162,25 +162,39 @@
"elif (MODEL == 'TPXO9-atlas'):\n",
" model_directory = os.path.join(tide_dir,'TPXO9_atlas')\n",
" grid_file = 'grid_tpxo9_atlas.nc.gz'\n",
" model_files = ['u_q1_tpxo9_atlas_30.nc.gz','u_o1_tpxo9_atlas_30.nc.gz',\n",
" model_files = {}\n",
" model_files['u'] = ['u_q1_tpxo9_atlas_30.nc.gz','u_o1_tpxo9_atlas_30.nc.gz',\n",
" 'u_p1_tpxo9_atlas_30.nc.gz','u_k1_tpxo9_atlas_30.nc.gz',\n",
" 'u_n2_tpxo9_atlas_30.nc.gz','u_m2_tpxo9_atlas_30.nc.gz',\n",
" 'u_s2_tpxo9_atlas_30.nc.gz','u_k2_tpxo9_atlas_30.nc.gz',\n",
" 'u_m4_tpxo9_atlas_30.nc.gz','u_ms4_tpxo9_atlas_30.nc.gz',\n",
" 'u_mn4_tpxo9_atlas_30.nc.gz','u_2n2_tpxo9_atlas_30.nc.gz']\n",
" model_files['v'] = ['v_q1_tpxo9_atlas_30.nc.gz','v_o1_tpxo9_atlas_30.nc.gz',\n",
" 'v_p1_tpxo9_atlas_30.nc.gz','v_k1_tpxo9_atlas_30.nc.gz',\n",
" 'v_n2_tpxo9_atlas_30.nc.gz','v_m2_tpxo9_atlas_30.nc.gz',\n",
" 'v_s2_tpxo9_atlas_30.nc.gz','v_k2_tpxo9_atlas_30.nc.gz',\n",
" 'v_m4_tpxo9_atlas_30.nc.gz','v_ms4_tpxo9_atlas_30.nc.gz',\n",
" 'v_mn4_tpxo9_atlas_30.nc.gz','v_2n2_tpxo9_atlas_30.nc.gz']\n",
" model_format = 'netcdf'\n",
" TYPES = ['u','v']\n",
" SCALE = 1.0/100.0\n",
" GZIP = True\n",
"elif (MODEL == 'TPXO9-atlas-v2'):\n",
" model_directory = os.path.join(tide_dir,'TPXO9_atlas_v2')\n",
" grid_file = 'grid_tpxo9_atlas_v2.nc.gz'\n",
" model_files = ['u_q1_tpxo9_atlas_30_v2.nc.gz','u_o1_tpxo9_atlas_30_v2.nc.gz',\n",
" grid_file = 'grid_tpxo9_atlas_30_v2.nc.gz'\n",
" model_files = {}\n",
" model_files['u'] = ['u_q1_tpxo9_atlas_30_v2.nc.gz','u_o1_tpxo9_atlas_30_v2.nc.gz',\n",
" 'u_p1_tpxo9_atlas_30_v2.nc.gz','u_k1_tpxo9_atlas_30_v2.nc.gz',\n",
" 'u_n2_tpxo9_atlas_30_v2.nc.gz','u_m2_tpxo9_atlas_30_v2.nc.gz',\n",
" 'u_s2_tpxo9_atlas_30_v2.nc.gz','u_k2_tpxo9_atlas_30_v2.nc.gz',\n",
" 'u_m4_tpxo9_atlas_30_v2.nc.gz','u_ms4_tpxo9_atlas_30_v2.nc.gz',\n",
" 'u_mn4_tpxo9_atlas_30_v2.nc.gz','u_2n2_tpxo9_atlas_30_v2.nc.gz']\n",
" model_files['v'] = ['v_q1_tpxo9_atlas_30_v2.nc.gz','v_o1_tpxo9_atlas_30_v2.nc.gz',\n",
" 'v_p1_tpxo9_atlas_30_v2.nc.gz','v_k1_tpxo9_atlas_30_v2.nc.gz',\n",
" 'v_n2_tpxo9_atlas_30_v2.nc.gz','v_m2_tpxo9_atlas_30_v2.nc.gz',\n",
" 'v_s2_tpxo9_atlas_30_v2.nc.gz','v_k2_tpxo9_atlas_30_v2.nc.gz',\n",
" 'v_m4_tpxo9_atlas_30_v2.nc.gz','v_ms4_tpxo9_atlas_30_v2.nc.gz',\n",
" 'v_mn4_tpxo9_atlas_30_v2.nc.gz','v_2n2_tpxo9_atlas_30_v2.nc.gz']\n",
" model_format = 'netcdf'\n",
" TYPES = ['u','v']\n",
" SCALE = 1.0/100.0\n",
Expand Down Expand Up @@ -282,7 +296,8 @@
" DELTAT = np.zeros_like(tide_time)\n",
" elif (model_format == 'netcdf'):\n",
" amp,ph,D,c = extract_netcdf_constants(lon, lat, model_directory,\n",
" grid_file, model_files, TYPE=TYPE, METHOD='spline', SCALE=SCALE, GZIP=GZIP)\n",
" grid_file, model_files[TYPE], TYPE=TYPE, METHOD='spline',\n",
" SCALE=SCALE, GZIP=GZIP)\n",
" DELTAT = np.zeros_like(tide_time)\n",
" elif (model_format == 'GOT'):\n",
" amp,ph = extract_GOT_constants(lon, lat, model_directory, model_files,\n",
Expand Down
2 changes: 1 addition & 1 deletion Plot Antarctic Tide Range.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
" SCALE = 1.0/1000.0\n",
"elif (MODEL == 'TPXO9-atlas-v2'):\n",
" model_directory = os.path.join(tide_dir,'TPXO9_atlas_v2')\n",
" grid_file = 'grid_tpxo9_atlas_v2.nc.gz'\n",
" grid_file = 'grid_tpxo9_atlas_30_v2.nc.gz'\n",
" model_files = ['h_q1_tpxo9_atlas_30_v2.nc.gz','h_o1_tpxo9_atlas_30_v2.nc.gz',\n",
" 'h_p1_tpxo9_atlas_30_v2.nc.gz','h_k1_tpxo9_atlas_30_v2.nc.gz',\n",
" 'h_n2_tpxo9_atlas_30_v2.nc.gz','h_m2_tpxo9_atlas_30_v2.nc.gz',\n",
Expand Down
2 changes: 1 addition & 1 deletion Plot Ross Ice Shelf Map.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
" SCALE = 1.0/1000.0\n",
"elif (MODEL == 'TPXO9-atlas-v2'):\n",
" model_directory = os.path.join(tide_dir,'TPXO9_atlas_v2')\n",
" grid_file = 'grid_tpxo9_atlas_v2.nc.gz'\n",
" grid_file = 'grid_tpxo9_atlas_30_v2.nc.gz'\n",
" model_files = ['h_q1_tpxo9_atlas_30_v2.nc.gz','h_o1_tpxo9_atlas_30_v2.nc.gz',\n",
" 'h_p1_tpxo9_atlas_30_v2.nc.gz','h_k1_tpxo9_atlas_30_v2.nc.gz',\n",
" 'h_n2_tpxo9_atlas_30_v2.nc.gz','h_m2_tpxo9_atlas_30_v2.nc.gz',\n",
Expand Down
2 changes: 1 addition & 1 deletion Plot Tide Forecasts.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@
" SCALE = 1.0/1000.0\n",
"elif (TIDE_MODEL == 'TPXO9-atlas-v2'):\n",
" model_directory = os.path.join(tide_dir,'TPXO9_atlas_v2')\n",
" grid_file = 'grid_tpxo9_atlas_v2.nc.gz'\n",
" grid_file = 'grid_tpxo9_atlas_30_v2.nc.gz'\n",
" model_files = ['h_q1_tpxo9_atlas_30_v2.nc.gz','h_o1_tpxo9_atlas_30_v2.nc.gz',\n",
" 'h_p1_tpxo9_atlas_30_v2.nc.gz','h_k1_tpxo9_atlas_30_v2.nc.gz',\n",
" 'h_n2_tpxo9_atlas_30_v2.nc.gz','h_m2_tpxo9_atlas_30_v2.nc.gz',\n",
Expand Down
2 changes: 1 addition & 1 deletion doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
author = 'Tyler C. Sutterley'

# The full version, including alpha/beta/rc tags
release = '1.0.2.5'
release = '1.0.2.6'


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion pyTMD/compute_tide_corrections.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ def compute_tide_corrections(x, y, delta_time, DIRECTORY=None, MODEL=None,
SCALE = 1.0/1000.0
elif (MODEL == 'TPXO9-atlas-v2'):
model_directory = os.path.join(DIRECTORY,'TPXO9_atlas_v2')
grid_file = 'grid_tpxo9_atlas_v2.nc.gz'
grid_file = 'grid_tpxo9_atlas_30_v2.nc.gz'
model_files = ['h_q1_tpxo9_atlas_30_v2.nc.gz','h_o1_tpxo9_atlas_30_v2.nc.gz',
'h_p1_tpxo9_atlas_30_v2.nc.gz','h_k1_tpxo9_atlas_30_v2.nc.gz',
'h_n2_tpxo9_atlas_30_v2.nc.gz','h_m2_tpxo9_atlas_30_v2.nc.gz',
Expand Down
2 changes: 1 addition & 1 deletion scripts/compute_tidal_elevations.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def compute_tidal_elevations(tide_dir, input_file, output_file,
SCALE = 1.0/1000.0
elif (TIDE_MODEL == 'TPXO9-atlas-v2'):
model_directory = os.path.join(tide_dir,'TPXO9_atlas_v2')
grid_file = 'grid_tpxo9_atlas_v2.nc.gz'
grid_file = 'grid_tpxo9_atlas_30_v2.nc.gz'
model_files = ['h_q1_tpxo9_atlas_30_v2.nc.gz','h_o1_tpxo9_atlas_30_v2.nc.gz',
'h_p1_tpxo9_atlas_30_v2.nc.gz','h_k1_tpxo9_atlas_30_v2.nc.gz',
'h_n2_tpxo9_atlas_30_v2.nc.gz','h_m2_tpxo9_atlas_30_v2.nc.gz',
Expand Down
2 changes: 1 addition & 1 deletion scripts/compute_tides_ICESat2_ATL03.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def compute_tides_ICESat2(tide_dir,FILE,MODEL,VERBOSE=False,MODE=0o775):
SCALE = 1.0/1000.0
elif (MODEL == 'TPXO9-atlas-v2'):
model_directory = os.path.join(tide_dir,'TPXO9_atlas_v2')
grid_file = 'grid_tpxo9_atlas_v2.nc.gz'
grid_file = 'grid_tpxo9_atlas_30_v2.nc.gz'
model_files = ['h_q1_tpxo9_atlas_30_v2.nc.gz','h_o1_tpxo9_atlas_30_v2.nc.gz',
'h_p1_tpxo9_atlas_30_v2.nc.gz','h_k1_tpxo9_atlas_30_v2.nc.gz',
'h_n2_tpxo9_atlas_30_v2.nc.gz','h_m2_tpxo9_atlas_30_v2.nc.gz',
Expand Down
2 changes: 1 addition & 1 deletion scripts/compute_tides_ICESat2_ATL06.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def compute_tides_ICESat2(tide_dir,FILE,MODEL,VERBOSE=False,MODE=0o775):
SCALE = 1.0/1000.0
elif (MODEL == 'TPXO9-atlas-v2'):
model_directory = os.path.join(tide_dir,'TPXO9_atlas_v2')
grid_file = 'grid_tpxo9_atlas_v2.nc.gz'
grid_file = 'grid_tpxo9_atlas_30_v2.nc.gz'
model_files = ['h_q1_tpxo9_atlas_30_v2.nc.gz','h_o1_tpxo9_atlas_30_v2.nc.gz',
'h_p1_tpxo9_atlas_30_v2.nc.gz','h_k1_tpxo9_atlas_30_v2.nc.gz',
'h_n2_tpxo9_atlas_30_v2.nc.gz','h_m2_tpxo9_atlas_30_v2.nc.gz',
Expand Down
2 changes: 1 addition & 1 deletion scripts/compute_tides_ICESat2_ATL07.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ def compute_tides_ICESat2(tide_dir,FILE,MODEL,VERBOSE=False,MODE=0o775):
SCALE = 1.0/1000.0
elif (MODEL == 'TPXO9-atlas-v2'):
model_directory = os.path.join(tide_dir,'TPXO9_atlas_v2')
grid_file = 'grid_tpxo9_atlas_v2.nc.gz'
grid_file = 'grid_tpxo9_atlas_30_v2.nc.gz'
model_files = ['h_q1_tpxo9_atlas_30_v2.nc.gz','h_o1_tpxo9_atlas_30_v2.nc.gz',
'h_p1_tpxo9_atlas_30_v2.nc.gz','h_k1_tpxo9_atlas_30_v2.nc.gz',
'h_n2_tpxo9_atlas_30_v2.nc.gz','h_m2_tpxo9_atlas_30_v2.nc.gz',
Expand Down
2 changes: 1 addition & 1 deletion scripts/compute_tides_ICESat2_ATL12.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def compute_tides_ICESat2(tide_dir,FILE,MODEL,VERBOSE=False,MODE=0o775):
SCALE = 1.0/1000.0
elif (MODEL == 'TPXO9-atlas-v2'):
model_directory = os.path.join(tide_dir,'TPXO9_atlas_v2')
grid_file = 'grid_tpxo9_atlas_v2.nc.gz'
grid_file = 'grid_tpxo9_atlas_30_v2.nc.gz'
model_files = ['h_q1_tpxo9_atlas_30_v2.nc.gz','h_o1_tpxo9_atlas_30_v2.nc.gz',
'h_p1_tpxo9_atlas_30_v2.nc.gz','h_k1_tpxo9_atlas_30_v2.nc.gz',
'h_n2_tpxo9_atlas_30_v2.nc.gz','h_m2_tpxo9_atlas_30_v2.nc.gz',
Expand Down
2 changes: 1 addition & 1 deletion scripts/compute_tides_icebridge_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ def compute_tides_icebridge_data(tide_dir, arg, MODEL, METHOD=None,
SCALE = 1.0/1000.0
elif (MODEL == 'TPXO9-atlas-v2'):
model_directory = os.path.join(tide_dir,'TPXO9_atlas_v2')
grid_file = 'grid_tpxo9_atlas_v2.nc.gz'
grid_file = 'grid_tpxo9_atlas_30_v2.nc.gz'
model_files = ['h_q1_tpxo9_atlas_30_v2.nc.gz','h_o1_tpxo9_atlas_30_v2.nc.gz',
'h_p1_tpxo9_atlas_30_v2.nc.gz','h_k1_tpxo9_atlas_30_v2.nc.gz',
'h_n2_tpxo9_atlas_30_v2.nc.gz','h_m2_tpxo9_atlas_30_v2.nc.gz',
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

setup(
name='pyTMD',
version='1.0.2.5',
version='1.0.2.6',
description='Tide Model Driver to read OTIS, GOT and FES formatted tidal solutions and make tidal predictions',
long_description=long_description,
long_description_content_type="text/markdown",
Expand Down

0 comments on commit 064b98a

Please sign in to comment.