Skip to content

Commit 43ab450

Browse files
authored
Merge pull request #127 from daavid00/dev
Nitpicks
2 parents 2bf91da + fd3e09f commit 43ab450

14 files changed

Lines changed: 36 additions & 25 deletions

docs/_sources/benchmark.rst.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ All configuration files are located in the `benchmark <https://github.com/OPM/py
66

77
.. note::
88
A few weeks after the OPM Flow 2025.04 release, there was a PR that changed the command line parameters for
9-
`--partition-method` and `--edge-weights-method` (see `the PR <https://github.com/OPM/opm-simulators/pull/6264>`_). Then, the
9+
`\-\-partition-method` and `\-\-edge-weights-method` (see `the PR <https://github.com/OPM/opm-simulators/pull/6264>`_). Then, the
1010
.txt configuration files in the benchmark folder use the old format from the OPM Flow 2025.04 release, while the .toml
1111
configuration files use the new naming after that PR.
1212

@@ -156,7 +156,11 @@ Spatial maps
156156
plopm -v xco2l -i "r1_Cart_50m-50m-10m/flow/R1_CART_50M-50M-10M r2_cp_50m-50m-8mish/flow/R2_CP_50M-50M-8MISH r3_cp_50m-50m-8mish_convective/flow/R3_CP_50M-50M-8MISH_CONVECTIVE r4_cp_8m-8mish-8mish/flow/R4_CP_8M-8MISH-8MISH" -dpi 300 -c cet_diverging_protanopic_deuteranopic_bwy_60_95_c32 -cnum 3 -xlnum 8 -clabel 'SPE11C: CO$_2$ mass fraction (liquid phase) after 1000 years (y=2.5 [km])' -d 16,3 -t "r1 Cart [50m,50m,10m] r2 cp [50m,50m,8mish] r3 cp [50m,50m,8mish] convective r4 cp [8m,8mish,8mish]" -yunits km -xunits km -yformat .1f -xformat .1f -r 27 -save massfractc -cformat .2e -mask satnum -maskthr 1e-4 -suptitle 0 -subfigs 2,2 -cbsfax 0.30,0.97,0.4,0.02 -delax 1 -s ',51, ,51, ,51, ,304,' -u opm
157157
158158
.. tip::
159-
You can install `plopm <https://github.com/cssr-tools/plopm>`_ by executing in the terminal: pip install git+https://github.com/cssr-tools/plopm.git.
159+
You can install `plopm <https://github.com/cssr-tools/plopm>`_ by executing in the terminal:
160+
161+
.. code-block:: bash
162+
163+
pip install git+https://github.com/cssr-tools/plopm.git
160164
161165
-----------------
162166
Well 1 correction

docs/_sources/contributing.rst.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ This requires a Python version of at least 3.11 (due to `tomllib <https://toml.i
2626
#. **pip install -r dev-requirements.txt** (this installs the `dev-requirements.txt <https://github.com/cssr-tools/pyopmspe11/blob/main/dev-requirements.txt>`_; in addition, both opm Python and LaTeX are required, then for not macOs users run **pip install opm** and **sudo apt-get install texlive-fonts-recommended texlive-fonts-extra dvipng cm-super**, or else follow the instructions in `macOS installation <https://cssr-tools.github.io/pyopmspe11/installation.html#source-build-in-macos>`_)
2727
#. **black src/ tests/** (this formats the code)
2828
#. **pylint src/ tests/** (this analyses the code, and might rise issues that need to be fixed before the pull request)
29-
#. **mypy --ignore-missing-imports src/ tests/** (this is a static checker, and might rise issues that need to be fixed before the pull request)
30-
#. **pytest --cov=pyopmspe11 --cov-report term-missing tests/** (this runs locally the tests in ca. 30 minutes, and might rise issues that need to be fixed before the pull request)
29+
#. **mypy \-\-ignore-missing-imports src/ tests/** (this is a static checker, and might rise issues that need to be fixed before the pull request)
30+
#. **pytest \-\-cov=pyopmspe11 \-\-cov-report term-missing tests/** (this runs locally the tests in ca. 30 minutes, and might rise issues that need to be fixed before the pull request)
3131
#. **pushd docs & make html** (this generates the documentation, and might rise issues that need to be fixed before the pull request; if the build succeeds and if the contribution changes the documentation, then delete all content from the `docs <https://github.com/cssr-tools/pyopmspe11/tree/main/docs>`_ folder except `Makefile <https://github.com/OPM/pyopmspe11/blob/main/docs/Makefile>`_, `text <https://github.com/OPM/pyopmspe11/blob/main/docs/text>`_, and `.nojekyll <https://github.com/OPM/pyopmspe11/blob/main/docs/.nojekyll>`_, after copy all contents from the docs/_build/html/ folder, and finally paste them in the `docs <https://github.com/cssr-tools/pyopmspe11/tree/main/docs>`_ folder)
3232

3333
.. tip::

docs/_sources/related.rst.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Related
33
=======
44

5-
Below are some tools that might be of interest; check them out 🙂.
5+
Below are some tools that might be of interest; check 'em out 🙂.
66

77
******
88
pycopm

docs/benchmark.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ <h1>Benchmark<a class="headerlink" href="#benchmark" title="Link to this heading
108108
<div class="admonition note">
109109
<p class="admonition-title">Note</p>
110110
<p>A few weeks after the OPM Flow 2025.04 release, there was a PR that changed the command line parameters for
111-
<cite>partition-method</cite> and <cite>edge-weights-method</cite> (see <a class="reference external" href="https://github.com/OPM/opm-simulators/pull/6264">the PR</a>). Then, the
111+
<cite>--partition-method</cite> and <cite>--edge-weights-method</cite> (see <a class="reference external" href="https://github.com/OPM/opm-simulators/pull/6264">the PR</a>). Then, the
112112
.txt configuration files in the benchmark folder use the old format from the OPM Flow 2025.04 release, while the .toml
113113
configuration files use the new naming after that PR.</p>
114114
</div>
@@ -287,7 +287,10 @@ <h3>Spatial maps<a class="headerlink" href="#id7" title="Link to this heading">
287287
</div>
288288
<div class="admonition tip">
289289
<p class="admonition-title">Tip</p>
290-
<p>You can install <a class="reference external" href="https://github.com/cssr-tools/plopm">plopm</a> by executing in the terminal: pip install git+https://github.com/cssr-tools/plopm.git.</p>
290+
<p>You can install <a class="reference external" href="https://github.com/cssr-tools/plopm">plopm</a> by executing in the terminal:</p>
291+
<div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>pip<span class="w"> </span>install<span class="w"> </span>git+https://github.com/cssr-tools/plopm.git
292+
</pre></div>
293+
</div>
291294
</div>
292295
</section>
293296
<section id="well-1-correction">

docs/contributing.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ <h2>Contribute to the software<a class="headerlink" href="#contribute-to-the-sof
111111
<li><p><strong>pip install -r dev-requirements.txt</strong> (this installs the <a class="reference external" href="https://github.com/cssr-tools/pyopmspe11/blob/main/dev-requirements.txt">dev-requirements.txt</a>; in addition, both opm Python and LaTeX are required, then for not macOs users run <strong>pip install opm</strong> and <strong>sudo apt-get install texlive-fonts-recommended texlive-fonts-extra dvipng cm-super</strong>, or else follow the instructions in <a class="reference external" href="https://cssr-tools.github.io/pyopmspe11/installation.html#source-build-in-macos">macOS installation</a>)</p></li>
112112
<li><p><strong>black src/ tests/</strong> (this formats the code)</p></li>
113113
<li><p><strong>pylint src/ tests/</strong> (this analyses the code, and might rise issues that need to be fixed before the pull request)</p></li>
114-
<li><p><strong>mypy ignore-missing-imports src/ tests/</strong> (this is a static checker, and might rise issues that need to be fixed before the pull request)</p></li>
115-
<li><p><strong>pytest cov=pyopmspe11 cov-report term-missing tests/</strong> (this runs locally the tests in ca. 30 minutes, and might rise issues that need to be fixed before the pull request)</p></li>
114+
<li><p><strong>mypy --ignore-missing-imports src/ tests/</strong> (this is a static checker, and might rise issues that need to be fixed before the pull request)</p></li>
115+
<li><p><strong>pytest --cov=pyopmspe11 --cov-report term-missing tests/</strong> (this runs locally the tests in ca. 30 minutes, and might rise issues that need to be fixed before the pull request)</p></li>
116116
<li><p><strong>pushd docs &amp; make html</strong> (this generates the documentation, and might rise issues that need to be fixed before the pull request; if the build succeeds and if the contribution changes the documentation, then delete all content from the <a class="reference external" href="https://github.com/cssr-tools/pyopmspe11/tree/main/docs">docs</a> folder except <a class="reference external" href="https://github.com/OPM/pyopmspe11/blob/main/docs/Makefile">Makefile</a>, <a class="reference external" href="https://github.com/OPM/pyopmspe11/blob/main/docs/text">text</a>, and <a class="reference external" href="https://github.com/OPM/pyopmspe11/blob/main/docs/.nojekyll">.nojekyll</a>, after copy all contents from the docs/_build/html/ folder, and finally paste them in the <a class="reference external" href="https://github.com/cssr-tools/pyopmspe11/tree/main/docs">docs</a> folder)</p></li>
117117
</ol>
118118
<div class="admonition tip">

docs/related.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191

9292
<section id="related">
9393
<h1>Related<a class="headerlink" href="#related" title="Link to this heading"></a></h1>
94-
<p>Below are some tools that might be of interest; check them out 🙂.</p>
94+
<p>Below are some tools that might be of interest; check ‘em out 🙂.</p>
9595
<section id="pycopm">
9696
<h2>pycopm<a class="headerlink" href="#pycopm" title="Link to this heading"></a></h2>
9797
<a class="reference internal image-reference" href="_images/pycopm.png"><img alt="_images/pycopm.png" src="_images/pycopm.png" style="width: 699.52px; height: 295.68px;" />

docs/searchindex.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/text/benchmark.rst

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ All configuration files are located in the `benchmark <https://github.com/OPM/py
66

77
.. note::
88
A few weeks after the OPM Flow 2025.04 release, there was a PR that changed the command line parameters for
9-
`--partition-method` and `--edge-weights-method` (see `the PR <https://github.com/OPM/opm-simulators/pull/6264>`_). Then, the
9+
`\-\-partition-method` and `\-\-edge-weights-method` (see `the PR <https://github.com/OPM/opm-simulators/pull/6264>`_). Then, the
1010
.txt configuration files in the benchmark folder use the old format from the OPM Flow 2025.04 release, while the .toml
1111
configuration files use the new naming after that PR.
1212

@@ -156,7 +156,11 @@ Spatial maps
156156
plopm -v xco2l -i "r1_Cart_50m-50m-10m/flow/R1_CART_50M-50M-10M r2_cp_50m-50m-8mish/flow/R2_CP_50M-50M-8MISH r3_cp_50m-50m-8mish_convective/flow/R3_CP_50M-50M-8MISH_CONVECTIVE r4_cp_8m-8mish-8mish/flow/R4_CP_8M-8MISH-8MISH" -dpi 300 -c cet_diverging_protanopic_deuteranopic_bwy_60_95_c32 -cnum 3 -xlnum 8 -clabel 'SPE11C: CO$_2$ mass fraction (liquid phase) after 1000 years (y=2.5 [km])' -d 16,3 -t "r1 Cart [50m,50m,10m] r2 cp [50m,50m,8mish] r3 cp [50m,50m,8mish] convective r4 cp [8m,8mish,8mish]" -yunits km -xunits km -yformat .1f -xformat .1f -r 27 -save massfractc -cformat .2e -mask satnum -maskthr 1e-4 -suptitle 0 -subfigs 2,2 -cbsfax 0.30,0.97,0.4,0.02 -delax 1 -s ',51, ,51, ,51, ,304,' -u opm
157157
158158
.. tip::
159-
You can install `plopm <https://github.com/cssr-tools/plopm>`_ by executing in the terminal: pip install git+https://github.com/cssr-tools/plopm.git.
159+
You can install `plopm <https://github.com/cssr-tools/plopm>`_ by executing in the terminal:
160+
161+
.. code-block:: bash
162+
163+
pip install git+https://github.com/cssr-tools/plopm.git
160164
161165
-----------------
162166
Well 1 correction

docs/text/contributing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ This requires a Python version of at least 3.11 (due to `tomllib <https://toml.i
2626
#. **pip install -r dev-requirements.txt** (this installs the `dev-requirements.txt <https://github.com/cssr-tools/pyopmspe11/blob/main/dev-requirements.txt>`_; in addition, both opm Python and LaTeX are required, then for not macOs users run **pip install opm** and **sudo apt-get install texlive-fonts-recommended texlive-fonts-extra dvipng cm-super**, or else follow the instructions in `macOS installation <https://cssr-tools.github.io/pyopmspe11/installation.html#source-build-in-macos>`_)
2727
#. **black src/ tests/** (this formats the code)
2828
#. **pylint src/ tests/** (this analyses the code, and might rise issues that need to be fixed before the pull request)
29-
#. **mypy --ignore-missing-imports src/ tests/** (this is a static checker, and might rise issues that need to be fixed before the pull request)
30-
#. **pytest --cov=pyopmspe11 --cov-report term-missing tests/** (this runs locally the tests in ca. 30 minutes, and might rise issues that need to be fixed before the pull request)
29+
#. **mypy \-\-ignore-missing-imports src/ tests/** (this is a static checker, and might rise issues that need to be fixed before the pull request)
30+
#. **pytest \-\-cov=pyopmspe11 \-\-cov-report term-missing tests/** (this runs locally the tests in ca. 30 minutes, and might rise issues that need to be fixed before the pull request)
3131
#. **pushd docs & make html** (this generates the documentation, and might rise issues that need to be fixed before the pull request; if the build succeeds and if the contribution changes the documentation, then delete all content from the `docs <https://github.com/cssr-tools/pyopmspe11/tree/main/docs>`_ folder except `Makefile <https://github.com/OPM/pyopmspe11/blob/main/docs/Makefile>`_, `text <https://github.com/OPM/pyopmspe11/blob/main/docs/text>`_, and `.nojekyll <https://github.com/OPM/pyopmspe11/blob/main/docs/.nojekyll>`_, after copy all contents from the docs/_build/html/ folder, and finally paste them in the `docs <https://github.com/cssr-tools/pyopmspe11/tree/main/docs>`_ folder)
3232

3333
.. tip::

docs/text/related.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Related
33
=======
44

5-
Below are some tools that might be of interest; check them out 🙂.
5+
Below are some tools that might be of interest; check 'em out 🙂.
66

77
******
88
pycopm

0 commit comments

Comments
 (0)