Skip to content

Commit

Permalink
create 6.4.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
langevin-usgs committed Dec 1, 2022
1 parent 98ddcd8 commit 236d5f6
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 37 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.
19 changes: 10 additions & 9 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.4.0 release candidate
### Version 6.4.0

[![MODFLOW 6 continuous integration](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/ci.yml/badge.svg)](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/ci.yml)
[![MODFLOW 6 documentation](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/docs.yml/badge.svg)](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/docs.yml)
Expand Down Expand Up @@ -105,12 +105,13 @@ Citations for specific versions are included with the [releases](https://github.
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.4.0",
"date": {
"metadataLastUpdated": "2022-03-04"
"metadataLastUpdated": "2022-12-01"
},
"organization": "U.S. Geological Survey",
"permissions": {
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...March 04, 2022 13:18:46
# created on...December 01, 2022 08:04:49

major = 6
minor = 4
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.4.0---release candidate}
\newcommand{\modflowdate}{March 04, 2022}
\newcommand{\modflowversion}{mf6.4.0}
\newcommand{\modflowdate}{December 01, 2022}
\newcommand{\currentmodflowversion}{Version \modflowversion---\modflowdate}
30 changes: 16 additions & 14 deletions src/Utilities/version.f90
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ module VersionModule
implicit none
public
! -- modflow 6 version
integer(I4B), parameter :: IDEVELOPMODE = 1
integer(I4B), parameter :: IDEVELOPMODE = 0
character(len=*), parameter :: VERSIONNUMBER = '6.4.0'
character(len=*), parameter :: VERSIONTAG = ' release candidate 03/04/2022'
character(len=40), parameter :: VERSION = VERSIONNUMBER//VERSIONTAG
character(len=40), parameter :: VERSION = '6.4.0 12/01/2022'
character(len=10), parameter :: MFVNAM = ' 6'
character(len=*), parameter :: MFTITLE = &
&'U.S. GEOLOGICAL SURVEY MODULAR HYDROLOGIC MODEL'
Expand Down Expand Up @@ -56,18 +56,20 @@ module VersionModule
&' (https://github.com/jacobwilliams/daglib)',/&
&)"
! -- disclaimer must be appropriate for version (release or release candidate)
character(len=*), parameter :: FMTDISCLAIMER = &
"(/,&
&'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.',/)"
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.',/)"

contains

Expand Down
2 changes: 1 addition & 1 deletion version.txt
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...March 04, 2022 13:18:46
# created on...December 01, 2022 08:04:49

major = 6
minor = 4
Expand Down

0 comments on commit 236d5f6

Please sign in to comment.