From 671228b1efc5e8662fd9c5f7c2d5ff8b4ea1c73e Mon Sep 17 00:00:00 2001 From: Christian Langevin Date: Fri, 12 Jun 2020 08:58:13 -0500 Subject: [PATCH] Commit files for 6.1.1 release --- DISCLAIMER.md | 17 ++- README.md | 23 +-- code.json | 4 +- doc/ReleaseNotes/folder_struct.tex | 98 ++++++------ doc/mf6io/mf6ivar/md/mf6ivar.md | 2 +- doc/mf6io/mf6ivar/tex/gwf-lak-desc.tex | 2 +- doc/mf6io/mf6noname.tex | 5 +- doc/mf6io/mf6output.tex | 34 +++-- doc/mf6io/mf6switches.tex | 16 +- doc/version.tex | 2 +- make/makefile | 138 ++++++++--------- src/Utilities/version.f90 | 26 ++-- utils/mf5to6/make/makefile | 202 ++++++++++++------------- utils/zonebudget/make/makefile | 18 +-- version.txt | 2 +- 15 files changed, 299 insertions(+), 290 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 985c94d347b..ddcf872e1c5 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,8 @@ ## Automated Testing Status on Travis-CI -### Version 6.1.1 release candidate -[![Build Status](https://travis-ci.org/MODFLOW-USGS/modflow6.svg?branch=develop)](https://travis-ci.org/MODFLOW-USGS/modflow6) +### Version 6.1.1 +[![Build Status](https://travis-ci.org/MODFLOW-USGS/modflow6.svg?branch=master)](https://travis-ci.org/MODFLOW-USGS/modflow6) ## Introduction @@ -31,7 +31,7 @@ MODFLOW 6 is the latest core version of MODFLOW. It synthesizes many of the capa #### ***Software/Code citation for MODFLOW 6:*** -[Langevin, C.D., Hughes, J.D., Banta, E.R., Provost, A.M., Niswonger, R.G., and Panday, Sorab, 2019, MODFLOW 6 Modular Hydrologic Model version 6.1.1 release candidate: U.S. Geological Survey Software Release, 12 December 2019, 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, 2020, MODFLOW 6 Modular Hydrologic Model version 6.1.1: U.S. Geological Survey Software Release, 12 June 2020, https://doi.org/10.5066/F76Q1VQV](https://doi.org/10.5066/F76Q1VQV) ## Instructions for building definition files for new packages @@ -41,12 +41,13 @@ Instructions for building definition files for new packages are summarized in [d 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 122a8a5a066..633df9dba17 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.1.1", "date": { - "metadataLastUpdated": "2019-12-12" + "metadataLastUpdated": "2020-06-12" }, "organization": "U.S. Geological Survey", "permissions": { diff --git a/doc/ReleaseNotes/folder_struct.tex b/doc/ReleaseNotes/folder_struct.tex index d5adb0783c8..498ee733e96 100644 --- a/doc/ReleaseNotes/folder_struct.tex +++ b/doc/ReleaseNotes/folder_struct.tex @@ -1,73 +1,73 @@ \begin{verbatim} mf6.1.1/ bin/ - utils/ - mf5to6/ - make/ - msvs/ - src/ - NWT/ - LGR/ - Preproc/ - MF2005/ - zonebudget/ - make/ - msvs/ - src/ - srcbmi/ - make/ + doc/ examples/ - ex10-bumpnr/ - ex19-zaidel/ ex01-twri/ - ex29-vilhelmsen-gc/ - ex31-vilhelmsen-lgr/ + ex02-tidal/ + ex03-bcf2ss/ + ex04-fhb/ + ex05-mfusg1disu/ + ex06-mfusg1disv/ + ex07-mfusg1lgr/ + ex08-mfusg1xt3d/ + ex09-bump/ + ex10-bumpnr/ + ex11-disvmesh/ + ex12-hanicol/ + ex13-hanirow/ + ex14-hanixt3d/ ex15-whirlsxt3d/ - ex24-neville/ - ex37-draindepth/ ex16-mfnwt2/ + ex17-mfnwt3h/ + ex18-mfnwt3l/ + ex19-zaidel/ ex20-keating/ - ex32-periodicbc/ + ex21-sfr1/ + ex22-lak2/ + ex23-lak4/ + ex24-neville/ ex25-flowing-maw/ ex26-Reilly-maw/ - ex03-bcf2ss/ - ex23-lak4/ - ex34-csub-sub01/ - ex11-disvmesh/ - ex33-csub-jacob/ - ex36-csub-subwt01/ - ex14-hanixt3d/ - ex13-hanirow/ - ex04-fhb/ - ex02-tidal/ - ex22-lak2/ - ex05-mfusg1disu/ - ex09-bump/ ex27-advpakmvr/ - ex21-sfr1/ - ex12-hanicol/ ex28-mflgr3/ - ex06-mfusg1disv/ - ex17-mfnwt3h/ - ex08-mfusg1xt3d/ + ex29-vilhelmsen-gc/ ex30-vilhelmsen-gf/ + ex31-vilhelmsen-lgr/ + ex32-periodicbc/ + ex33-csub-jacob/ + ex34-csub-sub01/ ex35-csub-holly/ - ex07-mfusg1lgr/ - ex18-mfnwt3l/ - doc/ + ex36-csub-subwt01/ + ex37-draindepth/ + make/ msvs/ src/ Exchange/ + Model/ + Geometry/ + GroundWaterFlow/ + ModelUtilities/ Solution/ SparseMatrixSolver/ Timing/ Utilities/ - TimeSeries/ Memory/ - OutputControl/ Observation/ - Model/ - ModelUtilities/ - GroundWaterFlow/ - Geometry/ + OutputControl/ + TimeSeries/ + srcbmi/ + utils/ + mf5to6/ + make/ + msvs/ + src/ + LGR/ + MF2005/ + NWT/ + Preproc/ + zonebudget/ + make/ + msvs/ + src/ \end{verbatim} diff --git a/doc/mf6io/mf6ivar/md/mf6ivar.md b/doc/mf6io/mf6ivar/md/mf6ivar.md index f05f66ddd9c..44ade7593c1 100644 --- a/doc/mf6io/mf6ivar/md/mf6ivar.md +++ b/doc/mf6io/mf6ivar/md/mf6ivar.md @@ -583,7 +583,7 @@ | GWF | LAK | TABLES | LAKENO | INTEGER | integer value that defines the lake number associated with the specified TABLES data on the line. LAKENO must be greater than zero and less than or equal to NLAKES. The program will terminate with an error if table information for a lake is specified more than once or the number of specified tables is less than NTABLES. | | GWF | LAK | TABLES | TAB6 | KEYWORD | keyword to specify that record corresponds to a table file. | | GWF | LAK | TABLES | FILEIN | KEYWORD | keyword to specify that an input filename is expected next. | -| GWF | LAK | TABLES | TAB6_FILENAME | STRING | character string that defines the path and filename for the file containing lake table data for the lake connection. The CTABNAME file includes the number of entries in the file and the relation between stage, volume, and surface area for each entry in the file. Lake table files for EMBEDDEDH and EMBEDDEDV lake-GWF connections also include lake-GWF exchange area data for each entry in the file. Input instructions for the CTABNAME file is included at the LAK package lake table file input instructions section. | +| GWF | LAK | TABLES | TAB6_FILENAME | STRING | character string that defines the path and filename for the file containing lake table data for the lake connection. The TAB6\_FILENAME file includes the number of entries in the file and the relation between stage, volume, and surface area for each entry in the file. Lake table files for EMBEDDEDH and EMBEDDEDV lake-GWF connections also include lake-GWF exchange area data for each entry in the file. Instructions for creating the TAB6\_FILENAME input file are provided in Lake Table Input File section. | | GWF | LAK | OUTLETS | OUTLETNO | INTEGER | integer value that defines the outlet number associated with the specified OUTLETS data on the line. OUTLETNO must be greater than zero and less than or equal to NOUTLETS. Outlet information must be specified for every outlet or the program will terminate with an error. The program will also terminate with an error if information for a outlet is specified more than once. | | GWF | LAK | OUTLETS | LAKEIN | INTEGER | integer value that defines the lake number that outlet is connected to. LAKEIN must be greater than zero and less than or equal to NLAKES. | | GWF | LAK | OUTLETS | LAKEOUT | INTEGER | integer value that defines the lake number that outlet discharge from lake outlet OUTLETNO is routed to. LAKEOUT must be greater than or equal to zero and less than or equal to NLAKES. If LAKEOUT is zero, outlet discharge from lake outlet OUTLETNO is discharged to an external boundary. | diff --git a/doc/mf6io/mf6ivar/tex/gwf-lak-desc.tex b/doc/mf6io/mf6ivar/tex/gwf-lak-desc.tex index f775d2c69a9..cf0061a2d06 100644 --- a/doc/mf6io/mf6ivar/tex/gwf-lak-desc.tex +++ b/doc/mf6io/mf6ivar/tex/gwf-lak-desc.tex @@ -103,7 +103,7 @@ \item \texttt{FILEIN}---keyword to specify that an input filename is expected next. -\item \texttt{tab6\_filename}---character string that defines the path and filename for the file containing lake table data for the lake connection. The CTABNAME file includes the number of entries in the file and the relation between stage, volume, and surface area for each entry in the file. Lake table files for EMBEDDEDH and EMBEDDEDV lake-GWF connections also include lake-GWF exchange area data for each entry in the file. Input instructions for the CTABNAME file is included at the LAK package lake table file input instructions section. +\item \texttt{tab6\_filename}---character string that defines the path and filename for the file containing lake table data for the lake connection. The TAB6\_FILENAME file includes the number of entries in the file and the relation between stage, volume, and surface area for each entry in the file. Lake table files for EMBEDDEDH and EMBEDDEDV lake-GWF connections also include lake-GWF exchange area data for each entry in the file. Instructions for creating the TAB6\_FILENAME input file are provided in Lake Table Input File section. \end{description} \item \textbf{Block: OUTLETS} diff --git a/doc/mf6io/mf6noname.tex b/doc/mf6io/mf6noname.tex index 6c559038397..71a571c4bcc 100644 --- a/doc/mf6io/mf6noname.tex +++ b/doc/mf6io/mf6noname.tex @@ -3,8 +3,9 @@ ERROR REPORT: - 1. mf6: mfsim.nam is not present in working directory. + 1. mf6.exe: mfsim.nam is not present in working directory. + +2 -STOP 2 \end{lstlisting} } diff --git a/doc/mf6io/mf6output.tex b/doc/mf6io/mf6output.tex index ea8687f9011..64354f091c3 100644 --- a/doc/mf6io/mf6output.tex +++ b/doc/mf6io/mf6output.tex @@ -2,31 +2,32 @@ \begin{lstlisting}[style=modeloutput] MODFLOW 6 U.S. GEOLOGICAL SURVEY MODULAR HYDROLOGIC MODEL - VERSION 6.1.1 12/12/2019 - ***DEVELOP MODE*** + VERSION 6.1.1 06/12/2020 - MODFLOW 6 compiled Jun 8 2020 12:35:50 with GFORTRAN compiler (ver. 8.4.0) + MODFLOW 6 compiled Jun 11 2020 17:47:19 with IFORT compiler (ver. 19.10.0) -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. - Run start date and time (yyyy/mm/dd hh:mm:ss): 2020/06/08 12:37:34 + Run start date and time (yyyy/mm/dd hh:mm:ss): 2020/06/11 17:50:15 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/06/08 12:37:34 - Elapsed run time: 0.021 Seconds + Run end date and time (yyyy/mm/dd hh:mm:ss): 2020/06/11 17:50:15 + Elapsed run time: 0.031 Seconds WARNING REPORT: @@ -36,5 +37,6 @@ 2. LINEAR BLOCK VARIABLE 'INNER_HCLOSE' IN FILE 'twri.ims' WAS DEPRECATED IN VERSION 6.1.1. SETTING INNER_DVCLOSE TO INNER_HCLOSE VALUE. Normal termination of simulation. + \end{lstlisting} } diff --git a/doc/mf6io/mf6switches.tex b/doc/mf6io/mf6switches.tex index 1a747012fb8..8546c05cc53 100644 --- a/doc/mf6io/mf6switches.tex +++ b/doc/mf6io/mf6switches.tex @@ -1,10 +1,10 @@ {\small \begin{lstlisting}[style=modeloutput] -mf6 - MODFLOW 6.1.1 12/12/2019 (compiled Jun 8 2020 12:35:50) -usage: mf6 run MODFLOW 6 using "mfsim.nam" - or: mf6 [options] retrieve program information +mf6.exe - MODFLOW 6.1.1 06/12/2020 (compiled Jun 11 2020 17:47:19) +usage: mf6.exe run MODFLOW 6 using "mfsim.nam" + or: mf6.exe [options] retrieve program information -Options GNU long option Meaning +Options GNU long option Meaning -h, -? --help Show this message -v --version Display program version information. -dev --develop Display program develop option mode. @@ -18,13 +18,15 @@ errors but do assemble or solve matrix equations or write solution output. - -Bug reporting and contributions are welcome from the community. + +Bug reporting and contributions are welcome from the community. Questions can be asked on the issues page[1]. Before creating a new issue, please take a moment to search and make sure a similar issue does not already exist. If one does exist, you can comment (most simply even with just :+1:) to show your support for that issue. - + [1] https://github.com/MODFLOW-USGS/modflow6/issues + + \end{lstlisting} } diff --git a/doc/version.tex b/doc/version.tex index 708573d2c7a..bc4eba22ba3 100644 --- a/doc/version.tex +++ b/doc/version.tex @@ -1,3 +1,3 @@ \newcommand{\modflowversion}{mf6.1.1} -\newcommand{\modflowdate}{December 12, 2019} +\newcommand{\modflowdate}{June 12, 2020} \newcommand{\currentmodflowversion}{Version \modflowversion---\modflowdate} diff --git a/make/makefile b/make/makefile index ef529bc123a..b90efad84ed 100644 --- a/make/makefile +++ b/make/makefile @@ -1,4 +1,4 @@ -# makefile created on 2020-06-08 12:35:49.625919 +# makefile created on 2020-06-11 17:47:11.819998 # by pymake (version 1.1.0) # using the gfortran fortran and gcc c/c++ compilers. @@ -10,18 +10,18 @@ PROGRAM = mf6 SOURCEDIR1=../src SOURCEDIR2=../src/Exchange -SOURCEDIR3=../src/Solution -SOURCEDIR4=../src/Solution/SparseMatrixSolver -SOURCEDIR5=../src/Timing -SOURCEDIR6=../src/Utilities -SOURCEDIR7=../src/Utilities/TimeSeries -SOURCEDIR8=../src/Utilities/Memory -SOURCEDIR9=../src/Utilities/OutputControl -SOURCEDIR10=../src/Utilities/Observation -SOURCEDIR11=../src/Model -SOURCEDIR12=../src/Model/ModelUtilities -SOURCEDIR13=../src/Model/GroundWaterFlow -SOURCEDIR14=../src/Model/Geometry +SOURCEDIR3=../src/Model +SOURCEDIR4=../src/Model/Geometry +SOURCEDIR5=../src/Model/GroundWaterFlow +SOURCEDIR6=../src/Model/ModelUtilities +SOURCEDIR7=../src/Solution +SOURCEDIR8=../src/Solution/SparseMatrixSolver +SOURCEDIR9=../src/Timing +SOURCEDIR10=../src/Utilities +SOURCEDIR11=../src/Utilities/Memory +SOURCEDIR12=../src/Utilities/Observation +SOURCEDIR13=../src/Utilities/OutputControl +SOURCEDIR14=../src/Utilities/TimeSeries VPATH = \ ${SOURCEDIR1} \ @@ -43,117 +43,117 @@ ${SOURCEDIR14} # Define the Fortran compile flags FC = gfortran -FFLAGS = -O2 -ffpe-summary=overflow -ffpe-trap=overflow,zero,invalid -fbacktrace -D__APPLE__ -MMD -cpp +FFLAGS = -O2 -fbacktrace -Bstatic -D_WIN32 -MMD -cpp # Define the C compile flags CC = gcc -CFLAGS = -O2 -D_UF -MMD -cpp +CFLAGS = -O2 -Bstatic -D_UF -MMD -cpp # Define the libraries -SYSLIBS = -lc +SYSLIBS = -lgfortran -lm OBJECTS = \ +$(OBJDIR)/OpenSpec.o \ $(OBJDIR)/kind.o \ -$(OBJDIR)/version.o \ -$(OBJDIR)/Sparse.o \ -$(OBJDIR)/compilerversion.o \ -$(OBJDIR)/BaseGeometry.o \ -$(OBJDIR)/ims8reordering.o \ $(OBJDIR)/Constants.o \ $(OBJDIR)/HashTable.o \ -$(OBJDIR)/SimVariables.o \ -$(OBJDIR)/OpenSpec.o \ -$(OBJDIR)/Xt3dAlgorithm.o \ -$(OBJDIR)/SmoothingFunctions.o \ $(OBJDIR)/defmacro.o \ +$(OBJDIR)/BaseGeometry.o \ +$(OBJDIR)/SimVariables.o \ $(OBJDIR)/genericutils.o \ +$(OBJDIR)/compilerversion.o \ +$(OBJDIR)/ims8reordering.o \ +$(OBJDIR)/Sparse.o \ +$(OBJDIR)/version.o \ $(OBJDIR)/ArrayHandlers.o \ -$(OBJDIR)/Timer.o \ $(OBJDIR)/List.o \ -$(OBJDIR)/mf6lists.o \ -$(OBJDIR)/ObsOutput.o \ +$(OBJDIR)/SmoothingFunctions.o \ +$(OBJDIR)/Timer.o \ +$(OBJDIR)/Xt3dAlgorithm.o \ +$(OBJDIR)/TimeSeriesRecord.o \ $(OBJDIR)/Message.o \ +$(OBJDIR)/ObsOutput.o \ +$(OBJDIR)/mf6lists.o \ $(OBJDIR)/StringList.o \ -$(OBJDIR)/TimeSeriesRecord.o \ $(OBJDIR)/Sim.o \ +$(OBJDIR)/Budget.o \ $(OBJDIR)/InputOutput.o \ -$(OBJDIR)/PrintSaveManager.o \ -$(OBJDIR)/BudgetFileReader.o \ $(OBJDIR)/sort.o \ +$(OBJDIR)/BudgetFileReader.o \ +$(OBJDIR)/CircularGeometry.o \ +$(OBJDIR)/PrintSaveManager.o \ +$(OBJDIR)/RectangularGeometry.o \ $(OBJDIR)/ArrayReaders.o \ -$(OBJDIR)/comarg.o \ $(OBJDIR)/Iunit.o \ $(OBJDIR)/ObsOutputList.o \ -$(OBJDIR)/DisvGeom.o \ +$(OBJDIR)/comarg.o \ $(OBJDIR)/TableTerm.o \ -$(OBJDIR)/BlockParser.o \ -$(OBJDIR)/Budget.o \ -$(OBJDIR)/RectangularGeometry.o \ $(OBJDIR)/Table.o \ +$(OBJDIR)/DisvGeom.o \ +$(OBJDIR)/BlockParser.o \ $(OBJDIR)/Memory.o \ -$(OBJDIR)/CircularGeometry.o \ $(OBJDIR)/TimeSeries.o \ +$(OBJDIR)/MemoryList.o \ $(OBJDIR)/TimeSeriesLink.o \ $(OBJDIR)/ListReader.o \ $(OBJDIR)/NameFile.o \ -$(OBJDIR)/MemoryList.o \ -$(OBJDIR)/MemoryManager.o \ $(OBJDIR)/TimeSeriesFileList.o \ +$(OBJDIR)/MemoryManager.o \ $(OBJDIR)/Connections.o \ -$(OBJDIR)/PackageMover.o \ -$(OBJDIR)/BaseModel.o \ $(OBJDIR)/tdis.o \ -$(OBJDIR)/BaseSolution.o \ -$(OBJDIR)/UzfCellGroup.o \ +$(OBJDIR)/BaseModel.o \ $(OBJDIR)/ims8linear.o \ -$(OBJDIR)/BaseExchange.o \ -$(OBJDIR)/SolutionGroup.o \ -$(OBJDIR)/Mover.o \ +$(OBJDIR)/PackageMover.o \ $(OBJDIR)/TimeSeriesManager.o \ +$(OBJDIR)/UzfCellGroup.o \ +$(OBJDIR)/BaseSolution.o \ $(OBJDIR)/DiscretizationBase.o \ +$(OBJDIR)/gwf3disu8.o \ $(OBJDIR)/gwf3dis8.o \ $(OBJDIR)/BudgetTerm.o \ -$(OBJDIR)/gwf3disv8.o \ -$(OBJDIR)/OutputControlData.o \ -$(OBJDIR)/NumericalPackage.o \ +$(OBJDIR)/SolutionGroup.o \ $(OBJDIR)/TimeArray.o \ -$(OBJDIR)/gwf3disu8.o \ -$(OBJDIR)/gwf3ic8.o \ -$(OBJDIR)/TimeArraySeries.o \ +$(OBJDIR)/OutputControlData.o \ +$(OBJDIR)/gwf3disv8.o \ $(OBJDIR)/Observe.o \ $(OBJDIR)/Xt3dInterface.o \ -$(OBJDIR)/gwf3sto8.o \ -$(OBJDIR)/ObsUtility.o \ +$(OBJDIR)/Mover.o \ +$(OBJDIR)/BaseExchange.o \ +$(OBJDIR)/NumericalPackage.o \ $(OBJDIR)/BudgetObject.o \ -$(OBJDIR)/gwf3npf8.o \ -$(OBJDIR)/gwf3mvr8.o \ +$(OBJDIR)/TimeArraySeries.o \ +$(OBJDIR)/ObsUtility.o \ $(OBJDIR)/OutputControl.o \ -$(OBJDIR)/TimeArraySeriesLink.o \ $(OBJDIR)/ObsContainer.o \ -$(OBJDIR)/gwf3oc8.o \ +$(OBJDIR)/TimeArraySeriesLink.o \ +$(OBJDIR)/gwf3mvr8.o \ $(OBJDIR)/gwf3hfb8.o \ -$(OBJDIR)/TimeArraySeriesManager.o \ +$(OBJDIR)/gwf3ic8.o \ +$(OBJDIR)/gwf3npf8.o \ +$(OBJDIR)/gwf3sto8.o \ +$(OBJDIR)/gwf3oc8.o \ $(OBJDIR)/Obs3.o \ $(OBJDIR)/gwf3obs8.o \ $(OBJDIR)/gwf3csub8.o \ +$(OBJDIR)/TimeArraySeriesManager.o \ $(OBJDIR)/BoundaryPackage.o \ -$(OBJDIR)/gwf3lak8.o \ +$(OBJDIR)/gwf3evt8.o \ +$(OBJDIR)/gwf3rch8.o \ $(OBJDIR)/NumericalModel.o \ +$(OBJDIR)/gwf3maw8.o \ +$(OBJDIR)/gwf3riv8.o \ +$(OBJDIR)/gwf3ghb8.o \ $(OBJDIR)/gwf3wel8.o \ -$(OBJDIR)/gwf3sfr8.o \ -$(OBJDIR)/gwf3evt8.o \ $(OBJDIR)/gwf3chd8.o \ -$(OBJDIR)/gwf3maw8.o \ -$(OBJDIR)/NumericalExchange.o \ +$(OBJDIR)/gwf3sfr8.o \ +$(OBJDIR)/GhostNode.o \ +$(OBJDIR)/gwf3lak8.o \ $(OBJDIR)/gwf3uzf8.o \ -$(OBJDIR)/gwf3rch8.o \ -$(OBJDIR)/gwf3riv8.o \ $(OBJDIR)/gwf3drn8.o \ -$(OBJDIR)/GhostNode.o \ -$(OBJDIR)/gwf3ghb8.o \ -$(OBJDIR)/NumericalSolution.o \ $(OBJDIR)/gwf3.o \ +$(OBJDIR)/NumericalExchange.o \ $(OBJDIR)/GwfGwfExchange.o \ +$(OBJDIR)/NumericalSolution.o \ $(OBJDIR)/SimulationCreate.o \ $(OBJDIR)/mf6core.o \ $(OBJDIR)/mf6.o diff --git a/src/Utilities/version.f90 b/src/Utilities/version.f90 index 6d080cd80af..8f41f15512e 100644 --- a/src/Utilities/version.f90 +++ b/src/Utilities/version.f90 @@ -2,8 +2,8 @@ module VersionModule use KindModule public ! -- modflow 6 version - integer(I4B), parameter :: IDEVELOPMODE = 1 - character(len=40), parameter :: VERSION = '6.1.1 12/12/2019' + integer(I4B), parameter :: IDEVELOPMODE = 0 + character(len=40), parameter :: VERSION = '6.1.1 06/12/2020' character(len=10), parameter :: MFVNAM = ' 6' character(len=*), parameter :: MFTITLE = & 'U.S. GEOLOGICAL SURVEY MODULAR HYDROLOGIC MODEL' @@ -14,15 +14,17 @@ 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.',/)" end module VersionModule diff --git a/utils/mf5to6/make/makefile b/utils/mf5to6/make/makefile index 7188d5b93ac..a09bc5322cc 100644 --- a/utils/mf5to6/make/makefile +++ b/utils/mf5to6/make/makefile @@ -1,4 +1,4 @@ -# makefile created on 2020-06-08 12:36:37.282790 +# makefile created on 2020-06-11 17:48:34.879702 # by pymake (version 1.1.0) # using the gfortran fortran and gcc c/c++ compilers. @@ -9,10 +9,10 @@ BINDIR = . PROGRAM = mf5to6 SOURCEDIR1=../src -SOURCEDIR2=../src/NWT -SOURCEDIR3=../src/LGR -SOURCEDIR4=../src/Preproc -SOURCEDIR5=../src/MF2005 +SOURCEDIR2=../src/LGR +SOURCEDIR3=../src/MF2005 +SOURCEDIR4=../src/NWT +SOURCEDIR5=../src/Preproc SOURCEDIR6=../../../src/Utilities/Memory SOURCEDIR7=../../../src/Utilities/TimeSeries SOURCEDIR8=../../../src/Utilities @@ -31,163 +31,163 @@ ${SOURCEDIR8} # Define the Fortran compile flags FC = gfortran -FFLAGS = -O2 -ffpe-summary=overflow -ffpe-trap=overflow,zero,invalid -fbacktrace -D__APPLE__ -MMD -cpp +FFLAGS = -O2 -fbacktrace -Bstatic -D_WIN32 -MMD -cpp # Define the C compile flags CC = gcc -CFLAGS = -O2 -D_UF -MMD -cpp +CFLAGS = -O2 -Bstatic -D_UF -MMD -cpp # Define the libraries -SYSLIBS = -lc +SYSLIBS = -lgfortran -lm OBJECTS = \ -$(OBJDIR)/GwfUzfModule_NWT.o \ -$(OBJDIR)/GwfBcfModule.o \ -$(OBJDIR)/GwfLgrModule.o \ -$(OBJDIR)/GwfRchModule.o \ -$(OBJDIR)/GwfUpwModule.o \ -$(OBJDIR)/GwfWelModule.o \ -$(OBJDIR)/GwfMnwModule.o \ -$(OBJDIR)/GwfGhbModule.o \ +$(OBJDIR)/GlobalPHMF.o \ $(OBJDIR)/kind.o \ -$(OBJDIR)/GwfLakModule.o \ -$(OBJDIR)/GwfDrnModule.o \ +$(OBJDIR)/GwfGhbModule.o \ $(OBJDIR)/GwfEvtModule.o \ -$(OBJDIR)/GwfEtsModule.o \ -$(OBJDIR)/GwfChdModule.o \ -$(OBJDIR)/GlobalPHMF.o \ +$(OBJDIR)/ConstantsPHMF.o \ $(OBJDIR)/GwfLpfModule.o \ -$(OBJDIR)/ParamModule.o \ -$(OBJDIR)/StressPeriod.o \ -$(OBJDIR)/ConverterCommon.o \ -$(OBJDIR)/NWT1_xmdlib.o \ -$(OBJDIR)/GwfFhbModule.o \ +$(OBJDIR)/GwfWelModule.o \ +$(OBJDIR)/gwf2hfb7_NWT.o \ +$(OBJDIR)/GwfMnwModule.o \ +$(OBJDIR)/Constants.o \ +$(OBJDIR)/GwfUpwModule.o \ $(OBJDIR)/version.o \ +$(OBJDIR)/GwfDrnModule.o \ $(OBJDIR)/OpenSpec.o \ -$(OBJDIR)/GwfResModule.o \ -$(OBJDIR)/gwf2hfb7_NWT.o \ +$(OBJDIR)/NWT1_xmdlib.o \ +$(OBJDIR)/StressPeriod.o \ +$(OBJDIR)/GwfLgrModule.o \ +$(OBJDIR)/ConverterCommon.o \ +$(OBJDIR)/ParamModule.o \ $(OBJDIR)/mach_mod.o \ -$(OBJDIR)/ConstantsPHMF.o \ +$(OBJDIR)/GwfUzfModule_NWT.o \ $(OBJDIR)/GwfRivModule.o \ +$(OBJDIR)/GlobalVariables.o \ +$(OBJDIR)/GwfChdModule.o \ +$(OBJDIR)/GwfRchModule.o \ +$(OBJDIR)/Connection.o \ +$(OBJDIR)/GwfEtsModule.o \ $(OBJDIR)/GlobalVariablesPHMF.o \ -$(OBJDIR)/Constants.o \ -$(OBJDIR)/SimVariables.o \ -$(OBJDIR)/genericutils.o \ +$(OBJDIR)/GwfLakModule.o \ +$(OBJDIR)/GwfFhbModule.o \ +$(OBJDIR)/GwfBcfModule.o \ +$(OBJDIR)/GwfResModule.o \ $(OBJDIR)/Global.o \ $(OBJDIR)/GwfSfrModule.o \ -$(OBJDIR)/Connection.o \ $(OBJDIR)/NWT1_module.o \ -$(OBJDIR)/GlobalVariables.o \ $(OBJDIR)/ArrayHandlers.o \ -$(OBJDIR)/GwfBasModule.o \ +$(OBJDIR)/SimVariables.o \ +$(OBJDIR)/genericutils.o \ +$(OBJDIR)/pcgn2.o \ $(OBJDIR)/SimPHMF.o \ +$(OBJDIR)/GwfSfrCheck.o \ +$(OBJDIR)/GwfBasModule.o \ $(OBJDIR)/NWT1_ilupc_mod.o \ -$(OBJDIR)/pcgn2.o \ +$(OBJDIR)/InputOutput.o \ $(OBJDIR)/List.o \ +$(OBJDIR)/BlockParser.o \ $(OBJDIR)/SfrDiversion.o \ -$(OBJDIR)/GwfSfrCheck.o \ -$(OBJDIR)/LakeConnection.o \ -$(OBJDIR)/SimVariablesPHMF.o \ -$(OBJDIR)/LakeOutlet.o \ -$(OBJDIR)/InputOutput.o \ -$(OBJDIR)/Auxiliary.o \ -$(OBJDIR)/MultiLayerObsModule.o \ -$(OBJDIR)/TimeSeriesRecord.o \ -$(OBJDIR)/SimListVariables.o \ -$(OBJDIR)/Lake.o \ -$(OBJDIR)/ModelPackage.o \ $(OBJDIR)/Utilities.o \ -$(OBJDIR)/LakeTributary.o \ +$(OBJDIR)/SimVariablesPHMF.o \ +$(OBJDIR)/GwfFhbSubs.o \ +$(OBJDIR)/ArrayReadersMF5.o \ +$(OBJDIR)/GwfResSubs.o \ +$(OBJDIR)/LakeConnection.o \ $(OBJDIR)/CharacterContainer.o \ $(OBJDIR)/TableTerm.o \ -$(OBJDIR)/precutls.o \ +$(OBJDIR)/Auxiliary.o \ $(OBJDIR)/ObservePHMF.o \ -$(OBJDIR)/GwfFhbSubs.o \ +$(OBJDIR)/SimListVariables.o \ +$(OBJDIR)/LakeOutlet.o \ +$(OBJDIR)/MultiLayerObsModule.o \ +$(OBJDIR)/SfrReach.o \ $(OBJDIR)/LineList.o \ -$(OBJDIR)/BlockParser.o \ -$(OBJDIR)/ArrayReadersMF5.o \ +$(OBJDIR)/TimeSeriesRecord.o \ $(OBJDIR)/Table.o \ -$(OBJDIR)/SfrReach.o \ -$(OBJDIR)/File.o \ -$(OBJDIR)/GwfResSubs.o \ +$(OBJDIR)/LakeTributary.o \ +$(OBJDIR)/Lake.o \ +$(OBJDIR)/precutls.o \ +$(OBJDIR)/ModelPackage.o \ +$(OBJDIR)/Memory.o \ $(OBJDIR)/SfrSegment.o \ -$(OBJDIR)/FileWriter.o \ -$(OBJDIR)/DisWriter.o \ $(OBJDIR)/TimeSeries.o \ -$(OBJDIR)/StoWriter.o \ -$(OBJDIR)/TdisWriter.o \ -$(OBJDIR)/Memory.o \ -$(OBJDIR)/TdisVariables.o \ +$(OBJDIR)/File.o \ $(OBJDIR)/FileList.o \ -$(OBJDIR)/ChdType.o \ -$(OBJDIR)/IcWriter.o \ -$(OBJDIR)/MemoryList.o \ +$(OBJDIR)/FileWriter.o \ $(OBJDIR)/utl7.o \ +$(OBJDIR)/GwfSfrSubs.o \ $(OBJDIR)/GwfDrnSubs.o \ +$(OBJDIR)/obs2bas7.o \ +$(OBJDIR)/NpfWriter.o \ +$(OBJDIR)/GwfGhbSubs.o \ +$(OBJDIR)/GwfMnwSubs.o \ $(OBJDIR)/gwf2wel7_NWT.o \ -$(OBJDIR)/obs2drn7.o \ -$(OBJDIR)/gmg7.o \ -$(OBJDIR)/NWT1_solver.o \ $(OBJDIR)/parutl7.o \ +$(OBJDIR)/obs2riv7.o \ +$(OBJDIR)/NWT1_xmd.o \ +$(OBJDIR)/GwfEvtSubs.o \ +$(OBJDIR)/gmg7.o \ $(OBJDIR)/de47.o \ -$(OBJDIR)/NpfWriter.o \ -$(OBJDIR)/GwfGhbSubs.o \ -$(OBJDIR)/GwfLakSubs.o \ +$(OBJDIR)/GwfLgrSubs.o \ +$(OBJDIR)/GwfBasOcSubs.o \ $(OBJDIR)/GwfHfbSubs_NWT.o \ +$(OBJDIR)/MemoryList.o \ $(OBJDIR)/GwfRchSubs.o \ $(OBJDIR)/pcg7.o \ -$(OBJDIR)/GwfLgrSubs.o \ -$(OBJDIR)/obs2bas7.o \ +$(OBJDIR)/TdisWriter.o \ $(OBJDIR)/obs2chd7.o \ -$(OBJDIR)/GwfChdSubs.o \ -$(OBJDIR)/GwfEtsSubs.o \ -$(OBJDIR)/GwfMnwSubs.o \ -$(OBJDIR)/obs2ghb7.o \ -$(OBJDIR)/obs2riv7.o \ -$(OBJDIR)/MemoryManager.o \ +$(OBJDIR)/StoWriter.o \ +$(OBJDIR)/IcWriter.o \ +$(OBJDIR)/GwfLakSubs.o \ +$(OBJDIR)/NWT1_solver.o \ +$(OBJDIR)/NWT1_gmres.o \ +$(OBJDIR)/ChdType.o \ $(OBJDIR)/GwfRivSubs.o \ -$(OBJDIR)/GwfUzfSubs_NWT.o \ -$(OBJDIR)/GwfBasOcSubs.o \ -$(OBJDIR)/GwfEvtSubs.o \ -$(OBJDIR)/NWT1_xmd.o \ -$(OBJDIR)/GwfSfrSubs.o \ $(OBJDIR)/Mover.o \ +$(OBJDIR)/obs2drn7.o \ +$(OBJDIR)/DisWriter.o \ +$(OBJDIR)/obs2ghb7.o \ +$(OBJDIR)/TdisVariables.o \ +$(OBJDIR)/GwfEtsSubs.o \ +$(OBJDIR)/GwfChdSubs.o \ +$(OBJDIR)/GwfUzfSubs_NWT.o \ $(OBJDIR)/sip7.o \ -$(OBJDIR)/NWT1_gmres.o \ -$(OBJDIR)/DiscretizationBasePHMF.o \ +$(OBJDIR)/MemoryManager.o \ $(OBJDIR)/gwf2mnw17.o \ +$(OBJDIR)/DiscretizationBasePHMF.o \ $(OBJDIR)/gwf2mnw2i7.o \ $(OBJDIR)/Discretization3D.o \ $(OBJDIR)/ObsBlock.o \ $(OBJDIR)/Preproc.o \ $(OBJDIR)/ObsWriter.o \ $(OBJDIR)/PackageWriter.o \ -$(OBJDIR)/RchPackageWriter.o \ -$(OBJDIR)/RivPackageWriter.o \ -$(OBJDIR)/ImsPackageWriter.o \ -$(OBJDIR)/WelPackageWriter.o \ -$(OBJDIR)/ChdObsWriter.o \ -$(OBJDIR)/GhbPackageWriter.o \ -$(OBJDIR)/HfbPackageWriter.o \ -$(OBJDIR)/DrnPackageWriter.o \ -$(OBJDIR)/OutputControlWriter.o \ $(OBJDIR)/GhbObsWriter.o \ $(OBJDIR)/RivObsWriter.o \ -$(OBJDIR)/DrnObsWriter.o \ +$(OBJDIR)/ChdObsWriter.o \ $(OBJDIR)/MvrPackageWriter.o \ +$(OBJDIR)/DrnPackageWriter.o \ +$(OBJDIR)/ImsPackageWriter.o \ +$(OBJDIR)/WelPackageWriter.o \ $(OBJDIR)/EvtPackageWriter.o \ -$(OBJDIR)/SfrPackageWriter.o \ +$(OBJDIR)/DrnObsWriter.o \ +$(OBJDIR)/LakPackageWriter.o \ +$(OBJDIR)/OutputControlWriter.o \ $(OBJDIR)/MawPackageWriter.o \ $(OBJDIR)/ChdPackageWriter.o \ -$(OBJDIR)/LakPackageWriter.o \ +$(OBJDIR)/GhbPackageWriter.o \ +$(OBJDIR)/RivPackageWriter.o \ +$(OBJDIR)/HfbPackageWriter.o \ +$(OBJDIR)/SfrPackageWriter.o \ +$(OBJDIR)/RchPackageWriter.o \ $(OBJDIR)/FhbPackageWriter.o \ $(OBJDIR)/UzfPackageWriter.o \ $(OBJDIR)/Model.o \ -$(OBJDIR)/GwfBasSubs.o \ -$(OBJDIR)/Exchange.o \ -$(OBJDIR)/GwfLpfSubs.o \ -$(OBJDIR)/GwfBcfSubs.o \ $(OBJDIR)/GwfUpwSubs.o \ +$(OBJDIR)/GwfBcfSubs.o \ +$(OBJDIR)/GwfLpfSubs.o \ +$(OBJDIR)/Exchange.o \ +$(OBJDIR)/GwfBasSubs.o \ $(OBJDIR)/ModelConverter.o \ $(OBJDIR)/ExchangeWriter.o \ $(OBJDIR)/SimFileWriter.o \ diff --git a/utils/zonebudget/make/makefile b/utils/zonebudget/make/makefile index 117e786fe6e..1aee8b68137 100644 --- a/utils/zonebudget/make/makefile +++ b/utils/zonebudget/make/makefile @@ -1,4 +1,4 @@ -# makefile created on 2020-06-08 12:36:32.365194 +# makefile created on 2020-06-11 17:48:22.733501 # by pymake (version 1.1.0) # using the gfortran fortran and gcc c/c++ compilers. @@ -19,31 +19,31 @@ ${SOURCEDIR2} # Define the Fortran compile flags FC = gfortran -FFLAGS = -O2 -ffpe-summary=overflow -ffpe-trap=overflow,zero,invalid -fbacktrace -D__APPLE__ -MMD -cpp +FFLAGS = -O2 -fbacktrace -Bstatic -D_WIN32 -MMD -cpp # Define the C compile flags CC = gcc -CFLAGS = -O2 -D_UF -MMD -cpp +CFLAGS = -O2 -Bstatic -D_UF -MMD -cpp # Define the libraries -SYSLIBS = -lc +SYSLIBS = -lgfortran -lm OBJECTS = \ $(OBJDIR)/OpenSpec.o \ $(OBJDIR)/kind.o \ +$(OBJDIR)/version.o \ $(OBJDIR)/Constants.o \ -$(OBJDIR)/defmacro.o \ $(OBJDIR)/SimVariables.o \ -$(OBJDIR)/version.o \ +$(OBJDIR)/defmacro.o \ $(OBJDIR)/genericutils.o \ $(OBJDIR)/ArrayHandlers.o \ $(OBJDIR)/Message.o \ $(OBJDIR)/Sim.o \ -$(OBJDIR)/budgetdata.o \ -$(OBJDIR)/sort.o \ -$(OBJDIR)/Budget.o \ $(OBJDIR)/InputOutput.o \ $(OBJDIR)/ArrayReaders.o \ +$(OBJDIR)/sort.o \ +$(OBJDIR)/budgetdata.o \ +$(OBJDIR)/Budget.o \ $(OBJDIR)/BlockParser.o \ $(OBJDIR)/grb.o \ $(OBJDIR)/zone.o \ diff --git a/version.txt b/version.txt index a4a64112a00..22adfd9511f 100644 --- a/version.txt +++ b/version.txt @@ -1,5 +1,5 @@ # MODFLOW 6 version file automatically created using...make-release.py -# created on...December 12, 2019 15:20:23 +# created on...June 11, 2020 10:18:09 major = 6 minor = 1