diff --git a/CITATION.cff b/CITATION.cff index c2fff462923..094e7d0686d 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -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.dev1 -date-released: '2024-02-08' +version: 6.5.0.dev2 +date-released: '2024-02-13' 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 diff --git a/README.md b/README.md index 303b0f49002..15ec9fb662f 100644 --- a/README.md +++ b/README.md @@ -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.dev1 (preliminary) +### Version 6.5.0.dev2 (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) diff --git a/code.json b/code.json index 45049765bd2..8edddb0aa5a 100644 --- a/code.json +++ b/code.json @@ -18,9 +18,9 @@ "email": "langevin@usgs.gov" }, "laborHours": -1, - "version": "6.5.0.dev1", + "version": "6.5.0.dev2", "date": { - "metadataLastUpdated": "2024-02-07" + "metadataLastUpdated": "2024-02-13" }, "organization": "U.S. Geological Survey", "permissions": { diff --git a/doc/ReleaseNotes/ReleaseNotes.tex b/doc/ReleaseNotes/ReleaseNotes.tex index 6d41dd8ad47..d5ccd1117c0 100644 --- a/doc/ReleaseNotes/ReleaseNotes.tex +++ b/doc/ReleaseNotes/ReleaseNotes.tex @@ -177,6 +177,7 @@ \section{Release History} 6.4.1 & December 9, 2022 & \url{https://doi.org/10.5066/P9FL1JCC} \\ 6.4.2 & June 28, 2023 & \url{https://doi.org/10.5066/P9FL1JCC} \\ 6.4.3 & February 7, 2024 & \url{https://doi.org/10.5066/P9FL1JCC} \\ +6.4.4 & February 13, 2024 & \url{https://doi.org/10.5066/P9FL1JCC} \\ 6.x.x & Xxx x, 202x & \url{https://doi.org/10.5066/P9FL1JCC} \\ \hline \label{tab:releases} diff --git a/doc/ReleaseNotes/appendixA.tex b/doc/ReleaseNotes/appendixA.tex index bcc041cb842..694c2540f64 100644 --- a/doc/ReleaseNotes/appendixA.tex +++ b/doc/ReleaseNotes/appendixA.tex @@ -1,5 +1,6 @@ This appendix describes changes introduced into MODFLOW~6 in previous releases. These changes may substantially affect users. + \input{./previous/v6.4.4.tex} \input{./previous/v6.4.3.tex} \input{./previous/v6.4.2.tex} \input{./previous/v6.4.1.tex} diff --git a/doc/ReleaseNotes/previous/v6.4.4.tex b/doc/ReleaseNotes/previous/v6.4.4.tex new file mode 100644 index 00000000000..20733d85bb4 --- /dev/null +++ b/doc/ReleaseNotes/previous/v6.4.4.tex @@ -0,0 +1,69 @@ +% Use this template for starting initializing the release notes +% after a release has just been made. + + \subsection{Version mf6.4.4--February 13, 2024} + + %\underline{NEW FUNCTIONALITY} + %\begin{itemize} + % \item xxx + % \item xxx + % \item xxx + %\end{itemize} + + %\underline{EXAMPLES} + %\begin{itemize} + % \item xxx + % \item xxx + % \item xxx + %\end{itemize} + + %\textbf{\underline{BUG FIXES AND OTHER CHANGES TO EXISTING FUNCTIONALITY}} \\ + %\underline{BASIC FUNCTIONALITY} + %\begin{itemize} + % \item xxx + % \item xxx + % \item xxx + %\end{itemize} + + %\underline{INTERNAL FLOW PACKAGES} + %\begin{itemize} + % \item xxx + % \item xxx + % \item xxx + %\end{itemize} + + %\underline{STRESS PACKAGES} + %\begin{itemize} + % \item xxx + % \item xxx + % \item xxx + %\end{itemize} + + \underline{ADVANCED STRESS PACKAGES} + \begin{itemize} + \item Refactoring of the Water Mover package in version 6.4.3 introduced a reduction in performance for GWF models with a large number of movers. The program was corrected so that performance is similar to previous versions. + \item Deprecation warnings in the Lake and Streamflow Routing Packages, which can be issued by MODFLOW 6 at run time, incorrectly listed the version number as 6.5.0. The warning was modified to show 6.4.3 as the version number for the deprecation. + % \item xxx + \end{itemize} + + %\underline{SOLUTION} + %\begin{itemize} + % \item xxx + % \item xxx + % \item xxx + %\end{itemize} + + %\underline{EXCHANGES} + %\begin{itemize} + % \item xxx + % \item xxx + % \item xxx + %\end{itemize} + + \underline{PARALLEL} + \begin{itemize} + \item A memory leak was identified in the way MPI messages were constructed and cached. The memory leak caused problems for large models with many time steps. The message construction and caching was fixed and tests confirm that the memory leak is no longer present. + % \item xxx + % \item xxx + \end{itemize} + diff --git a/doc/ReleaseNotes/vx.x.x-template.tex b/doc/ReleaseNotes/vx.x.x-template.tex index 7771001dfba..467f4f458ca 100644 --- a/doc/ReleaseNotes/vx.x.x-template.tex +++ b/doc/ReleaseNotes/vx.x.x-template.tex @@ -60,3 +60,10 @@ % \item xxx %\end{itemize} + %\underline{PARALLEL} + %\begin{itemize} + % \item xxx + % \item xxx + % \item xxx + %\end{itemize} + diff --git a/doc/version.py b/doc/version.py index c4fda5d1f40..b9069149d3d 100644 --- a/doc/version.py +++ b/doc/version.py @@ -1,3 +1,3 @@ # MODFLOW 6 version file automatically created using...update_version.py -# created on...February 07, 2024 21:29:25 -__version__ = "6.5.0.dev1" +# created on...February 13, 2024 21:29:25 +__version__ = "6.5.0.dev2" diff --git a/doc/version.tex b/doc/version.tex index 1aa74e9d7a9..ae1627b11a1 100644 --- a/doc/version.tex +++ b/doc/version.tex @@ -1,3 +1,3 @@ -\newcommand{\modflowversion}{mf6.5.0.dev1} -\newcommand{\modflowdate}{February 07, 2024} +\newcommand{\modflowversion}{mf6.5.0.dev2} +\newcommand{\modflowdate}{February 13, 2024} \newcommand{\currentmodflowversion}{Version \modflowversion---\modflowdate} diff --git a/make/makedefaults b/make/makedefaults index 88e1790887a..56b33637346 100644 --- a/make/makedefaults +++ b/make/makedefaults @@ -57,11 +57,11 @@ OPTLEVEL ?= -O2 # set the fortran flags ifeq ($(detected_OS), Windows) ifeq ($(FC), gfortran) - FFLAGS ?= -static -fbacktrace -ffpe-summary=overflow -ffpe-trap=overflow,zero,invalid -fall-intrinsics -pedantic -Wcharacter-truncation $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -std=f2008 -cpp + FFLAGS ?= -static -fbacktrace $(OS_macro) -fall-intrinsics -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -pedantic -std=f2008 -Wcharacter-truncation -cpp endif else ifeq ($(FC), gfortran) - FFLAGS ?= -fbacktrace -ffpe-summary=overflow -ffpe-trap=overflow,zero,invalid -fall-intrinsics -pedantic -Wcharacter-truncation $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -std=f2008 -cpp + FFLAGS ?= -fbacktrace $(OS_macro) -fall-intrinsics -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 -Qdiag-disable:7416 -Qdiag-disable:7025 -Qdiag-disable:5268 -fpp diff --git a/make/makefile b/make/makefile index d7d5d3cef71..ef6f84526e1 100644 --- a/make/makefile +++ b/make/makefile @@ -1,41 +1,41 @@ -# makefile created by pymake (version 1.2.7) for the 'mf6' executable. +# makefile created by pymake (version 1.2.9.dev0) for the 'mf6' executable. include ./makedefaults # Define the source file directories SOURCEDIR1=../src -SOURCEDIR2=../src/Distributed -SOURCEDIR3=../src/Exchange -SOURCEDIR4=../src/Model -SOURCEDIR5=../src/Model/Connection -SOURCEDIR6=../src/Model/Geometry -SOURCEDIR7=../src/Model/GroundWaterEnergy -SOURCEDIR8=../src/Model/GroundWaterFlow -SOURCEDIR9=../src/Model/GroundWaterTransport -SOURCEDIR10=../src/Model/ModelUtilities -SOURCEDIR11=../src/Model/TransportModel -SOURCEDIR12=../src/Solution -SOURCEDIR13=../src/Solution/LinearMethods -SOURCEDIR14=../src/Solution/PETSc -SOURCEDIR15=../src/Timing -SOURCEDIR16=../src/Utilities -SOURCEDIR17=../src/Utilities/ArrayRead -SOURCEDIR18=../src/Utilities/Idm -SOURCEDIR19=../src/Utilities/Idm/mf6blockfile -SOURCEDIR20=../src/Utilities/Idm/selector -SOURCEDIR21=../src/Utilities/Libraries -SOURCEDIR22=../src/Utilities/Libraries/blas -SOURCEDIR23=../src/Utilities/Libraries/daglib -SOURCEDIR24=../src/Utilities/Libraries/rcm -SOURCEDIR25=../src/Utilities/Libraries/sparsekit -SOURCEDIR26=../src/Utilities/Libraries/sparskit2 -SOURCEDIR27=../src/Utilities/Matrix -SOURCEDIR28=../src/Utilities/Memory -SOURCEDIR29=../src/Utilities/Observation -SOURCEDIR30=../src/Utilities/OutputControl -SOURCEDIR31=../src/Utilities/TimeSeries -SOURCEDIR32=../src/Utilities/Vector +SOURCEDIR2=../src/Exchange +SOURCEDIR3=../src/Distributed +SOURCEDIR4=../src/Solution +SOURCEDIR5=../src/Solution/LinearMethods +SOURCEDIR6=../src/Solution/PETSc +SOURCEDIR7=../src/Timing +SOURCEDIR8=../src/Utilities +SOURCEDIR9=../src/Utilities/Idm +SOURCEDIR10=../src/Utilities/Idm/selector +SOURCEDIR11=../src/Utilities/Idm/mf6blockfile +SOURCEDIR12=../src/Utilities/TimeSeries +SOURCEDIR13=../src/Utilities/Memory +SOURCEDIR14=../src/Utilities/OutputControl +SOURCEDIR15=../src/Utilities/ArrayRead +SOURCEDIR16=../src/Utilities/Libraries +SOURCEDIR17=../src/Utilities/Libraries/rcm +SOURCEDIR18=../src/Utilities/Libraries/blas +SOURCEDIR19=../src/Utilities/Libraries/sparskit2 +SOURCEDIR20=../src/Utilities/Libraries/daglib +SOURCEDIR21=../src/Utilities/Libraries/sparsekit +SOURCEDIR22=../src/Utilities/Vector +SOURCEDIR23=../src/Utilities/Matrix +SOURCEDIR24=../src/Utilities/Observation +SOURCEDIR25=../src/Model +SOURCEDIR26=../src/Model/Connection +SOURCEDIR27=../src/Model/GroundWaterTransport +SOURCEDIR28=../src/Model/ModelUtilities +SOURCEDIR29=../src/Model/GroundWaterFlow +SOURCEDIR30=../src/Model/TransportModel +SOURCEDIR31=../src/Model/Geometry +SOURCEDIR32=../src/Model/GroundWaterEnergy VPATH = \ ${SOURCEDIR1} \ diff --git a/meson.build b/meson.build index 605420c63a0..5589f7b43d7 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'MODFLOW 6', 'fortran', - version: '6.5.0.dev1', + version: '6.5.0.dev2', license: 'CC0', meson_version: '>= 1.1.0', default_options : [ diff --git a/src/Utilities/version.f90 b/src/Utilities/version.f90 index b01704b6aa0..0f3fa1ce2ee 100644 --- a/src/Utilities/version.f90 +++ b/src/Utilities/version.f90 @@ -17,8 +17,8 @@ module VersionModule public ! -- modflow 6 version integer(I4B), parameter :: IDEVELOPMODE = 1 - character(len=*), parameter :: VERSIONNUMBER = '6.5.0.dev1' - character(len=*), parameter :: VERSIONTAG = ' (preliminary) 02/07/2024' + character(len=*), parameter :: VERSIONNUMBER = '6.5.0.dev2' + character(len=*), parameter :: VERSIONTAG = ' (preliminary) 02/13/2024' character(len=40), parameter :: VERSION = VERSIONNUMBER//VERSIONTAG character(len=2), parameter :: MFVNAM = ' 6' character(len=*), parameter :: MFTITLE = & diff --git a/utils/mf5to6/make/makedefaults b/utils/mf5to6/make/makedefaults index e7b3710e4ab..471ec1ebcae 100644 --- a/utils/mf5to6/make/makedefaults +++ b/utils/mf5to6/make/makedefaults @@ -57,11 +57,11 @@ OPTLEVEL ?= -O2 # set the fortran flags ifeq ($(detected_OS), Windows) ifeq ($(FC), gfortran) - FFLAGS ?= -static -fbacktrace -ffpe-summary=overflow -ffpe-trap=overflow,zero,invalid $(OS_macro) -cpp + FFLAGS ?= -static -fbacktrace $(OS_macro) -cpp endif else ifeq ($(FC), gfortran) - FFLAGS ?= -fbacktrace -ffpe-summary=overflow -ffpe-trap=overflow,zero,invalid $(OS_macro) -cpp + FFLAGS ?= -fbacktrace $(OS_macro) -cpp endif ifeq ($(FC), $(filter $(FC), ifort mpiifort)) FFLAGS ?= -no-heap-arrays -fpe0 -traceback -Qdiag-disable:7416 -Qdiag-disable:7025 -Qdiag-disable:5268 -fpp diff --git a/utils/mf5to6/make/makefile b/utils/mf5to6/make/makefile index 0e3b414c298..35c5c30f0a6 100644 --- a/utils/mf5to6/make/makefile +++ b/utils/mf5to6/make/makefile @@ -5,10 +5,10 @@ include ./makedefaults # Define the source file directories SOURCEDIR1=../src -SOURCEDIR2=../src/MF2005 -SOURCEDIR3=../src/NWT -SOURCEDIR4=../src/LGR -SOURCEDIR5=../src/Preproc +SOURCEDIR2=../src/NWT +SOURCEDIR3=../src/LGR +SOURCEDIR4=../src/Preproc +SOURCEDIR5=../src/MF2005 SOURCEDIR6=../../../src/Utilities/Memory SOURCEDIR7=../../../src/Utilities/TimeSeries SOURCEDIR8=../../../src/Utilities diff --git a/utils/zonebudget/make/makedefaults b/utils/zonebudget/make/makedefaults index c0eadf7ac21..d53db57a948 100644 --- a/utils/zonebudget/make/makedefaults +++ b/utils/zonebudget/make/makedefaults @@ -57,11 +57,11 @@ OPTLEVEL ?= -O2 # set the fortran flags ifeq ($(detected_OS), Windows) ifeq ($(FC), gfortran) - FFLAGS ?= -static -fbacktrace -ffpe-summary=overflow -ffpe-trap=overflow,zero,invalid -fall-intrinsics -pedantic -Wcharacter-truncation $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -std=f2008 -cpp + FFLAGS ?= -static -fbacktrace $(OS_macro) -fall-intrinsics -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -pedantic -std=f2008 -Wcharacter-truncation -cpp endif else ifeq ($(FC), gfortran) - FFLAGS ?= -fbacktrace -ffpe-summary=overflow -ffpe-trap=overflow,zero,invalid -fall-intrinsics -pedantic -Wcharacter-truncation $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -std=f2008 -cpp + FFLAGS ?= -fbacktrace $(OS_macro) -fall-intrinsics -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 -Qdiag-disable:7416 -Qdiag-disable:7025 -Qdiag-disable:5268 -fpp diff --git a/version.txt b/version.txt index 510f24f8334..393ba97a6cb 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -6.5.0.dev1 \ No newline at end of file +6.5.0.dev2