Skip to content

Commit

Permalink
ci(release): release version 6.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
langevin-usgs committed Feb 18, 2021
1 parent c610821 commit 95ff014
Show file tree
Hide file tree
Showing 17 changed files with 261 additions and 221 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.
21 changes: 11 additions & 10 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.2.1 release candidate
### Version 6.2.1

![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,18 +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.2.1 release candidate: U.S. Geological Survey Software Release, 22 October 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, 2021, MODFLOW 6 Modular Hydrologic Model version 6.2.1: U.S. Geological Survey Software Release, 18 February 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.

4 changes: 2 additions & 2 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 @@ -20,7 +20,7 @@
"laborHours": -1,
"version": "6.2.1",
"date": {
"metadataLastUpdated": "2020-10-22"
"metadataLastUpdated": "2021-02-18"
},
"organization": "U.S. Geological Survey",
"permissions": {
Expand Down
2 changes: 1 addition & 1 deletion doc/ReleaseNotes/ReleaseNotes.tex
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ \section{History}
This section describes changes introduced into MODFLOW~6 for the current release. Changes introduced in previous releases are in Appendix~\ref{app:A}. These changes may substantially affect users.

\begin{itemize}
\item Version mf6.2.1--February 17, 2021
\item Version mf6.2.1--February 18, 2021

\underline{NEW FUNCTIONALITY}
\begin{itemize}
Expand Down
38 changes: 37 additions & 1 deletion doc/ReleaseNotes/folder_struct.tex
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
\begin{verbatim}
mf6.2.0/
mf6.2.1/
bin/
doc/
examples/
Expand Down Expand Up @@ -77,6 +77,36 @@
mt3d/
ex-gwt-mt3dms-p01d/
mt3d/
ex-gwt-mt3dms-p02a/
mf2005/
mf6gwf/
mf6gwt/
mt3d/
ex-gwt-mt3dms-p02b/
mf2005/
mf6gwf/
mf6gwt/
mt3d/
ex-gwt-mt3dms-p02c/
mf2005/
mf6gwf/
mf6gwt/
mt3d/
ex-gwt-mt3dms-p02d/
mf2005/
mf6gwf/
mf6gwt/
mt3d/
ex-gwt-mt3dms-p02e/
mf2005/
mf6gwf/
mf6gwt/
mt3d/
ex-gwt-mt3dms-p02f/
mf2005/
mf6gwf/
mf6gwt/
mt3d/
ex-gwt-mt3dms-p03/
mt3d/
ex-gwt-mt3dms-p04a/
Expand Down Expand Up @@ -125,6 +155,12 @@
ex-gwt-prudic2004t2/
mf6gwf/
mf6gwt/
ex-gwt-rotate/
ex-gwt-saltlake/
ex-gwt-uzt-2d-a/
mt3d/
ex-gwt-uzt-2d-b/
mt3d/
make/
msvs/
src/
Expand Down
10 changes: 5 additions & 5 deletions doc/mf6io/mf6output.tex
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
\begin{lstlisting}[style=modeloutput]
MODFLOW 6
U.S. GEOLOGICAL SURVEY MODULAR HYDROLOGIC MODEL
VERSION 6.2.0 10/22/2020
VERSION 6.2.1 02/18/2021

MODFLOW 6 compiled Oct 22 2020 09:26:42 with IFORT compiler (ver. 19.10.2)
MODFLOW 6 compiled Feb 18 2021 08:24:05 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
Expand All @@ -20,15 +20,15 @@
and distribution information.


Run start date and time (yyyy/mm/dd hh:mm:ss): 2020/10/22 9:34:01
Run start date and time (yyyy/mm/dd hh:mm:ss): 2021/02/18 8:32:29

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/10/22 9:34:01
Elapsed run time: 0.068 Seconds
Run end date and time (yyyy/mm/dd hh:mm:ss): 2021/02/18 8:32:29
Elapsed run time: 0.076 Seconds

Normal termination of simulation.

Expand Down
2 changes: 1 addition & 1 deletion doc/mf6io/mf6switches.tex
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{\small
\begin{lstlisting}[style=modeloutput]
mf6.exe - MODFLOW 6.2.0 10/22/2020 (compiled Oct 22 2020 09:26:42)
mf6.exe - MODFLOW 6.2.1 02/18/2021 (compiled Feb 18 2021 08:24:05)
usage: mf6.exe run MODFLOW 6 using "mfsim.nam"
or: mf6.exe [options] retrieve program information

Expand Down
2 changes: 1 addition & 1 deletion doc/version.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# MODFLOW 6 version file automatically created using...make_release.py
# created on...October 22, 2020 12:23:55
# created on...February 18, 2021 08:23:34

major = 6
minor = 2
Expand Down
4 changes: 2 additions & 2 deletions doc/version.tex
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
\newcommand{\modflowversion}{mf6.2.1---release candidate}
\newcommand{\modflowdate}{October 22, 2020}
\newcommand{\modflowversion}{mf6.2.1}
\newcommand{\modflowdate}{February 18, 2021}
\newcommand{\currentmodflowversion}{Version \modflowversion---\modflowdate}
2 changes: 1 addition & 1 deletion make/makedefaults
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# makedefaults created on 2020-10-22 09:26:36.744206
# makedefaults created on 2021-02-18 08:23:56.262624
# by pymake (version 1.2.0) for the 'mf6' executable
# using the 'gfortran' fortran compiler(s).

Expand Down
Loading

0 comments on commit 95ff014

Please sign in to comment.