From 95ff014a1bddcee2d5d35859350571ba4fd9fb2f Mon Sep 17 00:00:00 2001 From: Christian Langevin Date: Thu, 18 Feb 2021 12:00:23 -0600 Subject: [PATCH] ci(release): release version 6.2.1 --- DISCLAIMER.md | 17 +-- README.md | 21 ++-- code.json | 4 +- doc/ReleaseNotes/ReleaseNotes.tex | 2 +- doc/ReleaseNotes/folder_struct.tex | 38 +++++- doc/mf6io/mf6output.tex | 10 +- doc/mf6io/mf6switches.tex | 2 +- doc/version.py | 2 +- doc/version.tex | 4 +- make/makedefaults | 2 +- make/makefile | 142 ++++++++++----------- src/Utilities/version.f90 | 26 ++-- utils/mf5to6/make/makedefaults | 2 +- utils/mf5to6/make/makefile | 192 ++++++++++++++--------------- utils/zonebudget/make/makedefaults | 2 +- utils/zonebudget/make/makefile | 14 +-- version.txt | 2 +- 17 files changed, 261 insertions(+), 221 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 b01423cfed7..cd4de417fd3 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.2.1 release candidate +### Version 6.2.1 ![MODFLOW 6 CI with latest gfortran](https://github.com/MODFLOW-USGS/modflow6/workflows/MODFLOW%206%20CI%20with%20latest%20gfortran/badge.svg) @@ -69,18 +69,19 @@ MODFLOW 6 is the latest core version of MODFLOW. It synthesizes many of the capa #### ***Software/Code*** -[Langevin, C.D., Hughes, J.D., Banta, E.R., Provost, A.M., Niswonger, R.G., and Panday, Sorab, 2020, MODFLOW 6 Modular Hydrologic Model version 6.2.1 release candidate: U.S. Geological Survey Software Release, 22 October 2020, 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.1: U.S. Geological Survey Software Release, 18 February 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 4350e6247fa..5542ac08919 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.1", "date": { - "metadataLastUpdated": "2020-10-22" + "metadataLastUpdated": "2021-02-18" }, "organization": "U.S. Geological Survey", "permissions": { diff --git a/doc/ReleaseNotes/ReleaseNotes.tex b/doc/ReleaseNotes/ReleaseNotes.tex index f76b05d29b6..7c3223b976c 100644 --- a/doc/ReleaseNotes/ReleaseNotes.tex +++ b/doc/ReleaseNotes/ReleaseNotes.tex @@ -154,7 +154,7 @@ \section{History} This section describes changes introduced into MODFLOW~6 for the current release. Changes introduced in previous releases are in Appendix~\ref{app:A}. These changes may substantially affect users. \begin{itemize} - \item Version mf6.2.1--February 17, 2021 + \item Version mf6.2.1--February 18, 2021 \underline{NEW FUNCTIONALITY} \begin{itemize} diff --git a/doc/ReleaseNotes/folder_struct.tex b/doc/ReleaseNotes/folder_struct.tex index d85e9653827..9f0fd71000f 100644 --- a/doc/ReleaseNotes/folder_struct.tex +++ b/doc/ReleaseNotes/folder_struct.tex @@ -1,5 +1,5 @@ \begin{verbatim} -mf6.2.0/ +mf6.2.1/ bin/ doc/ examples/ @@ -77,6 +77,36 @@ mt3d/ ex-gwt-mt3dms-p01d/ mt3d/ + ex-gwt-mt3dms-p02a/ + mf2005/ + mf6gwf/ + mf6gwt/ + mt3d/ + ex-gwt-mt3dms-p02b/ + mf2005/ + mf6gwf/ + mf6gwt/ + mt3d/ + ex-gwt-mt3dms-p02c/ + mf2005/ + mf6gwf/ + mf6gwt/ + mt3d/ + ex-gwt-mt3dms-p02d/ + mf2005/ + mf6gwf/ + mf6gwt/ + mt3d/ + ex-gwt-mt3dms-p02e/ + mf2005/ + mf6gwf/ + mf6gwt/ + mt3d/ + ex-gwt-mt3dms-p02f/ + mf2005/ + mf6gwf/ + mf6gwt/ + mt3d/ ex-gwt-mt3dms-p03/ mt3d/ ex-gwt-mt3dms-p04a/ @@ -125,6 +155,12 @@ ex-gwt-prudic2004t2/ mf6gwf/ mf6gwt/ + ex-gwt-rotate/ + ex-gwt-saltlake/ + ex-gwt-uzt-2d-a/ + mt3d/ + ex-gwt-uzt-2d-b/ + mt3d/ make/ msvs/ src/ diff --git a/doc/mf6io/mf6output.tex b/doc/mf6io/mf6output.tex index 8fb6c5f75fe..c0678cf5cd3 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.0 10/22/2020 + VERSION 6.2.1 02/18/2021 - MODFLOW 6 compiled Oct 22 2020 09:26:42 with IFORT compiler (ver. 19.10.2) + MODFLOW 6 compiled Feb 18 2021 08:24:05 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): 2020/10/22 9:34:01 + Run start date and time (yyyy/mm/dd hh:mm:ss): 2021/02/18 8:32:29 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): 2020/10/22 9:34:01 - Elapsed run time: 0.068 Seconds + Run end date and time (yyyy/mm/dd hh:mm:ss): 2021/02/18 8:32:29 + Elapsed run time: 0.076 Seconds Normal termination of simulation. diff --git a/doc/mf6io/mf6switches.tex b/doc/mf6io/mf6switches.tex index d13f4095017..2b266012d97 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.0 10/22/2020 (compiled Oct 22 2020 09:26:42) +mf6.exe - MODFLOW 6.2.1 02/18/2021 (compiled Feb 18 2021 08:24:05) 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 7e9455dd699..e073ee1f488 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...October 22, 2020 12:23:55 +# created on...February 18, 2021 08:23:34 major = 6 minor = 2 diff --git a/doc/version.tex b/doc/version.tex index df3098d9dae..0397faba4c3 100644 --- a/doc/version.tex +++ b/doc/version.tex @@ -1,3 +1,3 @@ -\newcommand{\modflowversion}{mf6.2.1---release candidate} -\newcommand{\modflowdate}{October 22, 2020} +\newcommand{\modflowversion}{mf6.2.1} +\newcommand{\modflowdate}{February 18, 2021} \newcommand{\currentmodflowversion}{Version \modflowversion---\modflowdate} diff --git a/make/makedefaults b/make/makedefaults index 3db757cdacd..baf00a7dc04 100644 --- a/make/makedefaults +++ b/make/makedefaults @@ -1,4 +1,4 @@ -# makedefaults created on 2020-10-22 09:26:36.744206 +# makedefaults created on 2021-02-18 08:23:56.262624 # by pymake (version 1.2.0) for the 'mf6' executable # using the 'gfortran' fortran compiler(s). diff --git a/make/makefile b/make/makefile index 9e772bd97c6..8cc569a10f3 100644 --- a/make/makefile +++ b/make/makefile @@ -1,4 +1,4 @@ -# makefile created on 2020-10-22 09:26:36.744206 +# makefile created on 2021-02-18 08:23:56.262624 # by pymake (version 1.2.0) for the 'mf6' executable # using the 'gfortran' fortran compiler(s). @@ -42,131 +42,131 @@ ${SOURCEDIR15} .SUFFIXES: .f90 .fpp .o OBJECTS = \ +$(OBJDIR)/OpenSpec.o \ $(OBJDIR)/kind.o \ -$(OBJDIR)/Sparse.o \ +$(OBJDIR)/compilerversion.o \ +$(OBJDIR)/ims8reordering.o \ $(OBJDIR)/BaseGeometry.o \ -$(OBJDIR)/OpenSpec.o \ -$(OBJDIR)/Constants.o \ $(OBJDIR)/HashTable.o \ -$(OBJDIR)/defmacro.o \ +$(OBJDIR)/Constants.o \ +$(OBJDIR)/Xt3dAlgorithm.o \ +$(OBJDIR)/PackageBudget.o \ +$(OBJDIR)/Sparse.o \ $(OBJDIR)/SimVariables.o \ -$(OBJDIR)/compilerversion.o \ $(OBJDIR)/SmoothingFunctions.o \ -$(OBJDIR)/ims8reordering.o \ -$(OBJDIR)/PackageBudget.o \ $(OBJDIR)/genericutils.o \ -$(OBJDIR)/Xt3dAlgorithm.o \ -$(OBJDIR)/List.o \ +$(OBJDIR)/defmacro.o \ $(OBJDIR)/ArrayHandlers.o \ -$(OBJDIR)/ObsOutput.o \ -$(OBJDIR)/TimeSeriesRecord.o \ -$(OBJDIR)/Timer.o \ -$(OBJDIR)/mf6lists.o \ -$(OBJDIR)/StringList.o \ $(OBJDIR)/version.o \ +$(OBJDIR)/Timer.o \ $(OBJDIR)/Message.o \ +$(OBJDIR)/List.o \ +$(OBJDIR)/ObsOutput.o \ +$(OBJDIR)/StringList.o \ $(OBJDIR)/Sim.o \ +$(OBJDIR)/MemoryHelper.o \ +$(OBJDIR)/mf6lists.o \ +$(OBJDIR)/TimeSeriesRecord.o \ $(OBJDIR)/sort.o \ $(OBJDIR)/Iunit.o \ -$(OBJDIR)/Budget.o \ -$(OBJDIR)/MemoryHelper.o \ $(OBJDIR)/InputOutput.o \ -$(OBJDIR)/comarg.o \ -$(OBJDIR)/CircularGeometry.o \ +$(OBJDIR)/DisvGeom.o \ +$(OBJDIR)/BudgetFileReader.o \ +$(OBJDIR)/TableTerm.o \ $(OBJDIR)/ArrayReaders.o \ +$(OBJDIR)/comarg.o \ +$(OBJDIR)/Budget.o \ +$(OBJDIR)/HeadFileReader.o \ $(OBJDIR)/BlockParser.o \ -$(OBJDIR)/TableTerm.o \ -$(OBJDIR)/PrintSaveManager.o \ -$(OBJDIR)/BudgetFileReader.o \ -$(OBJDIR)/DisvGeom.o \ $(OBJDIR)/ObsOutputList.o \ -$(OBJDIR)/HeadFileReader.o \ +$(OBJDIR)/PrintSaveManager.o \ +$(OBJDIR)/RectangularGeometry.o \ $(OBJDIR)/Table.o \ +$(OBJDIR)/ListReader.o \ +$(OBJDIR)/CircularGeometry.o \ +$(OBJDIR)/NameFile.o \ $(OBJDIR)/TimeSeries.o \ -$(OBJDIR)/RectangularGeometry.o \ $(OBJDIR)/TimeSeriesLink.o \ +$(OBJDIR)/TimeSeriesFileList.o \ $(OBJDIR)/Memory.o \ -$(OBJDIR)/NameFile.o \ $(OBJDIR)/MemoryList.o \ -$(OBJDIR)/TimeSeriesFileList.o \ -$(OBJDIR)/ListReader.o \ $(OBJDIR)/MemoryManager.o \ -$(OBJDIR)/tdis.o \ $(OBJDIR)/MemorySetHandler.o \ -$(OBJDIR)/UzfCellGroup.o \ -$(OBJDIR)/PackageMover.o \ $(OBJDIR)/Connections.o \ +$(OBJDIR)/tdis.o \ $(OBJDIR)/ims8linear.o \ $(OBJDIR)/BaseModel.o \ -$(OBJDIR)/TimeSeriesManager.o \ +$(OBJDIR)/PackageMover.o \ +$(OBJDIR)/UzfCellGroup.o \ $(OBJDIR)/Mover.o \ +$(OBJDIR)/TimeSeriesManager.o \ $(OBJDIR)/DiscretizationBase.o \ -$(OBJDIR)/BaseSolution.o \ -$(OBJDIR)/gwf3disu8.o \ -$(OBJDIR)/gwf3dis8.o \ +$(OBJDIR)/Observe.o \ +$(OBJDIR)/Xt3dInterface.o \ $(OBJDIR)/TimeArray.o \ +$(OBJDIR)/ObsUtility.o \ +$(OBJDIR)/gwf3dis8.o \ +$(OBJDIR)/ObsContainer.o \ +$(OBJDIR)/gwf3disv8.o \ $(OBJDIR)/OutputControlData.o \ -$(OBJDIR)/BaseExchange.o \ $(OBJDIR)/NumericalPackage.o \ -$(OBJDIR)/gwf3disv8.o \ +$(OBJDIR)/BaseSolution.o \ $(OBJDIR)/BudgetTerm.o \ -$(OBJDIR)/Observe.o \ -$(OBJDIR)/Xt3dInterface.o \ -$(OBJDIR)/gwf3sto8.o \ -$(OBJDIR)/SolutionGroup.o \ +$(OBJDIR)/gwf3disu8.o \ $(OBJDIR)/TimeArraySeries.o \ -$(OBJDIR)/ObsContainer.o \ -$(OBJDIR)/ObsUtility.o \ -$(OBJDIR)/gwf3hfb8.o \ $(OBJDIR)/TimeArraySeriesLink.o \ -$(OBJDIR)/BudgetObject.o \ +$(OBJDIR)/Obs3.o \ +$(OBJDIR)/gwf3hfb8.o \ $(OBJDIR)/gwf3ic8.o \ +$(OBJDIR)/SolutionGroup.o \ $(OBJDIR)/OutputControl.o \ -$(OBJDIR)/Obs3.o \ -$(OBJDIR)/gwf3mvr8.o \ -$(OBJDIR)/gwt1ic1.o \ +$(OBJDIR)/gwf3sto8.o \ +$(OBJDIR)/gwf3obs8.o \ $(OBJDIR)/gwf3npf8.o \ $(OBJDIR)/TimeArraySeriesManager.o \ -$(OBJDIR)/gwf3obs8.o \ +$(OBJDIR)/gwt1ic1.o \ +$(OBJDIR)/BudgetObject.o \ +$(OBJDIR)/BaseExchange.o \ $(OBJDIR)/gwf3oc8.o \ -$(OBJDIR)/gwt1oc1.o \ -$(OBJDIR)/gwt1obs1.o \ $(OBJDIR)/gwf3csub8.o \ +$(OBJDIR)/gwt1oc1.o \ $(OBJDIR)/BoundaryPackage.o \ -$(OBJDIR)/gwf3uzf8.o \ -$(OBJDIR)/NumericalModel.o \ +$(OBJDIR)/gwf3lak8.o \ +$(OBJDIR)/gwf3mvr8.o \ +$(OBJDIR)/gwt1obs1.o \ $(OBJDIR)/gwf3evt8.o \ $(OBJDIR)/gwf3riv8.o \ -$(OBJDIR)/gwt1fmi1.o \ -$(OBJDIR)/gwf3chd8.o \ -$(OBJDIR)/gwf3lak8.o \ -$(OBJDIR)/gwf3drn8.o \ +$(OBJDIR)/gwf3ghb8.o \ +$(OBJDIR)/gwf3uzf8.o \ $(OBJDIR)/gwt1cnc1.o \ -$(OBJDIR)/gwt1mst1.o \ $(OBJDIR)/gwt1src1.o \ -$(OBJDIR)/gwt1mvt1.o \ -$(OBJDIR)/NumericalExchange.o \ -$(OBJDIR)/gwt1ssm1.o \ $(OBJDIR)/gwf3wel8.o \ -$(OBJDIR)/gwf3sfr8.o \ $(OBJDIR)/gwf3rch8.o \ +$(OBJDIR)/gwf3sfr8.o \ +$(OBJDIR)/gwt1fmi1.o \ $(OBJDIR)/gwf3maw8.o \ -$(OBJDIR)/GhostNode.o \ -$(OBJDIR)/gwt1adv1.o \ -$(OBJDIR)/gwt1dsp.o \ -$(OBJDIR)/gwf3ghb8.o \ -$(OBJDIR)/NumericalSolution.o \ -$(OBJDIR)/gwt1ist1.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)/gwf3buy8.o \ $(OBJDIR)/gwt1uzt1.o \ -$(OBJDIR)/gwt1mwt1.o \ +$(OBJDIR)/gwt1mvt1.o \ $(OBJDIR)/gwt1lkt1.o \ +$(OBJDIR)/gwt1mwt1.o \ +$(OBJDIR)/gwt1dsp.o \ +$(OBJDIR)/gwt1ist1.o \ +$(OBJDIR)/gwt1adv1.o \ +$(OBJDIR)/GhostNode.o \ +$(OBJDIR)/NumericalExchange.o \ $(OBJDIR)/gwf3.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 diff --git a/src/Utilities/version.f90 b/src/Utilities/version.f90 index 763599dfd75..d4ceebdf964 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.1 release candidate 10/22/2020' + integer(I4B), parameter :: IDEVELOPMODE = 0 + character(len=40), parameter :: VERSION = '6.2.1 02/18/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 f211e51fd61..1dcd425d21c 100644 --- a/utils/mf5to6/make/makedefaults +++ b/utils/mf5to6/make/makedefaults @@ -1,4 +1,4 @@ -# makedefaults created on 2020-10-22 09:28:15.441302 +# makedefaults created on 2021-02-18 08:25:53.237196 # by pymake (version 1.2.0) for the 'mf5to6' executable # using the 'gfortran' fortran compiler(s). diff --git a/utils/mf5to6/make/makefile b/utils/mf5to6/make/makefile index 79fdbb0b81b..ee12ce5fd1c 100644 --- a/utils/mf5to6/make/makefile +++ b/utils/mf5to6/make/makefile @@ -1,4 +1,4 @@ -# makefile created on 2020-10-22 09:28:15.441302 +# makefile created on 2021-02-18 08:25:53.237196 # by pymake (version 1.2.0) for the 'mf5to6' executable # using the 'gfortran' fortran compiler(s). @@ -28,155 +28,155 @@ ${SOURCEDIR8} .SUFFIXES: .f90 .f .fpp .o OBJECTS = \ +$(OBJDIR)/ParamModule.o \ $(OBJDIR)/GwfLakModule.o \ -$(OBJDIR)/StressPeriod.o \ -$(OBJDIR)/GwfWelModule.o \ $(OBJDIR)/ConverterCommon.o \ -$(OBJDIR)/GwfMnwModule.o \ -$(OBJDIR)/GwfChdModule.o \ -$(OBJDIR)/GlobalPHMF.o \ -$(OBJDIR)/GwfResModule.o \ -$(OBJDIR)/ConstantsPHMF.o \ -$(OBJDIR)/ParamModule.o \ $(OBJDIR)/GwfLpfModule.o \ -$(OBJDIR)/GwfBcfModule.o \ -$(OBJDIR)/kind.o \ +$(OBJDIR)/mach_mod.o \ $(OBJDIR)/GwfDrnModule.o \ -$(OBJDIR)/OpenSpec.o \ -$(OBJDIR)/GwfRchModule.o \ +$(OBJDIR)/GwfGhbModule.o \ +$(OBJDIR)/StressPeriod.o \ +$(OBJDIR)/GwfUzfModule_NWT.o \ +$(OBJDIR)/GwfEtsModule.o \ +$(OBJDIR)/GwfWelModule.o \ +$(OBJDIR)/GwfLgrModule.o \ $(OBJDIR)/GwfEvtModule.o \ $(OBJDIR)/NWT1_xmdlib.o \ -$(OBJDIR)/compilerversion.o \ $(OBJDIR)/gwf2hfb7_NWT.o \ -$(OBJDIR)/mach_mod.o \ -$(OBJDIR)/GwfUpwModule.o \ -$(OBJDIR)/GwfLgrModule.o \ -$(OBJDIR)/GwfGhbModule.o \ +$(OBJDIR)/NWT1_module.o \ $(OBJDIR)/GwfFhbModule.o \ +$(OBJDIR)/GwfChdModule.o \ +$(OBJDIR)/GwfUpwModule.o \ +$(OBJDIR)/GlobalPHMF.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)/GwfUzfModule_NWT.o \ $(OBJDIR)/GlobalVariablesPHMF.o \ -$(OBJDIR)/GwfEtsModule.o \ $(OBJDIR)/Constants.o \ -$(OBJDIR)/NWT1_module.o \ $(OBJDIR)/SimVariables.o \ +$(OBJDIR)/compilerversion.o \ $(OBJDIR)/genericutils.o \ -$(OBJDIR)/Connection.o \ -$(OBJDIR)/List.o \ -$(OBJDIR)/Global.o \ -$(OBJDIR)/CharacterContainer.o \ $(OBJDIR)/GwfSfrModule.o \ -$(OBJDIR)/SfrDiversion.o \ -$(OBJDIR)/pcgn2.o \ +$(OBJDIR)/Global.o \ +$(OBJDIR)/List.o \ +$(OBJDIR)/Connection.o \ $(OBJDIR)/version.o \ -$(OBJDIR)/Auxiliary.o \ -$(OBJDIR)/GlobalVariables.o \ -$(OBJDIR)/GwfBasModule.o \ -$(OBJDIR)/LakeTributary.o \ -$(OBJDIR)/SimListVariables.o \ $(OBJDIR)/TimeSeriesRecord.o \ -$(OBJDIR)/LakeOutlet.o \ +$(OBJDIR)/LakeTributary.o \ +$(OBJDIR)/ArrayHandlers.o \ $(OBJDIR)/LakeConnection.o \ +$(OBJDIR)/LakeOutlet.o \ +$(OBJDIR)/GlobalVariables.o \ +$(OBJDIR)/GwfBasModule.o \ +$(OBJDIR)/pcgn2.o \ +$(OBJDIR)/SimPHMF.o \ +$(OBJDIR)/Auxiliary.o \ +$(OBJDIR)/MemoryHelper.o \ $(OBJDIR)/NWT1_ilupc_mod.o \ -$(OBJDIR)/ArrayHandlers.o \ +$(OBJDIR)/CharacterContainer.o \ +$(OBJDIR)/SimListVariables.o \ +$(OBJDIR)/SfrDiversion.o \ $(OBJDIR)/SfrReach.o \ -$(OBJDIR)/SimPHMF.o \ -$(OBJDIR)/GwfSfrCheck.o \ -$(OBJDIR)/ModelPackage.o \ $(OBJDIR)/SimVariablesPHMF.o \ -$(OBJDIR)/SfrSegment.o \ $(OBJDIR)/MultiLayerObsModule.o \ +$(OBJDIR)/GwfSfrCheck.o \ $(OBJDIR)/InputOutput.o \ -$(OBJDIR)/BlockParser.o \ -$(OBJDIR)/ArrayReadersMF5.o \ -$(OBJDIR)/MemoryHelper.o \ -$(OBJDIR)/LineList.o \ -$(OBJDIR)/TimeSeries.o \ -$(OBJDIR)/GwfResSubs.o \ +$(OBJDIR)/SfrSegment.o \ +$(OBJDIR)/Lake.o \ $(OBJDIR)/Utilities.o \ -$(OBJDIR)/GwfFhbSubs.o \ +$(OBJDIR)/ModelPackage.o \ $(OBJDIR)/TableTerm.o \ -$(OBJDIR)/Table.o \ -$(OBJDIR)/ChdType.o \ -$(OBJDIR)/Lake.o \ +$(OBJDIR)/LineList.o \ $(OBJDIR)/ObservePHMF.o \ $(OBJDIR)/precutls.o \ -$(OBJDIR)/Memory.o \ -$(OBJDIR)/MemoryList.o \ -$(OBJDIR)/MemoryManager.o \ +$(OBJDIR)/Table.o \ +$(OBJDIR)/GwfFhbSubs.o \ +$(OBJDIR)/BlockParser.o \ +$(OBJDIR)/ArrayReadersMF5.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)/DiscretizationBasePHMF.o \ -$(OBJDIR)/Discretization3D.o \ -$(OBJDIR)/StoWriter.o \ $(OBJDIR)/utl7.o \ -$(OBJDIR)/GwfSfrSubs.o \ -$(OBJDIR)/GwfEvtSubs.o \ -$(OBJDIR)/sip7.o \ -$(OBJDIR)/obs2ghb7.o \ -$(OBJDIR)/NWT1_xmd.o \ -$(OBJDIR)/pcg7.o \ -$(OBJDIR)/TdisWriter.o \ -$(OBJDIR)/GwfChdSubs.o \ -$(OBJDIR)/IcWriter.o \ -$(OBJDIR)/NpfWriter.o \ +$(OBJDIR)/DisWriter.o \ +$(OBJDIR)/StoWriter.o \ +$(OBJDIR)/GwfLgrSubs.o \ $(OBJDIR)/GwfEtsSubs.o \ -$(OBJDIR)/parutl7.o \ +$(OBJDIR)/de47.o \ $(OBJDIR)/gmg7.o \ -$(OBJDIR)/obs2riv7.o \ $(OBJDIR)/GwfHfbSubs_NWT.o \ -$(OBJDIR)/GwfDrnSubs.o \ -$(OBJDIR)/GwfGhbSubs.o \ -$(OBJDIR)/GwfLgrSubs.o \ -$(OBJDIR)/DisWriter.o \ -$(OBJDIR)/gwf2wel7_NWT.o \ -$(OBJDIR)/GwfUzfSubs_NWT.o \ -$(OBJDIR)/GwfLakSubs.o \ +$(OBJDIR)/IcWriter.o \ +$(OBJDIR)/NWT1_gmres.o \ $(OBJDIR)/obs2drn7.o \ -$(OBJDIR)/de47.o \ -$(OBJDIR)/TdisVariables.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)/gwf2mnw17.o \ -$(OBJDIR)/NWT1_solver.o \ -$(OBJDIR)/ObsBlock.o \ +$(OBJDIR)/GwfDrnSubs.o \ $(OBJDIR)/GwfRivSubs.o \ -$(OBJDIR)/GwfBasOcSubs.o \ +$(OBJDIR)/NWT1_solver.o \ +$(OBJDIR)/pcg7.o \ +$(OBJDIR)/NpfWriter.o \ $(OBJDIR)/obs2bas7.o \ -$(OBJDIR)/NWT1_gmres.o \ +$(OBJDIR)/GwfGhbSubs.o \ +$(OBJDIR)/GwfUzfSubs_NWT.o \ +$(OBJDIR)/obs2ghb7.o \ +$(OBJDIR)/GwfSfrSubs.o \ +$(OBJDIR)/sip7.o \ +$(OBJDIR)/GwfBasOcSubs.o \ +$(OBJDIR)/DiscretizationBasePHMF.o \ +$(OBJDIR)/Discretization3D.o \ +$(OBJDIR)/gwf2mnw17.o \ +$(OBJDIR)/NWT1_xmd.o \ $(OBJDIR)/GwfMnwSubs.o \ -$(OBJDIR)/obs2chd7.o \ $(OBJDIR)/Mover.o \ -$(OBJDIR)/gwf2mnw2i7.o \ +$(OBJDIR)/gwf2wel7_NWT.o \ +$(OBJDIR)/TdisVariables.o \ +$(OBJDIR)/ObsBlock.o \ $(OBJDIR)/Preproc.o \ $(OBJDIR)/ObsWriter.o \ -$(OBJDIR)/RivObsWriter.o \ +$(OBJDIR)/gwf2mnw2i7.o \ +$(OBJDIR)/DrnObsWriter.o \ $(OBJDIR)/PackageWriter.o \ -$(OBJDIR)/OutputControlWriter.o \ +$(OBJDIR)/DrnPackageWriter.o \ $(OBJDIR)/WelPackageWriter.o \ -$(OBJDIR)/DrnObsWriter.o \ -$(OBJDIR)/RchPackageWriter.o \ -$(OBJDIR)/ChdObsWriter.o \ +$(OBJDIR)/MawPackageWriter.o \ $(OBJDIR)/GhbObsWriter.o \ +$(OBJDIR)/ChdObsWriter.o \ +$(OBJDIR)/OutputControlWriter.o \ $(OBJDIR)/RivPackageWriter.o \ -$(OBJDIR)/DrnPackageWriter.o \ -$(OBJDIR)/HfbPackageWriter.o \ +$(OBJDIR)/EvtPackageWriter.o \ +$(OBJDIR)/RivObsWriter.o \ +$(OBJDIR)/ChdPackageWriter.o \ $(OBJDIR)/GhbPackageWriter.o \ +$(OBJDIR)/HfbPackageWriter.o \ +$(OBJDIR)/RchPackageWriter.o \ $(OBJDIR)/MvrPackageWriter.o \ -$(OBJDIR)/MawPackageWriter.o \ -$(OBJDIR)/ChdPackageWriter.o \ $(OBJDIR)/ImsPackageWriter.o \ $(OBJDIR)/FhbPackageWriter.o \ -$(OBJDIR)/EvtPackageWriter.o \ $(OBJDIR)/SfrPackageWriter.o \ -$(OBJDIR)/LakPackageWriter.o \ $(OBJDIR)/UzfPackageWriter.o \ +$(OBJDIR)/LakPackageWriter.o \ $(OBJDIR)/Model.o \ +$(OBJDIR)/Exchange.o \ $(OBJDIR)/GwfBcfSubs.o \ -$(OBJDIR)/GwfBasSubs.o \ -$(OBJDIR)/GwfUpwSubs.o \ $(OBJDIR)/GwfLpfSubs.o \ -$(OBJDIR)/Exchange.o \ +$(OBJDIR)/GwfUpwSubs.o \ +$(OBJDIR)/GwfBasSubs.o \ $(OBJDIR)/ModelConverter.o \ $(OBJDIR)/ExchangeWriter.o \ $(OBJDIR)/SimFileWriter.o \ diff --git a/utils/zonebudget/make/makedefaults b/utils/zonebudget/make/makedefaults index 3998219e4d3..adc7c17f84d 100644 --- a/utils/zonebudget/make/makedefaults +++ b/utils/zonebudget/make/makedefaults @@ -1,4 +1,4 @@ -# makedefaults created on 2020-10-22 09:28:03.593336 +# makedefaults created on 2021-02-18 08:25:38.343732 # by pymake (version 1.2.0) for the 'zbud6' executable # using the 'gfortran' fortran compiler(s). diff --git a/utils/zonebudget/make/makefile b/utils/zonebudget/make/makefile index f6f74170b96..821a85ba50d 100644 --- a/utils/zonebudget/make/makefile +++ b/utils/zonebudget/make/makefile @@ -1,4 +1,4 @@ -# makefile created on 2020-10-22 09:28:03.593336 +# makefile created on 2021-02-18 08:25:38.343732 # by pymake (version 1.2.0) for the 'zbud6' executable # using the 'gfortran' fortran compiler(s). @@ -16,25 +16,25 @@ ${SOURCEDIR2} .SUFFIXES: .f90 .fpp .o OBJECTS = \ -$(OBJDIR)/OpenSpec.o \ $(OBJDIR)/kind.o \ +$(OBJDIR)/OpenSpec.o \ $(OBJDIR)/compilerversion.o \ $(OBJDIR)/Constants.o \ $(OBJDIR)/SimVariables.o \ -$(OBJDIR)/genericutils.o \ $(OBJDIR)/defmacro.o \ +$(OBJDIR)/genericutils.o \ +$(OBJDIR)/version.o \ $(OBJDIR)/ArrayHandlers.o \ $(OBJDIR)/Message.o \ -$(OBJDIR)/version.o \ $(OBJDIR)/Sim.o \ -$(OBJDIR)/budgetdata.o \ $(OBJDIR)/InputOutput.o \ -$(OBJDIR)/Budget.o \ $(OBJDIR)/ArrayReaders.o \ $(OBJDIR)/sort.o \ +$(OBJDIR)/budgetdata.o \ +$(OBJDIR)/Budget.o \ +$(OBJDIR)/grb.o \ $(OBJDIR)/BlockParser.o \ $(OBJDIR)/zone.o \ -$(OBJDIR)/grb.o \ $(OBJDIR)/zoneoutput.o \ $(OBJDIR)/zbud6.o diff --git a/version.txt b/version.txt index 7e9455dd699..e073ee1f488 100644 --- a/version.txt +++ b/version.txt @@ -1,5 +1,5 @@ # MODFLOW 6 version file automatically created using...make_release.py -# created on...October 22, 2020 12:23:55 +# created on...February 18, 2021 08:23:34 major = 6 minor = 2