merge master into develop and update version to 6.1.1

DISCLAIMER.md

@@ -1,12 +1,11 @@
 Disclaimer
 ----------
 
-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.
+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.

README.md

@@ -7,8 +7,8 @@
 
 ## Automated Testing Status on Travis-CI
 
-### Version 6.1.0
-[![Build Status](https://travis-ci.org/MODFLOW-USGS/modflow6.svg?branch=master)](https://travis-ci.org/MODFLOW-USGS/modflow6)
+### 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)
 
 ## 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: 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, 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)
 
 ## Instructions for building definition files for new packages
 
@@ -41,13 +41,12 @@ Instructions for building definition files for new packages are summarized in [d
 Disclaimer
 ----------
 
-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.
+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.
 

code.json

@@ -1,6 +1,6 @@
 [
     {
-        "status": "Production",
+        "status": "Release Candidate",
         "languages": [
             "Fortran2008"
         ],
@@ -18,7 +18,7 @@
             "email": "langevin@usgs.gov"
         },
         "laborHours": -1,
-        "version": "6.1.0",
+        "version": "6.1.1",
         "date": {
             "metadataLastUpdated": "2019-12-12"
         },

doc/version.tex

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

src/Utilities/version.f90

@@ -2,8 +2,8 @@ module VersionModule
   use KindModule
   public
   ! -- modflow 6 version
-  integer(I4B), parameter :: IDEVELOPMODE = 0
-  character(len=40), parameter :: VERSION = '6.1.0 12/12/2019'
+  integer(I4B), parameter :: IDEVELOPMODE = 1
+  character(len=40), parameter :: VERSION = '6.1.1 12/12/2019'
   character(len=10), parameter :: MFVNAM = ' 6'
   character(len=*), parameter  :: MFTITLE =                                     &
     'U.S. GEOLOGICAL SURVEY MODULAR HYDROLOGIC MODEL'
@@ -14,17 +14,15 @@ module VersionModule
   ! -- disclaimer must be appropriate for version (release or release candidate)
   character(len=*), parameter :: FMTDISCLAIMER =                                &
     "(/,                                                                        &
-    &'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.',/)"
+    &'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.',/)"
 end module VersionModule
 

version.txt

@@ -1,7 +1,7 @@
 # MODFLOW 6 version file automatically created using...make-release.py
-# created on...December 12, 2019 13:01:22
+# created on...December 12, 2019 15:20:23
 
 major = 6
 minor = 1
-micro = 0
+micro = 1
 __version__ = '{:d}.{:d}.{:d}'.format(major, minor, micro)