Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(mf5to6): fix SimModule name clash #2047

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

fix(mf5to6): fix SimModule name clash #2047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2ed778c
fix(mf5to6): fix SimModule name clash
jdhughes-usgs Nov 5, 2024
54a0f35
Update mf5to6 makefile
jdhughes-usgs Nov 6, 2024
5b002c6
doc: standardize previous version changes (#2045)
jdhughes-usgs Nov 6, 2024
aa0181a
- change file creation mode to logical AND of flags (#2051)
mjr-deltares Nov 8, 2024
002b8de
refactor(prt): split TrackData into separate file and control modules…
wpbonelli Nov 11, 2024
5919700
docs: touch up dfn spec, include in rtd dev docs (#1948)
wpbonelli Nov 12, 2024
06bf40b
Update
jdhughes-usgs Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .build_rtd_docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
dstdir = "_dev"
fpth = "DEVELOPER.md"
src = os.path.join("..", fpth)
dst = os.path.join(dstdir, fpth)
dst = os.path.join(dstdir, fpth.lower())
# clean up an existing _mf6run directory
if os.path.isdir(dstdir):
shutil.rmtree(dstdir)
Expand All @@ -72,7 +72,7 @@
# -- copy contributor docs
fpth = "CONTRIBUTING.md"
src = os.path.join("..", fpth)
dst = os.path.join(dstdir, fpth)
dst = os.path.join(dstdir, fpth.lower())
shutil.copy(src, dst)

# -- copy style guide
Expand All @@ -81,6 +81,12 @@
dst = os.path.join(dstdir, fpth)
shutil.copy(src, dst)

# -- copy DFN spec
fpth = "readme.md"
src = os.path.join("..", "doc", "mf6io", "mf6ivar", fpth)
dst = os.path.join(dstdir, "dfn.md")
shutil.copy(src, dst)

# -- build the deprecations table --------------------------------------------
print("Build the deprecations markdown table")
pth = os.path.join("..", "doc", "mf6io", "mf6ivar")
Expand Down
5 changes: 3 additions & 2 deletions .build_rtd_docs/dev.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ This section includes developer instructions and conventions.
:maxdepth: 1
:glob:

_dev/CONTRIBUTING.md
_dev/DEVELOPER.md
_dev/contributing.md
_dev/developer.md
_dev/styleguide.md
_dev/dfn.md
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ CMakeFiles/
.build_rtd_docs/_mf6io
.build_rtd_docs/_mf6src
.build_rtd_docs/_mf6run
.build_rtd_docs/_dev
latex/
html/
xml/
Expand Down
1 change: 1 addition & 0 deletions doc/ReleaseNotes/previous/v0.9.01.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
\subsection{Version mf6beta0.9.01---May 11, 2017}
\textbf{\underline{BUG FIXES AND OTHER CHANGES TO EXISTING FUNCTIONALITY}} \\
\begin{itemize}
\item Added a copy of the third MODFLOW~6 report.
\item Made several minor corrections to doc/mf6io.pdf.
Expand Down
1 change: 1 addition & 0 deletions doc/ReleaseNotes/previous/v0.9.02.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
\subsection{Version mf6beta0.9.02---May 19, 2017}
\textbf{\underline{BUG FIXES AND OTHER CHANGES TO EXISTING FUNCTIONALITY}} \\
\begin{itemize}
\item Renamed gwf3.f90 to be lower case.
\item Added the missing ``divrate'' variable to the ``sfrsetting'' description in mf6io.pdf.
Expand Down
1 change: 1 addition & 0 deletions doc/ReleaseNotes/previous/v0.9.03.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
\subsection{Version mf6beta0.9.03---June 23, 2017}

\textbf{\underline{BUG FIXES AND OTHER CHANGES TO EXISTING FUNCTIONALITY}} \\
\underline{BASIC FUNCTIONALITY}
\begin{itemize}
\item Renamed all FTYPE keywords to version 6. They were named with an 8. So, for example, the GHB Package is now activated in the GWF name file using ``GHB6'' instead of ``GHB8''.
Expand Down
1 change: 1 addition & 0 deletions doc/ReleaseNotes/previous/v6.0.0.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
\subsection{Version mf6.0.0---August 10, 2017}

\textbf{\underline{BUG FIXES AND OTHER CHANGES TO EXISTING FUNCTIONALITY}} \\
\underline{BASIC FUNCTIONALITY}
\begin{itemize}
\item Removed support for the SINGLE observation type. All observations must be CONTINUOUS, which means observation values are written for every time step.
Expand Down
3 changes: 2 additions & 1 deletion doc/ReleaseNotes/previous/v6.0.1.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

\subsection{Version mf6.0.1--Sep 28, 2017}
\subsection{Version mf6.0.1---September 28, 2017}

\textbf{\underline{BUG FIXES AND OTHER CHANGES TO EXISTING FUNCTIONALITY}} \\
\underline{BASIC FUNCTIONALITY}
\begin{itemize}
\item There is no requirement that FTYPE entries in the GWF name file should be upper case; however, an upper case convention was being enforced. FTYPE entries can now be specified using any case.
Expand Down
9 changes: 7 additions & 2 deletions doc/ReleaseNotes/previous/v6.0.2.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@

\subsection{Version mf6.0.2--Feb 23, 2018}
\subsection{Version mf6.0.2---February 23, 2018}

\underline{BASIC FUNCTIONALITY}
\underline{NEW FUNCTIONALITY}
\begin{itemize}
\item Added a new option, called SAVE\_SPECIFIC\_DISCHARGE to the Node Property Flow Package. When invoked, $x$, $y$, and $z$ specific discharge components are calculated for the center of each model cell and written to the binary budget file.
\end{itemize}

\textbf{\underline{BUG FIXES AND OTHER CHANGES TO EXISTING FUNCTIONALITY}} \\
\underline{BASIC FUNCTIONALITY}
\begin{itemize}
\item For binary input of grid data, such as initial heads, the array reading utility was not reading a header record consisting of KSTP, KPER, PERTIM, TOTIM, TEXT, NLAY, NROW, NCOL. This meant that a binary head file written by MODFLOW could not be used as input for a subsequent simulation. For binary input, the array reading utility now reads a header record before reading the array values.
\item The NOGRB option in the discretization packages was not working. This option will now prevent the binary grid file from being written.
\item Removed the PRIVATE attribute for two methods of the discretization packages so that the program works as intended with the latest Intel Fortran release.
Expand Down
3 changes: 2 additions & 1 deletion doc/ReleaseNotes/previous/v6.0.3.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
\subsection{Version mf6.0.3--Aug. 9, 2018}
\subsection{Version mf6.0.3---August 9, 2018}

\textbf{\underline{BUG FIXES AND OTHER CHANGES TO EXISTING FUNCTIONALITY}} \\
\underline{BASIC FUNCTIONALITY}
\begin{itemize}
\item Fixed issues with observations specified using boundnames that are enclosed in quotes. Previously, the closing quote was retained on a boundname enclosed in quotes and resulted in an error (the erroneous observation boundname could not be found in the package).
Expand Down
3 changes: 2 additions & 1 deletion doc/ReleaseNotes/previous/v6.0.4.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
\subsection{Version mf6.0.4--Feb. 27, 2019}
\subsection{Version mf6.0.4---February 27, 2019}

\textbf{\underline{BUG FIXES AND OTHER CHANGES TO EXISTING FUNCTIONALITY}} \\
\underline{BASIC FUNCTIONALITY}
\begin{itemize}
\item Addressed issue with pointing contiguous pointer vectors/arrays to non-contiguous pointer vectors/arrays that caused code compilation failure with gfortran-8. A consequence of addressing this issue is that all pointer vectors/arrays that are allocated or pointed to using the memory manager must be defined to be contiguous.
Expand Down
7 changes: 4 additions & 3 deletions doc/ReleaseNotes/previous/v6.1.0.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@

\subsection{Version mf6.1.0--December 12, 2019}
\subsection{Version mf6.1.0---December 12, 2019}

\underline{NEW FUNCTIONALITY}
\begin{itemize}
\item Added the Skeletal Storage, Compaction, and Subsidence (CSUB) Package. The one-dimensional effective-stress based compaction theory implemented in the CSUB Package is documented in \cite{leake2007modflow}. The numerical approach used for delay interbeds in the CSUB package is documented in \cite{hoffmann2003modflow} and uses the same one-dimensional effective-stress based compaction theory as coarse-grained and fine-grained no-delay interbed sediments. A number of example problems that use the CSUB Package are documented in the ``MODFLOW 6 CSUB Package Example Problems'' pdf document included in this and subsequent releases.
\item Added restricted IDOMAIN support for DISU grids. Users can specify an optional IDOMAIN in the DISU Package input file. IDOMAIN values must be zero or one. Vertical pass-through cells (specified with an IDOMAIN value of -1 in the DIS or DISV Package input files) are not supported for DISU.
\item Added two new options to the NPF Package. The K22OVERK option allows the user to enter the anisotropy ratio for K22. If activated, the K22 values entered by the user in the NPF input file will be multiplied by the K values entered in the NPF input file. The K33OVERK option allows the user to enter the anisotropy ratio for K33. If activated, the K33 values entered by the user in the NPF input file will be multiplied by the K values entered in the NPF input file. With this K33OVERK option, for example, the user can specify a value of 0.1 for K33 and have all K33 values be one tenth of the values specified for K. The program will terminate with an error if these options are invoked, but arrays for K22 and/or K33 are not provided in the NPF input file.
\end{itemize}

\textbf{\underline{BUG FIXES AND OTHER CHANGES TO EXISTING FUNCTIONALITY}} \\
\underline{BASIC FUNCTIONALITY}
\begin{itemize}
\item Added an error check to the DISU Package that ensures that an underlying cell has a top elevation that is less than or equal to the bottom of an overlying cell. An underlying cell is one in which the IHC value for the connection is zero and the connecting node number is greater than the cell node number.
\item Added restricted IDOMAIN support for DISU grids. Users can specify an optional IDOMAIN in the DISU Package input file. IDOMAIN values must be zero or one. Vertical pass-through cells (specified with an IDOMAIN value of -1 in the DIS or DISV Package input files) are not supported for DISU.
\item NPF Package will now write a message to the GWF Model list file to indicate when the SAVE\_SPECIFIC\_DISCHARGE option is invoked.
\item Added two new options to the NPF Package. The K22OVERK option allows the user to enter the anisotropy ratio for K22. If activated, the K22 values entered by the user in the NPF input file will be multiplied by the K values entered in the NPF input file. The K33OVERK option allows the user to enter the anisotropy ratio for K33. If activated, the K33 values entered by the user in the NPF input file will be multiplied by the K values entered in the NPF input file. With this K33OVERK option, for example, the user can specify a value of 0.1 for K33 and have all K33 values be one tenth of the values specified for K. The program will terminate with an error if these options are invoked, but arrays for K22 and/or K33 are not provided in the NPF input file.
\item Added new MAXERRORS option to mfsim.nam. If specified, the maximum number of errors stored and printed will be limited to this number. This can prevent a situation where memory will run out when there are an excessive number of errors.
\item Refactored many parts of the code to remove unused variables, conform to stricter FORTRAN standard checks, and allow for new development efforts to be included in the code base.
\end{itemize}
Expand Down
2 changes: 1 addition & 1 deletion doc/ReleaseNotes/previous/v6.1.1.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\subsection{Version mf6.1.1--June 12, 2020}
\subsection{Version mf6.1.1---June 12, 2020}

\underline{NEW FUNCTIONALITY}
\begin{itemize}
Expand Down
2 changes: 1 addition & 1 deletion doc/ReleaseNotes/previous/v6.2.0.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\subsection{Version mf6.2.0--October 20, 2020}
\subsection{Version mf6.2.0---October 20, 2020}

\underline{NEW FUNCTIONALITY}
\begin{itemize}
Expand Down
2 changes: 1 addition & 1 deletion doc/ReleaseNotes/previous/v6.2.1.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\subsection{Version mf6.2.1--February 18, 2021}
\subsection{Version mf6.2.1---February 18, 2021}

\underline{NEW FUNCTIONALITY}
\begin{itemize}
Expand Down
2 changes: 1 addition & 1 deletion doc/ReleaseNotes/previous/v6.2.2.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\subsection{Version mf6.2.2--July 30, 2021}
\subsection{Version mf6.2.2---July 30, 2021}

\underline{NEW FUNCTIONALITY}
\begin{itemize}
Expand Down
2 changes: 1 addition & 1 deletion doc/ReleaseNotes/previous/v6.3.0.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\subsection{Version mf6.3.0--March 4, 2022}
\subsection{Version mf6.3.0---March 4, 2022}

\underline{NEW FUNCTIONALITY}
\begin{itemize}
Expand Down
2 changes: 1 addition & 1 deletion doc/ReleaseNotes/previous/v6.4.0.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\subsection{Version mf6.4.0--November 30, 2022}
\subsection{Version mf6.4.0---November 30, 2022}

\underline{NEW FUNCTIONALITY}
\begin{itemize}
Expand Down
2 changes: 1 addition & 1 deletion doc/ReleaseNotes/previous/v6.4.1.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\subsection{Version mf6.4.1--December 9, 2022}
\subsection{Version mf6.4.1---December 9, 2022}

\textbf{\underline{BUG FIXES AND OTHER CHANGES TO EXISTING FUNCTIONALITY}} \\

Expand Down
2 changes: 1 addition & 1 deletion doc/ReleaseNotes/previous/v6.4.2.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
% after a release has just been made.

%\item \currentmodflowversion
\subsection{Version mf6.4.2--June 28, 2023}
\subsection{Version mf6.4.2---June 28, 2023}

\underline{NEW FUNCTIONALITY}
\begin{itemize}
Expand Down
2 changes: 1 addition & 1 deletion doc/ReleaseNotes/previous/v6.4.3.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
% after a release has just been made.

%\item \currentmodflowversion
\subsection{Version mf6.4.3--February 7, 2024}
\subsection{Version mf6.4.3---February 7, 2024}

\underline{NEW FUNCTIONALITY}
\begin{itemize}
Expand Down
4 changes: 2 additions & 2 deletions doc/ReleaseNotes/previous/v6.4.4.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
% Use this template for starting initializing the release notes
% after a release has just been made.

\subsection{Version mf6.4.4--February 13, 2024}
\subsection{Version mf6.4.4---February 13, 2024}

%\underline{NEW FUNCTIONALITY}
%\begin{itemize}
Expand All @@ -17,7 +17,7 @@
% \item xxx
%\end{itemize}

%\textbf{\underline{BUG FIXES AND OTHER CHANGES TO EXISTING FUNCTIONALITY}} \\
\textbf{\underline{BUG FIXES AND OTHER CHANGES TO EXISTING FUNCTIONALITY}} \\
%\underline{BASIC FUNCTIONALITY}
%\begin{itemize}
% \item xxx
Expand Down
2 changes: 1 addition & 1 deletion doc/ReleaseNotes/previous/v6.5.0.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
% Use this template for starting initializing the release notes
% after a release has just been made.

\subsection{Version mf6.5.0--May 23, 2024}
\subsection{Version mf6.5.0---May 23, 2024}

\underline{NEW FUNCTIONALITY}
\begin{itemize}
Expand Down
Loading
Loading