Keep original structure with private subfunctions

pySTEPS · Jun 23, 2024 · 3b3c34f · 3b3c34f
1 parent c6984be
commit 3b3c34f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/pysteps_nwp_importers/importer_bom_nwp.py b/pysteps_nwp_importers/importer_bom_nwp.py
@@ -107,7 +107,7 @@ def import_bom_nwp(filename, **kwargs):
             "products but it is not installed"
         )
 
-    ds = xr.open_dataset(filename)
+    ds = _import_bom_nwp_data_xr(filename)
     metadata = _import_bom_nwp_geodata_xr(ds, **kwargs)
 
     # rename varname_time (def: time) to t
@@ -140,6 +140,10 @@ def import_bom_nwp(filename, **kwargs):
     return precipitation.values, quality, metadata
 
 
+def _import_bom_nwp_data_xr(filename, **kwargs):
+    return xr.open_dataset(filename)
+
+
 def _import_bom_nwp_geodata_xr(
     ds_in,
     **kwargs,

diff --git a/pysteps_nwp_importers/importer_knmi_nwp.py b/pysteps_nwp_importers/importer_knmi_nwp.py
@@ -107,7 +107,7 @@ def import_knmi_nwp(filename, **kwargs):
             "products but it is not installed"
         )
 
-    ds = xr.open_dataset(filename)
+    ds = _import_knmi_nwp_data_xr(filename)
     metadata = _import_knmi_nwp_geodata_xr(ds, **kwargs)
 
     # rename varname_time (def: time) to t
@@ -135,11 +135,14 @@ def import_knmi_nwp(filename, **kwargs):
     return precipitation.values, quality, metadata
 
 
+def _import_knmi_nwp_data_xr(filename, **kwargs):
+    return xr.open_dataset(filename)
+
+
 def _import_knmi_nwp_geodata_xr(
     ds_in,
     **kwargs,
 ):
-
     varname = kwargs.get("varname", "P_fc")
     varname_time = kwargs.get("varname_time", "time")
     # Get the projection string

diff --git a/pysteps_nwp_importers/importer_rmi_nwp.py b/pysteps_nwp_importers/importer_rmi_nwp.py
@@ -106,7 +106,7 @@ def import_rmi_nwp(filename, **kwargs):
             "products but it is not installed"
         )
 
-    ds = xr.open_dataset(filename, **kwargs)
+    ds = _import_rmi_nwp_data_xr(filename, **kwargs)
     metadata = _import_rmi_nwp_geodata_xr(ds, **kwargs)
 
     # rename varname_time (def: time) to t
@@ -139,11 +139,14 @@ def import_rmi_nwp(filename, **kwargs):
     return precipitation.values, quality, metadata
 
 
+def _import_rmi_nwp_data_xr(filename, **kwargs):
+    return xr.open_dataset(filename)
+
+
 def _import_rmi_nwp_geodata_xr(
     ds_in,
     **kwargs,
 ):
-
     varname = kwargs.get("varname", "precipitation")
     varname_time = kwargs.get("varname_time", "time")
     projdef = None