Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docstanya #298

Merged
merged 283 commits into from Jan 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
283 commits
Select commit Hold shift + click to select a range
b92460f
add requirements.txt
dnadeau4 Nov 15, 2017
96a2581
remove cdat_info
dnadeau4 Nov 15, 2017
d629683
remote cdat_info
dnadeau4 Dec 7, 2017
c533331
fix latex_logo png
dnadeau4 Dec 7, 2017
9d724ae
Merge branch 'master' into cdmsdocsmerge
dnadeau4 Dec 7, 2017
0ca4050
pin pyopenssl to 17.2.0 due to myproxyclient failure in py3
dnadeau4 Dec 7, 2017
263d814
update TOC
dnadeau4 Dec 8, 2017
bbafa04
work on tables and setup
dnadeau4 Dec 20, 2017
3ec8781
try to force jquery 3.1
dnadeau4 Dec 20, 2017
7eca248
just copy js script in _static
dnadeau4 Dec 20, 2017
95b3029
add highlight python
dnadeau4 Dec 20, 2017
a1f80cb
add sample dataset page
dnadeau4 Jan 9, 2018
f6335ee
add sample dataset page
dnadeau4 Jan 9, 2018
58915de
work on tables for cdms_2.rst
dnadeau4 Jan 11, 2018
89c45b9
continue cdms2 documentations
dnadeau4 Jan 17, 2018
d4269cf
update cdms2 tables
Jan 29, 2018
8402530
update sections
Jan 29, 2018
1ec5ef9
update table
Jan 30, 2018
7bc7d13
finish chapter 2
dnadeau4 Feb 7, 2018
dbdbbc9
merge master
dnadeau4 Feb 7, 2018
322803c
fix litteral error
dnadeau4 Feb 7, 2018
e9c0809
merge master
dnadeau4 Feb 7, 2018
ee5c35a
fix conclits
dnadeau4 Feb 7, 2018
9b9c9f8
Merge branch 'master' into cdmsdocsmerge
dnadeau4 Feb 7, 2018
c4563ee
unlink .dodsrc for cdscan
dnadeau4 Feb 7, 2018
9ae560a
First changes from Tanya
reshel3 Feb 27, 2018
f93e64f
some change in chapter 1 and 2
reshel3 Mar 1, 2018
42d56ee
some changes in Chapter 2
reshel3 Mar 1, 2018
af15c81
fix tables
reshel3 Mar 1, 2018
69478bd
Some changes to Chapter 2
reshel3 Mar 5, 2018
f542e15
Some Changes to Chapter 2
reshel3 Mar 6, 2018
10b3523
Some changes made to Chapters 1, 2 and 4
reshel3 Mar 7, 2018
33c90fd
Some changes to Chapter 2
reshel3 Mar 8, 2018
368d88d
Some Changes made to Chapter 2
reshel3 Mar 8, 2018
27603b7
Some changes to Chapters 2, 3 and 4
reshel3 Mar 9, 2018
62832f7
Some changes made to 1 through Appendix
reshel3 Mar 12, 2018
5e30a18
Some Changes made to Chapter 2
reshel3 Mar 13, 2018
1d7d259
Some Changes to Chapters 1, 2, 3, 6 and Appendix
reshel3 Mar 14, 2018
a40269d
Some changes made to Chapters 1 thru 7 and appendix
reshel3 Mar 15, 2018
074fcfb
Some changes to Chpaters 1, 2 and 3
reshel3 Mar 19, 2018
f2e7fef
Changes made to Chapters 1, 4, 5 and Appendix
reshel3 Mar 20, 2018
65943ff
Some changes to Chapter 2 and 4
reshel3 Mar 23, 2018
08ca15c
Some Changes to Images, Chapter 3 and Appendix
reshel3 Mar 26, 2018
e15c025
update logo
dnadeau4 Mar 28, 2018
a62a8fa
add my logo
dnadeau4 Mar 28, 2018
ab6f16d
Merge branch 'master' into cdmsdocsmerge
dnadeau4 Mar 28, 2018
680397b
fix chapter 1 test
dnadeau4 Mar 28, 2018
56c41b6
Some changes made to Chapters 2, 3 and 5
reshel3 Mar 28, 2018
35c1437
Some Changes to Chapters 1 and 2
reshel3 Mar 29, 2018
12737a4
Some changes to Appendix
reshel3 Apr 3, 2018
31931d4
update banner/footer and version
dnadeau4 Apr 3, 2018
a3f6282
Some Changes to Chapters 1, 2, 3 and appendix
reshel3 Apr 4, 2018
9b2a4e0
change u to uold in example
dnadeau4 Apr 9, 2018
a145945
Some changes to Chapters 2, 4, 5 and 6
reshel3 Apr 9, 2018
3583767
Some changes to Regrid 2, Lib, esmf, gsRegrid and horizontal
reshel3 Apr 16, 2018
89bd18b
Changes made to Chapters 1-7 and sample data
reshel3 Apr 16, 2018
66d4289
fix API documentation
reshel3 Apr 17, 2018
2e9414a
rename regrid2 directory and delete print message
reshel3 Apr 17, 2018
02b9195
add module API files
reshel3 Apr 17, 2018
d12d82f
add future and mock requirements
reshel3 Apr 17, 2018
adf2dcb
get cwd for readthedocs
reshel3 Apr 17, 2018
3724fb7
Changes made to API
reshel3 Apr 18, 2018
e252f48
Changes made to API
reshel3 Apr 20, 2018
ffce80d
Changes made to API
reshel3 Apr 20, 2018
1760785
Changes to API
reshel3 Apr 23, 2018
1b4d412
test rtd with mock
dnadeau4 Apr 24, 2018
34973dd
add future for readthedocs
dnadeau4 Apr 24, 2018
79f5c12
create git.py in ../..
dnadeau4 Apr 24, 2018
6c2f9b9
fix conflicts
dnadeau4 Apr 24, 2018
bdb5db6
add esmf
dnadeau4 Apr 24, 2018
62c24f7
add print statements for regrid2
dnadeau4 Apr 24, 2018
2846cfc
add print for libregrid2
dnadeau4 Apr 24, 2018
43e42eb
restore regrid2.Lib for readthedocs
dnadeau4 Apr 24, 2018
463c721
add mock modules
dnadeau4 Apr 24, 2018
62e160f
add git.py
dnadeau4 Apr 24, 2018
1b12f72
try with new mock list
dnadeau4 Apr 24, 2018
932d66f
force git.py
dnadeau4 Apr 24, 2018
9275ecd
force git.py
dnadeau4 Apr 24, 2018
c2baa86
try readthedocs.yml file
dnadeau4 Apr 24, 2018
970bb4e
fix readthedocs maping file
dnadeau4 Apr 24, 2018
92b39e6
change type pdb to pdf
dnadeau4 Apr 24, 2018
b0df74f
typo requirements.yml
dnadeau4 Apr 24, 2018
26661a8
add dependencies
dnadeau4 Apr 24, 2018
721da2d
add dependencies and change conf.yml
dnadeau4 Apr 24, 2018
2dc4acc
change API.rst and other rst files
dnadeau4 Apr 24, 2018
9d1487a
Changes to API
reshel3 Apr 24, 2018
3cf5491
UVCDAT_ANONYMOUS_LOG set to false
dnadeau4 Apr 24, 2018
443d7f5
check if git.py is there
dnadeau4 Apr 25, 2018
92fa468
add gcc to environment.yml
dnadeau4 Apr 25, 2018
eeb7777
try docker environment.yml
dnadeau4 Apr 25, 2018
3cac37b
remove git.py
dnadeau4 Apr 25, 2018
7c7b5c9
fix conflicts
dnadeau4 Apr 25, 2018
8952fb1
chage Libregrid to regrid2
dnadeau4 Apr 25, 2018
8ae28f7
revert
dnadeau4 Apr 25, 2018
0c6e809
revert
dnadeau4 Apr 25, 2018
2d12952
add cdms2 class
Apr 25, 2018
ad98288
delet cdms2 class
Apr 25, 2018
7c311f2
delet cdms2 class
Apr 25, 2018
0b340e5
change conf.py os.path
Apr 25, 2018
67cf584
Changes to API
reshel3 Apr 26, 2018
401b6cb
Changes made to API
reshel3 Apr 30, 2018
49c6890
Changes to API
reshel3 Apr 30, 2018
297d386
Changes made to API
reshel3 May 1, 2018
72414f2
Changes to API
reshel3 May 2, 2018
735a306
Changes made to API
reshel3 May 3, 2018
8ad34b5
Changes made to API
reshel3 May 9, 2018
10ddc5b
Changes to API
reshel3 May 16, 2018
12c2f0e
Changes to API
reshel3 May 16, 2018
3074964
Changes made to API
reshel3 May 17, 2018
b9e04a6
Changes made to API
reshel3 May 18, 2018
651ae1c
Changes made to API
reshel3 May 21, 2018
222ab4d
Merge branch 'docstanya' into readthedocstest
dnadeau4 May 22, 2018
1c91ea5
push latest rst files
reshel3 May 22, 2018
e13b988
Merge branch 'readthedocstest' of github.com:UV-CDAT/cdms into readth…
dnadeau4 May 22, 2018
8cd77b9
Merge branch 'docstanya' into readthedocstest
dnadeau4 May 22, 2018
6155ef0
Changes made to API
reshel3 May 23, 2018
521fb97
Made some changes to API
reshel3 May 24, 2018
7302fd9
update documentations
dnadeau4 May 29, 2018
ca61e5d
Changes made to API
reshel3 May 29, 2018
e737c89
Changes made to API
reshel3 May 30, 2018
a7063e2
Changes made to API
reshel3 May 31, 2018
3cb0aad
Changes made to Section 2 and API
reshel3 Jun 1, 2018
7878e53
Changes made to Section 2
reshel3 Jun 4, 2018
e8077bb
Changes made to Chapter 2
reshel3 Jun 5, 2018
a27487c
Changes made to Section 2
reshel3 Jun 6, 2018
7d0bd02
Changes made to Chapters 2, 3, 4,5 and 6
reshel3 Jun 7, 2018
4523dc2
Changes made to Sections 2, 4, 7 and Appendix
reshel3 Jun 11, 2018
e550c14
Changes made to Chapter 6 and Appendix
reshel3 Jun 12, 2018
554bd4c
Changes made to Section 2
reshel3 Jun 13, 2018
506ccb8
update summary table for API
dnadeau4 Jun 14, 2018
16f6fdd
add generated files
dnadeau4 Jun 14, 2018
5a7ebdc
Merge branch 'master' into docstanya
reshel3 Jun 14, 2018
6ae47a2
Changes made to al sections
reshel3 Jun 14, 2018
ba79685
Changes made to Section 2 and API
reshel3 Jun 15, 2018
765dd6f
Changes made to 2 and API
reshel3 Jun 18, 2018
a016201
Made changes to sections 1 and 2
reshel3 Jun 19, 2018
1b51879
Issue#231 (#232)
dnadeau4 Mar 7, 2018
3d614dd
failing test from vcs added here (#234)
doutriaux1 Mar 13, 2018
e2a12a8
Cdmsdocsmerge (#223)
dnadeau4 Mar 29, 2018
f32c86b
Fix python3 slice issue(setitem) and flake8 (#243)
dnadeau4 May 1, 2018
7ced34c
fix python 3 aggregation issue and flake8 (#244)
dnadeau4 May 2, 2018
9d5b7d2
Netcdf46 (#249)
dnadeau4 Jun 6, 2018
f18e8aa
Revert "Netcdf46 (#249)" (#250)
dnadeau4 Jun 6, 2018
074b412
Netcdf46 (#251)
dnadeau4 Jun 12, 2018
c9dd25e
Netcdf46 (#252)
dnadeau4 Jun 12, 2018
a378f31
Changes made to API
reshel3 May 23, 2018
5ffe9de
Made some changes to API
reshel3 May 24, 2018
6442448
Changes made to API
reshel3 May 29, 2018
93b206e
Changes made to API
reshel3 May 30, 2018
c390ee6
Changes made to API
reshel3 May 31, 2018
1b5ad8a
Changes made to Section 2 and API
reshel3 Jun 1, 2018
e9792fb
Changes made to Section 2
reshel3 Jun 4, 2018
01ba90a
Changes made to Chapter 2
reshel3 Jun 5, 2018
691b110
Changes made to Section 2
reshel3 Jun 6, 2018
519add2
Changes made to Chapters 2, 3, 4,5 and 6
reshel3 Jun 7, 2018
b4f6628
Changes made to Sections 2, 4, 7 and Appendix
reshel3 Jun 11, 2018
a294133
Changes made to Chapter 6 and Appendix
reshel3 Jun 12, 2018
08f62a5
Changes made to Section 2
reshel3 Jun 13, 2018
5158373
Changes made to al sections
reshel3 Jun 14, 2018
46e564f
Changes made to Section 2 and API
reshel3 Jun 15, 2018
134054c
Changes made to 2 and API
reshel3 Jun 18, 2018
a473fe3
Made changes to sections 1 and 2
reshel3 Jun 19, 2018
c2d8bd3
Issue#231 (#232)
dnadeau4 Mar 7, 2018
44add33
Fix python3 slice issue(setitem) and flake8 (#243)
dnadeau4 May 1, 2018
405fe24
fix python 3 aggregation issue and flake8 (#244)
dnadeau4 May 2, 2018
e1b587f
Netcdf46 (#249)
dnadeau4 Jun 6, 2018
97279be
Revert "Netcdf46 (#249)" (#250)
dnadeau4 Jun 6, 2018
f6ca669
Netcdf46 (#251)
dnadeau4 Jun 12, 2018
180f9e1
Netcdf46 (#252)
dnadeau4 Jun 12, 2018
7bf205a
fix conflict with master
dnadeau4 Jun 20, 2018
09d70ec
Fix table titles
reshel3 Jun 20, 2018
f6d99e3
Change made to Section 4
reshel3 Jun 21, 2018
ced9db6
fix bindex issue in hgrid
dnadeau4 Jun 25, 2018
8d2c194
Changes to all
reshel3 Jun 25, 2018
9dca0db
Corrections made to API Lib
reshel3 Jun 25, 2018
89b22f9
Changes to API
reshel3 Jun 25, 2018
0827d3b
fix ascii art
dnadeau4 Jun 26, 2018
f2b2e65
Changes to Sections 2, 4 and 5
reshel3 Jun 26, 2018
cdff139
Changes made to all
reshel3 Jun 27, 2018
529535e
Fix Conflict
reshel3 Jun 27, 2018
7dfb910
Changes made to Sections 2, 6 and Appendix
reshel3 Jun 28, 2018
3e67e57
Changes made to Section 2
reshel3 Jul 2, 2018
01fb416
Changes made to Section 2
reshel3 Jul 9, 2018
bac2fa4
Changes made to Section 2 and 5
reshel3 Jul 11, 2018
66eaa55
Changes to Sections 2, 6 and 7
reshel3 Jul 12, 2018
46ea27d
Changes to API
reshel3 Jul 25, 2018
28dbb4f
Changes made to API
reshel3 Jul 25, 2018
5819332
Made Changes to API
reshel3 Jul 25, 2018
99dd8f5
Changes made to API
reshel3 Jul 30, 2018
2d71dd9
Changes made to Section 4 and 7
reshel3 Jul 31, 2018
bdd5968
Changes made to API
reshel3 Aug 7, 2018
7c10798
Changes made to API
reshel3 Aug 8, 2018
556d92f
Revisit run tests (#262)
muryanto1 Aug 8, 2018
82142bd
merge master
dnadeau4 Aug 20, 2018
d474e9c
fix Axis.py
dnadeau4 Aug 20, 2018
6e40d4c
update documentation
reshel3 Aug 20, 2018
cbb943e
fix environment dependencies
reshel3 Aug 21, 2018
794a5e5
add/remote generated files
reshel3 Aug 21, 2018
4bddf04
try to fix API.rst
reshel3 Aug 21, 2018
ff931a7
add regrid2 to docs
reshel3 Aug 21, 2018
b049359
Changes made to API
reshel3 Aug 21, 2018
f300870
fix space with parameters
reshel3 Aug 21, 2018
3ca9877
fix readthedocs using numpydoc
reshel3 Aug 21, 2018
493d2c1
update environment
reshel3 Aug 21, 2018
304b3f1
fix some autodocs
reshel3 Aug 22, 2018
ffc6f2e
add hgrid
reshel3 Aug 22, 2018
58cadd7
Changes made to API
reshel3 Aug 22, 2018
86caf86
Changes made to API
reshel3 Aug 23, 2018
21d5e47
Merge branch 'master' into docstanya
dnadeau4 Aug 28, 2018
4def393
fix avariable bad location methods
dnadeau4 Aug 28, 2018
f3c72ff
Changes to Appendix and API
reshel3 Aug 29, 2018
7ee9c2e
Changes to Chapter 1 and 2
reshel3 Aug 30, 2018
eb38903
Changes made to Section 2
reshel3 Sep 4, 2018
75c3f41
Changes made to Section 2
reshel3 Sep 5, 2018
16c2397
Changes made to Section 2
reshel3 Sep 6, 2018
8753cc2
Changes to sections 1, 2, 3 and 4
reshel3 Sep 10, 2018
eb9ee84
Changes to section 2
reshel3 Sep 11, 2018
b39bb62
Changes made to entire docuemnt
reshel3 Sep 17, 2018
96cd85d
Changes to Section 1 and 2
reshel3 Sep 18, 2018
6de4bf7
Changes made to Section 2
reshel3 Sep 20, 2018
241ff9f
Changes made to Sections 2 thru 6
reshel3 Sep 27, 2018
085b28c
Changes made to Chapters 3 and 6
reshel3 Oct 4, 2018
451a012
add jupyter notebook
reshel3 Oct 18, 2018
0fbeaba
Changes to all
reshel3 Oct 24, 2018
dd65dfd
Changes to Jupyter Notebooks
reshel3 Nov 6, 2018
06f672c
Changes to all
reshel3 Nov 7, 2018
0e1e668
fix conflict merge master
dnadeau4 Nov 8, 2018
193e42a
update documentation for version 3.1.0
dnadeau4 Nov 9, 2018
5216d3b
Merge branch 'master' into docstanya
dnadeau4 Nov 9, 2018
b7a23ec
merge documentations
dnadeau4 Nov 9, 2018
e1a9e29
Merge branch 'master' into docstanya
dnadeau4 Nov 13, 2018
46a8b5f
change banner and sidebar colors
dnadeau4 Nov 13, 2018
866a225
Changes to API
reshel3 Nov 13, 2018
c1f98a9
fix style sheet
dnadeau4 Nov 14, 2018
f444406
Changes to API
reshel3 Nov 14, 2018
aea7a3e
Changes to API
reshel3 Nov 15, 2018
69de7c1
Changes to API and Sections
reshel3 Nov 19, 2018
64cc035
Changes to all
reshel3 Nov 28, 2018
8006c3c
will this fix master? (#292)
doutriaux1 Nov 14, 2018
24130a4
Merge branch 'master' into docstanya
Nov 29, 2018
9297ece
Changes to Sections 1 and 2
reshel3 Dec 10, 2018
e3da499
fix cdtime and scripts
reshel3 Jan 4, 2019
8cf4121
Merge branch 'docstanya' of github.com:CDAT/cdms into docstanya
reshel3 Jan 4, 2019
743d60e
fix conflicts
reshel3 Jan 4, 2019
a87283c
trigger read-the-docs
reshel3 Jan 4, 2019
df6905e
fix more cdtime doc issues
reshel3 Jan 5, 2019
da1e5eb
fix typo Default-Calendar
reshel3 Jan 5, 2019
86b4c45
fix conflicts
reshel3 Jan 5, 2019
c6b2a6c
pass flake8
reshel3 Jan 5, 2019
b56141c
Changes
reshel3 Jan 17, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 13 additions & 16 deletions Lib/MV2.py
Expand Up @@ -79,7 +79,6 @@ def __init__(self, mafunc):
"""
Parameters
----------

var_unary_operation(mafunc)

mafunc is an numpy.ma masked_unary_function.
Expand Down Expand Up @@ -124,7 +123,6 @@ def commonDomain(a, b, omit=None):

commonDomain(a,b)
tests that the domains of variables/arrays a and b are equal,
and

Returns
-------
Expand All @@ -146,14 +144,15 @@ def commonDomain(a, b, omit=None):


def commonAxes(a, bdom, omit=None):
"""Helper function for commonDomain.
"""
Helper function for commonDomain.

Parameters
----------

'a' is a variable or array,

'b' is an axislist or None.
'a':
is a variable or array,
'b':
is an axislist or None.
"""
if isinstance(a, AbstractVariable) and bdom is not None:
adom = a.getAxisList()
Expand Down Expand Up @@ -272,7 +271,6 @@ def __init__(self, mafunc):
----------

var_binary_operation(mafunc)

mafunc is an numpy.ma masked_binary_function.
"""
self.mafunc = mafunc
Expand Down Expand Up @@ -935,13 +933,14 @@ def outer(self, a, b):


def asarray(data, typecode=None, dtype=None):
"""asarray(data, typecode=None, dtype=None) is equivalent to array(data, dtype=None, copy=0)
"""
asarray(data, typecode=None, dtype=None) is equivalent to array(data, dtype=None, copy=0)


Returns
-------
Returns
-------

data if dtype is None or data is a MaskedArray of the same dtype.
data if dtype is None or data is a MaskedArray of the same dtype.
typecode arg is for backward compatibility.
"""
dtype = _convdtype(dtype, typecode)
Expand Down Expand Up @@ -1061,7 +1060,8 @@ def resize(a, new_shape, axes=None, attributes=None, id=None, grid=None):
-------
a new array with the specified shape.

The original array's total size can be any size."""
The original array's total size can be any size.
"""
ignore, attributes, id, ignore = _extractMetadata(a, axes, attributes, id)
if axes is not None:
axesshape = [len(item) for item in axes]
Expand Down Expand Up @@ -1099,7 +1099,6 @@ def masked_values(data, value, rtol=1.e-5, atol=1.e-8, copy=1,
"""
Parameters
----------

masked_values(data, value, rtol=1.e-5, atol=1.e-8)

Create a masked array; mask is None if possible.
Expand Down Expand Up @@ -1131,7 +1130,6 @@ def isMaskedVariable(x):

def set_default_fill_value(value_type, value):
"""Set the default fill value for value_type to value.

Parameters
----------
value_type is a string:
Expand Down Expand Up @@ -1164,7 +1162,6 @@ def diagonal(a, offset=0, axis1=0, axis2=1):

Returns
-------

the given diagonals defined by the two dimensions of the array.
"""
F = getattr(a, "fill_value", 1.e20)
Expand Down
8 changes: 3 additions & 5 deletions Lib/avariable.py
Expand Up @@ -701,17 +701,15 @@ def getOrder(self, ids=0):
"""
Parameters
----------

id:
0 or 1
id:
0 or 1

Returns
-------

the order string, such as t, z, y, x (time, level, lat, lon).

Note

----
* if ids == 0 (the default) for an axis that is not t,z,x,y
the order string will contain a (-) character in that location.
The result string will be of the same length as the number
Expand Down
3 changes: 1 addition & 2 deletions Lib/axis.py
Expand Up @@ -1255,8 +1255,7 @@ def mapInterval(self, interval, indicator='ccn', cycle=None):

Returns
-------

The corresponding index interval (i,j), where i<j, indicating
The corresponding index interval (i,j), where i<j, indicating
the half-open index interval [i,j), or None if the intersection is empty.

For an axis which is circular (self.topology == 'circular'), [i,j)
Expand Down
4 changes: 2 additions & 2 deletions Lib/cache.py
Expand Up @@ -326,8 +326,8 @@ def put(self, filekey, path):

Parameters
----------
<filekey>
filekey for cache
filekey:
for cache
"""

filekey = str(filekey)
Expand Down
6 changes: 0 additions & 6 deletions Lib/database.py
Expand Up @@ -55,7 +55,6 @@ def connect(uri=None, user="", password=""):
Database instance

Example

db = cdms.connect("ldap://dbhost.llnl.gov/database=CDMS,ou=PCMDI,o=LLNL,c=US")
"""
if uri is None:
Expand Down Expand Up @@ -312,7 +311,6 @@ def openDataset(self, dsetid, mode='r'):
Dataset instance.

Example

dset = db.openDataset('ncep_reanalysis_mo')
"""
dn = "dataset=%s,%s" % (dsetid, self.path)
Expand Down Expand Up @@ -416,7 +414,6 @@ def searchFilter(self, filter=None, tag=None, relbase=None,
Entries can be refined with searchPredicate().

Example

(1) Find all variables named "cli":

result = db.searchFilter(filter="id=cli",tag="variable")
Expand Down Expand Up @@ -529,7 +526,6 @@ def searchPredicate(self, predicate, tag=None):
Entries can be refined with searchPredicate().

Example

(1) Find all variables on a 73x96 grid

newresult = result.searchPredicate(lambda obj: obj.getGrid().shape==(73,96),"variable")
Expand Down Expand Up @@ -561,11 +557,9 @@ def __init__(self, db):
def getObject(self):
"""
Method

getObject()

Description

Get the CDMS object associated with this entry.

Returns
Expand Down
9 changes: 6 additions & 3 deletions Lib/dataset.py
Expand Up @@ -2138,8 +2138,8 @@ def write(self, var, attributes=None, axes=None, extbounds=None, id=None,

Parameters
----------
var:
variable to copy.
var:
variable to copy.
attributes:
The attribute dictionary for the variable. The default is var.attributes.
axes:
Expand All @@ -2160,6 +2160,7 @@ def write(self, var, attributes=None, axes=None, extbounds=None, id=None,
The numpy dtype.
typecode:
Deprecated, for backward compatibility only

Returns
-------
File variable
Expand Down Expand Up @@ -2316,9 +2317,11 @@ def write_it_yourself(self, obj):
----------
obj:
object containing `writeg`, `writeToFile` or `write` method.

Returns
-------
Nothig is returned. """
Nothing is returned.
"""
# This method was formerly called writeg and just wrote an
# AbstractCurveGrid.
if (hasattr(obj, 'writeg') and callable(getattr(obj, 'writeg'))):
Expand Down
10 changes: 2 additions & 8 deletions Lib/forecast.py
Expand Up @@ -85,15 +85,13 @@ class forecast():
is used to get the forecast file from the forecast time.

Example
-------

Each list item should look like this example:
Each list item should look like this example:
[None, None, None, None, 2006022200000L, 'file2006-02-22-00000.nc']
Normally dataset_list = fm[i][1] where fm is the output of
cdms2.dataset.parseFileMap and fm[i][0] matches the variables of interest.

Note
----

N.B. This is like a CdmsFile. Creating a forecast means opening a file,
so later on you should call forecast.close() to close it.
Expand Down Expand Up @@ -139,7 +137,6 @@ def available_forecasts(dataset_file, path="."):
through the specified cdscan-generated dataset xml file.

Note

The forecasts are given in 64-bit integer format, but can be converted
to component times with the function two_times_from_one.
This function may help in choosing the right arguments for initializing
Expand All @@ -157,8 +154,6 @@ class forecasts():
Represents a set of forecasts

Example


Creates a set of forecasts. Normally you do it by something like
f = forecasts( 'file.xml', (min_time, max_time) )
or
Expand Down Expand Up @@ -256,7 +251,7 @@ def time_interval_to_list(self, tlo, thi, openclosed='co'):
def reduce_inplace(self, min_time, max_time, openclosed='co'):
"""
Example

=======

For a forecasts object f, f( min_time, max_time ) will reduce the
scope of f, to forecasts whose start time t has min_time<=t<max_time.
Expand Down Expand Up @@ -366,7 +361,6 @@ def forecast_axis(self, varname, fcss=None):
a tuple (axis,start,length,true_length) where axis is in the forecast direction.

Note

If a list of forecasts be specified, the axis' data will be limited to them."""
if fcss is None:
fcss = self.fcs
Expand Down
8 changes: 3 additions & 5 deletions Lib/grid.py
Expand Up @@ -752,10 +752,10 @@ def writeScrip(self, cufile, gridTitle=None):

Parameters
----------
cufile:
cufile
is a Cdunif file, NOT a CDMS file.

gridtitle:
gridtitle
is a string identifying the grid.

"""
Expand All @@ -768,11 +768,9 @@ def toCurveGrid(self, gridid=None):

Parameters
----------
gridid:
gridid
is the string identifier of the resulting curvilinear grid object.

_: None

"""

from .coord import TransientVirtualAxis, TransientAxis2D
Expand Down
17 changes: 7 additions & 10 deletions Lib/hgrid.py
Expand Up @@ -189,23 +189,20 @@ def fixCutCells(self, nonConvexCells, threshold=270.0):

Parameters
----------

nonConvexCells:
1D numpy array of indices of nonconvex cells, as returned from
checkConvex.
threshold:
positive floating-point value in degrees.


If the difference in longitude values of consecutive boundaries nodes exceeds the
threshold, the cell is considered a cut cell.

On return, the grid boundaries are modified.
If the difference in longitude values of consecutive boundaries nodes
exceeds the threshold, the cell is considered a cut cell. On return,
the grid boundaries are modified.

Returns
-------

value is a 1D array of indices of cells that cannot be repaired.
value is a 1D array of indices of cells that cannot be repaired.
"""

from numpy import take, array
Expand Down Expand Up @@ -583,7 +580,7 @@ def writeg(self, file):
file.close()

def write_gridspec(self, filename):
"""writes this grid to a Gridspec-compliant file, or does nothing if there is
"""Writes this grid to a Gridspec-compliant file, or does nothing if there is
already a known file corresponding to this grid. The filename should be a
complete path."""
# This method was never completed because the libCF functionality I had planned to
Expand All @@ -600,7 +597,7 @@ def write_gridspec(self, filename):
'The libCF/Gridspec API does not provide for writing CurveGrids<<<')

def init_from_gridspec(self, filename):
"""reads to grid from a Gridspec-compliant file. The filename should be a
"""Reads to grid from a Gridspec-compliant file. The filename should be a
complete path. The contents of the file may overwrite data in the existing
grid object."""
# - This is really a kind of init function. The __init__ function should
Expand All @@ -618,7 +615,7 @@ def init_from_gridspec(self, filename):
f.close()

def init_from_gridspec_file(self, f):
"""reads to grid from a Gridspec-compliant file, f. This f should be a
"""Reads to grid from a Gridspec-compliant file, f. This f should be a
CdmsFile object, already open for reading. The contents of the file may
overwrite data in the existing grid object."""
# As for the above init_from_gridspec method, this is really a kind of
Expand Down
4 changes: 2 additions & 2 deletions Lib/tvariable.py
Expand Up @@ -583,8 +583,8 @@ def clone(self, copyData=1):
-------

a copy of self as a transient variable.

If copyData is 1 (default), make a separate copy of the data."""
If copyData is 1 (default), make a separate copy of the data.
"""
result = createVariable(self, copy=copyData)
return result

Expand Down