6.1.0 release

DISCLAIMER.md

@@ -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.

README.md

@@ -7,8 +7,8 @@
 
 ## Automated Testing Status on Travis-CI
 
-### Version 6.1.0 release candidate
-[![Build Status](https://travis-ci.org/MODFLOW-USGS/modflow6.svg?branch=develop)](https://travis-ci.org/MODFLOW-USGS/modflow6)
+### Version 6.1.0
+[![Build Status](https://travis-ci.org/MODFLOW-USGS/modflow6.svg?branch=master)](https://travis-ci.org/MODFLOW-USGS/modflow6)
 
 ## Introduction
 
@@ -31,7 +31,7 @@ MODFLOW 6 is the latest core version of MODFLOW. It synthesizes many of the capa
 
 #### ***Software/Code citation for MODFLOW 6:***
 
-[Langevin, C.D., Hughes, J.D., Banta, E.R., Provost, A.M., Niswonger, R.G., and Panday, Sorab, 2019, MODFLOW 6 Modular Hydrologic Model version 6.1.0 release candidate: U.S. Geological Survey Software Release, 29 November 2019, 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, 2019, MODFLOW 6 Modular Hydrologic Model version 6.1.0: U.S. Geological Survey Software Release, 12 December 2019, https://doi.org/10.5066/F76Q1VQV](https://doi.org/10.5066/F76Q1VQV)
 
 ## Instructions for building definition files for new packages
 
@@ -41,12 +41,13 @@ Instructions for building definition files for new packages are summarized in [d
 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.
 

code.json

@@ -1,6 +1,6 @@
 [
     {
-        "status": "Release Candidate",
+        "status": "Production",
         "languages": [
             "Fortran2008"
         ],
@@ -20,7 +20,7 @@
         "laborHours": -1,
         "version": "6.1.0",
         "date": {
-            "metadataLastUpdated": "2019-11-29"
+            "metadataLastUpdated": "2019-12-12"
         },
         "organization": "U.S. Geological Survey",
         "permissions": {

distribution/mkdist.py

@@ -764,10 +764,10 @@ def update_latex_releaseinfo():
     for url in ['https://pubs.usgs.gov/tm/06/a57/tm6a57.pdf',
                 'https://pubs.usgs.gov/tm/06/a55/tm6a55.pdf',
                 'https://pubs.usgs.gov/tm/06/a56/tm6a56.pdf',
-                'https://github.com/MODFLOW-USGS/modflow6-examples/releases/download/untagged-0ee0f28c4bb6f261a5c9/csubexamples.pdf',
+                'https://github.com/MODFLOW-USGS/modflow6-examples/releases/download/6.1.0/csubexamples.pdf',
                 ]:
         print('  downloading {}'.format(url))
-        download_and_unzip(url, pth=fd['doc'], delete_zip=False)
+        download_and_unzip(url, pth=fd['doc'], delete_zip=False, verify=False)
     print('\n')
 
     # Prior to zipping, enforce os line endings on all text files

doc/ReleaseNotes/example_items.tex

@@ -35,4 +35,9 @@
 \item ex30-vilhelmsen-gf---This is the Globally Fine (GF) model described in Vilhelmsen et al. (2012).
 \item ex31-vilhelmsen-lgr---This is the Local Grid Refinement (LGR) model described in Vilhelmsen et al. (2012).
 \item ex32-periodicbc---Periodic boundary condition problem is based on Laattoe and others (2014). A MODFLOW 6 GWF-GWF Exchange is used to connect the left column with the right column. 
+\item ex33-csub-jacob---This is the Jacob (1939) train problem simulates elastic compaction of aquifer materials in response to the loading of an aquifer by
+
+\item ex34-csub-sub01---This is the Problem 1 from the Subsidence Package for MODFLOW-2000 documentation (Hoffman and others, 2003), which is described in the MODFLOW 6 CSUB Package Example Problems document released with MODFLOW 6 (version 6.1.0 or higher).  This simulates the drainage of a thick interbed caused by a step decrease in hydraulic head in the aquifer in MODFLOW 6. The thick interbed is simulated using a delay-bed interbed and the default effective-stress formulation is used to simulate thick interbed compaction.
+\item ex35-csub-holly---This is the one-dimensional MODFLOW 6 extensometer model based on the model developed by Sneed (2008) to simulate aquitard drainage, compaction and, land subsidence at the Holly site, located at the Edwards Air Force base, in response to effective stress changes caused by groundwater pumpage in the Antelope Valley in southern California. This problem is described in the MODFLOW 6 CSUB Package Example Problems document released with MODFLOW 6 (version 6.1.0 or higher). The model simulates compaction in a combination of no-delay and delay interbeds and the default effective-stress formulation is used to simulate interbed compaction.
+\item ex36-csub-subwt01---This is the one-dimensional compaction in a three-dimensional flow field problem that is described in the MODFLOW 6 CSUB Package Example Problems document released with MODFLOW 6 (version 6.1.0 or higher). This problem is based on the problem presented in the SUB-WT package for MODFLOW-2005 report (Leake and Galloway, 2007) and represents groundwater development in a hypothetical aquifer that includes some features typical of basin-fill aquifers in an arid or semi-arid environment. The problem of Leake and Galloway (2007) was modified to include compaction of coarse-grained aquifer materials and water compressibility. The model simulates compaction in no-delay interbeds and the default effective-stress formulation is used to simulate interbed compaction.
 \end{itemize}

doc/ReleaseNotes/example_table.tex

@@ -81,6 +81,14 @@
 \hline
 ex32-periodicbc & 1 & \parbox[t]{3cm}{ pbc.nam \\}& \parbox[t]{3cm}{ (190, 1, 100) \\}& \parbox[t]{4cm}{ CHD  \\}\\
 \hline
+ex33-csub-jacob & 2 & \parbox[t]{3cm}{ fig4\_base.nam \\}& \parbox[t]{3cm}{ (3, 1, 35) \\}& \parbox[t]{4cm}{ none \\}\\
+\hline
+ex34-csub-sub01 & 1 & \parbox[t]{3cm}{ sub01es.nam \\}& \parbox[t]{3cm}{ (1, 1, 3) \\}& \parbox[t]{4cm}{ CHD  \\}\\
+\hline
+ex35-csub-holly & 353 & \parbox[t]{3cm}{ holly.nam \\}& \parbox[t]{3cm}{ (14, 1, 1) \\}& \parbox[t]{4cm}{ chd  \\}\\
+\hline
+ex36-csub-subwt01 & 3 & \parbox[t]{3cm}{ csub\_subwt02b.nam \\}& \parbox[t]{3cm}{ (4, 20, 15) \\}& \parbox[t]{4cm}{ CHD WEL RCH  \\}\\
+\hline
 \hline
 \end{longtable}
 \label{table:examples}

doc/ReleaseNotes/folder_struct.tex

@@ -1,5 +1,5 @@
 \begin{verbatim}
-mf6.0.4/ 
+mf6.1.0/ 
     bin/ 
     doc/ 
     examples/ 
@@ -35,6 +35,10 @@
         ex30-vilhelmsen-gf/ 
         ex31-vilhelmsen-lgr/ 
         ex32-periodicbc/ 
+        ex33-csub-jacob/ 
+        ex34-csub-sub01/ 
+        ex35-csub-holly/ 
+        ex36-csub-subwt01/ 
     make/ 
     msvs/ 
     src/ 

doc/mf6io/gwf/info_existing_users.tex

@@ -47,16 +47,13 @@
 
 \item The GWF Model described in this report does not support the following list of packages and capabilities.  Support for some of these capabilities may be added in future \mf versions.
   \begin{itemize}
-    \item Interbed Storage Package \citep{leake1991documentation},
-    \item Subsidence Package \citep{hoffmann2003modflow},
-    \item Subsidence and Aquifer-System Compaction Package for Water-Table Aquifers \citep{leake2007modflow},
     \item Drain with Return Flow Package \citep{modflowdrtpack}
     \item Reservoir Package \citep{fenske1996documentation},
     \item Seawater Intrusion Package \citep{bakker2013documentation},
     \item Surface-Water Routing Process \citep{hughes2012documentation},
     \item Connected Linear Network Process \citep{modflowusg},
     \item Parameter Value File \citep{modflow2005}, and
-    \item Link to the MT3DMS Contaminant Transport Model \citep{zheng2001modflow}.
+    \item Link to the MT3DMS Contaminant Transport Model \citep{zheng2001modflow}.  However, MT3D-USGS can read the head and budget files created by MODFLOW 6, but only if the GWF Model uses the DIS Package.  MT3D-USGS will not work with GWF output if the DISV or DISU Packages are used.
   \end{itemize}
 
 \end{enumerate}

doc/mf6io/gwf/namefile.tex

@@ -29,6 +29,7 @@ \subsubsection{Explanation of Variables}
 OC6 & Output Control Option \\
 NPF6 & Node Property Flow Package \\ 
 STO6 & Storage Package \\
+CSUB6 & Compaction and Subsidence Package \\
 HFB6 & Horizontal Flow Barrier Package\\
 CHD6 & Time-Variant Specified Head Option & * \\
 WEL6 & Well Package & * \\

doc/mf6io/mf6io.bbl

@@ -1,4 +1,4 @@
-\begin{thebibliography}{29}
+\begin{thebibliography}{26}
 \providecommand{\natexlab}[1]{#1}
 \expandafter\ifx\csname urlstyle\endcsname\relax
   \providecommand{\doi}[1]{doi:\discretionary{}{}{}#1}\else
@@ -78,14 +78,6 @@ Hill, M.C., Banta, E.R., Harbaugh, A.W., and Anderman, E.R., 2000,
   three post-processing programs: {U.S. Geological Survey Open-File Report
   00--184, 210 p.}
 
-\bibitem[{Hoffmann and others(2003)Hoffmann, Leake, Galloway, and
-  Wilson}]{hoffmann2003modflow}
-Hoffmann, J{\"o}rn, Leake, S.A., Galloway, D.L., and Wilson, A.M., 2003,
-  MODFLOW-2000 Ground-Water Model---User Guide to the Subsidence and
-  Aquifer-System Compaction (SUB) Package: {U.S. Geological Survey Open-File
-  Report 03--233, 44 p.}, accessed June 27, 2017, at
-  \url{https://pubs.usgs.gov/of/2003/ofr03-233/}.
-
 \bibitem[{Hsieh and Freckleton(1993)}]{hsieh1993hfb}
 Hsieh, P.A., and Freckleton, J.R., 1993, Documentation of a computer program to
   simulate horizontal-flow barriers using the U.S. Geological Survey's modular
@@ -123,27 +115,13 @@ Langevin, C.D., Hughes, J.D., Provost, A.M., Banta, E.R., Niswonger, R.G., and
   Model: {U.S. Geological Survey Techniques and Methods, book 6, chap. A55, 197
   p.}, accessed August 4, 2017, at \url{https://doi.org/10.3133/tm6A55}.
 
-\bibitem[{Leake and Galloway(2007)}]{leake2007modflow}
-Leake, S.A., and Galloway, D.L., 2007, MODFLOW Ground-water model---User guide
-  to the Subsidence and Aquifer-System Compaction Package (SUB-WT) for
-  Water-Table Aquifers: {U.S. Geological Survey Techniques and Methods, book 6,
-  chap. A23, 42 p.}, accessed June 27, 2017, at
-  \url{https://pubs.er.usgs.gov/publication/tm6A23}.
-
 \bibitem[{Leake and Lilly(1997)}]{leake1997documentation}
 Leake, S.A., and Lilly, M.R., 1997, Documentation of computer program (FHB1)
   for assignment of transient specified-flow and specified-head boundaries in
   applications of the modular finite-diference ground-water flow model
   (MODFLOW): {U.S. Geological Survey Open-File Report 97--571, 50 p.}, accessed
   June 27, 2017, at \url{https://pubs.er.usgs.gov/publication/ofr97571}.
 
-\bibitem[{Leake and Prudic(1991)}]{leake1991documentation}
-Leake, S.A., and Prudic, D.E., 1991, Documentation of a computer program to
-  simulate aquifer-system compaction using the modular finite-difference
-  ground-water flow model: {U.S. Geological Survey Techniques of
-  Water-Resources Investigations, book 6, chap. A2, 68 p.}, accessed June 27,
-  2017, at \url{https://pubs.er.usgs.gov/publication/twri06A2}.
-
 \bibitem[{Maddock and others(2012)Maddock, Baird, Hanson, Schmid, and
   Ajami}]{modflowripetpack}
 Maddock, Thomas, III, Baird, K.J., Hanson, R.T., Schmid, Wolfgang, and Ajami,

doc/mf6io/mf6noname.tex

@@ -4,6 +4,7 @@
 ERROR REPORT:
 
  mf6.exe: mfsim.nam is not present in working directory.
+ 1 errors detected.
  Stopping due to error(s)
 2
 

doc/mf6io/mf6output.tex

@@ -2,9 +2,9 @@
 \begin{lstlisting}[style=modeloutput]
                                    MODFLOW 6
                 U.S. GEOLOGICAL SURVEY MODULAR HYDROLOGIC MODEL
-                            VERSION 6.0.4 03/13/2019
+                            VERSION 6.1.0 12/12/2019
 
-   MODFLOW 6 compiled Mar 13 2019 12:37:09 with IFORT compiler (ver. 19.0.0)
+   MODFLOW 6 compiled Dec 12 2019 13:30:12 with IFORT compiler (ver. 19.0.5)
 
 This software has been approved for release by the U.S. Geological
 Survey (USGS). Although the software has been subjected to rigorous
@@ -19,13 +19,13 @@
 Resources Software User Rights Notice for complete use, copyright,
 and distribution information.
 
- Run start date and time (yyyy/mm/dd hh:mm:ss): 2019/03/13 12:39:44
+ Run start date and time (yyyy/mm/dd hh:mm:ss): 2019/12/12 13:32:39
 
  Writing simulation list file: mfsim.lst
  Using Simulation name file: mfsim.nam
  Solving:  Stress period:     1    Time step:     1
- Run end date and time (yyyy/mm/dd hh:mm:ss): 2019/03/13 12:39:44
- Elapsed run time:  0.125 Seconds
+ Run end date and time (yyyy/mm/dd hh:mm:ss): 2019/12/12 13:32:39
+ Elapsed run time:  0.073 Seconds
 
  Normal termination of simulation.
 

doc/mf6io/mf6switches.tex

@@ -1,6 +1,6 @@
 {\small
 \begin{lstlisting}[style=modeloutput]
-mf6.exe - MODFLOW 6.0.4 03/13/2019 (compiled Mar 13 2019 12:37:09)
+mf6.exe - MODFLOW 6.1.0 12/12/2019 (compiled Dec 12 2019 13:30:12)
 usage: mf6.exe               run MODFLOW 6 using "mfsim.nam"
    or: mf6.exe [options]     retrieve program information
 

doc/version.tex

@@ -1,3 +1,3 @@
 \newcommand{\modflowversion}{mf6.1.0}
-\newcommand{\modflowdate}{December 15, 2019}
+\newcommand{\modflowdate}{December 12, 2019}
 \newcommand{\currentmodflowversion}{Version \modflowversion---\modflowdate}