You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by hu...@apache.org on 2016/01/25 19:46:31 UTC

[1/2] climate git commit: CLIMATE-724 - Debugging load_dataset_from_multiple_netcdf_files

Repository: climate
Updated Branches:
  refs/heads/master c943988d2 -> a9dab5b49


CLIMATE-724 - Debugging load_dataset_from_multiple_netcdf_files

- ocw.data_source.local.load_dataset_from_multiple_netcdf_files has been fixed.


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/70216edf
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/70216edf
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/70216edf

Branch: refs/heads/master
Commit: 70216edf039fe73a51aafd7dfc98e3b3147b4643
Parents: d9e3c7e
Author: huikyole <hu...@argo.jpl.nasa.gov>
Authored: Mon Jan 25 10:37:57 2016 -0800
Committer: huikyole <hu...@argo.jpl.nasa.gov>
Committed: Mon Jan 25 10:37:57 2016 -0800

----------------------------------------------------------------------
 ocw/data_source/local.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/climate/blob/70216edf/ocw/data_source/local.py
----------------------------------------------------------------------
diff --git a/ocw/data_source/local.py b/ocw/data_source/local.py
index 34738ac..2ae1fd1 100644
--- a/ocw/data_source/local.py
+++ b/ocw/data_source/local.py
@@ -406,9 +406,9 @@ def load_WRF_2d_files_RAIN(file_path=None,
     times2 = numpy.array(times2)
     return Dataset(lats, lons, times2, values, variable_name, units=variable_unit, name=name)
 
-def load_dataset_from_multiple_netcdf_files(file_list, variable_name,
+def load_dataset_from_multiple_netcdf_files(variable_name, 
                                             lat_name=None, lon_name=None, time_name=None,
-                                            name='', file_path=None, filename_pattern=None,
+                                            name='', file_list=None, file_path=None, filename_pattern=None,
                                             mask_file=None, mask_variable=None, mask_value=0):
     ''' Load multiple netCDF files from the same source (an observation or a model) into a Dataset.
     The dataset can be spatially subset.


[2/2] climate git commit: CLIMATE-724 - Debugging load_dataset_from_multiple_netcdf_files

Posted by hu...@apache.org.
CLIMATE-724 - Debugging load_dataset_from_multiple_netcdf_files

- ocw.data_source.local.load_dataset_from_multiple_netcdf_files has been fixed.


Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/a9dab5b4
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/a9dab5b4
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/a9dab5b4

Branch: refs/heads/master
Commit: a9dab5b495bcba64feaee1297ac0aa6a1888fd95
Parents: c943988 70216ed
Author: huikyole <hu...@argo.jpl.nasa.gov>
Authored: Mon Jan 25 10:45:10 2016 -0800
Committer: huikyole <hu...@argo.jpl.nasa.gov>
Committed: Mon Jan 25 10:45:10 2016 -0800

----------------------------------------------------------------------
 ocw/data_source/local.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------