Skip to content

Commit 64094ae

Browse files
authored
doc(modpathfile): clarify docstrings for get_destination_data() (#1171)
Reorganize MODFLOW 6 tutorials and rename a few. Closes #1029
1 parent 9020bf3 commit 64094ae

File tree

14 files changed

+237
-188
lines changed

14 files changed

+237
-188
lines changed

.docs/conf.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@
181181
# html_static_path = ["_static"]
182182

183183
html_theme_options = {
184-
"github_url": "https://github.com/modflowpy/flopy",
185-
"use_edit_page_button": False,
184+
# "github_url": "https://github.com/modflowpy/flopy",
185+
# "use_edit_page_button": False,
186186
}
187187

188188
autosummary_generate = True
@@ -222,7 +222,7 @@
222222
html_split_index = False
223223

224224
# If true, links to the reST sources are added to the pages.
225-
# html_show_sourcelink = True
225+
html_show_sourcelink = False
226226

227227
# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
228228
html_show_sphinx = True

.docs/create_rstfiles.py

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import os
22

33

4-
def create_section(f, title, filenames):
5-
title = "{} Tutorials".format(title.upper())
4+
def create_section(f, title, filenames, upper_case=False):
5+
if upper_case:
6+
title = title.upper()
7+
title = "{} Tutorials".format(title)
68
line = "{}\n".format(title) + len(title) * "-" + "\n\n"
79
line += "Contents:\n\n.. toctree::\n :maxdepth: 2\n\n"
810
for filename in filenames:
@@ -32,14 +34,24 @@ def create_tutorial_rst():
3234
create_section(f, "MODFLOW 6", tutorial_dict[key])
3335
keys.remove(key)
3436

37+
key = "modflow6data"
38+
if key in keys:
39+
create_section(f, "MODFLOW 6 FloPy Use", tutorial_dict[key])
40+
keys.remove(key)
41+
42+
key = "modflow6output"
43+
if key in keys:
44+
create_section(f, "MODFLOW 6 Output", tutorial_dict[key])
45+
keys.remove(key)
46+
3547
key = "modflow"
3648
if key in keys:
3749
create_section(f, "MODFLOW", tutorial_dict[key])
3850
keys.remove(key)
3951

4052
# create the remaining tutorial sections
4153
for key in keys:
42-
create_section(f, key, tutorial_dict[key])
54+
create_section(f, key, tutorial_dict[key], upper_case=True)
4355

4456
# close the file
4557
f.close()

.docs/notebooks.rst

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
Jupyter Notebooks
22
=================
33

4-
A list of Jupyter Notebooks are available `here <https://github.com/modflowpy/flopy/blob/develop/docs/notebook_examples.md>`_.
5-
They are the best resource for learning the underlying capabilities in FloPy.
4+
A list of Jupyter Notebooks are available
5+
`here <https://github.com/modflowpy/flopy/blob/develop/docs/notebook_examples.md>`_.
6+
After the `tutorials <https://flopy.readthedocs.io/en/latest/tutorials.html>`_,
7+
the Jupyter Notebooks are the best resource for learning the underlying
8+
capabilities of FloPy.
9+

.docs/tutorials.rst

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,35 @@ Contents:
1010
:maxdepth: 2
1111

1212
_notebooks/tutorial01_mf6
13-
_notebooks/tutorial02_mf6
14-
_notebooks/tutorial03_mf6
15-
_notebooks/tutorial04_mf6
16-
_notebooks/tutorial05_mf6
17-
_notebooks/tutorial06_mf6
18-
_notebooks/tutorial07_mf6
19-
_notebooks/tutorial08_mf6
20-
_notebooks/tutorial09_mf6
21-
_notebooks/tutorial101_mf6_output
13+
14+
15+
MODFLOW 6 FloPy Use Tutorials
16+
-----------------------------
17+
18+
Contents:
19+
20+
.. toctree::
21+
:maxdepth: 2
22+
23+
_notebooks/tutorial01_mf6_data
24+
_notebooks/tutorial02_mf6_data
25+
_notebooks/tutorial03_mf6_data
26+
_notebooks/tutorial04_mf6_data
27+
_notebooks/tutorial05_mf6_data
28+
_notebooks/tutorial06_mf6_data
29+
_notebooks/tutorial07_mf6_data
30+
_notebooks/tutorial08_mf6_data
31+
32+
33+
MODFLOW 6 Output Tutorials
34+
--------------------------
35+
36+
Contents:
37+
38+
.. toctree::
39+
:maxdepth: 2
40+
41+
_notebooks/tutorial01_mf6_output
2242

2343

2444
MODFLOW Tutorials

examples/Tutorials/modflow6/tutorial02_mf6.py renamed to examples/Tutorials/modflow6data/tutorial01_mf6_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# name: python3
1313
# ---
1414

15-
# # MODFLOW 6 Tutorial 2: Accessing Simulation Settings, Models, and Packages
15+
# # MODFLOW 6: Accessing Simulation Settings, Models, and Packages
1616
#
1717
# This tutorial shows how to view, access, and change the underlying package
1818
# variables for MODFLOW 6 objects in FloPy. Interaction with a FloPy

examples/Tutorials/modflow6/tutorial03_mf6.py renamed to examples/Tutorials/modflow6data/tutorial02_mf6_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# name: python3
1313
# ---
1414

15-
# # MODFLOW 6 Tutorial 3: Observation packages
15+
# # MODFLOW 6: Observation packages
1616
#
1717

1818
# ## Introduction to Observations

examples/Tutorials/modflow6/tutorial04_mf6.py renamed to examples/Tutorials/modflow6data/tutorial03_mf6_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# name: python3
1313
# ---
1414

15-
# # MODFLOW 6 Tutorial 4: Time Series Packages
15+
# # MODFLOW 6: Time Series Packages
1616
#
1717

1818
# ## Introduction to Time Series

examples/Tutorials/modflow6/tutorial05_mf6.py renamed to examples/Tutorials/modflow6data/tutorial04_mf6_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# name: python3
1313
# ---
1414

15-
# # MODFLOW 6 Tutorial 5: Time Array Series Packages
15+
# # MODFLOW 6: Time Array Series Packages
1616
#
1717

1818
# ## Introduction to Time Array Series

examples/Tutorials/modflow6/tutorial06_mf6.py renamed to examples/Tutorials/modflow6data/tutorial05_mf6_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# name: python3
1313
# ---
1414

15-
# # MODFLOW 6 Tutorial 6: Working with MODFLOW Scalar Data
15+
# # MODFLOW 6: Working with MODFLOW Scalar Data
1616
#
1717
# This tutorial shows how to view, access, and change the underlying data
1818
# variables for MODFLOW 6 objects in FloPy. Interaction with a FloPy

examples/Tutorials/modflow6/tutorial07_mf6.py renamed to examples/Tutorials/modflow6data/tutorial06_mf6_data.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# name: python3
1313
# ---
1414

15-
# # MODFLOW 6 Tutorial 7: Working with MODFLOW List Data.
15+
# # MODFLOW 6: Working with MODFLOW List Data.
1616
#
1717
# This tutorial shows how to view, access, and change the underlying data
1818
# variables for MODFLOW 6 objects in FloPy. Interaction with a FloPy

0 commit comments

Comments
 (0)