ci(distribution): final 6.2.2 distribution

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

@@ -3,10 +3,10 @@
 
 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.2.2 release candidate
+### Version 6.2.2
 
 [![Intel compiler](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/ci-intel.yml/badge.svg)](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/ci-intel.yml)
-[![gfortran - latest version](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/ci-gfortran-latest.yml/badge.svg)](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/ci-gfortran-latest.yml) 
+[![gfortran - latest version](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/ci-gfortran-latest.yml/badge.svg)](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/ci-gfortran-latest.yml)
 [![gfortran - previous versions](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/ci-gfortran-previous.yml/badge.svg)](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/ci-gfortran-previous.yml)
 
 [![MODFLOW 6 intel nightly build](https://github.com/MODFLOW-USGS/modflow6-nightly-build/actions/workflows/nightly-build-intel.yml/badge.svg)](https://github.com/MODFLOW-USGS/modflow6-nightly-build/actions/workflows/nightly-build-intel.yml)
@@ -32,7 +32,7 @@ The `develop` branch often contains bug fixes and new features that are not yet
 Software distributions for the current and previous official USGS releases are available [here](https://github.com/MODFLOW-USGS/modflow6/releases).  The current release is also available [here](https://water.usgs.gov/water-resources/software/MODFLOW-6/) from the USGS.
 
 ## Examples
-MODFLOW 6 has an extensive suite of example problems that are constructed using the python [FloPy](https://github.com/modflowpy/flopy) package.  These example problems are contained in a separate git repository located [here](https://github.com/MODFLOW-USGS/modflow6-examples).  These examples are included in the official [USGS MODFLOW 6 distribution](https://water.usgs.gov/water-resources/software/MODFLOW-6/), and they are also rendered into online [descriptions](https://modflow6-examples.readthedocs.io/en/master/examples.html) and [jupyter notebooks](https://modflow6-examples.readthedocs.io/en/master/notebook_examples.html).  
+MODFLOW 6 has an extensive suite of example problems that are constructed using the python [FloPy](https://github.com/modflowpy/flopy) package.  These example problems are contained in a separate git repository located [here](https://github.com/MODFLOW-USGS/modflow6-examples).  These examples are included in the official [USGS MODFLOW 6 distribution](https://water.usgs.gov/water-resources/software/MODFLOW-6/), and they are also rendered into online [descriptions](https://modflow6-examples.readthedocs.io/en/master/examples.html) and [jupyter notebooks](https://modflow6-examples.readthedocs.io/en/master/notebook_examples.html).
 
 ## Continuous Integration
 
@@ -84,18 +84,19 @@ The GWT model for MODFLOW 6 simulates three-dimensional transport of a single so
 
 #### ***Software/Code***
 
-[Langevin, C.D., Hughes, J.D., Banta, E.R., Provost, A.M., Niswonger, R.G., and Panday, Sorab, 2021, MODFLOW 6 Modular Hydrologic Model version 6.2.2 release candidate: U.S. Geological Survey Software Release, 18 February 2021, 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, 2021, MODFLOW 6 Modular Hydrologic Model version 6.2.2: U.S. Geological Survey Software Release, 30 July 2021, https://doi.org/10.5066/F76Q1VQV](https://doi.org/10.5066/F76Q1VQV)
 
 
 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.2.2",
         "date": {
-            "metadataLastUpdated": "2021-02-18"
+            "metadataLastUpdated": "2021-07-30"
         },
         "organization": "U.S. Geological Survey",
         "permissions": {

doc/ReleaseNotes/folder_struct.tex

@@ -1,5 +1,5 @@
 \begin{verbatim}
-mf6.2.1/ 
+mf6.2.2/ 
     bin/ 
     doc/ 
     examples/ 
@@ -12,6 +12,21 @@
         ex-gwf-csub-p01/ 
         ex-gwf-csub-p02a/ 
         ex-gwf-csub-p02b/ 
+        ex-gwf-csub-p02c/ 
+            es-001/ 
+            es-002/ 
+            es-005/ 
+            es-010/ 
+            es-020/ 
+            es-050/ 
+            es-100/ 
+            hb-001/ 
+            hb-002/ 
+            hb-005/ 
+            hb-010/ 
+            hb-020/ 
+            hb-050/ 
+            hb-100/ 
         ex-gwf-csub-p03a/ 
         ex-gwf-csub-p03b/ 
         ex-gwf-csub-p04/ 
@@ -32,6 +47,8 @@
         ex-gwf-maw-p01b/ 
         ex-gwf-maw-p02/ 
         ex-gwf-maw-p03a/ 
+        ex-gwf-maw-p03b/ 
+        ex-gwf-maw-p03c/ 
         ex-gwf-nwt-p02a/ 
         ex-gwf-nwt-p02b/ 
         ex-gwf-nwt-p03a/ 
@@ -46,6 +63,12 @@
         ex-gwf-u1disv-x/ 
         ex-gwf-whirl/ 
         ex-gwf-zaidel/ 
+        ex-gwt-hecht-mendez-b/ 
+            mf6gwf/ 
+            mf6gwt/ 
+        ex-gwt-hecht-mendez-c/ 
+            mf6gwf/ 
+            mf6gwt/ 
         ex-gwt-henry-a/ 
         ex-gwt-henry-b/ 
         ex-gwt-keating/ 

doc/mf6io/mf6ivar/tex/gwf-api-desc.tex

@@ -0,0 +1,29 @@
+% DO NOT MODIFY THIS FILE DIRECTLY.  IT IS CREATED BY mf6ivar.py 
+
+\item \textbf{Block: OPTIONS}
+
+\begin{description}
+\item \texttt{BOUNDNAMES}---keyword to indicate that boundary names may be provided with the list of api boundary cells.
+
+\item \texttt{PRINT\_INPUT}---keyword to indicate that the list of api boundary information will be written to the listing file immediately after it is read.
+
+\item \texttt{PRINT\_FLOWS}---keyword to indicate that the list of api boundary flow rates will be printed to the listing file for every stress period time step in which ``BUDGET PRINT'' is specified in Output Control.  If there is no Output Control option and ``PRINT\_FLOWS'' is specified, then flow rates are printed for the last time step of each stress period.
+
+\item \texttt{SAVE\_FLOWS}---keyword to indicate that api boundary flow terms will be written to the file specified with ``BUDGET FILEOUT'' in Output Control.
+
+\item \texttt{OBS6}---keyword to specify that record corresponds to an observations file.
+
+\item \texttt{FILEIN}---keyword to specify that an input filename is expected next.
+
+\item \texttt{obs6\_filename}---name of input file to define observations for the api boundary package. See the ``Observation utility'' section for instructions for preparing observation input files. Tables \ref{table:gwf-obstypetable} and \ref{table:gwt-obstypetable} lists observation type(s) supported by the api boundary package.
+
+\item \texttt{MOVER}---keyword to indicate that this instance of the api boundary Package can be used with the Water Mover (MVR) Package.  When the MOVER option is specified, additional memory is allocated within the package to store the available, provided, and received water.
+
+\end{description}
+\item \textbf{Block: DIMENSIONS}
+
+\begin{description}
+\item \texttt{maxbound}---integer value specifying the maximum number of api boundary cells that will be specified for use during any stress period.
+
+\end{description}
+

doc/mf6io/mf6ivar/tex/gwf-api-dimensions.dat

@@ -0,0 +1,3 @@
+BEGIN DIMENSIONS
+  MAXBOUND <maxbound>
+END DIMENSIONS

doc/mf6io/mf6ivar/tex/gwf-api-options.dat

@@ -0,0 +1,8 @@
+BEGIN OPTIONS
+  [BOUNDNAMES]
+  [PRINT_INPUT]
+  [PRINT_FLOWS]
+  [SAVE_FLOWS]
+  [OBS6 FILEIN <obs6_filename>]
+  [MOVER]
+END OPTIONS

doc/mf6io/mf6ivar/tex/gwt-api-desc.tex

@@ -0,0 +1,29 @@
+% DO NOT MODIFY THIS FILE DIRECTLY.  IT IS CREATED BY mf6ivar.py 
+
+\item \textbf{Block: OPTIONS}
+
+\begin{description}
+\item \texttt{BOUNDNAMES}---keyword to indicate that boundary names may be provided with the list of api boundary cells.
+
+\item \texttt{PRINT\_INPUT}---keyword to indicate that the list of api boundary information will be written to the listing file immediately after it is read.
+
+\item \texttt{PRINT\_FLOWS}---keyword to indicate that the list of api boundary flow rates will be printed to the listing file for every stress period time step in which ``BUDGET PRINT'' is specified in Output Control.  If there is no Output Control option and ``PRINT\_FLOWS'' is specified, then flow rates are printed for the last time step of each stress period.
+
+\item \texttt{SAVE\_FLOWS}---keyword to indicate that api boundary flow terms will be written to the file specified with ``BUDGET FILEOUT'' in Output Control.
+
+\item \texttt{OBS6}---keyword to specify that record corresponds to an observations file.
+
+\item \texttt{FILEIN}---keyword to specify that an input filename is expected next.
+
+\item \texttt{obs6\_filename}---name of input file to define observations for the api boundary package. See the ``Observation utility'' section for instructions for preparing observation input files. Tables \ref{table:gwf-obstypetable} and \ref{table:gwt-obstypetable} lists observation type(s) supported by the api boundary package.
+
+\item \texttt{MOVER}---keyword to indicate that this instance of the api boundary Package can be used with the Water Mover (MVR) Package.  When the MOVER option is specified, additional memory is allocated within the package to store the available, provided, and received water.
+
+\end{description}
+\item \textbf{Block: DIMENSIONS}
+
+\begin{description}
+\item \texttt{maxbound}---integer value specifying the maximum number of api boundary cells that will be specified for use during any stress period.
+
+\end{description}
+

doc/mf6io/mf6ivar/tex/gwt-api-dimensions.dat

@@ -0,0 +1,3 @@
+BEGIN DIMENSIONS
+  MAXBOUND <maxbound>
+END DIMENSIONS

doc/mf6io/mf6ivar/tex/gwt-api-options.dat

@@ -0,0 +1,8 @@
+BEGIN OPTIONS
+  [BOUNDNAMES]
+  [PRINT_INPUT]
+  [PRINT_FLOWS]
+  [SAVE_FLOWS]
+  [OBS6 FILEIN <obs6_filename>]
+  [MOVER]
+END OPTIONS

doc/mf6io/mf6output.tex

@@ -2,9 +2,9 @@
 \begin{lstlisting}[style=modeloutput]
                                    MODFLOW 6
                 U.S. GEOLOGICAL SURVEY MODULAR HYDROLOGIC MODEL
-                            VERSION 6.2.1 02/18/2021
+                            VERSION 6.2.2 07/30/2021
 
-   MODFLOW 6 compiled Feb 18 2021 08:24:05 with IFORT compiler (ver. 19.10.2)
+   MODFLOW 6 compiled Jul 30 2021 14:34:58 with IFORT compiler (ver. 19.10.2)
 
 This software has been approved for release by the U.S. Geological
 Survey (USGS). Although the software has been subjected to rigorous
@@ -20,15 +20,15 @@
 and distribution information.
 
 
- Run start date and time (yyyy/mm/dd hh:mm:ss): 2021/02/18  8:32:29
+ Run start date and time (yyyy/mm/dd hh:mm:ss): 2021/07/30 14:44:24
 
  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): 2021/02/18  8:32:29
- Elapsed run time:  0.076 Seconds
+ Run end date and time (yyyy/mm/dd hh:mm:ss): 2021/07/30 14:44:24
+ Elapsed run time:  0.062 Seconds
 
  Normal termination of simulation.
 

doc/mf6io/mf6switches.tex

@@ -1,6 +1,6 @@
 {\small
 \begin{lstlisting}[style=modeloutput]
-mf6.exe - MODFLOW 6.2.1 02/18/2021 (compiled Feb 18 2021 08:24:05)
+mf6.exe - MODFLOW 6.2.2 07/30/2021 (compiled Jul 30 2021 14:34:58)
 usage: mf6.exe               run MODFLOW 6 using "mfsim.nam"
    or: mf6.exe [options]     retrieve program information
 

doc/version.py

@@ -1,5 +1,5 @@
 # MODFLOW 6 version file automatically created using...make_release.py
-# created on...February 18, 2021 12:04:58
+# created on...July 30, 2021 14:34:30
 
 major = 6
 minor = 2

doc/version.tex

@@ -1,3 +1,3 @@
-\newcommand{\modflowversion}{mf6.2.2---release candidate}
-\newcommand{\modflowdate}{February 18, 2021}
+\newcommand{\modflowversion}{mf6.2.2}
+\newcommand{\modflowdate}{July 30, 2021}
 \newcommand{\currentmodflowversion}{Version \modflowversion---\modflowdate}

make/makedefaults

@@ -1,5 +1,5 @@
-# makedefaults created on 2021-02-18 08:23:56.262624
-# by pymake (version 1.2.0) for the 'mf6' executable 
+# makedefaults created on 2021-07-30 14:34:49.615882
+# by pymake (version 1.2.1) for the 'mf6' executable 
 # using the 'gfortran' fortran compiler(s).
 
 # determine OS
@@ -58,14 +58,14 @@ OPTLEVEL ?= -O2
 # set the fortran flags
 ifeq ($(detected_OS), Windows)
 	ifeq ($(FC), gfortran)
-		FFLAGS ?= -static -fbacktrace $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -pedantic -std=f2008
+		FFLAGS ?= -static -fbacktrace $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -pedantic -std=f2008 -Wcharacter-truncation -cpp
 	endif
 else
 	ifeq ($(FC), gfortran)
-		FFLAGS ?= -fbacktrace $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -pedantic -std=f2008
+		FFLAGS ?= -fbacktrace $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -pedantic -std=f2008 -Wcharacter-truncation -cpp
 	endif
 	ifeq ($(FC), $(filter $(FC), ifort mpiifort))
-		FFLAGS ?= -no-heap-arrays -fpe0 -traceback
+		FFLAGS ?= -no-heap-arrays -fpe0 -traceback -fpp
 		MODSWITCH = -module $(MODDIR)
 	endif
 endif