Skip to content

Commit

Permalink
release(6.2.0): final changes for release
Browse files Browse the repository at this point in the history
  • Loading branch information
langevin-usgs committed Oct 22, 2020
1 parent 72484a5 commit d711450
Show file tree
Hide file tree
Showing 19 changed files with 405 additions and 383 deletions.
17 changes: 9 additions & 8 deletions DISCLAIMER.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
Disclaimer
----------

This software is preliminary or provisional and is subject to revision. It is
being provided to meet the need for timely best science. The software has not
received final approval by the U.S. Geological Survey (USGS). No warranty,
expressed or implied, is made by the USGS or the U.S. Government as to the
functionality of the software and related material nor shall the fact of release
constitute any such warranty. The software is provided on the condition that
neither the USGS nor the U.S. Government shall be held liable for any damages
resulting from the authorized or unauthorized use of the software.
This software has been approved for release by the U.S. Geological Survey
(USGS). Although the software has been subjected to rigorous review, the USGS
reserves the right to update the software as needed pursuant to further analysis
and review. No warranty, expressed or implied, is made by the USGS or the U.S.
Government as to the functionality of the software and related material nor
shall the fact of release constitute any such warranty. Furthermore, the
software is released on condition that neither the USGS nor the U.S. Government
shall be held liable for any damages resulting from its authorized or
unauthorized use.
24 changes: 13 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

This is the development repository for the USGS MODFLOW 6 Hydrologic Model. The official USGS distribution is available at [USGS Release Page](https://water.usgs.gov/ogw/modflow/MODFLOW.html).

## Version 6.1.2 release candidate
### Version 6.2.0

![MODFLOW 6 CI with latest gfortran](https://github.com/MODFLOW-USGS/modflow6/workflows/MODFLOW%206%20CI%20with%20latest%20gfortran/badge.svg)

Expand Down Expand Up @@ -69,17 +69,19 @@ MODFLOW 6 is the latest core version of MODFLOW. It synthesizes many of the capa

#### ***Software/Code***

[Langevin, C.D., Hughes, J.D., Banta, E.R., Provost, A.M., Niswonger, R.G., and Panday, Sorab, 2020, MODFLOW 6 Modular Hydrologic Model version 6.1.2 release candidate: U.S. Geological Survey Software Release, 15 June 2020, https://doi.org/10.5066/F76Q1VQV](https://doi.org/10.5066/F76Q1VQV)
[Langevin, C.D., Hughes, J.D., Banta, E.R., Provost, A.M., Niswonger, R.G., and Panday, Sorab, 2020, MODFLOW 6 Modular Hydrologic Model version 6.2.0: U.S. Geological Survey Software Release, 22 October 2020, https://doi.org/10.5066/F76Q1VQV](https://doi.org/10.5066/F76Q1VQV)


# Disclaimer
Disclaimer
----------

This software is preliminary or provisional and is subject to revision. It is
being provided to meet the need for timely best science. The software has not
received final approval by the U.S. Geological Survey (USGS). No warranty,
expressed or implied, is made by the USGS or the U.S. Government as to the
functionality of the software and related material nor shall the fact of release
constitute any such warranty. The software is provided on the condition that
neither the USGS nor the U.S. Government shall be held liable for any damages
resulting from the authorized or unauthorized use of the software.
This software has been approved for release by the U.S. Geological Survey
(USGS). Although the software has been subjected to rigorous review, the USGS
reserves the right to update the software as needed pursuant to further analysis
and review. No warranty, expressed or implied, is made by the USGS or the U.S.
Government as to the functionality of the software and related material nor
shall the fact of release constitute any such warranty. Furthermore, the
software is released on condition that neither the USGS nor the U.S. Government
shall be held liable for any damages resulting from its authorized or
unauthorized use.

6 changes: 3 additions & 3 deletions code.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[
{
"status": "Release Candidate",
"status": "Production",
"languages": [
"Fortran2008"
],
Expand All @@ -18,9 +18,9 @@
"email": "[email protected]"
},
"laborHours": -1,
"version": "6.1.2",
"version": "6.2.0",
"date": {
"metadataLastUpdated": "2020-06-15"
"metadataLastUpdated": "2020-10-22"
},
"organization": "U.S. Geological Survey",
"permissions": {
Expand Down
211 changes: 111 additions & 100 deletions doc/ReleaseNotes/folder_struct.tex
Original file line number Diff line number Diff line change
@@ -1,148 +1,159 @@
\begin{verbatim}
mf6.1.2/
mf6.2.0/
bin/
utils/
mf5to6/
make/
msvs/
src/
NWT/
LGR/
Preproc/
MF2005/
zonebudget/
make/
msvs/
src/
srcbmi/
make/
doc/
examples/
ex-gwf-advtidal/
ex-gwf-bcf2ss-p01a/
ex-gwf-bcf2ss-p02a/
ex-gwf-bump-p01a/
ex-gwf-bump-p01b/
ex-gwf-bump-p01c/
ex-gwf-csub-p01/
ex-gwf-csub-p02a/
ex-gwf-csub-p02b/
ex-gwf-csub-p03a/
ex-gwf-csub-p03b/
ex-gwf-csub-p04/
ex-gwf-disvmesh/
ex-gwf-drn-p01a/
ex-gwf-drn-p01b/
ex-gwf-fhb/
ex-gwf-hanic/
ex-gwf-hanir/
ex-gwt-mt3dms-p03/
mt3d/
ex-gwf-hanix/
ex-gwf-lak-p01/
ex-gwf-lak-p02/
ex-gwf-lgr/
ex-gwf-lgrv-gc/
ex-gwf-lgrv-gr/
ex-gwf-lgrv-lgr/
ex-gwf-maw-p01a/
ex-gwf-maw-p01b/
ex-gwf-maw-p02/
ex-gwf-maw-p03a/
ex-gwf-nwt-p02a/
ex-gwf-nwt-p02b/
ex-gwf-nwt-p03a/
ex-gwf-nwt-p03b/
ex-gwf-sagehen/
ex-gwf-sfr-p01/
ex-gwf-sfr-p01b/
ex-gwf-spbc/
ex-gwf-csub-p03a/
ex-gwt-mt3dsupp632a/
mf6gwt/
mf6gwf/
ex-gwf-twri01/
mf2005/
mt3d/
ex-gwt-mt3dms-p05/
mt3d/
ex-gwf-lgrv-gc/
ex-gwf-u1disv/
ex-gwt-mt3dms-p04c/
mt3d/
ex-gwf-csub-p01/
ex-gwf-bump-p01c/
ex-gwt-moc3d-p01b/
mf6gwt/
ex-gwf-u1disv-x/
ex-gwf-whirl/
ex-gwf-zaidel/
ex-gwt-henry-a/
ex-gwt-henry-b/
ex-gwt-keating/
mf6gwf/
ex-gwt-mt3dms-p04b/
mt3d/
ex-gwt-mt3dms-p01a/
mt3d/
ex-gwt-moc3d-p01c/
mf6gwt/
ex-gwt-moc3d-p01a/
mf6gwf/
ex-gwt-moc3d-p01d/
mf6gwt/
ex-gwt-moc3d-p01b/
mf6gwf/
ex-gwf-sagehen/
ex-gwf-bump-p01b/
ex-gwf-bcf2ss-p01a/
ex-gwf-bcf2ss-p02a/
ex-gwf-zaidel/
ex-gwf-u1disv-x/
ex-gwf-nwt-p02a/
ex-gwf-csub-p02b/
ex-gwf-fhb/
ex-gwf-lgr/
ex-gwt-mt3dms-p10/
mt3d/
ex-gwf-advtidal/
ex-gwt-mt3dms-p09/
mt3d/
ex-gwt-mt3dms-p07/
mt3d/
ex-gwt-mt3dsupp632c/
mf6gwt/
ex-gwt-moc3d-p01c/
mf6gwf/
mf2005/
mt3d/
ex-gwf-whirl/
ex-gwf-hanix/
ex-gwf-hanic/
ex-gwt-mt3dsupp632b/
mf6gwt/
ex-gwt-moc3d-p01d/
mf6gwf/
mf2005/
mt3d/
ex-gwt-mt3dms-p06/
mt3d/
ex-gwt-mt3dms-p08/
mt3d/
ex-gwt-prudic2004t2/
mf6gwt/
ex-gwt-moc3d-p02/
mf6gwf/
ex-gwf-lgrv-gr/
ex-gwf-nwt-p03a/
ex-gwf-csub-p03b/
ex-gwt-moc3d-p02tg/
mf6gwt/
ex-gwt-moc3d-p02tg/
mf6gwf/
ex-gwt-mt3dsupp631/
mf6gwt/
mf6gwf/
mf2005/
ex-gwt-mt3dms-p01a/
mt3d/
ex-gwt-mt3dms-p01b/
mt3d/
ex-gwt-mt3dms-p01c/
mt3d/
ex-gwt-moc3d-p01a/
mf6gwt/
mf6gwf/
ex-gwt-mt3dms-p01d/
mt3d/
ex-gwt-mt3dms-p01b/
ex-gwt-mt3dms-p03/
mt3d/
ex-gwf-bump-p01a/
ex-gwf-csub-p04/
ex-gwt-mt3dms-p04a/
mt3d/
ex-gwt-keating/
mf6gwt/
ex-gwt-mt3dms-p04b/
mt3d/
ex-gwt-mt3dms-p04c/
mt3d/
ex-gwt-mt3dms-p05/
mt3d/
ex-gwt-mt3dms-p06/
mt3d/
ex-gwt-mt3dms-p07/
mt3d/
ex-gwt-mt3dms-p08/
mt3d/
ex-gwt-mt3dms-p09/
mt3d/
ex-gwt-mt3dms-p10/
mt3d/
ex-gwt-mt3dsupp631/
mf2005/
mf6gwf/
ex-gwf-sfr-p01/
ex-gwf-lgrv-lgr/
ex-gwf-twri01/
mf6gwt/
mt3d/
ex-gwt-mt3dsupp632a/
mf2005/
ex-gwf-nwt-p02b/
ex-gwf-csub-p02a/
ex-gwt-mt3dsupp82/
mf6gwf/
mf6gwt/
mt3d/
ex-gwt-mt3dsupp632b/
mf2005/
mf6gwf/
mf6gwt/
mt3d/
ex-gwt-mt3dsupp632c/
mf2005/
mf6gwf/
mf6gwt/
mt3d/
ex-gwf-disvmesh/
ex-gwt-moc3d-p02/
ex-gwt-mt3dsupp82/
mf2005/
mf6gwf/
mf6gwt/
mt3d/
ex-gwt-prudic2004t2/
mf6gwf/
doc/
mf6gwt/
make/
msvs/
src/
Exchange/
Model/
Geometry/
GroundWaterFlow/
GroundWaterTransport/
ModelUtilities/
Solution/
SparseMatrixSolver/
Timing/
Utilities/
TimeSeries/
Memory/
OutputControl/
Observation/
Model/
GroundWaterTransport/
ModelUtilities/
GroundWaterFlow/
Geometry/
OutputControl/
TimeSeries/
srcbmi/
utils/
mf5to6/
make/
msvs/
src/
LGR/
MF2005/
NWT/
Preproc/
zonebudget/
make/
msvs/
src/
\end{verbatim}
2 changes: 1 addition & 1 deletion doc/mf6io/mf6ivar/md/mf6ivar.md
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@
| GWF | OC | PERIOD | FREQUENCY | INTEGER | save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps. |
| GWF | OC | PERIOD | STEPS | INTEGER (<NSTP) | save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps. |
| GWT | ADV | OPTIONS | SCHEME | STRING | scheme used to solve the advection term. Can be upstream, central, or TVD. If not specified, upstream weighting is the default weighting scheme. |
| GWT | DSP | OPTIONS | XT3D_OFF | KEYWORD | deactivate the xt3d method to and use the faster and less accurate approximation. This option may provide a fast and accurate solution under some circumstances, such as when flow aligns with the model grid, there is no mechanical dispersion, or when the longitudinal and transverse dispersivities are equal. This option may also be used to assess the computational demand of the XT3D approach by noting the run time differences with and without this option on. |
| GWT | DSP | OPTIONS | XT3D_OFF | KEYWORD | deactivate the xt3d method and use the faster and less accurate approximation. This option may provide a fast and accurate solution under some circumstances, such as when flow aligns with the model grid, there is no mechanical dispersion, or when the longitudinal and transverse dispersivities are equal. This option may also be used to assess the computational demand of the XT3D approach by noting the run time differences with and without this option on. |
| GWT | DSP | OPTIONS | XT3D_RHS | KEYWORD | add xt3d terms to right-hand side, when possible. This option uses less memory, but may require more iterations. |
| GWT | DSP | GRIDDATA | DIFFC | DOUBLE PRECISION (NODES) | effective molecular diffusion coefficient. |
| GWT | DSP | GRIDDATA | ALH | DOUBLE PRECISION (NODES) | longitudinal dispersivity in horizontal direction. If flow is strictly horizontal, then this is the longitudinal dispersivity that will be used. If flow is not strictly horizontal or strictly vertical, then the longitudinal dispersivity is a function of both ALH and ALV. If mechanical dispersion is represented (by specifying any dispersivity values) then this array is required. |
Expand Down
2 changes: 1 addition & 1 deletion doc/mf6io/mf6ivar/tex/gwt-dsp-desc.tex
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
\item \textbf{Block: OPTIONS}

\begin{description}
\item \texttt{XT3D\_OFF}---deactivate the xt3d method to and use the faster and less accurate approximation. This option may provide a fast and accurate solution under some circumstances, such as when flow aligns with the model grid, there is no mechanical dispersion, or when the longitudinal and transverse dispersivities are equal. This option may also be used to assess the computational demand of the XT3D approach by noting the run time differences with and without this option on.
\item \texttt{XT3D\_OFF}---deactivate the xt3d method and use the faster and less accurate approximation. This option may provide a fast and accurate solution under some circumstances, such as when flow aligns with the model grid, there is no mechanical dispersion, or when the longitudinal and transverse dispersivities are equal. This option may also be used to assess the computational demand of the XT3D approach by noting the run time differences with and without this option on.

\item \texttt{XT3D\_RHS}---add xt3d terms to right-hand side, when possible. This option uses less memory, but may require more iterations.

Expand Down
5 changes: 3 additions & 2 deletions doc/mf6io/mf6noname.tex
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@

ERROR REPORT:

1. mf6: mfsim.nam is not present in working directory.
1. mf6.exe: mfsim.nam is not present in working directory.

2

STOP 2
\end{lstlisting}
}
Loading

0 comments on commit d711450

Please sign in to comment.