Commit files for 6.1.1 release

MODFLOW-USGS · Jun 12, 2020 · 671228b · 671228b
1 parent cd72d9b
commit 671228b
Show file tree

Hide file tree

Showing 15 changed files with 299 additions and 290 deletions.
diff --git a/DISCLAIMER.md b/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.
diff --git a/README.md b/README.md
@@ -7,8 +7,8 @@
 
 ## Automated Testing Status on Travis-CI
 
-### Version 6.1.1 release candidate
-[![Build Status](https://travis-ci.org/MODFLOW-USGS/modflow6.svg?branch=develop)](https://travis-ci.org/MODFLOW-USGS/modflow6)
+### Version 6.1.1
+[![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.1 release candidate: U.S. Geological Survey Software Release, 12 December 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, 2020, MODFLOW 6 Modular Hydrologic Model version 6.1.1: U.S. Geological Survey Software Release, 12 June 2020, 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.
 
diff --git a/code.json b/code.json
@@ -1,6 +1,6 @@
 [
     {
-        "status": "Release Candidate",
+        "status": "Production",
         "languages": [
             "Fortran2008"
         ],
@@ -20,7 +20,7 @@
         "laborHours": -1,
         "version": "6.1.1",
         "date": {
-            "metadataLastUpdated": "2019-12-12"
+            "metadataLastUpdated": "2020-06-12"
         },
         "organization": "U.S. Geological Survey",
         "permissions": {

diff --git a/doc/ReleaseNotes/folder_struct.tex b/doc/ReleaseNotes/folder_struct.tex
@@ -1,73 +1,73 @@
 \begin{verbatim}
 mf6.1.1/ 
     bin/ 
-    utils/ 
-        mf5to6/ 
-            make/ 
-            msvs/ 
-            src/ 
-                NWT/ 
-                LGR/ 
-                Preproc/ 
-                MF2005/ 
-        zonebudget/ 
-            make/ 
-            msvs/ 
-            src/ 
-    srcbmi/ 
-    make/ 
+    doc/ 
     examples/ 
-        ex10-bumpnr/ 
-        ex19-zaidel/ 
         ex01-twri/ 
-        ex29-vilhelmsen-gc/ 
-        ex31-vilhelmsen-lgr/ 
+        ex02-tidal/ 
+        ex03-bcf2ss/ 
+        ex04-fhb/ 
+        ex05-mfusg1disu/ 
+        ex06-mfusg1disv/ 
+        ex07-mfusg1lgr/ 
+        ex08-mfusg1xt3d/ 
+        ex09-bump/ 
+        ex10-bumpnr/ 
+        ex11-disvmesh/ 
+        ex12-hanicol/ 
+        ex13-hanirow/ 
+        ex14-hanixt3d/ 
         ex15-whirlsxt3d/ 
-        ex24-neville/ 
-        ex37-draindepth/ 
         ex16-mfnwt2/ 
+        ex17-mfnwt3h/ 
+        ex18-mfnwt3l/ 
+        ex19-zaidel/ 
         ex20-keating/ 
-        ex32-periodicbc/ 
+        ex21-sfr1/ 
+        ex22-lak2/ 
+        ex23-lak4/ 
+        ex24-neville/ 
         ex25-flowing-maw/ 
         ex26-Reilly-maw/ 
-        ex03-bcf2ss/ 
-        ex23-lak4/ 
-        ex34-csub-sub01/ 
-        ex11-disvmesh/ 
-        ex33-csub-jacob/ 
-        ex36-csub-subwt01/ 
-        ex14-hanixt3d/ 
-        ex13-hanirow/ 
-        ex04-fhb/ 
-        ex02-tidal/ 
-        ex22-lak2/ 
-        ex05-mfusg1disu/ 
-        ex09-bump/ 
         ex27-advpakmvr/ 
-        ex21-sfr1/ 
-        ex12-hanicol/ 
         ex28-mflgr3/ 
-        ex06-mfusg1disv/ 
-        ex17-mfnwt3h/ 
-        ex08-mfusg1xt3d/ 
+        ex29-vilhelmsen-gc/ 
         ex30-vilhelmsen-gf/ 
+        ex31-vilhelmsen-lgr/ 
+        ex32-periodicbc/ 
+        ex33-csub-jacob/ 
+        ex34-csub-sub01/ 
         ex35-csub-holly/ 
-        ex07-mfusg1lgr/ 
-        ex18-mfnwt3l/ 
-    doc/ 
+        ex36-csub-subwt01/ 
+        ex37-draindepth/ 
+    make/ 
     msvs/ 
     src/ 
         Exchange/ 
+        Model/ 
+            Geometry/ 
+            GroundWaterFlow/ 
+            ModelUtilities/ 
         Solution/ 
             SparseMatrixSolver/ 
         Timing/ 
         Utilities/ 
-            TimeSeries/ 
             Memory/ 
-            OutputControl/ 
             Observation/ 
-        Model/ 
-            ModelUtilities/ 
-            GroundWaterFlow/ 
-            Geometry/ 
+            OutputControl/ 
+            TimeSeries/ 
+    srcbmi/ 
+    utils/ 
+        mf5to6/ 
+            make/ 
+            msvs/ 
+            src/ 
+                LGR/ 
+                MF2005/ 
+                NWT/ 
+                Preproc/ 
+        zonebudget/ 
+            make/ 
+            msvs/ 
+            src/ 
 \end{verbatim}
diff --git a/doc/mf6io/mf6ivar/md/mf6ivar.md b/doc/mf6io/mf6ivar/md/mf6ivar.md
@@ -583,7 +583,7 @@
 | GWF | LAK | TABLES | LAKENO | INTEGER | integer value that defines the lake number associated with the specified TABLES data on the line. LAKENO must be greater than zero and less than or equal to NLAKES. The program will terminate with an error if table information for a lake is specified more than once or the number of specified tables is less than NTABLES. |
 | GWF | LAK | TABLES | TAB6 | KEYWORD | keyword to specify that record corresponds to a table file. |
 | GWF | LAK | TABLES | FILEIN | KEYWORD | keyword to specify that an input filename is expected next. |
-| GWF | LAK | TABLES | TAB6_FILENAME | STRING | character string that defines the path and filename for the file containing lake table data for the lake connection. The CTABNAME file includes the number of entries in the file and the relation between stage, volume, and surface area for each entry in the file. Lake table files for EMBEDDEDH and EMBEDDEDV lake-GWF connections also include lake-GWF exchange area data for each entry in the file. Input instructions for the CTABNAME file is included at the LAK package lake table file input instructions section. |
+| GWF | LAK | TABLES | TAB6_FILENAME | STRING | character string that defines the path and filename for the file containing lake table data for the lake connection. The TAB6\_FILENAME file includes the number of entries in the file and the relation between stage, volume, and surface area for each entry in the file. Lake table files for EMBEDDEDH and EMBEDDEDV lake-GWF connections also include lake-GWF exchange area data for each entry in the file. Instructions for creating the TAB6\_FILENAME input file are provided in Lake Table Input File section. |
 | GWF | LAK | OUTLETS | OUTLETNO | INTEGER | integer value that defines the outlet number associated with the specified OUTLETS data on the line. OUTLETNO must be greater than zero and less than or equal to NOUTLETS. Outlet information must be specified for every outlet or the program will terminate with an error. The program will also terminate with an error if information for a outlet is specified more than once. |
 | GWF | LAK | OUTLETS | LAKEIN | INTEGER | integer value that defines the lake number that outlet is connected to. LAKEIN must be greater than zero and less than or equal to NLAKES. |
 | GWF | LAK | OUTLETS | LAKEOUT | INTEGER | integer value that defines the lake number that outlet discharge from lake outlet OUTLETNO is routed to. LAKEOUT must be greater than or equal to zero and less than or equal to NLAKES. If LAKEOUT is zero, outlet discharge from lake outlet OUTLETNO is discharged to an external boundary. |

diff --git a/doc/mf6io/mf6ivar/tex/gwf-lak-desc.tex b/doc/mf6io/mf6ivar/tex/gwf-lak-desc.tex
@@ -103,7 +103,7 @@
 
 \item \texttt{FILEIN}---keyword to specify that an input filename is expected next.
 
-\item \texttt{tab6\_filename}---character string that defines the path and filename for the file containing lake table data for the lake connection. The CTABNAME file includes the number of entries in the file and the relation between stage, volume, and surface area for each entry in the file. Lake table files for EMBEDDEDH and EMBEDDEDV lake-GWF connections also include lake-GWF exchange area data for each entry in the file. Input instructions for the CTABNAME file is included at the LAK package lake table file input instructions section.
+\item \texttt{tab6\_filename}---character string that defines the path and filename for the file containing lake table data for the lake connection. The TAB6\_FILENAME file includes the number of entries in the file and the relation between stage, volume, and surface area for each entry in the file. Lake table files for EMBEDDEDH and EMBEDDEDV lake-GWF connections also include lake-GWF exchange area data for each entry in the file. Instructions for creating the TAB6\_FILENAME input file are provided in Lake Table Input File section.
 
 \end{description}
 \item \textbf{Block: OUTLETS}

diff --git a/doc/mf6io/mf6noname.tex b/doc/mf6io/mf6noname.tex
@@ -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}
 }
diff --git a/doc/mf6io/mf6output.tex b/doc/mf6io/mf6output.tex
@@ -2,31 +2,32 @@
 \begin{lstlisting}[style=modeloutput]
                                    MODFLOW 6
                 U.S. GEOLOGICAL SURVEY MODULAR HYDROLOGIC MODEL
-                            VERSION 6.1.1 12/12/2019
-                               ***DEVELOP MODE***
+                            VERSION 6.1.1 06/12/2020
 
-  MODFLOW 6 compiled Jun  8 2020 12:35:50 with GFORTRAN compiler (ver. 8.4.0)
+   MODFLOW 6 compiled Jun 11 2020 17:47:19 with IFORT compiler (ver. 19.10.0)
 
-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. Also refer to the USGS Water
+Resources Software User Rights Notice for complete use, copyright,
+and distribution information.
 
- Run start date and time (yyyy/mm/dd hh:mm:ss): 2020/06/08 12:37:34
+ Run start date and time (yyyy/mm/dd hh:mm:ss): 2020/06/11 17:50:15
 
  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): 2020/06/08 12:37:34
- Elapsed run time:  0.021 Seconds
+ Run end date and time (yyyy/mm/dd hh:mm:ss): 2020/06/11 17:50:15
+ Elapsed run time:  0.031 Seconds
 
 
 WARNING REPORT:
@@ -36,5 +37,6 @@
   2. LINEAR BLOCK VARIABLE 'INNER_HCLOSE' IN FILE 'twri.ims' WAS DEPRECATED
      IN VERSION 6.1.1. SETTING INNER_DVCLOSE TO INNER_HCLOSE VALUE.
  Normal termination of simulation.
+
 \end{lstlisting}
 }
diff --git a/doc/mf6io/mf6switches.tex b/doc/mf6io/mf6switches.tex
@@ -1,10 +1,10 @@
 {\small
 \begin{lstlisting}[style=modeloutput]
-mf6 - MODFLOW 6.1.1 12/12/2019 (compiled Jun  8 2020 12:35:50)
-usage: mf6               run MODFLOW 6 using "mfsim.nam"
-   or: mf6 [options]     retrieve program information
+mf6.exe - MODFLOW 6.1.1 06/12/2020 (compiled Jun 11 2020 17:47:19)
+usage: mf6.exe               run MODFLOW 6 using "mfsim.nam"
+   or: mf6.exe [options]     retrieve program information
 
-Options   GNU long option   Meaning 
+Options   GNU long option   Meaning
  -h, -?    --help           Show this message
  -v        --version        Display program version information.
  -dev      --develop        Display program develop option mode.
@@ -18,13 +18,15 @@
                                            errors but do assemble or
                                            solve matrix equations or
                                            write solution output.
-                                                                    
-Bug reporting and contributions are welcome from the community. 
+
+Bug reporting and contributions are welcome from the community.
 Questions can be asked on the issues page[1]. Before creating a new
 issue, please take a moment to search and make sure a similar issue
 does not already exist. If one does exist, you can comment (most
 simply even with just :+1:) to show your support for that issue.
-                                                                    
+
 [1] https://github.com/MODFLOW-USGS/modflow6/issues
+
+
 \end{lstlisting}
 }
diff --git a/doc/version.tex b/doc/version.tex
@@ -1,3 +1,3 @@
 \newcommand{\modflowversion}{mf6.1.1}
-\newcommand{\modflowdate}{December 12, 2019}
+\newcommand{\modflowdate}{June 12, 2020}
 \newcommand{\currentmodflowversion}{Version \modflowversion---\modflowdate}