Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Post release 6.4.3 reset #1595

Merged
merged 3 commits into from
Feb 8, 2024
Merged

Post release 6.4.3 reset #1595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
196bb42
ci(release): update version to 6.4.3
github-actions[bot] Feb 7, 2024
be6d39f
Merge pull request #1594 from MODFLOW-USGS/v6.4.3
wpbonelli Feb 7, 2024
7b5f3d7
ci(release): update version to 6.5.0.dev1, reset IDEVELOPMODE to 1
github-actions[bot] Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CITATION.cff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ cff-version: 1.2.0
message: If you use this software, please cite the software itself.
type: software
title: MODFLOW 6 Modular Hydrologic Model
version: 6.5.0.dev0
date-released: '2023-07-13'
version: 6.5.0.dev1
date-released: '2024-02-07'
doi: 10.5066/F76Q1VQV
abstract: MODFLOW 6 is an object-oriented program and framework developed to provide
a platform for supporting multiple models and multiple types of models within the
Expand Down Expand Up @@ -60,7 +60,7 @@ authors:
orcid: https://orcid.org/0000-0002-2665-5078
- family-names: Boyce
given-names: Scott E.
alias: ScottBoyce
alias: ScottBoyce
affiliation: U.S. Geological Survey
orcid: https://orcid.org/0000-0003-0626-9492
- family-names: Banta
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
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.5.0.dev0 (preliminary)
### Version 6.5.0.dev1 (preliminary)

[![GitHub release](https://img.shields.io/github/release/MODFLOW-USGS/modflow6.svg)](https://github.com/MODFLOW-USGS/modflow6/releases/latest)
[![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)
Expand Down
4 changes: 2 additions & 2 deletions code.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
"email": "[email protected]"
},
"laborHours": -1,
"version": "6.5.0.dev0",
"version": "6.5.0.dev1",
"date": {
"metadataLastUpdated": "2023-07-13"
"metadataLastUpdated": "2024-02-07"
},
"organization": "U.S. Geological Survey",
"permissions": {
Expand Down
4 changes: 2 additions & 2 deletions doc/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# MODFLOW 6 version file automatically created using...update_version.py
# created on...July 13, 2023 15:32:29
__version__ = "6.5.0.dev0"
# created on...February 07, 2024 21:29:25
__version__ = "6.5.0.dev1"
4 changes: 2 additions & 2 deletions doc/version.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
\newcommand{\modflowversion}{mf6.5.0.dev0}
\newcommand{\modflowdate}{July 13, 2023}
\newcommand{\modflowversion}{mf6.5.0.dev1}
\newcommand{\modflowdate}{February 07, 2024}
\newcommand{\currentmodflowversion}{Version \modflowversion---\modflowdate}
2 changes: 1 addition & 1 deletion meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project(
'MODFLOW 6',
'fortran',
version: '6.5.0.dev0',
version: '6.5.0.dev1',
license: 'CC0',
meson_version: '>= 1.1.0',
default_options : [
Expand Down
4 changes: 2 additions & 2 deletions src/Utilities/version.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ module VersionModule
public
! -- modflow 6 version
integer(I4B), parameter :: IDEVELOPMODE = 1
character(len=*), parameter :: VERSIONNUMBER = '6.5.0.dev0'
character(len=*), parameter :: VERSIONTAG = ' (preliminary) 07/13/2023'
character(len=*), parameter :: VERSIONNUMBER = '6.5.0.dev1'
character(len=*), parameter :: VERSIONTAG = ' (preliminary) 02/07/2024'
character(len=40), parameter :: VERSION = VERSIONNUMBER//VERSIONTAG
character(len=2), parameter :: MFVNAM = ' 6'
character(len=*), parameter :: MFTITLE = &
Expand Down
2 changes: 1 addition & 1 deletion version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.5.0.dev0
6.5.0.dev1
Loading