Merge branch 'master' of github.com:GPlates/gplately

GPlates · Feb 23, 2023 · e60d94b · e60d94b
2 parents 3272f3c + d7e90db
commit e60d94b
Show file tree

Hide file tree

Showing 13 changed files with 850 additions and 706 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 gplately.egg-info
 build
 __pycache__
+.ipynb_checkpoints
diff --git a/Notebooks/01-GettingStarted.ipynb b/Notebooks/01-GettingStarted.ipynb
diff --git a/Notebooks/04-VelocityBasics.ipynb b/Notebooks/04-VelocityBasics.ipynb
diff --git a/Notebooks/06-Rasters.ipynb b/Notebooks/06-Rasters.ipynb
diff --git a/Notebooks/08-PredictingSlabDip.ipynb b/Notebooks/08-PredictingSlabDip.ipynb
diff --git a/Notebooks/NotebookFiles/.gitignore b/Notebooks/NotebookFiles/.gitignore
@@ -1 +1,4 @@
 reconstructed_etopo.nc
+GlobalAveragePlateVelocities.csv
+average_plate_velocity.pdf
+India_collision.pdf
diff --git a/README.md b/README.md
@@ -151,7 +151,7 @@ relief rasters. You can also reconstruct raster data back through geological tim
 ```python
 time = 0
 agegrid = gdownload.get_age_grid(time)
-graster = gplately.Raster(model, array=agegrid, extent=[-180,180,-90,90])
+graster = gplately.Raster(model, data=agegrid, extent=[-180,180,-90,90])
 ```
 
 Below is a plot of the original Müller et al. (2019) age grid (L) and an age-grid resampled with the `Raster` object (R):

diff --git a/gplately/download.py b/gplately/download.py
@@ -1315,7 +1315,7 @@ def get_raster(self, raster_id_string=None):
         else:
             # If the downloaded raster is a grid, process it with the gplately.Raster object
             if any(grid_extension in raster_filenames for grid_extension in grid_extensions):
-                raster_matrix = _gplately.grids.Raster(filename=raster_filenames).data
+                raster_matrix = _gplately.grids.Raster(data=raster_filenames).data
 
             # Otherwise, the raster is an image; use imread to process
             else: