Add Muller2022 optimised plate model to DataServer

GPlates · Aug 8, 2023 · 8a6c9e9 · 8a6c9e9
1 parent dcc9499
commit 8a6c9e9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/gplately/data.py b/gplately/data.py
@@ -152,7 +152,7 @@ def plate_reconstruction_files(self):
             "Muller2008" : ["https://www.earthbyte.org/webdav/ftp/Data_Collections/Muller2008/Global_Model_Rigid_Internal_Release_2010.zip"],
             "Scotese2016" : ["https://www.earthbyte.org/webdav/ftp/Data_Collections/Scotese2016/PALEOMAP_GlobalPlateModel.zip"],
             "Shephard2013" : ["https://www.earthbyte.org/webdav/ftp/Data_Collections/Shephard2013/GPlates.zip"],
-            "Muller2022" : ["https://www.earthbyte.org/webdav/ftp/Data_Collections/Muller2022/Muller_etal_2022_SE_1Ga_Opt.zip"],
+            "Muller2022" : ["https://earthbyte.org/webdav/ftp/Data_Collections/Muller_etal_2022_SE/Muller_etal_2022_SE_1Ga_Opt_PlateMotionModel.zip"],
 
         }
 
@@ -188,6 +188,15 @@ def plate_model_valid_reconstruction_times(self):
         return database
 
 
+    def rotation_strings_to_include(self):
+
+        strings = [
+
+            "1000_0_rotfile_Merdith_et_al_optimised.rot", # For Muller et al. 2022
+        ]
+        return strings
+
+
     def rotation_strings_to_ignore(self):
 
         strings = [
@@ -311,7 +320,7 @@ def topology_geometries(self):
             "Muller2008" : ["https://www.earthbyte.org/webdav/ftp/Data_Collections/Muller2008/Global_Model_Rigid_Internal_Release_2010.zip"],
             "Scotese2016" : ["https://www.earthbyte.org/webdav/ftp/Data_Collections/Scotese2016/PALEOMAP_GlobalPlateModel.zip"],
             "Shephard2013" : ["https://www.earthbyte.org/webdav/ftp/Data_Collections/Shephard2013/GPlates.zip"],
-            "Muller2022" : ["https://www.earthbyte.org/webdav/ftp/Data_Collections/Muller2022/Muller_etal_2022_SE_1Ga_Opt.zip"],
+            "Muller2022" : ["https://earthbyte.org/webdav/ftp/Data_Collections/Muller_etal_2022_SE/Muller_etal_2022_SE_1Ga_Opt_PlateMotionModel.zip"],
 
         }
         return database
@@ -336,6 +345,7 @@ def coastline_strings_to_ignore(self):
             "OLD",
             "__MACOSX",
             "Clennett_2020_Coastlines", # Clennett et al. 2020
+            "COB_polygons_and_coastlines_combined_1000_0_Merdith_etal", # Muller et al. 2022
         ]
         return strings
 

diff --git a/gplately/download.py b/gplately/download.py
@@ -1425,6 +1425,7 @@ def get_plate_reconstruction_files(self):
                     rotation_filenames = _collect_file_extension(
                         _str_in_folder(
                             _str_in_filename(fnames,
+                                strings_to_include=DataCollection.rotation_strings_to_include(self),
                                 strings_to_ignore=DataCollection.rotation_strings_to_ignore(self)
                             ),
                         strings_to_ignore=DataCollection.rotation_strings_to_ignore(self)