You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sdap.apache.org by sk...@apache.org on 2023/06/30 02:43:48 UTC
[incubator-sdap-nexus] 02/04: Merge branch 'SDAP-455' into SDAP-467
This is an automated email from the ASF dual-hosted git repository.
skperez pushed a commit to branch SDAP-473
in repository https://gitbox.apache.org/repos/asf/incubator-sdap-nexus.git
commit d4e310027266fcae64121d000b1bc230079a9a4c
Merge: 8abe072 830a234
Author: skorper <st...@gmail.com>
AuthorDate: Wed Jun 28 14:50:07 2023 -0700
Merge branch 'SDAP-455' into SDAP-467
.readthedocs.yaml | 5 +
CHANGELOG.md | 3 +
.../webservice/algorithms/doms/BaseDomsHandler.py | 5 +-
.../webservice/algorithms/doms/ExecutionCancel.py | 6 +-
.../webservice/algorithms/doms/ExecutionStatus.py | 2 -
.../webservice/algorithms/doms/ResultsStorage.py | 3 +-
analysis/webservice/algorithms_spark/Matchup.py | 9 +-
analysis/webservice/apidocs/openapi.yml | 10 +
.../request/renderers/NexusCSVRenderer.py | 7 +-
.../request/renderers/NexusNETCDFRenderer.py | 7 +-
analysis/webservice/webmodel/NexusResults.py | 4 +
climatology/.gitignore | 11 -
climatology/clim/ClimatologySpark.py | 469 -----------
climatology/clim/ClimatologySpark2.py | 650 ----------------
climatology/clim/README.md | 32 -
climatology/clim/__init__.py | 14 -
climatology/clim/binsum.f | 64 --
climatology/clim/cache.py | 87 ---
climatology/clim/climatology.py | 247 ------
climatology/clim/climatology1.py | 247 ------
climatology/clim/climatology2.py | 467 -----------
climatology/clim/climatology3Spark.py | 432 -----------
climatology/clim/cluster.py | 98 ---
climatology/clim/cluster2.py | 98 ---
climatology/clim/datasets.py | 331 --------
climatology/clim/dparkTest.py | 23 -
climatology/clim/gaussInterp.py | 57 --
climatology/clim/gaussInterp.pyx | 145 ----
climatology/clim/gaussInterp_f.f | 219 ------
climatology/clim/gaussInterp_f.mk | 1 -
climatology/clim/gaussInterp_slow.py | 144 ----
climatology/clim/interp.f | 302 --------
climatology/clim/jobClimatology2.py | 36 -
climatology/clim/jobTest.py | 32 -
climatology/clim/orig/C/README | 6 -
climatology/clim/orig/C/binsum.c | 125 ---
climatology/clim/orig/C/clouderosion.c | 33 -
climatology/clim/orig/C/gaussinterp.readme | 159 ----
climatology/clim/orig/C/gaussinterp_C_code.tar | Bin 51200 -> 0 bytes
climatology/clim/orig/C/interp.c | 448 -----------
climatology/clim/orig/C/makefile | 33 -
climatology/clim/orig/C/setupinterp.c | 431 -----------
.../clim/orig/Fortran/armstrong_interp_code.tar | Bin 30720 -> 0 bytes
climatology/clim/orig/Fortran/binsum.f | 64 --
climatology/clim/orig/Fortran/interp.f | 302 --------
climatology/clim/orig/Fortran/makefile | 46 --
climatology/clim/orig/Fortran/passbase.f | 9 -
climatology/clim/orig/Fortran/setupinterp.f | 291 -------
climatology/clim/pixelStats.py | 232 ------
climatology/clim/plotlib.py | 857 ---------------------
climatology/clim/reroot.py | 45 --
climatology/clim/setup.py | 22 -
climatology/clim/sort.py | 57 --
climatology/clim/sparkTest.py | 31 -
climatology/clim/spatialFilter.py | 50 --
climatology/clim/spatialFilter_f.f | 121 ---
climatology/clim/spatialFilter_f.mk | 1 -
climatology/clim/split.py | 212 -----
climatology/clim/test/__init__.py | 14 -
climatology/clim/test/ccmpTest.py | 30 -
climatology/clim/timePartitions.py | 46 --
climatology/clim/util/__init__.py | 14 -
climatology/clim/util/array.py | 194 -----
climatology/clim/util/introspect.py | 49 --
climatology/clim/util/plot.py | 147 ----
climatology/clim/util/stats.py | 232 ------
climatology/clim/util/timeJ2000.py | 383 ---------
climatology/clim/util/warn.py | 57 --
climatology/clim/util/wls.py | 811 -------------------
climatology/clim/variables.py | 154 ----
climatology/clim/wls.py | 811 -------------------
climatology/setup.py | 23 -
data-access/requirements.txt | 1 +
docs/requirements.txt | 1 +
74 files changed, 53 insertions(+), 10756 deletions(-)
diff --cc analysis/webservice/apidocs/openapi.yml
index 0ffe669,25d6f24..edd2ae3
--- a/analysis/webservice/apidocs/openapi.yml
+++ b/analysis/webservice/apidocs/openapi.yml
@@@ -535,22 -535,16 +535,32 @@@ paths
type: string
enum: ['CSV', 'NETCDF', 'JSON']
example: CSV
+ - in: query
+ name: filename
+ description: |
+ Name of output file. Only works with CSV and NETCDF
+ output types. Do not include file extension in this field.
+ If this value is not provided, the filename will be
+ `CDMS_[execution_id].[csv|nc]`
+ required: false
+ schema:
+ type: string
+ - in: query
+ name: pageNum
+ description: |
+ Which page of results should be returned to user.
+ required: false
+ schema:
+ type: integer
+ default: 1
+ - in: query
+ name: pageSize
+ description: |
+ How many results should be returned to user in a single page. One entry is equal to one primary matched point.
+ required: false
+ schema:
+ type: integer
+ default: 1000
responses:
'200':
description: Successful operation