|
5 | 5 | <head> |
6 | 6 | <meta charset="utf-8" /> |
7 | 7 | <meta name="viewport" content="width=device-width, initial-scale=1.0" /> |
8 | | - <title>fmu.tools.properties.swfunction — fmu-tools 1.22.1.dev2+ge91db27 documentation</title> |
| 8 | + <title>fmu.tools.properties.swfunction — fmu-tools 1.22.1.dev3+gd7363de documentation</title> |
9 | 9 | <link rel="stylesheet" type="text/css" href="../../../../_static/pygments.css?v=03e43079" /> |
10 | 10 | <link rel="stylesheet" type="text/css" href="../../../../_static/css/theme.css?v=e59714d7" /> |
11 | 11 |
|
12 | 12 |
|
13 | 13 | <script src="../../../../_static/jquery.js?v=5d32c60e"></script> |
14 | 14 | <script src="../../../../_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script> |
15 | | - <script src="../../../../_static/documentation_options.js?v=ae73660c"></script> |
| 15 | + <script src="../../../../_static/documentation_options.js?v=56b49628"></script> |
16 | 16 | <script src="../../../../_static/doctools.js?v=9bcbadda"></script> |
17 | 17 | <script src="../../../../_static/sphinx_highlight.js?v=dc90522c"></script> |
18 | 18 | <script src="../../../../_static/js/theme.js"></script> |
@@ -168,7 +168,7 @@ <h1>Source code for fmu.tools.properties.swfunction</h1><div class="highlight">< |
168 | 168 |
|
169 | 169 | <span class="n">grid</span><span class="p">:</span> <span class="n">xtgeo</span><span class="o">.</span><span class="n">Grid</span> |
170 | 170 | <span class="c1"># all input are constants or xtgeo grid or gridproperty</span> |
171 | | - <span class="n">x</span><span class="p">:</span> <span class="nb">float</span> <span class="o">|</span> <span class="n">xtgeo</span><span class="o">.</span><span class="n">GridProperty</span> <span class="o">=</span> <span class="mf">0.0</span> |
| 171 | + <span class="n">x</span><span class="p">:</span> <span class="nb">float</span> <span class="o">|</span> <span class="n">xtgeo</span><span class="o">.</span><span class="n">GridProperty</span> <span class="o">=</span> <span class="mf">1e-6</span> <span class="c1"># default to avoid division by zero</span> |
172 | 172 | <span class="n">a</span><span class="p">:</span> <span class="nb">float</span> <span class="o">|</span> <span class="n">xtgeo</span><span class="o">.</span><span class="n">GridProperty</span> <span class="o">=</span> <span class="mf">1.0</span> |
173 | 173 | <span class="n">b</span><span class="p">:</span> <span class="nb">float</span> <span class="o">|</span> <span class="n">xtgeo</span><span class="o">.</span><span class="n">GridProperty</span> <span class="o">=</span> <span class="o">-</span><span class="mf">1.0</span> |
174 | 174 | <span class="n">ffl</span><span class="p">:</span> <span class="nb">float</span> <span class="o">|</span> <span class="n">xtgeo</span><span class="o">.</span><span class="n">GridProperty</span> <span class="o">=</span> <span class="mf">999.0</span> |
@@ -255,6 +255,9 @@ <h1>Source code for fmu.tools.properties.swfunction</h1><div class="highlight">< |
255 | 255 | <span class="n">new_b</span><span class="p">,</span> |
256 | 256 | <span class="p">)</span> |
257 | 257 |
|
| 258 | + <span class="c1"># ensure that self.x is not zero, as this will cause division by zero</span> |
| 259 | + <span class="bp">self</span><span class="o">.</span><span class="n">x</span><span class="o">.</span><span class="n">values</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">ma</span><span class="o">.</span><span class="n">where</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">x</span><span class="o">.</span><span class="n">values</span> <span class="o">==</span> <span class="mf">0.0</span><span class="p">,</span> <span class="mf">1e-6</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">x</span><span class="o">.</span><span class="n">values</span><span class="p">)</span> |
| 260 | + |
258 | 261 | <span class="k">def</span><span class="w"> </span><span class="nf">_compute_htop_hbot</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span> <span class="o">-></span> <span class="kc">None</span><span class="p">:</span> |
259 | 262 | <span class="w"> </span><span class="sd">"""Setting geometries for 'bottom' and 'top' cell.</span> |
260 | 263 |
|
@@ -415,6 +418,13 @@ <h1>Source code for fmu.tools.properties.swfunction</h1><div class="highlight">< |
415 | 418 | <span class="k">else</span><span class="p">:</span> |
416 | 419 | <span class="bp">self</span><span class="o">.</span><span class="n">_compute_direct</span><span class="p">()</span> |
417 | 420 |
|
| 421 | + <span class="c1"># ensure that the result's mask is not inconcistent with the grid</span> |
| 422 | + <span class="n">actnum</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">grid</span><span class="o">.</span><span class="n">get_actnum</span><span class="p">()</span> |
| 423 | + <span class="n">grid_mask</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">ma</span><span class="o">.</span><span class="n">masked_where</span><span class="p">(</span><span class="n">actnum</span><span class="o">.</span><span class="n">values</span> <span class="o">==</span> <span class="mi">0</span><span class="p">,</span> <span class="n">actnum</span><span class="o">.</span><span class="n">values</span><span class="p">)</span> |
| 424 | + <span class="k">assert</span> <span class="n">np</span><span class="o">.</span><span class="n">array_equal</span><span class="p">(</span><span class="n">grid_mask</span><span class="o">.</span><span class="n">mask</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">_sw</span><span class="o">.</span><span class="n">values</span><span class="o">.</span><span class="n">mask</span><span class="p">),</span> <span class="p">(</span> |
| 425 | + <span class="s2">"Bug: Grid mask and Sw mask are not equal, contact developer!"</span> |
| 426 | + <span class="p">)</span> |
| 427 | + |
418 | 428 | <span class="k">return</span> <span class="bp">self</span><span class="o">.</span><span class="n">_sw</span></div> |
419 | 429 | </div> |
420 | 430 |
|
|
0 commit comments