From 7a6dbe8878dedb981225b55d408726b853e40bf5 Mon Sep 17 00:00:00 2001 From: Christian Langevin Date: Fri, 4 Mar 2022 13:08:14 -0600 Subject: [PATCH] ci(distribution): final 6.3.0 distribution --- DISCLAIMER.md | 17 +++++++++-------- README.md | 20 +++++++++++--------- code.json | 4 ++-- doc/ReleaseNotes/folder_struct.tex | 10 +++++++++- doc/mf6io/mf6noname.tex | 1 - doc/mf6io/mf6output.tex | 12 +++++++----- doc/mf6io/mf6switches.tex | 12 ++++++++---- doc/version.py | 2 +- doc/version.tex | 4 ++-- src/Utilities/version.f90 | 30 ++++++++++++++++-------------- version.txt | 2 +- 11 files changed, 66 insertions(+), 48 deletions(-) diff --git a/DISCLAIMER.md b/DISCLAIMER.md index f32778cb5e4..9226475a939 100644 --- a/DISCLAIMER.md +++ b/DISCLAIMER.md @@ -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. diff --git a/README.md b/README.md index 8fec9a84f39..9dcd2345b60 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.3.0 release candidate +### Version 6.3.0 [![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) [![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,11 +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. + diff --git a/code.json b/code.json index fa39e7627f6..bc4a64f1664 100755 --- a/code.json +++ b/code.json @@ -1,6 +1,6 @@ [ { - "status": "Release Candidate", + "status": "Production", "languages": [ "Fortran2008" ], @@ -20,7 +20,7 @@ "laborHours": -1, "version": "6.3.0", "date": { - "metadataLastUpdated": "2021-07-30" + "metadataLastUpdated": "2022-03-04" }, "organization": "U.S. Geological Survey", "permissions": { diff --git a/doc/ReleaseNotes/folder_struct.tex b/doc/ReleaseNotes/folder_struct.tex index 36a313bc9d5..053f07d8457 100644 --- a/doc/ReleaseNotes/folder_struct.tex +++ b/doc/ReleaseNotes/folder_struct.tex @@ -1,5 +1,5 @@ \begin{verbatim} -mf6.2.2/ +mf6.3.0/ bin/ doc/ examples/ @@ -184,11 +184,13 @@ mt3d/ ex-gwt-uzt-2d-b/ mt3d/ + ex-gwtgwt-mt3dms-p10/ make/ msvs/ src/ Exchange/ Model/ + Connection/ Geometry/ GroundWaterFlow/ GroundWaterTransport/ @@ -197,6 +199,12 @@ SparseMatrixSolver/ Timing/ Utilities/ + Libraries/ + blas/ + daglib/ + rcm/ + sparsekit/ + sparskit2/ Memory/ Observation/ OutputControl/ diff --git a/doc/mf6io/mf6noname.tex b/doc/mf6io/mf6noname.tex index 71a571c4bcc..2a1d08622d2 100644 --- a/doc/mf6io/mf6noname.tex +++ b/doc/mf6io/mf6noname.tex @@ -5,7 +5,6 @@ 1. mf6.exe: mfsim.nam is not present in working directory. -2 \end{lstlisting} } diff --git a/doc/mf6io/mf6output.tex b/doc/mf6io/mf6output.tex index f1e72435f11..6c982d2f831 100644 --- a/doc/mf6io/mf6output.tex +++ b/doc/mf6io/mf6output.tex @@ -2,9 +2,11 @@ \begin{lstlisting}[style=modeloutput] MODFLOW 6 U.S. GEOLOGICAL SURVEY MODULAR HYDROLOGIC MODEL - VERSION 6.2.2 07/30/2021 + VERSION 6.3.0 03/04/2022 - MODFLOW 6 compiled Jul 30 2021 14:34:58 with IFORT compiler (ver. 19.10.2) + MODFLOW 6 compiled Mar 02 2022 15:29:04 with Intel(R) Fortran Intel(R) 64 + Compiler Classic for applications running on Intel(R) 64, Version 2021.5.0 + Build 20211109_000000 This software has been approved for release by the U.S. Geological Survey (USGS). Although the software has been subjected to rigorous @@ -20,15 +22,15 @@ and distribution information. - Run start date and time (yyyy/mm/dd hh:mm:ss): 2021/07/30 14:44:24 + Run start date and time (yyyy/mm/dd hh:mm:ss): 2022/03/04 12:00:35 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): 2021/07/30 14:44:24 - Elapsed run time: 0.062 Seconds + Run end date and time (yyyy/mm/dd hh:mm:ss): 2022/03/04 12:00:36 + Elapsed run time: 0.156 Seconds Normal termination of simulation. diff --git a/doc/mf6io/mf6switches.tex b/doc/mf6io/mf6switches.tex index 7256a532818..280a969fdd6 100644 --- a/doc/mf6io/mf6switches.tex +++ b/doc/mf6io/mf6switches.tex @@ -1,6 +1,6 @@ {\small \begin{lstlisting}[style=modeloutput] -mf6.exe - MODFLOW 6.2.2 07/30/2021 (compiled Jul 30 2021 14:34:58) +mf6.exe - MODFLOW 6.3.0 03/04/2022 (compiled Mar 02 2022 15:29:04) usage: mf6.exe run MODFLOW 6 using "mfsim.nam" or: mf6.exe [options] retrieve program information @@ -8,16 +8,20 @@ -h, -? --help Show this message -v --version Display program version information. -dev --develop Display program develop option mode. + -d --disclaimer Display program disclaimer. + -lic --license Display program license information. -c --compiler Display compiler information. + -co --compiler-opt Display compiler options. -s --silent All STDOUT to mfsim.stdout. -l --level STDOUT output to screen based on . =summary Limited output to STDOUT. =debug Enhanced output to STDOUT. -m --mode MODFLOW 6 simulation mode based on . =validate Check model input for - errors but do assemble or - solve matrix equations or - write solution output. + errors but do not + assemble or solve matrix + equations or write + solution output. Bug reporting and contributions are welcome from the community. Questions can be asked on the issues page[1]. Before creating a new diff --git a/doc/version.py b/doc/version.py index 411cd8eff0a..69888194b97 100644 --- a/doc/version.py +++ b/doc/version.py @@ -1,5 +1,5 @@ # MODFLOW 6 version file automatically created using...make_release.py -# created on...July 30, 2021 15:31:43 +# created on...March 04, 2022 11:12:44 major = 6 minor = 3 diff --git a/doc/version.tex b/doc/version.tex index c49669ec392..b866d55b59c 100644 --- a/doc/version.tex +++ b/doc/version.tex @@ -1,3 +1,3 @@ -\newcommand{\modflowversion}{mf6.3.0---release candidate} -\newcommand{\modflowdate}{July 30, 2021} +\newcommand{\modflowversion}{mf6.3.0} +\newcommand{\modflowdate}{March 04, 2022} \newcommand{\currentmodflowversion}{Version \modflowversion---\modflowdate} diff --git a/src/Utilities/version.f90 b/src/Utilities/version.f90 index ad0fff1d907..22946380c96 100644 --- a/src/Utilities/version.f90 +++ b/src/Utilities/version.f90 @@ -14,8 +14,8 @@ module VersionModule implicit none public ! -- modflow 6 version - integer(I4B), parameter :: IDEVELOPMODE = 1 - character(len=40), parameter :: VERSION = '6.3.0 release candidate 07/30/2021' + integer(I4B), parameter :: IDEVELOPMODE = 0 + character(len=40), parameter :: VERSION = '6.3.0 03/04/2022' character(len=10), parameter :: MFVNAM = ' 6' character(len=*), parameter :: MFTITLE = & 'U.S. GEOLOGICAL SURVEY MODULAR HYDROLOGIC MODEL' @@ -54,18 +54,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 diff --git a/version.txt b/version.txt index 411cd8eff0a..69888194b97 100644 --- a/version.txt +++ b/version.txt @@ -1,5 +1,5 @@ # MODFLOW 6 version file automatically created using...make_release.py -# created on...July 30, 2021 15:31:43 +# created on...March 04, 2022 11:12:44 major = 6 minor = 3