Skip to content

Commit 6a73c18

Browse files
christianlangevinHofer-Julian
christianlangevin
authored and
Hofer-Julian
committed
ci(release): reinitialize develop for next release
1 parent 0a00231 commit 6a73c18

7 files changed

Lines changed: 36 additions & 40 deletions

File tree

‎DISCLAIMER.md‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
Disclaimer
22
----------
33

4-
This software has been approved for release by the U.S. Geological Survey
5-
(USGS). Although the software has been subjected to rigorous review, the USGS
6-
reserves the right to update the software as needed pursuant to further analysis
7-
and review. No warranty, expressed or implied, is made by the USGS or the U.S.
8-
Government as to the functionality of the software and related material nor
9-
shall the fact of release constitute any such warranty. Furthermore, the
10-
software is released on condition that neither the USGS nor the U.S. Government
11-
shall be held liable for any damages resulting from its authorized or
12-
unauthorized use.
4+
This software is preliminary or provisional and is subject to revision. It is
5+
being provided to meet the need for timely best science. The software has not
6+
received final approval by the U.S. Geological Survey (USGS). No warranty,
7+
expressed or implied, is made by the USGS or the U.S. Government as to the
8+
functionality of the software and related material nor shall the fact of release
9+
constitute any such warranty. The software is provided on the condition that
10+
neither the USGS nor the U.S. Government shall be held liable for any damages
11+
resulting from the authorized or unauthorized use of the software.

‎README.md‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
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).
55

6-
### Version 6.3.0
6+
### Version 6.4.0 release candidate
77

88
[![tests - ifort](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/ci-tests-ifort.yml/badge.svg)](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/ci-tests-ifort.yml)
99
[![tests - gfortran - latest version](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/ci-tests-gfortran-latest.yml/badge.svg)](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/ci-tests-gfortran-latest.yml)
@@ -105,13 +105,12 @@ Citations for specific versions are included with the [releases](https://github.
105105
Disclaimer
106106
----------
107107

108-
This software has been approved for release by the U.S. Geological Survey
109-
(USGS). Although the software has been subjected to rigorous review, the USGS
110-
reserves the right to update the software as needed pursuant to further analysis
111-
and review. No warranty, expressed or implied, is made by the USGS or the U.S.
112-
Government as to the functionality of the software and related material nor
113-
shall the fact of release constitute any such warranty. Furthermore, the
114-
software is released on condition that neither the USGS nor the U.S. Government
115-
shall be held liable for any damages resulting from its authorized or
116-
unauthorized use.
108+
This software is preliminary or provisional and is subject to revision. It is
109+
being provided to meet the need for timely best science. The software has not
110+
received final approval by the U.S. Geological Survey (USGS). No warranty,
111+
expressed or implied, is made by the USGS or the U.S. Government as to the
112+
functionality of the software and related material nor shall the fact of release
113+
constitute any such warranty. The software is provided on the condition that
114+
neither the USGS nor the U.S. Government shall be held liable for any damages
115+
resulting from the authorized or unauthorized use of the software.
117116

‎code.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[
22
{
3-
"status": "Production",
3+
"status": "Release Candidate",
44
"languages": [
55
"Fortran2008"
66
],
@@ -18,7 +18,7 @@
1818
"email": "langevin@usgs.gov"
1919
},
2020
"laborHours": -1,
21-
"version": "6.3.0",
21+
"version": "6.4.0",
2222
"date": {
2323
"metadataLastUpdated": "2022-03-04"
2424
},

‎doc/version.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# MODFLOW 6 version file automatically created using...make_release.py
2-
# created on...March 04, 2022 11:12:44
2+
# created on...March 04, 2022 13:18:46
33

44
major = 6
5-
minor = 3
5+
minor = 4
66
micro = 0
77
__version__ = '{:d}.{:d}.{:d}'.format(major, minor, micro)

‎doc/version.tex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
\newcommand{\modflowversion}{mf6.3.0}
1+
\newcommand{\modflowversion}{mf6.4.0---release candidate}
22
\newcommand{\modflowdate}{March 04, 2022}
33
\newcommand{\currentmodflowversion}{Version \modflowversion---\modflowdate}

‎src/Utilities/version.f90‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ module VersionModule
1414
implicit none
1515
public
1616
! -- modflow 6 version
17-
integer(I4B), parameter :: IDEVELOPMODE = 0
18-
character(len=40), parameter :: VERSION = '6.3.0 03/04/2022'
17+
integer(I4B), parameter :: IDEVELOPMODE = 1
18+
character(len=40), parameter :: VERSION = '6.4.0 release candidate 03/04/2022'
1919
character(len=10), parameter :: MFVNAM = ' 6'
2020
character(len=*), parameter :: MFTITLE = &
2121
'U.S. GEOLOGICAL SURVEY MODULAR HYDROLOGIC MODEL'
@@ -56,18 +56,16 @@ module VersionModule
5656
! -- disclaimer must be appropriate for version (release or release candidate)
5757
character(len=*), parameter :: FMTDISCLAIMER = &
5858
"(/, &
59-
&'This software has been approved for release by the U.S. Geological ',/, &
60-
&'Survey (USGS). Although the software has been subjected to rigorous ',/, &
61-
&'review, the USGS reserves the right to update the software as needed ',/, &
62-
&'pursuant to further analysis and review. No warranty, expressed or ',/, &
63-
&'implied, is made by the USGS or the U.S. Government as to the ',/, &
64-
&'functionality of the software and related material nor shall the ',/, &
65-
&'fact of release constitute any such warranty. Furthermore, the ',/, &
66-
&'software is released on condition that neither the USGS nor the U.S. ',/, &
67-
&'Government shall be held liable for any damages resulting from its ',/, &
68-
&'authorized or unauthorized use. Also refer to the USGS Water ',/, &
69-
&'Resources Software User Rights Notice for complete use, copyright, ',/, &
70-
&'and distribution information.',/)"
59+
&'This software is preliminary or provisional and is subject to ',/, &
60+
&'revision. It is being provided to meet the need for timely best ',/, &
61+
&'science. The software has not received final approval by the U.S. ',/, &
62+
&'Geological Survey (USGS). No warranty, expressed or implied, is made ',/, &
63+
&'by the USGS or the U.S. Government as to the functionality of the ',/, &
64+
&'software and related material nor shall the fact of release ',/, &
65+
&'constitute any such warranty. The software is provided on the ',/, &
66+
&'condition that neither the USGS nor the U.S. Government shall be held ',/,&
67+
&'liable for any damages resulting from the authorized or unauthorized ',/, &
68+
&'use of the software.',/)"
7169

7270
contains
7371

‎version.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# MODFLOW 6 version file automatically created using...make_release.py
2-
# created on...March 04, 2022 11:12:44
2+
# created on...March 04, 2022 13:18:46
33

44
major = 6
5-
minor = 3
5+
minor = 4
66
micro = 0
77
__version__ = '{:d}.{:d}.{:d}'.format(major, minor, micro)

0 commit comments

Comments
 (0)