From c41b78dc24267b170f60384abed0d3594433e052 Mon Sep 17 00:00:00 2001 From: Christian Langevin Date: Fri, 30 Jul 2021 15:23:50 -0500 Subject: [PATCH] ci(distribution): final 6.2.2 distribution --- DISCLAIMER.md | 17 +- README.md | 25 +-- code.json | 4 +- doc/ReleaseNotes/folder_struct.tex | 25 ++- doc/mf6io/mf6ivar/tex/gwf-api-desc.tex | 29 +++ doc/mf6io/mf6ivar/tex/gwf-api-dimensions.dat | 3 + doc/mf6io/mf6ivar/tex/gwf-api-options.dat | 8 + doc/mf6io/mf6ivar/tex/gwt-api-desc.tex | 29 +++ doc/mf6io/mf6ivar/tex/gwt-api-dimensions.dat | 3 + doc/mf6io/mf6ivar/tex/gwt-api-options.dat | 8 + doc/mf6io/mf6output.tex | 10 +- doc/mf6io/mf6switches.tex | 2 +- doc/version.py | 2 +- doc/version.tex | 4 +- make/makedefaults | 10 +- make/makefile | 160 +++++++------- src/Utilities/version.f90 | 26 +-- utils/mf5to6/make/makedefaults | 10 +- utils/mf5to6/make/makefile | 210 +++++++++---------- utils/zonebudget/make/makedefaults | 10 +- utils/zonebudget/make/makefile | 22 +- version.txt | 2 +- 22 files changed, 361 insertions(+), 258 deletions(-) create mode 100644 doc/mf6io/mf6ivar/tex/gwf-api-desc.tex create mode 100644 doc/mf6io/mf6ivar/tex/gwf-api-dimensions.dat create mode 100644 doc/mf6io/mf6ivar/tex/gwf-api-options.dat create mode 100644 doc/mf6io/mf6ivar/tex/gwt-api-desc.tex create mode 100644 doc/mf6io/mf6ivar/tex/gwt-api-dimensions.dat create mode 100644 doc/mf6io/mf6ivar/tex/gwt-api-options.dat 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 30a1008b96c..ac493029aeb 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,10 @@ 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.2.2 release candidate +### Version 6.2.2 [![Intel compiler](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/ci-intel.yml/badge.svg)](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/ci-intel.yml) -[![gfortran - latest version](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/ci-gfortran-latest.yml/badge.svg)](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/ci-gfortran-latest.yml) +[![gfortran - latest version](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/ci-gfortran-latest.yml/badge.svg)](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/ci-gfortran-latest.yml) [![gfortran - previous versions](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/ci-gfortran-previous.yml/badge.svg)](https://github.com/MODFLOW-USGS/modflow6/actions/workflows/ci-gfortran-previous.yml) [![MODFLOW 6 intel nightly build](https://github.com/MODFLOW-USGS/modflow6-nightly-build/actions/workflows/nightly-build-intel.yml/badge.svg)](https://github.com/MODFLOW-USGS/modflow6-nightly-build/actions/workflows/nightly-build-intel.yml) @@ -32,7 +32,7 @@ The `develop` branch often contains bug fixes and new features that are not yet Software distributions for the current and previous official USGS releases are available [here](https://github.com/MODFLOW-USGS/modflow6/releases). The current release is also available [here](https://water.usgs.gov/water-resources/software/MODFLOW-6/) from the USGS. ## Examples -MODFLOW 6 has an extensive suite of example problems that are constructed using the python [FloPy](https://github.com/modflowpy/flopy) package. These example problems are contained in a separate git repository located [here](https://github.com/MODFLOW-USGS/modflow6-examples). These examples are included in the official [USGS MODFLOW 6 distribution](https://water.usgs.gov/water-resources/software/MODFLOW-6/), and they are also rendered into online [descriptions](https://modflow6-examples.readthedocs.io/en/master/examples.html) and [jupyter notebooks](https://modflow6-examples.readthedocs.io/en/master/notebook_examples.html). +MODFLOW 6 has an extensive suite of example problems that are constructed using the python [FloPy](https://github.com/modflowpy/flopy) package. These example problems are contained in a separate git repository located [here](https://github.com/MODFLOW-USGS/modflow6-examples). These examples are included in the official [USGS MODFLOW 6 distribution](https://water.usgs.gov/water-resources/software/MODFLOW-6/), and they are also rendered into online [descriptions](https://modflow6-examples.readthedocs.io/en/master/examples.html) and [jupyter notebooks](https://modflow6-examples.readthedocs.io/en/master/notebook_examples.html). ## Continuous Integration @@ -84,18 +84,19 @@ The GWT model for MODFLOW 6 simulates three-dimensional transport of a single so #### ***Software/Code*** -[Langevin, C.D., Hughes, J.D., Banta, E.R., Provost, A.M., Niswonger, R.G., and Panday, Sorab, 2021, MODFLOW 6 Modular Hydrologic Model version 6.2.2 release candidate: U.S. Geological Survey Software Release, 18 February 2021, https://doi.org/10.5066/F76Q1VQV](https://doi.org/10.5066/F76Q1VQV) +[Langevin, C.D., Hughes, J.D., Banta, E.R., Provost, A.M., Niswonger, R.G., and Panday, Sorab, 2021, MODFLOW 6 Modular Hydrologic Model version 6.2.2: U.S. Geological Survey Software Release, 30 July 2021, https://doi.org/10.5066/F76Q1VQV](https://doi.org/10.5066/F76Q1VQV) 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 31b37a85ec5..457ca7e2b8b 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.2.2", "date": { - "metadataLastUpdated": "2021-02-18" + "metadataLastUpdated": "2021-07-30" }, "organization": "U.S. Geological Survey", "permissions": { diff --git a/doc/ReleaseNotes/folder_struct.tex b/doc/ReleaseNotes/folder_struct.tex index 9f0fd71000f..36a313bc9d5 100644 --- a/doc/ReleaseNotes/folder_struct.tex +++ b/doc/ReleaseNotes/folder_struct.tex @@ -1,5 +1,5 @@ \begin{verbatim} -mf6.2.1/ +mf6.2.2/ bin/ doc/ examples/ @@ -12,6 +12,21 @@ ex-gwf-csub-p01/ ex-gwf-csub-p02a/ ex-gwf-csub-p02b/ + ex-gwf-csub-p02c/ + es-001/ + es-002/ + es-005/ + es-010/ + es-020/ + es-050/ + es-100/ + hb-001/ + hb-002/ + hb-005/ + hb-010/ + hb-020/ + hb-050/ + hb-100/ ex-gwf-csub-p03a/ ex-gwf-csub-p03b/ ex-gwf-csub-p04/ @@ -32,6 +47,8 @@ ex-gwf-maw-p01b/ ex-gwf-maw-p02/ ex-gwf-maw-p03a/ + ex-gwf-maw-p03b/ + ex-gwf-maw-p03c/ ex-gwf-nwt-p02a/ ex-gwf-nwt-p02b/ ex-gwf-nwt-p03a/ @@ -46,6 +63,12 @@ ex-gwf-u1disv-x/ ex-gwf-whirl/ ex-gwf-zaidel/ + ex-gwt-hecht-mendez-b/ + mf6gwf/ + mf6gwt/ + ex-gwt-hecht-mendez-c/ + mf6gwf/ + mf6gwt/ ex-gwt-henry-a/ ex-gwt-henry-b/ ex-gwt-keating/ diff --git a/doc/mf6io/mf6ivar/tex/gwf-api-desc.tex b/doc/mf6io/mf6ivar/tex/gwf-api-desc.tex new file mode 100644 index 00000000000..f00b7dc80bb --- /dev/null +++ b/doc/mf6io/mf6ivar/tex/gwf-api-desc.tex @@ -0,0 +1,29 @@ +% DO NOT MODIFY THIS FILE DIRECTLY. IT IS CREATED BY mf6ivar.py + +\item \textbf{Block: OPTIONS} + +\begin{description} +\item \texttt{BOUNDNAMES}---keyword to indicate that boundary names may be provided with the list of api boundary cells. + +\item \texttt{PRINT\_INPUT}---keyword to indicate that the list of api boundary information will be written to the listing file immediately after it is read. + +\item \texttt{PRINT\_FLOWS}---keyword to indicate that the list of api boundary flow rates will be printed to the listing file for every stress period time step in which ``BUDGET PRINT'' is specified in Output Control. If there is no Output Control option and ``PRINT\_FLOWS'' is specified, then flow rates are printed for the last time step of each stress period. + +\item \texttt{SAVE\_FLOWS}---keyword to indicate that api boundary flow terms will be written to the file specified with ``BUDGET FILEOUT'' in Output Control. + +\item \texttt{OBS6}---keyword to specify that record corresponds to an observations file. + +\item \texttt{FILEIN}---keyword to specify that an input filename is expected next. + +\item \texttt{obs6\_filename}---name of input file to define observations for the api boundary package. See the ``Observation utility'' section for instructions for preparing observation input files. Tables \ref{table:gwf-obstypetable} and \ref{table:gwt-obstypetable} lists observation type(s) supported by the api boundary package. + +\item \texttt{MOVER}---keyword to indicate that this instance of the api boundary Package can be used with the Water Mover (MVR) Package. When the MOVER option is specified, additional memory is allocated within the package to store the available, provided, and received water. + +\end{description} +\item \textbf{Block: DIMENSIONS} + +\begin{description} +\item \texttt{maxbound}---integer value specifying the maximum number of api boundary cells that will be specified for use during any stress period. + +\end{description} + diff --git a/doc/mf6io/mf6ivar/tex/gwf-api-dimensions.dat b/doc/mf6io/mf6ivar/tex/gwf-api-dimensions.dat new file mode 100644 index 00000000000..7b4c7bf6ec7 --- /dev/null +++ b/doc/mf6io/mf6ivar/tex/gwf-api-dimensions.dat @@ -0,0 +1,3 @@ +BEGIN DIMENSIONS + MAXBOUND +END DIMENSIONS diff --git a/doc/mf6io/mf6ivar/tex/gwf-api-options.dat b/doc/mf6io/mf6ivar/tex/gwf-api-options.dat new file mode 100644 index 00000000000..1b75ddeac7f --- /dev/null +++ b/doc/mf6io/mf6ivar/tex/gwf-api-options.dat @@ -0,0 +1,8 @@ +BEGIN OPTIONS + [BOUNDNAMES] + [PRINT_INPUT] + [PRINT_FLOWS] + [SAVE_FLOWS] + [OBS6 FILEIN ] + [MOVER] +END OPTIONS diff --git a/doc/mf6io/mf6ivar/tex/gwt-api-desc.tex b/doc/mf6io/mf6ivar/tex/gwt-api-desc.tex new file mode 100644 index 00000000000..f00b7dc80bb --- /dev/null +++ b/doc/mf6io/mf6ivar/tex/gwt-api-desc.tex @@ -0,0 +1,29 @@ +% DO NOT MODIFY THIS FILE DIRECTLY. IT IS CREATED BY mf6ivar.py + +\item \textbf{Block: OPTIONS} + +\begin{description} +\item \texttt{BOUNDNAMES}---keyword to indicate that boundary names may be provided with the list of api boundary cells. + +\item \texttt{PRINT\_INPUT}---keyword to indicate that the list of api boundary information will be written to the listing file immediately after it is read. + +\item \texttt{PRINT\_FLOWS}---keyword to indicate that the list of api boundary flow rates will be printed to the listing file for every stress period time step in which ``BUDGET PRINT'' is specified in Output Control. If there is no Output Control option and ``PRINT\_FLOWS'' is specified, then flow rates are printed for the last time step of each stress period. + +\item \texttt{SAVE\_FLOWS}---keyword to indicate that api boundary flow terms will be written to the file specified with ``BUDGET FILEOUT'' in Output Control. + +\item \texttt{OBS6}---keyword to specify that record corresponds to an observations file. + +\item \texttt{FILEIN}---keyword to specify that an input filename is expected next. + +\item \texttt{obs6\_filename}---name of input file to define observations for the api boundary package. See the ``Observation utility'' section for instructions for preparing observation input files. Tables \ref{table:gwf-obstypetable} and \ref{table:gwt-obstypetable} lists observation type(s) supported by the api boundary package. + +\item \texttt{MOVER}---keyword to indicate that this instance of the api boundary Package can be used with the Water Mover (MVR) Package. When the MOVER option is specified, additional memory is allocated within the package to store the available, provided, and received water. + +\end{description} +\item \textbf{Block: DIMENSIONS} + +\begin{description} +\item \texttt{maxbound}---integer value specifying the maximum number of api boundary cells that will be specified for use during any stress period. + +\end{description} + diff --git a/doc/mf6io/mf6ivar/tex/gwt-api-dimensions.dat b/doc/mf6io/mf6ivar/tex/gwt-api-dimensions.dat new file mode 100644 index 00000000000..7b4c7bf6ec7 --- /dev/null +++ b/doc/mf6io/mf6ivar/tex/gwt-api-dimensions.dat @@ -0,0 +1,3 @@ +BEGIN DIMENSIONS + MAXBOUND +END DIMENSIONS diff --git a/doc/mf6io/mf6ivar/tex/gwt-api-options.dat b/doc/mf6io/mf6ivar/tex/gwt-api-options.dat new file mode 100644 index 00000000000..1b75ddeac7f --- /dev/null +++ b/doc/mf6io/mf6ivar/tex/gwt-api-options.dat @@ -0,0 +1,8 @@ +BEGIN OPTIONS + [BOUNDNAMES] + [PRINT_INPUT] + [PRINT_FLOWS] + [SAVE_FLOWS] + [OBS6 FILEIN ] + [MOVER] +END OPTIONS diff --git a/doc/mf6io/mf6output.tex b/doc/mf6io/mf6output.tex index c0678cf5cd3..f1e72435f11 100644 --- a/doc/mf6io/mf6output.tex +++ b/doc/mf6io/mf6output.tex @@ -2,9 +2,9 @@ \begin{lstlisting}[style=modeloutput] MODFLOW 6 U.S. GEOLOGICAL SURVEY MODULAR HYDROLOGIC MODEL - VERSION 6.2.1 02/18/2021 + VERSION 6.2.2 07/30/2021 - MODFLOW 6 compiled Feb 18 2021 08:24:05 with IFORT compiler (ver. 19.10.2) + MODFLOW 6 compiled Jul 30 2021 14:34:58 with IFORT compiler (ver. 19.10.2) This software has been approved for release by the U.S. Geological Survey (USGS). Although the software has been subjected to rigorous @@ -20,15 +20,15 @@ and distribution information. - Run start date and time (yyyy/mm/dd hh:mm:ss): 2021/02/18 8:32:29 + Run start date and time (yyyy/mm/dd hh:mm:ss): 2021/07/30 14:44:24 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/02/18 8:32:29 - Elapsed run time: 0.076 Seconds + Run end date and time (yyyy/mm/dd hh:mm:ss): 2021/07/30 14:44:24 + Elapsed run time: 0.062 Seconds Normal termination of simulation. diff --git a/doc/mf6io/mf6switches.tex b/doc/mf6io/mf6switches.tex index 2b266012d97..7256a532818 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.1 02/18/2021 (compiled Feb 18 2021 08:24:05) +mf6.exe - MODFLOW 6.2.2 07/30/2021 (compiled Jul 30 2021 14:34:58) usage: mf6.exe run MODFLOW 6 using "mfsim.nam" or: mf6.exe [options] retrieve program information diff --git a/doc/version.py b/doc/version.py index 918c9db57c0..b1ad5955fb7 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...February 18, 2021 12:04:58 +# created on...July 30, 2021 14:34:30 major = 6 minor = 2 diff --git a/doc/version.tex b/doc/version.tex index 204b2e2c818..a9eadeef001 100644 --- a/doc/version.tex +++ b/doc/version.tex @@ -1,3 +1,3 @@ -\newcommand{\modflowversion}{mf6.2.2---release candidate} -\newcommand{\modflowdate}{February 18, 2021} +\newcommand{\modflowversion}{mf6.2.2} +\newcommand{\modflowdate}{July 30, 2021} \newcommand{\currentmodflowversion}{Version \modflowversion---\modflowdate} diff --git a/make/makedefaults b/make/makedefaults index baf00a7dc04..7d9996b8d93 100644 --- a/make/makedefaults +++ b/make/makedefaults @@ -1,5 +1,5 @@ -# makedefaults created on 2021-02-18 08:23:56.262624 -# by pymake (version 1.2.0) for the 'mf6' executable +# makedefaults created on 2021-07-30 14:34:49.615882 +# by pymake (version 1.2.1) for the 'mf6' executable # using the 'gfortran' fortran compiler(s). # determine OS @@ -58,14 +58,14 @@ OPTLEVEL ?= -O2 # set the fortran flags ifeq ($(detected_OS), Windows) ifeq ($(FC), gfortran) - FFLAGS ?= -static -fbacktrace $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -pedantic -std=f2008 + FFLAGS ?= -static -fbacktrace $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -pedantic -std=f2008 -Wcharacter-truncation -cpp endif else ifeq ($(FC), gfortran) - FFLAGS ?= -fbacktrace $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -pedantic -std=f2008 + FFLAGS ?= -fbacktrace $(OS_macro) -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 + FFLAGS ?= -no-heap-arrays -fpe0 -traceback -fpp MODSWITCH = -module $(MODDIR) endif endif diff --git a/make/makefile b/make/makefile index 8cc569a10f3..45f7d424cb3 100644 --- a/make/makefile +++ b/make/makefile @@ -1,5 +1,5 @@ -# makefile created on 2021-02-18 08:23:56.262624 -# by pymake (version 1.2.0) for the 'mf6' executable +# makefile created on 2021-07-30 14:34:49.615882 +# by pymake (version 1.2.1) for the 'mf6' executable # using the 'gfortran' fortran compiler(s). @@ -39,134 +39,142 @@ ${SOURCEDIR13} \ ${SOURCEDIR14} \ ${SOURCEDIR15} -.SUFFIXES: .f90 .fpp .o +.SUFFIXES: .f90 .o OBJECTS = \ -$(OBJDIR)/OpenSpec.o \ $(OBJDIR)/kind.o \ -$(OBJDIR)/compilerversion.o \ +$(OBJDIR)/Sparse.o \ $(OBJDIR)/ims8reordering.o \ -$(OBJDIR)/BaseGeometry.o \ -$(OBJDIR)/HashTable.o \ $(OBJDIR)/Constants.o \ +$(OBJDIR)/GwfNpfGridData.o \ $(OBJDIR)/Xt3dAlgorithm.o \ +$(OBJDIR)/compilerversion.o \ +$(OBJDIR)/SmoothingFunctions.o \ $(OBJDIR)/PackageBudget.o \ -$(OBJDIR)/Sparse.o \ +$(OBJDIR)/GwfNpfOptions.o \ +$(OBJDIR)/OpenSpec.o \ +$(OBJDIR)/HashTable.o \ +$(OBJDIR)/BaseGeometry.o \ +$(OBJDIR)/defmacro.o \ $(OBJDIR)/SimVariables.o \ -$(OBJDIR)/SmoothingFunctions.o \ +$(OBJDIR)/GwfStorageUtils.o \ $(OBJDIR)/genericutils.o \ -$(OBJDIR)/defmacro.o \ -$(OBJDIR)/ArrayHandlers.o \ -$(OBJDIR)/version.o \ -$(OBJDIR)/Timer.o \ -$(OBJDIR)/Message.o \ $(OBJDIR)/List.o \ $(OBJDIR)/ObsOutput.o \ +$(OBJDIR)/TimeSeriesRecord.o \ +$(OBJDIR)/Timer.o \ +$(OBJDIR)/mf6lists.o \ +$(OBJDIR)/version.o \ +$(OBJDIR)/ArrayHandlers.o \ +$(OBJDIR)/ims8sparsekit.o \ $(OBJDIR)/StringList.o \ +$(OBJDIR)/Message.o \ $(OBJDIR)/Sim.o \ -$(OBJDIR)/MemoryHelper.o \ -$(OBJDIR)/mf6lists.o \ -$(OBJDIR)/TimeSeriesRecord.o \ -$(OBJDIR)/sort.o \ -$(OBJDIR)/Iunit.o \ $(OBJDIR)/InputOutput.o \ -$(OBJDIR)/DisvGeom.o \ -$(OBJDIR)/BudgetFileReader.o \ -$(OBJDIR)/TableTerm.o \ -$(OBJDIR)/ArrayReaders.o \ -$(OBJDIR)/comarg.o \ $(OBJDIR)/Budget.o \ -$(OBJDIR)/HeadFileReader.o \ +$(OBJDIR)/Iunit.o \ +$(OBJDIR)/ArrayReaders.o \ +$(OBJDIR)/sort.o \ +$(OBJDIR)/MemoryHelper.o \ $(OBJDIR)/BlockParser.o \ -$(OBJDIR)/ObsOutputList.o \ +$(OBJDIR)/ims8base.o \ +$(OBJDIR)/BudgetFileReader.o \ $(OBJDIR)/PrintSaveManager.o \ $(OBJDIR)/RectangularGeometry.o \ -$(OBJDIR)/Table.o \ -$(OBJDIR)/ListReader.o \ -$(OBJDIR)/CircularGeometry.o \ +$(OBJDIR)/HeadFileReader.o \ $(OBJDIR)/NameFile.o \ +$(OBJDIR)/ObsOutputList.o \ +$(OBJDIR)/comarg.o \ $(OBJDIR)/TimeSeries.o \ +$(OBJDIR)/CircularGeometry.o \ +$(OBJDIR)/DisvGeom.o \ $(OBJDIR)/TimeSeriesLink.o \ +$(OBJDIR)/TableTerm.o \ $(OBJDIR)/TimeSeriesFileList.o \ +$(OBJDIR)/Table.o \ $(OBJDIR)/Memory.o \ +$(OBJDIR)/ListReader.o \ $(OBJDIR)/MemoryList.o \ $(OBJDIR)/MemoryManager.o \ -$(OBJDIR)/MemorySetHandler.o \ -$(OBJDIR)/Connections.o \ -$(OBJDIR)/tdis.o \ $(OBJDIR)/ims8linear.o \ -$(OBJDIR)/BaseModel.o \ $(OBJDIR)/PackageMover.o \ -$(OBJDIR)/UzfCellGroup.o \ $(OBJDIR)/Mover.o \ +$(OBJDIR)/Connections.o \ +$(OBJDIR)/BaseModel.o \ +$(OBJDIR)/MemorySetHandler.o \ +$(OBJDIR)/ats.o \ +$(OBJDIR)/tdis.o \ $(OBJDIR)/TimeSeriesManager.o \ +$(OBJDIR)/BaseExchange.o \ +$(OBJDIR)/UzfCellGroup.o \ $(OBJDIR)/DiscretizationBase.o \ +$(OBJDIR)/OutputControlData.o \ +$(OBJDIR)/gwf3disu8.o \ $(OBJDIR)/Observe.o \ +$(OBJDIR)/BudgetTerm.o \ $(OBJDIR)/Xt3dInterface.o \ -$(OBJDIR)/TimeArray.o \ +$(OBJDIR)/NumericalPackage.o \ $(OBJDIR)/ObsUtility.o \ +$(OBJDIR)/BaseSolution.o \ $(OBJDIR)/gwf3dis8.o \ -$(OBJDIR)/ObsContainer.o \ $(OBJDIR)/gwf3disv8.o \ -$(OBJDIR)/OutputControlData.o \ -$(OBJDIR)/NumericalPackage.o \ -$(OBJDIR)/BaseSolution.o \ -$(OBJDIR)/BudgetTerm.o \ -$(OBJDIR)/gwf3disu8.o \ -$(OBJDIR)/TimeArraySeries.o \ -$(OBJDIR)/TimeArraySeriesLink.o \ -$(OBJDIR)/Obs3.o \ $(OBJDIR)/gwf3hfb8.o \ -$(OBJDIR)/gwf3ic8.o \ $(OBJDIR)/SolutionGroup.o \ -$(OBJDIR)/OutputControl.o \ $(OBJDIR)/gwf3sto8.o \ -$(OBJDIR)/gwf3obs8.o \ -$(OBJDIR)/gwf3npf8.o \ -$(OBJDIR)/TimeArraySeriesManager.o \ -$(OBJDIR)/gwt1ic1.o \ +$(OBJDIR)/TimeArray.o \ +$(OBJDIR)/OutputControl.o \ +$(OBJDIR)/ObsContainer.o \ $(OBJDIR)/BudgetObject.o \ -$(OBJDIR)/BaseExchange.o \ -$(OBJDIR)/gwf3oc8.o \ -$(OBJDIR)/gwf3csub8.o \ +$(OBJDIR)/gwf3ic8.o \ $(OBJDIR)/gwt1oc1.o \ -$(OBJDIR)/BoundaryPackage.o \ -$(OBJDIR)/gwf3lak8.o \ +$(OBJDIR)/TimeArraySeries.o \ +$(OBJDIR)/Obs3.o \ +$(OBJDIR)/gwf3oc8.o \ $(OBJDIR)/gwf3mvr8.o \ +$(OBJDIR)/TimeArraySeriesLink.o \ +$(OBJDIR)/gwf3npf8.o \ +$(OBJDIR)/gwt1ic1.o \ +$(OBJDIR)/TimeArraySeriesManager.o \ +$(OBJDIR)/gwf3obs8.o \ +$(OBJDIR)/gwf3csub8.o \ $(OBJDIR)/gwt1obs1.o \ -$(OBJDIR)/gwf3evt8.o \ +$(OBJDIR)/BoundaryPackage.o \ $(OBJDIR)/gwf3riv8.o \ -$(OBJDIR)/gwf3ghb8.o \ -$(OBJDIR)/gwf3uzf8.o \ +$(OBJDIR)/gwf3sfr8.o \ $(OBJDIR)/gwt1cnc1.o \ +$(OBJDIR)/gwf3evt8.o \ +$(OBJDIR)/gwf3ghb8.o \ +$(OBJDIR)/NumericalModel.o \ +$(OBJDIR)/gwf3maw8.o \ +$(OBJDIR)/gwf3rch8.o \ $(OBJDIR)/gwt1src1.o \ +$(OBJDIR)/GhostNode.o \ +$(OBJDIR)/gwf3api8.o \ +$(OBJDIR)/gwf3lak8.o \ +$(OBJDIR)/gwf3buy8.o \ +$(OBJDIR)/gwf3uzf8.o \ +$(OBJDIR)/gwf3chd8.o \ $(OBJDIR)/gwf3wel8.o \ -$(OBJDIR)/gwf3rch8.o \ -$(OBJDIR)/gwf3sfr8.o \ $(OBJDIR)/gwt1fmi1.o \ -$(OBJDIR)/gwf3maw8.o \ $(OBJDIR)/gwf3drn8.o \ -$(OBJDIR)/gwf3chd8.o \ -$(OBJDIR)/NumericalModel.o \ -$(OBJDIR)/gwf3buy8.o \ $(OBJDIR)/gwt1ssm1.o \ $(OBJDIR)/gwt1mst1.o \ -$(OBJDIR)/gwt1apt1.o \ -$(OBJDIR)/gwt1sft1.o \ -$(OBJDIR)/gwt1uzt1.o \ +$(OBJDIR)/NumericalExchange.o \ $(OBJDIR)/gwt1mvt1.o \ -$(OBJDIR)/gwt1lkt1.o \ -$(OBJDIR)/gwt1mwt1.o \ -$(OBJDIR)/gwt1dsp.o \ +$(OBJDIR)/NumericalSolution.o \ +$(OBJDIR)/DisConnExchange.o \ $(OBJDIR)/gwt1ist1.o \ $(OBJDIR)/gwt1adv1.o \ -$(OBJDIR)/GhostNode.o \ -$(OBJDIR)/NumericalExchange.o \ +$(OBJDIR)/gwt1apt1.o \ +$(OBJDIR)/gwt1mwt1.o \ +$(OBJDIR)/gwt1sft1.o \ +$(OBJDIR)/gwt1dsp.o \ $(OBJDIR)/gwf3.o \ +$(OBJDIR)/gwt1uzt1.o \ +$(OBJDIR)/gwt1lkt1.o \ +$(OBJDIR)/GwfGwfExchange.o \ $(OBJDIR)/gwt1.o \ $(OBJDIR)/GwfGwtExchange.o \ -$(OBJDIR)/NumericalSolution.o \ -$(OBJDIR)/GwfGwfExchange.o \ $(OBJDIR)/SimulationCreate.o \ $(OBJDIR)/mf6core.o \ $(OBJDIR)/mf6.o @@ -179,7 +187,3 @@ $(OBJDIR)/%.o : %.f90 @mkdir -p $(@D) $(FC) $(OPTLEVEL) $(FFLAGS) -c $< -o $@ $(INCSWITCH) $(MODSWITCH) -$(OBJDIR)/%.o : %.fpp - @mkdir -p $(@D) - $(FC) $(OPTLEVEL) $(FFLAGS) -c $< -o $@ $(INCSWITCH) $(MODSWITCH) - diff --git a/src/Utilities/version.f90 b/src/Utilities/version.f90 index 8244e9a3942..a346573d84b 100644 --- a/src/Utilities/version.f90 +++ b/src/Utilities/version.f90 @@ -3,8 +3,8 @@ module VersionModule implicit none public ! -- modflow 6 version - integer(I4B), parameter :: IDEVELOPMODE = 1 - character(len=40), parameter :: VERSION = '6.2.2 release candidate 02/18/2021' + integer(I4B), parameter :: IDEVELOPMODE = 0 + character(len=40), parameter :: VERSION = '6.2.2 07/30/2021' character(len=10), parameter :: MFVNAM = ' 6' character(len=*), parameter :: MFTITLE = & 'U.S. GEOLOGICAL SURVEY MODULAR HYDROLOGIC MODEL' @@ -15,16 +15,18 @@ module VersionModule ! -- 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.',/)" + &'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/utils/mf5to6/make/makedefaults b/utils/mf5to6/make/makedefaults index 1dcd425d21c..af085743381 100644 --- a/utils/mf5to6/make/makedefaults +++ b/utils/mf5to6/make/makedefaults @@ -1,5 +1,5 @@ -# makedefaults created on 2021-02-18 08:25:53.237196 -# by pymake (version 1.2.0) for the 'mf5to6' executable +# makedefaults created on 2021-07-30 14:36:43.397584 +# by pymake (version 1.2.1) for the 'mf5to6' executable # using the 'gfortran' fortran compiler(s). # determine OS @@ -58,14 +58,14 @@ OPTLEVEL ?= -O2 # set the fortran flags ifeq ($(detected_OS), Windows) ifeq ($(FC), gfortran) - FFLAGS ?= -static -fbacktrace $(OS_macro) + FFLAGS ?= -static -fbacktrace $(OS_macro) -cpp endif else ifeq ($(FC), gfortran) - FFLAGS ?= -fbacktrace $(OS_macro) + FFLAGS ?= -fbacktrace $(OS_macro) -cpp endif ifeq ($(FC), $(filter $(FC), ifort mpiifort)) - FFLAGS ?= -no-heap-arrays -fpe0 -traceback + FFLAGS ?= -no-heap-arrays -fpe0 -traceback -fpp MODSWITCH = -module $(MODDIR) endif endif diff --git a/utils/mf5to6/make/makefile b/utils/mf5to6/make/makefile index ee12ce5fd1c..a0013cf790d 100644 --- a/utils/mf5to6/make/makefile +++ b/utils/mf5to6/make/makefile @@ -1,5 +1,5 @@ -# makefile created on 2021-02-18 08:25:53.237196 -# by pymake (version 1.2.0) for the 'mf5to6' executable +# makefile created on 2021-07-30 14:36:43.397584 +# by pymake (version 1.2.1) for the 'mf5to6' executable # using the 'gfortran' fortran compiler(s). @@ -25,158 +25,158 @@ ${SOURCEDIR6} \ ${SOURCEDIR7} \ ${SOURCEDIR8} -.SUFFIXES: .f90 .f .fpp .o +.SUFFIXES: .f .f90 .o OBJECTS = \ +$(OBJDIR)/GwfBcfModule.o \ +$(OBJDIR)/GlobalPHMF.o \ $(OBJDIR)/ParamModule.o \ -$(OBJDIR)/GwfLakModule.o \ -$(OBJDIR)/ConverterCommon.o \ -$(OBJDIR)/GwfLpfModule.o \ -$(OBJDIR)/mach_mod.o \ -$(OBJDIR)/GwfDrnModule.o \ -$(OBJDIR)/GwfGhbModule.o \ +$(OBJDIR)/GwfUpwModule.o \ +$(OBJDIR)/GwfChdModule.o \ +$(OBJDIR)/GwfFhbModule.o \ +$(OBJDIR)/GwfResModule.o \ +$(OBJDIR)/gwf2hfb7_NWT.o \ $(OBJDIR)/StressPeriod.o \ -$(OBJDIR)/GwfUzfModule_NWT.o \ +$(OBJDIR)/kind.o \ $(OBJDIR)/GwfEtsModule.o \ $(OBJDIR)/GwfWelModule.o \ -$(OBJDIR)/GwfLgrModule.o \ -$(OBJDIR)/GwfEvtModule.o \ +$(OBJDIR)/GwfRchModule.o \ +$(OBJDIR)/ConstantsPHMF.o \ +$(OBJDIR)/GwfUzfModule_NWT.o \ $(OBJDIR)/NWT1_xmdlib.o \ -$(OBJDIR)/gwf2hfb7_NWT.o \ -$(OBJDIR)/NWT1_module.o \ -$(OBJDIR)/GwfFhbModule.o \ -$(OBJDIR)/GwfChdModule.o \ -$(OBJDIR)/GwfUpwModule.o \ -$(OBJDIR)/GlobalPHMF.o \ +$(OBJDIR)/GwfLakModule.o \ $(OBJDIR)/OpenSpec.o \ -$(OBJDIR)/GwfMnwModule.o \ -$(OBJDIR)/GwfBcfModule.o \ -$(OBJDIR)/GwfResModule.o \ -$(OBJDIR)/ConstantsPHMF.o \ -$(OBJDIR)/GwfRchModule.o \ -$(OBJDIR)/kind.o \ -$(OBJDIR)/GwfRivModule.o \ +$(OBJDIR)/GwfEvtModule.o \ $(OBJDIR)/GlobalVariablesPHMF.o \ +$(OBJDIR)/GwfRivModule.o \ +$(OBJDIR)/GwfLgrModule.o \ +$(OBJDIR)/GwfDrnModule.o \ +$(OBJDIR)/ConverterCommon.o \ +$(OBJDIR)/mach_mod.o \ +$(OBJDIR)/GwfGhbModule.o \ +$(OBJDIR)/GwfLpfModule.o \ +$(OBJDIR)/GwfMnwModule.o \ +$(OBJDIR)/compilerversion.o \ $(OBJDIR)/Constants.o \ +$(OBJDIR)/NWT1_module.o \ +$(OBJDIR)/Global.o \ +$(OBJDIR)/ArrayHandlers.o \ +$(OBJDIR)/Connection.o \ +$(OBJDIR)/NWT1_ilupc_mod.o \ $(OBJDIR)/SimVariables.o \ -$(OBJDIR)/compilerversion.o \ -$(OBJDIR)/genericutils.o \ $(OBJDIR)/GwfSfrModule.o \ -$(OBJDIR)/Global.o \ +$(OBJDIR)/GwfBasModule.o \ +$(OBJDIR)/pcgn2.o \ +$(OBJDIR)/genericutils.o \ $(OBJDIR)/List.o \ -$(OBJDIR)/Connection.o \ -$(OBJDIR)/version.o \ -$(OBJDIR)/TimeSeriesRecord.o \ -$(OBJDIR)/LakeTributary.o \ -$(OBJDIR)/ArrayHandlers.o \ -$(OBJDIR)/LakeConnection.o \ $(OBJDIR)/LakeOutlet.o \ +$(OBJDIR)/Auxiliary.o \ +$(OBJDIR)/version.o \ +$(OBJDIR)/SfrDiversion.o \ $(OBJDIR)/GlobalVariables.o \ -$(OBJDIR)/GwfBasModule.o \ -$(OBJDIR)/pcgn2.o \ +$(OBJDIR)/LakeTributary.o \ $(OBJDIR)/SimPHMF.o \ -$(OBJDIR)/Auxiliary.o \ -$(OBJDIR)/MemoryHelper.o \ -$(OBJDIR)/NWT1_ilupc_mod.o \ -$(OBJDIR)/CharacterContainer.o \ +$(OBJDIR)/LakeConnection.o \ +$(OBJDIR)/SimVariablesPHMF.o \ $(OBJDIR)/SimListVariables.o \ -$(OBJDIR)/SfrDiversion.o \ +$(OBJDIR)/TimeSeriesRecord.o \ $(OBJDIR)/SfrReach.o \ -$(OBJDIR)/SimVariablesPHMF.o \ -$(OBJDIR)/MultiLayerObsModule.o \ -$(OBJDIR)/GwfSfrCheck.o \ +$(OBJDIR)/CharacterContainer.o \ $(OBJDIR)/InputOutput.o \ +$(OBJDIR)/ModelPackage.o \ +$(OBJDIR)/BlockParser.o \ +$(OBJDIR)/GwfSfrCheck.o \ +$(OBJDIR)/MemoryHelper.o \ +$(OBJDIR)/MultiLayerObsModule.o \ +$(OBJDIR)/GwfFhbSubs.o \ $(OBJDIR)/SfrSegment.o \ -$(OBJDIR)/Lake.o \ +$(OBJDIR)/ObservePHMF.o \ $(OBJDIR)/Utilities.o \ -$(OBJDIR)/ModelPackage.o \ +$(OBJDIR)/TimeSeries.o \ $(OBJDIR)/TableTerm.o \ +$(OBJDIR)/Lake.o \ +$(OBJDIR)/ArrayReadersMF5.o \ $(OBJDIR)/LineList.o \ -$(OBJDIR)/ObservePHMF.o \ +$(OBJDIR)/ChdType.o \ $(OBJDIR)/precutls.o \ $(OBJDIR)/Table.o \ -$(OBJDIR)/GwfFhbSubs.o \ -$(OBJDIR)/BlockParser.o \ -$(OBJDIR)/ArrayReadersMF5.o \ +$(OBJDIR)/GwfResSubs.o \ $(OBJDIR)/File.o \ -$(OBJDIR)/FileList.o \ -$(OBJDIR)/TimeSeries.o \ $(OBJDIR)/Memory.o \ -$(OBJDIR)/GwfResSubs.o \ -$(OBJDIR)/MemoryList.o \ -$(OBJDIR)/ChdType.o \ $(OBJDIR)/FileWriter.o \ -$(OBJDIR)/utl7.o \ -$(OBJDIR)/DisWriter.o \ -$(OBJDIR)/StoWriter.o \ -$(OBJDIR)/GwfLgrSubs.o \ -$(OBJDIR)/GwfEtsSubs.o \ -$(OBJDIR)/de47.o \ -$(OBJDIR)/gmg7.o \ -$(OBJDIR)/GwfHfbSubs_NWT.o \ $(OBJDIR)/IcWriter.o \ -$(OBJDIR)/NWT1_gmres.o \ -$(OBJDIR)/obs2drn7.o \ -$(OBJDIR)/parutl7.o \ -$(OBJDIR)/MemoryManager.o \ $(OBJDIR)/TdisWriter.o \ -$(OBJDIR)/obs2chd7.o \ -$(OBJDIR)/GwfEvtSubs.o \ -$(OBJDIR)/GwfLakSubs.o \ -$(OBJDIR)/GwfChdSubs.o \ -$(OBJDIR)/obs2riv7.o \ -$(OBJDIR)/GwfRchSubs.o \ -$(OBJDIR)/GwfDrnSubs.o \ -$(OBJDIR)/GwfRivSubs.o \ -$(OBJDIR)/NWT1_solver.o \ -$(OBJDIR)/pcg7.o \ +$(OBJDIR)/MemoryList.o \ +$(OBJDIR)/StoWriter.o \ +$(OBJDIR)/FileList.o \ $(OBJDIR)/NpfWriter.o \ -$(OBJDIR)/obs2bas7.o \ +$(OBJDIR)/DisWriter.o \ +$(OBJDIR)/TdisVariables.o \ +$(OBJDIR)/MemoryManager.o \ +$(OBJDIR)/utl7.o \ +$(OBJDIR)/NWT1_xmd.o \ +$(OBJDIR)/GwfDrnSubs.o \ +$(OBJDIR)/de47.o \ +$(OBJDIR)/gwf2wel7_NWT.o \ $(OBJDIR)/GwfGhbSubs.o \ -$(OBJDIR)/GwfUzfSubs_NWT.o \ +$(OBJDIR)/pcg7.o \ $(OBJDIR)/obs2ghb7.o \ -$(OBJDIR)/GwfSfrSubs.o \ -$(OBJDIR)/sip7.o \ +$(OBJDIR)/GwfLgrSubs.o \ $(OBJDIR)/GwfBasOcSubs.o \ +$(OBJDIR)/GwfSfrSubs.o \ +$(OBJDIR)/parutl7.o \ $(OBJDIR)/DiscretizationBasePHMF.o \ -$(OBJDIR)/Discretization3D.o \ -$(OBJDIR)/gwf2mnw17.o \ -$(OBJDIR)/NWT1_xmd.o \ -$(OBJDIR)/GwfMnwSubs.o \ +$(OBJDIR)/GwfRivSubs.o \ +$(OBJDIR)/GwfChdSubs.o \ +$(OBJDIR)/sip7.o \ +$(OBJDIR)/obs2bas7.o \ +$(OBJDIR)/GwfHfbSubs_NWT.o \ +$(OBJDIR)/GwfLakSubs.o \ +$(OBJDIR)/NWT1_gmres.o \ +$(OBJDIR)/NWT1_solver.o \ $(OBJDIR)/Mover.o \ -$(OBJDIR)/gwf2wel7_NWT.o \ -$(OBJDIR)/TdisVariables.o \ +$(OBJDIR)/GwfEtsSubs.o \ +$(OBJDIR)/GwfMnwSubs.o \ +$(OBJDIR)/obs2chd7.o \ +$(OBJDIR)/obs2riv7.o \ +$(OBJDIR)/GwfUzfSubs_NWT.o \ +$(OBJDIR)/obs2drn7.o \ +$(OBJDIR)/gmg7.o \ +$(OBJDIR)/GwfRchSubs.o \ +$(OBJDIR)/GwfEvtSubs.o \ +$(OBJDIR)/gwf2mnw17.o \ +$(OBJDIR)/Discretization3D.o \ +$(OBJDIR)/gwf2mnw2i7.o \ $(OBJDIR)/ObsBlock.o \ $(OBJDIR)/Preproc.o \ $(OBJDIR)/ObsWriter.o \ -$(OBJDIR)/gwf2mnw2i7.o \ -$(OBJDIR)/DrnObsWriter.o \ -$(OBJDIR)/PackageWriter.o \ -$(OBJDIR)/DrnPackageWriter.o \ -$(OBJDIR)/WelPackageWriter.o \ -$(OBJDIR)/MawPackageWriter.o \ -$(OBJDIR)/GhbObsWriter.o \ $(OBJDIR)/ChdObsWriter.o \ -$(OBJDIR)/OutputControlWriter.o \ -$(OBJDIR)/RivPackageWriter.o \ -$(OBJDIR)/EvtPackageWriter.o \ $(OBJDIR)/RivObsWriter.o \ +$(OBJDIR)/PackageWriter.o \ $(OBJDIR)/ChdPackageWriter.o \ -$(OBJDIR)/GhbPackageWriter.o \ $(OBJDIR)/HfbPackageWriter.o \ +$(OBJDIR)/DrnObsWriter.o \ +$(OBJDIR)/GhbObsWriter.o \ +$(OBJDIR)/DrnPackageWriter.o \ +$(OBJDIR)/EvtPackageWriter.o \ +$(OBJDIR)/GhbPackageWriter.o \ +$(OBJDIR)/RivPackageWriter.o \ +$(OBJDIR)/WelPackageWriter.o \ +$(OBJDIR)/OutputControlWriter.o \ $(OBJDIR)/RchPackageWriter.o \ +$(OBJDIR)/MawPackageWriter.o \ $(OBJDIR)/MvrPackageWriter.o \ $(OBJDIR)/ImsPackageWriter.o \ -$(OBJDIR)/FhbPackageWriter.o \ +$(OBJDIR)/LakPackageWriter.o \ $(OBJDIR)/SfrPackageWriter.o \ +$(OBJDIR)/FhbPackageWriter.o \ $(OBJDIR)/UzfPackageWriter.o \ -$(OBJDIR)/LakPackageWriter.o \ $(OBJDIR)/Model.o \ -$(OBJDIR)/Exchange.o \ $(OBJDIR)/GwfBcfSubs.o \ -$(OBJDIR)/GwfLpfSubs.o \ $(OBJDIR)/GwfUpwSubs.o \ $(OBJDIR)/GwfBasSubs.o \ +$(OBJDIR)/GwfLpfSubs.o \ +$(OBJDIR)/Exchange.o \ $(OBJDIR)/ModelConverter.o \ $(OBJDIR)/ExchangeWriter.o \ $(OBJDIR)/SimFileWriter.o \ @@ -186,15 +186,11 @@ $(OBJDIR)/mf5to6.o $(PROGRAM) : $(OBJECTS) -$(FC) $(OPTLEVEL) -o $@ $(OBJECTS) $(LDFLAGS) -$(OBJDIR)/%.o : %.f90 - @mkdir -p $(@D) - $(FC) $(OPTLEVEL) $(FFLAGS) -c $< -o $@ $(INCSWITCH) $(MODSWITCH) - $(OBJDIR)/%.o : %.f @mkdir -p $(@D) $(FC) $(OPTLEVEL) $(FFLAGS) -c $< -o $@ $(INCSWITCH) $(MODSWITCH) -$(OBJDIR)/%.o : %.fpp +$(OBJDIR)/%.o : %.f90 @mkdir -p $(@D) $(FC) $(OPTLEVEL) $(FFLAGS) -c $< -o $@ $(INCSWITCH) $(MODSWITCH) diff --git a/utils/zonebudget/make/makedefaults b/utils/zonebudget/make/makedefaults index adc7c17f84d..8c6276ad35b 100644 --- a/utils/zonebudget/make/makedefaults +++ b/utils/zonebudget/make/makedefaults @@ -1,5 +1,5 @@ -# makedefaults created on 2021-02-18 08:25:38.343732 -# by pymake (version 1.2.0) for the 'zbud6' executable +# makedefaults created on 2021-07-30 14:36:28.583060 +# by pymake (version 1.2.1) for the 'zbud6' executable # using the 'gfortran' fortran compiler(s). # determine OS @@ -58,14 +58,14 @@ OPTLEVEL ?= -O2 # set the fortran flags ifeq ($(detected_OS), Windows) ifeq ($(FC), gfortran) - FFLAGS ?= -static -fbacktrace $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -pedantic -std=f2008 + FFLAGS ?= -static -fbacktrace $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -pedantic -std=f2008 -Wcharacter-truncation -cpp endif else ifeq ($(FC), gfortran) - FFLAGS ?= -fbacktrace $(OS_macro) -Wtabs -Wline-truncation -Wunused-label -Wunused-variable -pedantic -std=f2008 + FFLAGS ?= -fbacktrace $(OS_macro) -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 + FFLAGS ?= -no-heap-arrays -fpe0 -traceback -fpp MODSWITCH = -module $(MODDIR) endif endif diff --git a/utils/zonebudget/make/makefile b/utils/zonebudget/make/makefile index 821a85ba50d..22aca35cb85 100644 --- a/utils/zonebudget/make/makefile +++ b/utils/zonebudget/make/makefile @@ -1,5 +1,5 @@ -# makefile created on 2021-02-18 08:25:38.343732 -# by pymake (version 1.2.0) for the 'zbud6' executable +# makefile created on 2021-07-30 14:36:28.583060 +# by pymake (version 1.2.1) for the 'zbud6' executable # using the 'gfortran' fortran compiler(s). @@ -13,27 +13,27 @@ VPATH = \ ${SOURCEDIR1} \ ${SOURCEDIR2} -.SUFFIXES: .f90 .fpp .o +.SUFFIXES: .f90 .o OBJECTS = \ $(OBJDIR)/kind.o \ -$(OBJDIR)/OpenSpec.o \ $(OBJDIR)/compilerversion.o \ +$(OBJDIR)/OpenSpec.o \ $(OBJDIR)/Constants.o \ -$(OBJDIR)/SimVariables.o \ $(OBJDIR)/defmacro.o \ +$(OBJDIR)/SimVariables.o \ $(OBJDIR)/genericutils.o \ -$(OBJDIR)/version.o \ $(OBJDIR)/ArrayHandlers.o \ $(OBJDIR)/Message.o \ +$(OBJDIR)/version.o \ $(OBJDIR)/Sim.o \ -$(OBJDIR)/InputOutput.o \ -$(OBJDIR)/ArrayReaders.o \ $(OBJDIR)/sort.o \ +$(OBJDIR)/InputOutput.o \ +$(OBJDIR)/grb.o \ $(OBJDIR)/budgetdata.o \ $(OBJDIR)/Budget.o \ -$(OBJDIR)/grb.o \ $(OBJDIR)/BlockParser.o \ +$(OBJDIR)/ArrayReaders.o \ $(OBJDIR)/zone.o \ $(OBJDIR)/zoneoutput.o \ $(OBJDIR)/zbud6.o @@ -46,7 +46,3 @@ $(OBJDIR)/%.o : %.f90 @mkdir -p $(@D) $(FC) $(OPTLEVEL) $(FFLAGS) -c $< -o $@ $(INCSWITCH) $(MODSWITCH) -$(OBJDIR)/%.o : %.fpp - @mkdir -p $(@D) - $(FC) $(OPTLEVEL) $(FFLAGS) -c $< -o $@ $(INCSWITCH) $(MODSWITCH) - diff --git a/version.txt b/version.txt index 918c9db57c0..b1ad5955fb7 100644 --- a/version.txt +++ b/version.txt @@ -1,5 +1,5 @@ # MODFLOW 6 version file automatically created using...make_release.py -# created on...February 18, 2021 12:04:58 +# created on...July 30, 2021 14:34:30 major = 6 minor = 2