dev

Author: davidhassell

cf/read_write/um/umread.py

@@ -3566,7 +3566,7 @@ def read(
                 # Return now if there are valid file types
                 return []
 
-        f = self.file_open(filename, parse=True)
+        f = self.dataset_open(filename, parse=True)
 
         info = is_log_level_info(logger)
 
@@ -3589,7 +3589,7 @@ def read(
             for var in f.vars
         ]
 
-        self.file_close()
+        self.dataset_close()
 
         return [field for x in um for field in x.fields if field]
 
@@ -3623,7 +3623,7 @@ def _open_um_file(
                 The open PP or FF file object.
 
         """
-        self.file_close()
+        self.dataset_close()
         try:
             f = File(
                 filename,
@@ -3669,15 +3669,15 @@ def is_um_file(self, filename):
         try:
             # Note: No need to completely parse the file to ascertain
             #       if it's PP or FF.
-            self.file_open(filename, parse=False)
+            self.dataset_open(filename, parse=False)
         except Exception:
-            self.file_close()
+            self.dataset_close()
             return False
         else:
-            self.file_close()
+            self.dataset_close()
             return True
 
-    def file_close(self):
+    def dataset_close(self):
         """Close the file that has been read.
 
         :Returns:
@@ -3691,7 +3691,7 @@ def file_close(self):
 
         self._um_file = None
 
-    def file_open(self, filename, parse=True):
+    def dataset_open(self, filename, parse=True):
         """Open the file for reading.
 
         :Paramters:

docs/source/conf.py

@@ -389,7 +389,7 @@ def _get_date():
     "run_stale_examples": False,
     # Below setting can be buggy: see:
     # https://github.com/sphinx-gallery/sphinx-gallery/issues/967
-    #"reference_url": {"cf": None},
+    # "reference_url": {"cf": None},
     "backreferences_dir": "gen_modules/backreferences",
     "doc_module": ("cf",),
     "inspect_global_variables": True,
@@ -476,7 +476,6 @@ def _get_date():
 import cf
 
 
-
 def linkcode_resolve(domain, info):
     # =================================================================
     # Must delete all .doctrees directories in build for changes to be

docs/source/recipes/plot_08_recipe.py

@@ -9,11 +9,10 @@
 # 1. Import cf-python, cf-plot, numpy and scipy.stats:
 
 import cfplot as cfp
-import cf
-
 import numpy as np
 import scipy.stats as stats
 
+import cf
 
 # %%
 # 2. Three functions are defined:

docs/source/recipes/plot_12_recipe.py

@@ -13,8 +13,8 @@
 # %%
 # 1. Import cf-python, cf-plot and matplotlib.pyplot:
 
-import matplotlib.pyplot as plt
 import cfplot as cfp
+import matplotlib.pyplot as plt
 
 import cf
 

docs/source/recipes/plot_13_recipe.py

@@ -18,13 +18,11 @@
 # in next steps.
 
 import cartopy.crs as ccrs
-import matplotlib.patches as mpatches
-
 import cfplot as cfp
+import matplotlib.patches as mpatches
 
 import cf
 
-
 # %%
 # 2. Read and select the SST by index and look at its contents:
 sst = cf.read("~/recipes/ERA5_monthly_averaged_SST.nc")[0]

docs/source/recipes/plot_17_recipe.py

@@ -11,8 +11,8 @@
 # %%
 # 1. Import cf-python and cf-plot:
 
-import matplotlib.pyplot as plt
 import cfplot as cfp
+import matplotlib.pyplot as plt
 
 import cf
 

docs/source/recipes/plot_18_recipe.py

@@ -10,15 +10,15 @@
 
 """
 
+import cfplot as cfp
+
 # %%
 # 1. Import cf-python, cf-plot and other required packages:
 import matplotlib.pyplot as plt
 import scipy.stats.mstats as mstats
-import cfplot as cfp
 
 import cf
 
-
 # %%
 # 2. Read the data in and unpack the Fields from FieldLists using indexing.
 # In our example We are investigating the influence of the land height on

docs/source/recipes/plot_19_recipe.py

@@ -9,10 +9,11 @@
 maxima.
 """
 
+import cfplot as cfp
+
 # %%
 # 1. Import cf-python, cf-plot and other required packages:
 import matplotlib.pyplot as plt
-import cfplot as cfp
 
 import cf
 
@@ -55,7 +56,10 @@
 # of the maxima, we loop through the season query mapping and do a
 # "T: mean" collapse setting the season as the grouping:
 cfp.gopen(
-    rows=2, columns=1, bottom=0.1, top=0.85,
+    rows=2,
+    columns=1,
+    bottom=0.1,
+    top=0.85,
 )
 cfp.gpos(1)
 cfp.gset(xmin="1980-01-01", xmax="2022-12-01", ymin=304, ymax=312)

docs/source/recipes/plot_22_recipe.py

@@ -11,10 +11,11 @@
 # %%
 # 1. Import cf-python, Dask.array, NumPy, and Matplotlib:
 
-import cf
 import dask.array as da
-import numpy as np
 import matplotlib.pyplot as plt
+import numpy as np
+
+import cf
 
 # %%
 # 2. Read the field constructs and load the wind speed component fields:

docs/source/recipes/plot_23_recipe.py

@@ -18,12 +18,12 @@
 # sphinx_gallery_thumbnail_number = 2
 # sphinx_gallery_end_ignore
 
-import matplotlib.pyplot as plt
 import cfplot as cfp
-import cf
-
-import numpy as np
 import dask.array as da
+import matplotlib.pyplot as plt
+import numpy as np
+
+import cf
 
 # %%
 # 2. Read example data field constructs, and set region for our plots: