Skip to content

Commit 799088c

Browse files
wpbonelliwpbonelli
authored
Merge pull request MODFLOW-ORG#2116 from MODFLOW-USGS/v6.6.0
Release 6.6.0
2 parents 879f911 + 51f0009 commit 799088c

File tree

1,550 files changed

+99321
-50007
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,550 files changed

+99321
-50007
lines changed

‎.build_rtd_docs/Doxyfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ PROJECT_NAME = "MODFLOW 6"
3737
# could be handy for archiving the generated documentation or if some version
3838
# control system is used.
3939

40-
PROJECT_NUMBER = "version 6.5.0"
40+
PROJECT_NUMBER = "version 6.6.0"
4141

4242
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4343
# for a project that appears at the top of each page and should give viewer a
4444
# quick idea about the purpose of the project. Keep the description short.
4545

46-
PROJECT_BRIEF = "MODFLOW 6 Code Documentation"
46+
PROJECT_BRIEF = "USGS Modular Hydrologic Model"
4747

4848
# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
4949
# in the documentation. The maximum height of the logo should not exceed 55

‎.build_rtd_docs/MAINPAGE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# MODFLOW 6 Source Code Documentation
1+
# Overview
22

33
The documentation here is extracted from the source code by [doxygen](https://www.doxygen.nl/index.html).
44

5-
The source code repository is hosted at https://github.com/MODFLOW-USGS/modflow6 where full details can be found.
5+
The source code repository is hosted [on GitHub](https://github.com/MODFLOW-USGS/modflow6).
66

7-
MODFLOW 6 usage documentation can be found at https://modflow6.readthedocs.io/en/latest/
7+
This documentation is intended for MODFLOW 6 contributors and users of the MODFLOW 6 library/API. MODFLOW 6 usage documentation can be found [on ReadTheDocs](https://modflow6.readthedocs.io/en/latest/).

‎.build_rtd_docs/conf.py

Lines changed: 56 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# ruff: noqa: E402
12
# Configuration file for the Sphinx documentation builder.
23
#
34
# This file only contains a selection of the most common options. For a full
@@ -14,7 +15,7 @@
1415
# documentation root, use os.path.abspath to make it absolute, like shown here.
1516
#
1617
import sys
17-
from subprocess import Popen, PIPE
18+
from subprocess import PIPE, Popen
1819

1920
sys.path.insert(0, os.path.abspath(os.path.join("..", "doc")))
2021
sys.path.insert(0, os.path.abspath(os.path.join("..", "distribution")))
@@ -23,12 +24,12 @@
2324
on_rtd = os.environ.get("READTHEDOCS") == "True"
2425

2526
# -- print current directory
26-
print("Current Directory...'{}'".format(os.path.abspath(os.getcwd())))
27+
print(f"Current Directory...'{os.path.abspath(os.getcwd())}'")
2728

2829
# -- clean up doxygen files -------------------------------------------------
2930
dox_pths = ("_mf6io",)
3031
for dox_pth in dox_pths:
31-
print("cleaning....{}".format(dox_pth))
32+
print(f"cleaning....{dox_pth}")
3233
for root, dirs, files in os.walk(dox_pth):
3334
for name in files:
3435
fpth = os.path.join(root, name)
@@ -37,6 +38,7 @@
3738
# -- Update the modflow 6 version -------------------------------------------
3839
print("Update the modflow6 version")
3940
from update_version import update_version
41+
4042
update_version()
4143

4244
# -- import version from doc/version.py -------------------------------------
@@ -56,6 +58,50 @@
5658
# copy the file
5759
shutil.copy(src, dst)
5860

61+
# -- copy developer docs
62+
dstdir = "_dev"
63+
fpth = "DEVELOPER.md"
64+
src = os.path.join("..", fpth)
65+
dst = os.path.join(dstdir, fpth.lower())
66+
# clean up an existing _mf6run directory
67+
if os.path.isdir(dstdir):
68+
shutil.rmtree(dstdir)
69+
# make the directory
70+
os.makedirs(dstdir)
71+
# copy the file
72+
shutil.copy(src, dst)
73+
74+
# -- copy contributor docs
75+
fpth = "CONTRIBUTING.md"
76+
src = os.path.join("..", fpth)
77+
dst = os.path.join(dstdir, fpth.lower())
78+
shutil.copy(src, dst)
79+
80+
# -- copy style guide
81+
fpth = "styleguide.md"
82+
src = os.path.join(fpth)
83+
dst = os.path.join(dstdir, fpth)
84+
shutil.copy(src, dst)
85+
86+
# -- copy DFN spec
87+
fpth = "readme.md"
88+
src = os.path.join("..", "doc", "mf6io", "mf6ivar", fpth)
89+
dst = os.path.join(dstdir, "dfn.md")
90+
shutil.copy(src, dst)
91+
92+
# -- build the deprecations table --------------------------------------------
93+
print("Build the deprecations markdown table")
94+
pth = os.path.join("..", "doc", "mf6io", "mf6ivar")
95+
args = (sys.executable, "deprecations.py")
96+
# run the command
97+
proc = Popen(args, stdout=PIPE, stderr=PIPE, cwd=pth)
98+
stdout, stderr = proc.communicate()
99+
if stdout:
100+
print(stdout.decode("utf-8"))
101+
if stderr:
102+
print("Errors:")
103+
print(stderr.decode("utf-8"))
104+
59105
# -- copy deprecations markdown ---------------------------------------------
60106
print("Copy the deprecations table")
61107
dstdir = "_mf6run"
@@ -75,7 +121,8 @@
75121
if stdout:
76122
print(stdout.decode("utf-8"))
77123
if stderr:
78-
print("Errors:\n{}".format(stderr.decode("utf-8")))
124+
print("Errors:")
125+
print(stderr.decode("utf-8"))
79126

80127
# -- update the doxygen version number ---------------------------------------
81128
print("Update the Doxyfile with the latest version number")
@@ -86,13 +133,13 @@
86133
with open("Doxyfile", "w") as fp:
87134
for line in lines:
88135
if tag in line:
89-
line = '{} = "version {}"\n'.format(tag, __version__)
136+
line = f'{tag} = "version {__version__}"\n'
90137
fp.write(line)
91138

92139
# -- Project information -----------------------------------------------------
93140

94-
project = "MODFLOW 6 Program Documentation"
95-
copyright = "2023, MODFLOW Development Team"
141+
project = "MODFLOW 6"
142+
copyright = "2024, MODFLOW Development Team"
96143
author = "MODFLOW Development Team"
97144

98145
# -- Project version ---------------------------------------------------------
@@ -126,6 +173,8 @@
126173
# # Tell sphinx what the pygments highlight language should be.
127174
# highlight_language = 'fortran'
128175

176+
source_suffix = {".rst": "restructuredtext", ".md": "markdown"}
177+
129178
# Add any paths that contain templates here, relative to this directory.
130179
templates_path = ["_templates"]
131180

‎.build_rtd_docs/dev.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Developer Guide
2+
---------------
3+
4+
This section includes developer instructions and conventions.
5+
6+
.. toctree::
7+
:maxdepth: 1
8+
:glob:
9+
10+
_dev/contributing.md
11+
_dev/developer.md
12+
_dev/styleguide.md
13+
_dev/dfn.md

‎.build_rtd_docs/index.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ Contents:
1111
.. toctree::
1212
:maxdepth: 2
1313

14-
MODFLOW 6 Source Code Documentation <https://modflow-usgs.github.io/modflow6/>
15-
mf6io
14+
API Reference <https://modflow-usgs.github.io/modflow6/>
1615
_mf6run/run-time-comparison.md
1716
_mf6run/deprecations.md
17+
mf6io
18+
dev
1819

‎.build_rtd_docs/make.bat

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
@ECHO OFF
2+
3+
pushd %~dp0
4+
5+
REM Command file for Sphinx documentation
6+
7+
if "%SPHINXBUILD%" == "" (
8+
set SPHINXBUILD=sphinx-build
9+
)
10+
set SOURCEDIR=.
11+
set BUILDDIR=_build
12+
13+
if "%1" == "" goto help
14+
15+
%SPHINXBUILD% >NUL 2>NUL
16+
if errorlevel 9009 (
17+
echo.
18+
echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
19+
echo.installed, then set the SPHINXBUILD environment variable to point
20+
echo.to the full path of the 'sphinx-build' executable. Alternatively you
21+
echo.may add the Sphinx directory to PATH.
22+
echo.
23+
echo.If you don't have Sphinx installed, grab it from
24+
echo.http://sphinx-doc.org/
25+
exit /b 1
26+
)
27+
28+
%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
29+
goto end
30+
31+
:help
32+
%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
33+
34+
:end
35+
popd

‎.build_rtd_docs/mf6io.rst

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
MODFLOW 6 Input Guide
2-
---------------------
1+
Input Guide
2+
-----------
33

4-
The latest version of the complete MODFLOW 6 input output guide can be found
4+
The latest version of the complete MODFLOW 6 input/output guide can be found
55
`here <https://github.com/MODFLOW-USGS/modflow6-nightly-build/releases/>`_.
6+
This section enumerates and describes MODFLOW 6 input files.
67

78
Simulation
89
^^^^^^^^^^
@@ -44,6 +45,26 @@ Groundwater Transport
4445
_mf6io/gwt-*
4546

4647

48+
Groundwater Energy Transport
49+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
50+
51+
.. toctree::
52+
:maxdepth: 1
53+
:glob:
54+
55+
_mf6io/gwe-*
56+
57+
58+
Particle Tracking
59+
^^^^^^^^^^^^^^^^^
60+
61+
.. toctree::
62+
:maxdepth: 1
63+
:glob:
64+
65+
_mf6io/prt-*
66+
67+
4768
Model Exchanges
4869
^^^^^^^^^^^^^^^
4970

0 commit comments

Comments
 (0)