You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sdap.apache.org by GitBox <gi...@apache.org> on 2019/01/15 18:07:21 UTC
[incubator-sdap-nexus] Diff for: [GitHub] fgreg merged pull request #65:
SDAP-173 Fix Hovmoller code reporting missing get_spark_cfg attribute
diff --git a/analysis/webservice/algorithms_spark/HofMoellerSpark.py b/analysis/webservice/algorithms_spark/HofMoellerSpark.py
index 96e9f6a..1696732 100644
--- a/analysis/webservice/algorithms_spark/HofMoellerSpark.py
+++ b/analysis/webservice/algorithms_spark/HofMoellerSpark.py
@@ -190,13 +190,10 @@ def parse_arguments(self, request):
request.get_start_datetime().strftime(ISO_8601), request.get_end_datetime().strftime(ISO_8601)),
code=400)
- spark_master, spark_nexecs, spark_nparts = request.get_spark_cfg()
-
start_seconds_from_epoch = long((start_time - EPOCH).total_seconds())
end_seconds_from_epoch = long((end_time - EPOCH).total_seconds())
- return ds, bounding_polygon, start_seconds_from_epoch, end_seconds_from_epoch, \
- spark_master, spark_nexecs, spark_nparts
+ return ds, bounding_polygon, start_seconds_from_epoch, end_seconds_from_epoch
def applyDeseasonToHofMoellerByField(self, results, pivot="lats", field="mean", append=True):
shape = (len(results), len(results[0][pivot]))
@@ -336,7 +333,7 @@ def __init__(self):
BaseHoffMoellerHandlerImpl.__init__(self)
def calc(self, compute_options, **args):
- ds, bbox, start_time, end_time, spark_master, spark_nexecs, spark_nparts = self.parse_arguments(compute_options)
+ ds, bbox, start_time, end_time = self.parse_arguments(compute_options)
min_lon, min_lat, max_lon, max_lat = bbox.bounds
@@ -378,7 +375,7 @@ def __init__(self):
BaseHoffMoellerHandlerImpl.__init__(self)
def calc(self, compute_options, **args):
- ds, bbox, start_time, end_time, spark_master, spark_nexecs, spark_nparts = self.parse_arguments(compute_options)
+ ds, bbox, start_time, end_time = self.parse_arguments(compute_options)
min_lon, min_lat, max_lon, max_lat = bbox.bounds
With regards,
Apache Git Services