Skip to content

Commit

Permalink
Merge pull request #83 from NCAR/devel
Browse files Browse the repository at this point in the history
Merge to master for version 0.2.7
  • Loading branch information
sherimickelson authored Oct 24, 2018
2 parents 8e307d0 + 2bd1d20 commit 1cbe2f1
Show file tree
Hide file tree
Showing 63 changed files with 1,831 additions and 820 deletions.
2 changes: 1 addition & 1 deletion .pydevproject
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?eclipse-pydev version="1.0"?><pydev_project>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Anaconda Python 2.7</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Miniconda3 [conform]</pydev_property>
<pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
<path>/${PROJECT_DIR_NAME}/source</path>
</pydev_pathproperty>
Expand Down
2 changes: 1 addition & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PyConform ChangeLog
===================

Copyright 2017, University Corporation for Atmospheric Research
Copyright 2017-2018, University Corporation for Atmospheric Research
See the LICENSE.rst file for details

VERSION 0.0.1
Expand Down
2 changes: 1 addition & 1 deletion docs/_modules/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ <h1>All modules for which code is available</h1>

<div role="contentinfo">
<p>
&copy; Copyright 2017, University Corporation for Atmospheric Research.
&copy; Copyright 2017-2018, University Corporation for Atmospheric Research.

</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions docs/_modules/pyconform/dataflow.html
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ <h1>Source code for pyconform.dataflow</h1><div class="highlight"><pre>
<span class="sd">The action associated with each node is not performed until the data is</span>
<span class="sd">&quot;requested&quot; with the __getitem__ interface, via Node[key]. </span>

<span class="sd">Copyright 2017, University Corporation for Atmospheric Research</span>
<span class="sd">Copyright 2017-2018, University Corporation for Atmospheric Research</span>
<span class="sd">LICENSE: See the LICENSE.rst file for details</span>
<span class="sd">&quot;&quot;&quot;</span>

Expand Down Expand Up @@ -534,7 +534,7 @@ <h1>Source code for pyconform.dataflow</h1><div class="highlight"><pre>

<div role="contentinfo">
<p>
&copy; Copyright 2017, University Corporation for Atmospheric Research.
&copy; Copyright 2017-2018, University Corporation for Atmospheric Research.

</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions docs/_modules/pyconform/datasets.html
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ <h1>Source code for pyconform.datasets</h1><div class="highlight"><pre>
<span class="sd">This file contains the interface classes to the input and output multi-file</span>
<span class="sd">datasets.</span>

<span class="sd">Copyright 2017, University Corporation for Atmospheric Research</span>
<span class="sd">Copyright 2017-2018, University Corporation for Atmospheric Research</span>
<span class="sd">LICENSE: See the LICENSE.rst file for details</span>
<span class="sd">&quot;&quot;&quot;</span>

Expand Down Expand Up @@ -1012,7 +1012,7 @@ <h1>Source code for pyconform.datasets</h1><div class="highlight"><pre>

<div role="contentinfo">
<p>
&copy; Copyright 2017, University Corporation for Atmospheric Research.
&copy; Copyright 2017-2018, University Corporation for Atmospheric Research.

</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions docs/_modules/pyconform/flownodes.html
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ <h1>Source code for pyconform.flownodes</h1><div class="highlight"><pre>

<span class="sd">This module contains the classes and functions needed to define nodes in Data Flows.</span>

<span class="sd">Copyright 2017, University Corporation for Atmospheric Research</span>
<span class="sd">Copyright 2017-2018, University Corporation for Atmospheric Research</span>
<span class="sd">LICENSE: See the LICENSE.rst file for details</span>
<span class="sd">&quot;&quot;&quot;</span>

Expand Down Expand Up @@ -1081,7 +1081,7 @@ <h1>Source code for pyconform.flownodes</h1><div class="highlight"><pre>

<div role="contentinfo">
<p>
&copy; Copyright 2017, University Corporation for Atmospheric Research.
&copy; Copyright 2017-2018, University Corporation for Atmospheric Research.

</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions docs/_modules/pyconform/functions.html
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ <h1>Source code for pyconform.functions</h1><div class="highlight"><pre>
<span></span><span class="sd">&quot;&quot;&quot;</span>
<span class="sd">Functions for FunctionEvaluator Actions</span>

<span class="sd">Copyright 2017, University Corporation for Atmospheric Research</span>
<span class="sd">Copyright 2017-2018, University Corporation for Atmospheric Research</span>
<span class="sd">LICENSE: See the LICENSE.rst file for details</span>
<span class="sd">&quot;&quot;&quot;</span>

Expand Down Expand Up @@ -602,7 +602,7 @@ <h1>Source code for pyconform.functions</h1><div class="highlight"><pre>

<div role="contentinfo">
<p>
&copy; Copyright 2017, University Corporation for Atmospheric Research.
&copy; Copyright 2017-2018, University Corporation for Atmospheric Research.

</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions docs/_modules/pyconform/indexing.html
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ <h1>Source code for pyconform.indexing</h1><div class="highlight"><pre>

<span class="sd">----------------------------------------------------------------------------------------------------</span>

<span class="sd">Copyright 2017, University Corporation for Atmospheric Research</span>
<span class="sd">Copyright 2017-2018, University Corporation for Atmospheric Research</span>
<span class="sd">LICENSE: See the LICENSE.rst file for details</span>
<span class="sd">&quot;&quot;&quot;</span>

Expand Down Expand Up @@ -348,7 +348,7 @@ <h1>Source code for pyconform.indexing</h1><div class="highlight"><pre>

<div role="contentinfo">
<p>
&copy; Copyright 2017, University Corporation for Atmospheric Research.
&copy; Copyright 2017-2018, University Corporation for Atmospheric Research.

</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions docs/_modules/pyconform/parsing.html
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ <h1>Source code for pyconform.parsing</h1><div class="highlight"><pre>
<span class="sd">This module defines the necessary elements to parse a string variable definition</span>
<span class="sd">into the recognized elements that are used to construct an Operation Graph.</span>

<span class="sd">Copyright 2017, University Corporation for Atmospheric Research</span>
<span class="sd">Copyright 2017-2018, University Corporation for Atmospheric Research</span>
<span class="sd">LICENSE: See the LICENSE.rst file for details</span>
<span class="sd">&quot;&quot;&quot;</span>

Expand Down Expand Up @@ -360,7 +360,7 @@ <h1>Source code for pyconform.parsing</h1><div class="highlight"><pre>

<div role="contentinfo">
<p>
&copy; Copyright 2017, University Corporation for Atmospheric Research.
&copy; Copyright 2017-2018, University Corporation for Atmospheric Research.

</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions docs/_modules/pyconform/physarray.html
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ <h1>Source code for pyconform.physarray</h1><div class="highlight"><pre>
<span class="sd">its data the units associated with the data, the dimensions associated with each axis of</span>
<span class="sd">the data.</span>

<span class="sd">Copyright 2017, University Corporation for Atmospheric Research</span>
<span class="sd">Copyright 2017-2018, University Corporation for Atmospheric Research</span>
<span class="sd">LICENSE: See the LICENSE.rst file for details</span>
<span class="sd">&quot;&quot;&quot;</span>

Expand Down Expand Up @@ -900,7 +900,7 @@ <h1>Source code for pyconform.physarray</h1><div class="highlight"><pre>

<div role="contentinfo">
<p>
&copy; Copyright 2017, University Corporation for Atmospheric Research.
&copy; Copyright 2017-2018, University Corporation for Atmospheric Research.

</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions docs/changelog.html
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@

<div class="section" id="pyconform-changelog">
<h1>PyConform ChangeLog<a class="headerlink" href="#pyconform-changelog" title="Permalink to this headline"></a></h1>
<p>Copyright 2017, University Corporation for Atmospheric Research
<p>Copyright 2017-2018, University Corporation for Atmospheric Research
See the LICENSE.rst file for details</p>
<div class="section" id="version-0-0-1">
<h2>VERSION 0.0.1<a class="headerlink" href="#version-0-0-1" title="Permalink to this headline"></a></h2>
Expand Down Expand Up @@ -248,7 +248,7 @@ <h2>VERSION 0.2.2<a class="headerlink" href="#version-0-2-2" title="Permalink to

<div role="contentinfo">
<p>
&copy; Copyright 2017, University Corporation for Atmospheric Research.
&copy; Copyright 2017-2018, University Corporation for Atmospheric Research.

</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions docs/dataflow.html
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
graph edges is assumed to a Numpy.NDArray-like object.</p>
<p>The action associated with each node is not performed until the data is
“requested” with the __getitem__ interface, via Node[key].</p>
<p>Copyright 2017, University Corporation for Atmospheric Research
<p>Copyright 2017-2018, University Corporation for Atmospheric Research
LICENSE: See the LICENSE.rst file for details</p>
<dl class="class">
<dt id="pyconform.dataflow.DataFlow">
Expand Down Expand Up @@ -259,7 +259,7 @@

<div role="contentinfo">
<p>
&copy; Copyright 2017, University Corporation for Atmospheric Research.
&copy; Copyright 2017-2018, University Corporation for Atmospheric Research.

</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions docs/datasets.html
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
<p>DatasetDesc Interface Class</p>
<p>This file contains the interface classes to the input and output multi-file
datasets.</p>
<p>Copyright 2017, University Corporation for Atmospheric Research
<p>Copyright 2017-2018, University Corporation for Atmospheric Research
LICENSE: See the LICENSE.rst file for details</p>
<dl class="class">
<dt id="pyconform.datasets.DatasetDesc">
Expand Down Expand Up @@ -525,7 +525,7 @@

<div role="contentinfo">
<p>
&copy; Copyright 2017, University Corporation for Atmospheric Research.
&copy; Copyright 2017-2018, University Corporation for Atmospheric Research.

</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions docs/flownodes.html
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
<span id="pyconform-flownodes"></span><h1>pyconform.flownodes<a class="headerlink" href="#module-pyconform.flownodes" title="Permalink to this headline"></a></h1>
<p>Data Flow Node Classes and Functions</p>
<p>This module contains the classes and functions needed to define nodes in Data Flows.</p>
<p>Copyright 2017, University Corporation for Atmospheric Research
<p>Copyright 2017-2018, University Corporation for Atmospheric Research
LICENSE: See the LICENSE.rst file for details</p>
<dl class="class">
<dt id="pyconform.flownodes.DataNode">
Expand Down Expand Up @@ -400,7 +400,7 @@

<div role="contentinfo">
<p>
&copy; Copyright 2017, University Corporation for Atmospheric Research.
&copy; Copyright 2017-2018, University Corporation for Atmospheric Research.

</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions docs/functions.html
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
<div class="section" id="module-pyconform.functions">
<span id="pyconform-functions"></span><h1>pyconform.functions<a class="headerlink" href="#module-pyconform.functions" title="Permalink to this headline"></a></h1>
<p>Functions for FunctionEvaluator Actions</p>
<p>Copyright 2017, University Corporation for Atmospheric Research
<p>Copyright 2017-2018, University Corporation for Atmospheric Research
LICENSE: See the LICENSE.rst file for details</p>
<dl class="class">
<dt id="pyconform.functions.AdditionOperator">
Expand Down Expand Up @@ -444,7 +444,7 @@

<div role="contentinfo">
<p>
&copy; Copyright 2017, University Corporation for Atmospheric Research.
&copy; Copyright 2017-2018, University Corporation for Atmospheric Research.

</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/genindex.html
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ <h2 id="W">W</h2>

<div role="contentinfo">
<p>
&copy; Copyright 2017, University Corporation for Atmospheric Research.
&copy; Copyright 2017-2018, University Corporation for Atmospheric Research.

</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ <h1>Indices and tables<a class="headerlink" href="#indices-and-tables" title="Pe

<div role="contentinfo">
<p>
&copy; Copyright 2017, University Corporation for Atmospheric Research.
&copy; Copyright 2017-2018, University Corporation for Atmospheric Research.

</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions docs/indexing.html
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
reducing the amount of data read, as well as limiting the possibility of overrunning memory with
a large read.</p>
<hr class="docutils" />
<p>Copyright 2017, University Corporation for Atmospheric Research
<p>Copyright 2017-2018, University Corporation for Atmospheric Research
LICENSE: See the LICENSE.rst file for details</p>
<dl class="function">
<dt id="pyconform.indexing.align_index">
Expand Down Expand Up @@ -277,7 +277,7 @@

<div role="contentinfo">
<p>
&copy; Copyright 2017, University Corporation for Atmospheric Research.
&copy; Copyright 2017-2018, University Corporation for Atmospheric Research.

</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/license.html
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ <h3>Contributor License Agreement<a class="headerlink" href="#contributor-licens

<div role="contentinfo">
<p>
&copy; Copyright 2017, University Corporation for Atmospheric Research.
&copy; Copyright 2017-2018, University Corporation for Atmospheric Research.

</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/manual.html
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,7 @@ <h4>I/O Nodes<a class="headerlink" href="#i-o-nodes" title="Permalink to this he

<div role="contentinfo">
<p>
&copy; Copyright 2017, University Corporation for Atmospheric Research.
&copy; Copyright 2017-2018, University Corporation for Atmospheric Research.

</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions docs/parsing.html
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
<p>Parsing Module</p>
<p>This module defines the necessary elements to parse a string variable definition
into the recognized elements that are used to construct an Operation Graph.</p>
<p>Copyright 2017, University Corporation for Atmospheric Research
<p>Copyright 2017-2018, University Corporation for Atmospheric Research
LICENSE: See the LICENSE.rst file for details</p>
<dl class="class">
<dt id="pyconform.parsing.ParsedBinOp">
Expand Down Expand Up @@ -239,7 +239,7 @@

<div role="contentinfo">
<p>
&copy; Copyright 2017, University Corporation for Atmospheric Research.
&copy; Copyright 2017-2018, University Corporation for Atmospheric Research.

</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions docs/physarray.html
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
edges of a Data Flow graph. It is a subclass of the Numpy MaskedArray, and carries with
its data the units associated with the data, the dimensions associated with each axis of
the data.</p>
<p>Copyright 2017, University Corporation for Atmospheric Research
<p>Copyright 2017-2018, University Corporation for Atmospheric Research
LICENSE: See the LICENSE.rst file for details</p>
<dl class="class">
<dt id="pyconform.physarray.CharArray">
Expand Down Expand Up @@ -414,7 +414,7 @@

<div role="contentinfo">
<p>
&copy; Copyright 2017, University Corporation for Atmospheric Research.
&copy; Copyright 2017-2018, University Corporation for Atmospheric Research.

</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/py-modindex.html
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ <h1>Python Module Index</h1>

<div role="contentinfo">
<p>
&copy; Copyright 2017, University Corporation for Atmospheric Research.
&copy; Copyright 2017-2018, University Corporation for Atmospheric Research.

</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/pyconform.html
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ <h2>Modules<a class="headerlink" href="#modules" title="Permalink to this headli

<div role="contentinfo">
<p>
&copy; Copyright 2017, University Corporation for Atmospheric Research.
&copy; Copyright 2017-2018, University Corporation for Atmospheric Research.

</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/readme.html
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ <h2>Instructions &amp; Use<a class="headerlink" href="#instructions-use" title="

<div role="contentinfo">
<p>
&copy; Copyright 2017, University Corporation for Atmospheric Research.
&copy; Copyright 2017-2018, University Corporation for Atmospheric Research.

</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/search.html
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@

<div role="contentinfo">
<p>
&copy; Copyright 2017, University Corporation for Atmospheric Research.
&copy; Copyright 2017-2018, University Corporation for Atmospheric Research.

</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion examples/CESM/CMIP5/utilities/anlz_dirpatterns.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Command-Line Utility to analyze data directory patterns in CMIP5 data
Copyright 2017, University Corporation for Atmospheric Research
Copyright 2017-2018, University Corporation for Atmospheric Research
LICENSE: See the LICENSE.rst file for details
"""

Expand Down
2 changes: 1 addition & 1 deletion examples/CESM/CMIP5/utilities/anlz_stdfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Command-Line Utility to show attributes/definitions/etc in a standardization file
Copyright 2017, University Corporation for Atmospheric Research
Copyright 2017-2018, University Corporation for Atmospheric Research
LICENSE: See the LICENSE.rst file for details
"""

Expand Down
2 changes: 1 addition & 1 deletion examples/CESM/CMIP5/utilities/anlz_varmeta.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Command-Line Utility to analyze variable metadata in CMIP5 data
Copyright 2017, University Corporation for Atmospheric Research
Copyright 2017-2018, University Corporation for Atmospheric Research
LICENSE: See the LICENSE.rst file for details
"""

Expand Down
Loading

0 comments on commit 1cbe2f1

Please sign in to comment.