Skip to content

Commit

Permalink
[skip ci] Update latest
Browse files Browse the repository at this point in the history
  • Loading branch information
Azure Pipelines committed Feb 6, 2024
1 parent 6194ac4 commit b501ac2
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion latest/_modules/mpas_analysis/ocean/climatology_map_argo.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,7 @@ <h1>Source code for mpas_analysis.ocean.climatology_map_argo</h1><div class="hig
<span class="n">dsObs</span><span class="o">.</span><span class="n">coords</span><span class="p">[</span><span class="s1">&#39;month&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="p">(</span><span class="s1">&#39;Time&#39;</span><span class="p">,</span> <span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">(</span><span class="n">dsObs</span><span class="p">[</span><span class="s1">&#39;calmonth&#39;</span><span class="p">],</span> <span class="nb">int</span><span class="p">))</span>

<span class="c1"># no meaningful year since this is already a climatology</span>
<span class="n">dsObs</span><span class="o">.</span><span class="n">coords</span><span class="p">[</span><span class="s1">&#39;year&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="p">(</span><span class="s1">&#39;Time&#39;</span><span class="p">,</span> <span class="n">np</span><span class="o">.</span><span class="n">ones</span><span class="p">(</span><span class="n">dsObs</span><span class="o">.</span><span class="n">dims</span><span class="p">[</span><span class="s1">&#39;Time&#39;</span><span class="p">],</span> <span class="nb">int</span><span class="p">))</span>
<span class="n">dsObs</span><span class="o">.</span><span class="n">coords</span><span class="p">[</span><span class="s1">&#39;year&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="p">(</span><span class="s1">&#39;Time&#39;</span><span class="p">,</span> <span class="n">np</span><span class="o">.</span><span class="n">ones</span><span class="p">(</span><span class="n">dsObs</span><span class="o">.</span><span class="n">sizes</span><span class="p">[</span><span class="s1">&#39;Time&#39;</span><span class="p">],</span> <span class="nb">int</span><span class="p">))</span>
<span class="n">dsObs</span> <span class="o">=</span> <span class="n">dsObs</span><span class="p">[[</span><span class="bp">self</span><span class="o">.</span><span class="n">fieldName</span><span class="p">,</span> <span class="s1">&#39;month&#39;</span><span class="p">]]</span>

<span class="n">slices</span> <span class="o">=</span> <span class="p">[]</span>
Expand Down
2 changes: 1 addition & 1 deletion latest/_modules/mpas_analysis/ocean/climatology_map_mld.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ <h1>Source code for mpas_analysis.ocean.climatology_map_mld</h1><div class="high
<span class="n">dsObs</span><span class="o">.</span><span class="n">coords</span><span class="p">[</span><span class="s1">&#39;month&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="p">(</span><span class="s1">&#39;Time&#39;</span><span class="p">,</span> <span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">(</span><span class="n">dsObs</span><span class="p">[</span><span class="s1">&#39;calmonth&#39;</span><span class="p">],</span> <span class="nb">int</span><span class="p">))</span>

<span class="c1"># no meaningful year since this is already a climatology</span>
<span class="n">dsObs</span><span class="o">.</span><span class="n">coords</span><span class="p">[</span><span class="s1">&#39;year&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="p">(</span><span class="s1">&#39;Time&#39;</span><span class="p">,</span> <span class="n">np</span><span class="o">.</span><span class="n">ones</span><span class="p">(</span><span class="n">dsObs</span><span class="o">.</span><span class="n">dims</span><span class="p">[</span><span class="s1">&#39;Time&#39;</span><span class="p">],</span> <span class="nb">int</span><span class="p">))</span>
<span class="n">dsObs</span><span class="o">.</span><span class="n">coords</span><span class="p">[</span><span class="s1">&#39;year&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="p">(</span><span class="s1">&#39;Time&#39;</span><span class="p">,</span> <span class="n">np</span><span class="o">.</span><span class="n">ones</span><span class="p">(</span><span class="n">dsObs</span><span class="o">.</span><span class="n">sizes</span><span class="p">[</span><span class="s1">&#39;Time&#39;</span><span class="p">],</span> <span class="nb">int</span><span class="p">))</span>

<span class="n">dsObs</span> <span class="o">=</span> <span class="n">dsObs</span><span class="p">[[</span><span class="s1">&#39;mld&#39;</span><span class="p">,</span> <span class="s1">&#39;month&#39;</span><span class="p">]]</span>
<span class="k">return</span> <span class="n">dsObs</span>
Expand Down
4 changes: 2 additions & 2 deletions latest/_modules/mpas_analysis/ocean/streamfunction_moc.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1148,7 +1148,7 @@ <h1>Source code for mpas_analysis.ocean.streamfunction_moc</h1><div class="highl
<span class="n">refTopDepth</span> <span class="o">=</span> <span class="n">dsMOCIn</span><span class="o">.</span><span class="n">depth</span><span class="o">.</span><span class="n">values</span>

<span class="c1"># first, copy all computed data</span>
<span class="k">for</span> <span class="n">inIndex</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="n">dsMOCIn</span><span class="o">.</span><span class="n">dims</span><span class="p">[</span><span class="s1">&#39;Time&#39;</span><span class="p">]):</span>
<span class="k">for</span> <span class="n">inIndex</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="n">dsMOCIn</span><span class="o">.</span><span class="n">sizes</span><span class="p">[</span><span class="s1">&#39;Time&#39;</span><span class="p">]):</span>

<span class="n">mask</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">logical_and</span><span class="p">(</span>
<span class="n">dsMOCIn</span><span class="o">.</span><span class="n">year</span><span class="p">[</span><span class="n">inIndex</span><span class="p">]</span><span class="o">.</span><span class="n">values</span> <span class="o">==</span> <span class="n">years</span><span class="p">,</span>
Expand Down Expand Up @@ -1324,7 +1324,7 @@ <h1>Source code for mpas_analysis.ocean.streamfunction_moc</h1><div class="highl
<span class="n">dsMOCIn</span><span class="o">.</span><span class="n">load</span><span class="p">()</span>

<span class="c1"># first, copy all computed data</span>
<span class="k">for</span> <span class="n">inIndex</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="n">dsMOCIn</span><span class="o">.</span><span class="n">dims</span><span class="p">[</span><span class="s1">&#39;Time&#39;</span><span class="p">]):</span>
<span class="k">for</span> <span class="n">inIndex</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="n">dsMOCIn</span><span class="o">.</span><span class="n">sizes</span><span class="p">[</span><span class="s1">&#39;Time&#39;</span><span class="p">]):</span>

<span class="n">mask</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">logical_and</span><span class="p">(</span>
<span class="n">dsMOCIn</span><span class="o">.</span><span class="n">year</span><span class="p">[</span><span class="n">inIndex</span><span class="p">]</span><span class="o">.</span><span class="n">values</span> <span class="o">==</span> <span class="n">years</span><span class="p">,</span>
Expand Down
2 changes: 1 addition & 1 deletion latest/_modules/mpas_analysis/ocean/time_series_ocean_regions.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@ <h1>Source code for mpas_analysis.ocean.time_series_ocean_regions</h1><div class
<span class="n">startDate</span><span class="o">=</span><span class="n">startDate</span><span class="p">,</span>
<span class="n">endDate</span><span class="o">=</span><span class="n">endDate</span><span class="p">)</span> <span class="k">as</span> <span class="n">dsOut</span><span class="p">:</span>

<span class="k">for</span> <span class="n">inIndex</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="n">dsOut</span><span class="o">.</span><span class="n">dims</span><span class="p">[</span><span class="s1">&#39;Time&#39;</span><span class="p">]):</span>
<span class="k">for</span> <span class="n">inIndex</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="n">dsOut</span><span class="o">.</span><span class="n">sizes</span><span class="p">[</span><span class="s1">&#39;Time&#39;</span><span class="p">]):</span>

<span class="n">mask</span> <span class="o">=</span> <span class="n">numpy</span><span class="o">.</span><span class="n">logical_and</span><span class="p">(</span>
<span class="n">dsOut</span><span class="o">.</span><span class="n">year</span><span class="p">[</span><span class="n">inIndex</span><span class="p">]</span><span class="o">.</span><span class="n">values</span> <span class="o">==</span> <span class="n">years</span><span class="p">,</span>
Expand Down
2 changes: 1 addition & 1 deletion latest/_modules/mpas_analysis/ocean/time_series_transport.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ <h1>Source code for mpas_analysis.ocean.time_series_transport</h1><div class="hi
<span class="n">startDate</span><span class="o">=</span><span class="n">startDate</span><span class="p">,</span>
<span class="n">endDate</span><span class="o">=</span><span class="n">endDate</span><span class="p">)</span> <span class="k">as</span> <span class="n">dsOut</span><span class="p">:</span>

<span class="k">for</span> <span class="n">inIndex</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="n">dsOut</span><span class="o">.</span><span class="n">dims</span><span class="p">[</span><span class="s1">&#39;Time&#39;</span><span class="p">]):</span>
<span class="k">for</span> <span class="n">inIndex</span> <span class="ow">in</span> <span class="nb">range</span><span class="p">(</span><span class="n">dsOut</span><span class="o">.</span><span class="n">sizes</span><span class="p">[</span><span class="s1">&#39;Time&#39;</span><span class="p">]):</span>

<span class="n">mask</span> <span class="o">=</span> <span class="n">numpy</span><span class="o">.</span><span class="n">logical_and</span><span class="p">(</span>
<span class="n">dsOut</span><span class="o">.</span><span class="n">year</span><span class="p">[</span><span class="n">inIndex</span><span class="p">]</span><span class="o">.</span><span class="n">values</span> <span class="o">==</span> <span class="n">years</span><span class="p">,</span>
Expand Down
4 changes: 2 additions & 2 deletions latest/_modules/mpas_analysis/shared/climatology/climatology.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ <h1>Source code for mpas_analysis.shared.climatology.climatology</h1><div class=

<span class="n">cacheInfo</span> <span class="o">=</span> <span class="p">[]</span>

<span class="n">cacheIndices</span> <span class="o">=</span> <span class="o">-</span><span class="mi">1</span> <span class="o">*</span> <span class="n">numpy</span><span class="o">.</span><span class="n">ones</span><span class="p">(</span><span class="n">ds</span><span class="o">.</span><span class="n">dims</span><span class="p">[</span><span class="s1">&#39;Time&#39;</span><span class="p">],</span> <span class="nb">int</span><span class="p">)</span>
<span class="n">cacheIndices</span> <span class="o">=</span> <span class="o">-</span><span class="mi">1</span> <span class="o">*</span> <span class="n">numpy</span><span class="o">.</span><span class="n">ones</span><span class="p">(</span><span class="n">ds</span><span class="o">.</span><span class="n">sizes</span><span class="p">[</span><span class="s1">&#39;Time&#39;</span><span class="p">],</span> <span class="nb">int</span><span class="p">)</span>
<span class="n">monthsInDs</span> <span class="o">=</span> <span class="n">ds</span><span class="o">.</span><span class="n">month</span><span class="o">.</span><span class="n">values</span>
<span class="n">yearsInDs</span> <span class="o">=</span> <span class="n">ds</span><span class="o">.</span><span class="n">year</span><span class="o">.</span><span class="n">values</span>

Expand Down Expand Up @@ -910,7 +910,7 @@ <h1>Source code for mpas_analysis.shared.climatology.climatology</h1><div class=

<span class="n">totalDays</span> <span class="o">=</span> <span class="n">dsYear</span><span class="o">.</span><span class="n">daysInMonth</span><span class="o">.</span><span class="n">sum</span><span class="p">(</span><span class="n">dim</span><span class="o">=</span><span class="s1">&#39;Time&#39;</span><span class="p">)</span><span class="o">.</span><span class="n">values</span>

<span class="n">monthCount</span> <span class="o">=</span> <span class="n">dsYear</span><span class="o">.</span><span class="n">dims</span><span class="p">[</span><span class="s1">&#39;Time&#39;</span><span class="p">]</span>
<span class="n">monthCount</span> <span class="o">=</span> <span class="n">dsYear</span><span class="o">.</span><span class="n">sizes</span><span class="p">[</span><span class="s1">&#39;Time&#39;</span><span class="p">]</span>

<span class="n">climatology</span> <span class="o">=</span> <span class="n">compute_climatology</span><span class="p">(</span><span class="n">dsYear</span><span class="p">,</span> <span class="n">monthValues</span><span class="p">,</span> <span class="n">calendar</span><span class="p">,</span>
<span class="n">maskVaries</span><span class="o">=</span><span class="kc">False</span><span class="p">)</span>
Expand Down
2 changes: 1 addition & 1 deletion latest/_modules/mpas_analysis/shared/generalized_reader/generalized_reader.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ <h1>Source code for mpas_analysis.shared.generalized_reader.generalized_reader</
<span class="c1"># select only the data in the specified range of dates</span>
<span class="n">ds</span> <span class="o">=</span> <span class="n">ds</span><span class="o">.</span><span class="n">sel</span><span class="p">(</span><span class="n">Time</span><span class="o">=</span><span class="nb">slice</span><span class="p">(</span><span class="n">startDate</span><span class="p">,</span> <span class="n">endDate</span><span class="p">))</span>

<span class="k">if</span> <span class="n">ds</span><span class="o">.</span><span class="n">dims</span><span class="p">[</span><span class="s1">&#39;Time&#39;</span><span class="p">]</span> <span class="o">==</span> <span class="mi">0</span><span class="p">:</span>
<span class="k">if</span> <span class="n">ds</span><span class="o">.</span><span class="n">sizes</span><span class="p">[</span><span class="s1">&#39;Time&#39;</span><span class="p">]</span> <span class="o">==</span> <span class="mi">0</span><span class="p">:</span>
<span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span><span class="s1">&#39;The data set contains no Time entries between &#39;</span>
<span class="s1">&#39;dates </span><span class="si">{}</span><span class="s1"> and </span><span class="si">{}</span><span class="s1">.&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span>
<span class="n">days_to_datetime</span><span class="p">(</span><span class="n">startDate</span><span class="p">,</span> <span class="n">calendar</span><span class="o">=</span><span class="n">calendar</span><span class="p">),</span>
Expand Down
2 changes: 1 addition & 1 deletion latest/_modules/mpas_analysis/shared/io/mpas_reader.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ <h1>Source code for mpas_analysis.shared.io.mpas_reader</h1><div class="highligh
<span class="c1"># select only the data in the specified range of dates</span>
<span class="n">ds</span> <span class="o">=</span> <span class="n">ds</span><span class="o">.</span><span class="n">sel</span><span class="p">(</span><span class="n">Time</span><span class="o">=</span><span class="nb">slice</span><span class="p">(</span><span class="n">startDate</span><span class="p">,</span> <span class="n">endDate</span><span class="p">))</span>

<span class="k">if</span> <span class="n">ds</span><span class="o">.</span><span class="n">dims</span><span class="p">[</span><span class="s1">&#39;Time&#39;</span><span class="p">]</span> <span class="o">==</span> <span class="mi">0</span><span class="p">:</span>
<span class="k">if</span> <span class="n">ds</span><span class="o">.</span><span class="n">sizes</span><span class="p">[</span><span class="s1">&#39;Time&#39;</span><span class="p">]</span> <span class="o">==</span> <span class="mi">0</span><span class="p">:</span>
<span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span><span class="s1">&#39;The data set contains no Time entries between &#39;</span>
<span class="s1">&#39;dates </span><span class="si">{}</span><span class="s1"> and </span><span class="si">{}</span><span class="s1">.&#39;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span>
<span class="n">days_to_datetime</span><span class="p">(</span><span class="n">startDate</span><span class="p">,</span> <span class="n">calendar</span><span class="o">=</span><span class="n">calendar</span><span class="p">),</span>
Expand Down

0 comments on commit b501ac2

Please sign in to comment.