Merge pull request #204 from roocs/remove-diff-op

removed diff operator

rook/operator.py

@@ -73,6 +73,3 @@ class AverageByDimension(Operator):
 
     def _get_runner(self):
         return run_average_by_dim
-
-
-Diff = AverageByTime

rook/workflow.py

@@ -9,7 +9,6 @@
 from .operator import (
     AverageByTime,
     AverageByDimension,
-    Diff,
     Subset,
 )
 from .provenance import Provenance
@@ -83,7 +82,6 @@ def __init__(self, output_dir):
         self.subset_op = Subset(output_dir)
         self.average_time_op = AverageByTime(output_dir)
         self.average_dim_op = AverageByDimension(output_dir)
-        self.diff_op = Diff(output_dir)
         self.prov = Provenance(output_dir)
 
     def validate(self, wfdoc):
@@ -148,9 +146,6 @@ def _run_step(self, step_id, step, inputs=None):
             collection = step["in"]["collection"]
             result = self.average_dim_op.call(step["in"])
             self.prov.add_operator(step_id, step["in"], collection, result)
-        elif "diff" == step["run"]:
-            result = self.diff_op.call(step["in"])
-            self.prov.add_operator(step_id, step["in"], ["missing"], result)
         else:
             result = None
         LOGGER.debug(f"run result={result}")

tests/test_workflow.py

@@ -9,9 +9,7 @@
 
 TREE_WF = resource_file("subset_wf_1.json")
 TREE_WF_2 = resource_file("subset_wf_2.json")
-TREE_WF_3 = resource_file("subset_wf_3.json")
 TREE_WF_5 = resource_file("subset_wf_5.json")
-TREE_WF_6 = resource_file("subset_wf_6.json")
 
 
 def test_validate_tree_wf():
@@ -50,13 +48,6 @@ def test_run_tree_wf_2():
     assert "tas_mon_HadGEM2-ES_rcp85_r1i1p1_20900101-21000101_avg-year.nc" in output[0]
 
 
-@pytest.mark.skip(reason="Uses Diff operator - not implemented.")
-def test_run_tree_wf_3():
-    wf = workflow.WorkflowRunner(output_dir=tempfile.mkdtemp())
-    output = wf.run(TREE_WF_3)
-    assert "zostoga_mon_inmcm4_rcp45_r1i1p1_20850116-21001216.nc" in output[0]
-
-
 def test_run_wf_cmip6_subset_average():
     wfdoc = resource_file("wf_cmip6_subset_average.json")
     wf = workflow.WorkflowRunner(output_dir=tempfile.mkdtemp())
@@ -76,17 +67,6 @@ def test_run_tree_wf_5():
     )
 
 
-@pytest.mark.skip(reason="Uses Diff operator - not implemented.")
-def test_run_tree_wf_6():
-    wf = workflow.WorkflowRunner(output_dir=tempfile.mkdtemp())
-    output = wf.run(TREE_WF_6)
-    assert (
-        "https://data.mips.copernicus-climate.eu/thredds/fileServer/esg_c3s-cmip6"
-        in output[0]
-    )
-    assert "zostoga_mon_inmcm4_rcp45_r1i1p1_20850116-21001216.nc" in output[0]
-
-
 def test_wf_average_latlon_cmip6():
     wfdoc = resource_file("wf_average_latlon_cmip6.json")
     wf = workflow.WorkflowRunner(output_dir=tempfile.mkdtemp())