remove redundant get_extent code

Author: robertjwilson

oceanval/data/chunk_seasonal.py

@@ -87,7 +87,6 @@
     concise = True
     time_name = None
     model_unit = ""
-    raw_extent = "foo"
     xlim = "bar"
     ylim = "ba"
 if time_name is not None:
@@ -144,13 +143,9 @@
     except:
         model_unit = ds_obs.contents.unit[0]
         model_unit = fix_unit(model_unit)
-    from oceanval.utils import get_extent
-    raw_extent = get_extent(ds_annual[0])
-    if np.abs(raw_extent[0] - df_model.lon.min()) > 3:
-        # convert longitude to -180-180
-        df_model["lon" ] = [x if x < 180 else x -360 for x in df_model.lon]
-        df_obs["lon" ] = [x if x < 180 else x -360 for x in df_obs.lon]
-        df_diff["lon" ] = [x if x < 180 else x -360 for x in df_diff.lon]
+    df_model["lon" ] = [x if x < 180 else x -360 for x in df_model.lon]
+    df_obs["lon" ] = [x if x < 180 else x -360 for x in df_obs.lon]
+    df_diff["lon" ] = [x if x < 180 else x -360 for x in df_diff.lon]
 
     # generate a temporary csv file name in /tmp
     # create adhoc dir if not
@@ -173,7 +168,7 @@
 
 # %% tags=["remove-input"]
 # %%capture --no-display
-# %%R -i model_unit  -w 800 -h 600 -i variable -i raw_extent -i concise -r 100
+# %%R -i model_unit  -w 800 -h 600 -i variable  -i concise -r 100
 
 
 if(concise == FALSE){
@@ -428,7 +423,7 @@
 
 # %% tags=["remove-input"]
 # %%capture --no-display
-# %%R -i model_unit -w 800 -h 600 -i variable -i raw_extent -i concise -r 100
+# %%R -i model_unit -w 800 -h 600 -i variable  -i concise -r 100
 
 if (concise == FALSE){
 
@@ -674,39 +669,7 @@
                              b = 0,  # Bottom margin
                              l = 0)) # Left ggmargin 
 
-# figure out if it's a global file
-if(abs(raw_extent[1] - raw_extent[2]) > 350){
-    gg1 <- gg1 + 
-    scale_x_continuous(breaks = c(-180, -90, 0, 90, 180), labels = c("180°W", "90°W", "0°", "90°E", "180°E"))+
-    scale_y_continuous(breaks = c(-90, -45, 0, 45, 90), labels = c("90°S", "45°S", "0°", "45°N", "90°N"))
 
-    gg2 <- gg2 +
-    scale_x_continuous(breaks = c(-180, -90, 0, 90, 180), labels = c("180°W", "90°W", "0°", "90°E", "180°E"))+
-    scale_y_continuous(breaks = c(-90, -45, 0, 45, 90), labels = c("90°S", "45°S", "0°", "45°N", "90°N"))
-
-    gg3 <- gg3 +
-    scale_x_continuous(breaks = c(-180, -90, 0, 90, 180), labels = c("180°W", "90°W", "0°", "90°E", "180°E"))+
-    scale_y_continuous(breaks = c(-90, -45, 0, 45, 90), labels = c("90°S", "45°S", "0°", "45°N", "90°N"))
-
-}
-
-# appropriate plotting for northwest European Shelf
-if((raw_extent[1] > -30) & (raw_extent[2] < 20)){
-    gg1 <- gg1 + 
-    scale_x_continuous(breaks = c(-20, -10, 0, 10), labels = c("20°W", "10°W", "0°", "10°E"))+
-    scale_y_continuous(breaks = c(45, 50, 55, 60, 65), labels = c("45°N", "50°N", "55°N", "60°N", "65°N"))
-    gg2 <- gg2 + 
-    scale_x_continuous(breaks = c(-20, -10, 0, 10), labels = c("20°W", "10°W", "0°", "10°E"))+
-    scale_y_continuous(breaks = c(45, 50, 55, 60, 65), labels = c("45°N", "50°N", "55°N", "60°N", "65°N"))
-    gg3 <- gg3 +
-    scale_x_continuous(breaks = c(-20, -10, 0, 10), labels = c("20°W", "10°W", "0°", "10°E"))+
-    scale_y_continuous(breaks = c(45, 50, 55, 60, 65), labels = c("45°N", "50°N", "55°N", "60°N", "65°N"))
-}
-
-# gg1
-# reduce the size of the plot
-# options(repr.plot.width = 10, repr.plot.height = 3)
-# gg1
 cowplot::plot_grid(gg1, gg2, gg3, ncol = 1)
 
 }

oceanval/utils.py

@@ -19,82 +19,3 @@ def extension_of_directory(starting_directory, exclude=[]):
 
 
 
-def get_extent(ff):
-    # add docstring
-    """ "
-    Get the extent of a netcdf file
-
-    Parameters
-    ----------
-    ff : str
-        The path to the netcdf file
-
-    Returns
-    -------
-    extent : list
-        A list of the form [lon_min, lon_max, lat_min, lat_max]
-
-    """
-
-    ds = nc.open_data(ff)
-    ds.subset(variables=ds.variables[0])
-    ds.top()
-    ds.tmean()
-    ds.as_missing(0)
-    ds_xr = ds.to_xarray()
-    lon_name = [x for x in ds_xr.coords if "lon" in x][0]
-    lat_name = [x for x in ds_xr.coords if "lat" in x][0]
-
-    df = ds_xr.to_dataframe().reset_index()
-    df = ds.to_dataframe().dropna().reset_index()
-    df = df.rename(columns={lon_name: "lon", lat_name: "lat"})
-    df = df.dropna()
-    max_lon = df["lon"].max()
-    if max_lon > 180:
-        new_lon = df["lon"].values % 360
-        new_lon = new_lon - 180
-        lon_min = float(new_lon.min())
-        lon_max = float(new_lon.max())
-    else:
-        lon_min = float(df.lon.min())
-        lon_max = float(df.lon.max())
-    lat_min = float(df.lat.min())
-    lat_max = float(df.lat.max())
-    return [lon_min, lon_max, lat_min, lat_max]
-
-    lons = ds_xr[lon_name].values
-    lons = lons.flatten()
-    # as a unique, sorted list
-    lons = list(set(lons))
-    lats = ds_xr[lat_name].values
-    lats = lats.flatten()
-    # as a unique, sorted list
-    lats = list(set(lats))
-    lats.sort()
-    lons.sort()
-    lon_res = np.abs(lons[2] - lons[1])
-    lat_res = np.abs(lats[2] - lats[1])
-    print(lon_res)
-    print(lat_res)
-    ds = nc.open_data(ff)
-    ds.subset(variables=ds.variables[0])
-    ds.top()
-    ds.tmax()
-    ds.to_latlon(lon=[-180, 180], lat=[-90, 90], res=[lon_res, lat_res])
-    # rename
-    lon_min = df.lon.min()
-    lon_max = df.lon.max()
-    lat_min = df.lat.min()
-    lat_max = df.lat.max()
-    lons = [lon_min, lon_max]
-    lats = [lat_min, lat_max]
-    extent = [
-        lons[0] - lon_res,
-        lons[1] + lon_res,
-        lats[0] - lat_res,
-        lats[1] + lat_res,
-    ]
-    #
-    return extent
-
-