fix(dis/disv): terminate with error if all IDOMAIN values less than o…

…r equal to zero (#124)

* fix(dis/disv):  terminate with error if all IDOMAIN values less than or equal to zero

* couple fixes to get tests running with new flopy code

README.md

@@ -7,7 +7,7 @@
 
 ## Automated Testing Status on Travis-CI
 
-### Version 6.0.4 develop — build 6
+### Version 6.0.4 develop — build 8
 [![Build Status](https://travis-ci.org/MODFLOW-USGS/modflow6.svg?branch=develop)](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.0.4 — develop: U.S. Geological Survey Software Release, 20 March 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, 2019, MODFLOW 6 Modular Hydrologic Model version 6.0.4 — develop: U.S. Geological Survey Software Release, 30 March 2019, https://doi.org/10.5066/F76Q1VQV](https://doi.org/10.5066/F76Q1VQV)
 
 ## Instructions for building definition files for new packages
 

autotest/test_gwf_npf03_sfr.py

@@ -258,7 +258,7 @@ def get_model(idx, dir):
                                           perioddata=perioddata,
                                           pname='maw', mover=True)
             if nmodels == 1:
-                packages = [pname, 'maw']
+                packages = [(pname,), ('maw',)]
                 mpd = [('maw', 0, pname, sfrdst, 'FACTOR', 1.)]
                 fn = '{}.mvr'.format(mname)
                 # create mvr package

autotest/test_gwf_utl02_timeseries.py

@@ -113,10 +113,13 @@ def get_model(idx, dir):
                    (41272., 3.e30, 3.e30),
                    (15000., 0., 0.),
                    ]
-    wel.ts.filename = name + '.wel.ts'
-    wel.ts.timeseries = ts_recarray
-    wel.ts.time_series_namerecord = [('ts01', 'ts02')]
-    wel.ts.interpolation_methodrecord = [('linear', 'linear')]
+
+    filename = name + '.wel.ts'
+    time_series_namerecord = [('ts01', 'ts02')]
+    interpolation_methodrecord = [('linear', 'linear')]
+    wel.ts.initialize(filename=filename, timeseries=ts_recarray,
+                      time_series_namerecord=time_series_namerecord,
+                      interpolation_methodrecord=interpolation_methodrecord)
 
     # output control
     oc = flopy.mf6.ModflowGwfoc(gwf,

code.json

@@ -18,9 +18,9 @@
             "email": "langevin@usgs.gov"
         }, 
         "laborHours": -1, 
-        "version": "6.0.4.6", 
+        "version": "6.0.4.8", 
         "date": {
-            "metadataLastUpdated": "2019-03-20"
+            "metadataLastUpdated": "2019-03-30"
         }, 
         "organization": "U.S. Geological Survey", 
         "permissions": {

doc/version.tex

@@ -1,3 +1,3 @@
-\newcommand{\modflowversion}{mf6.0.4.6}
-\newcommand{\modflowdate}{March 20, 2019}
+\newcommand{\modflowversion}{mf6.0.4.8}
+\newcommand{\modflowdate}{March 30, 2019}
 \newcommand{\currentmodflowversion}{Version \modflowversion---\modflowdate}

src/Model/GroundWaterFlow/gwf3dis8.f90

@@ -450,6 +450,15 @@ subroutine read_griddata(this)
       enddo
     endif
     !
+    ! -- Check to make sure nodes is a valid number
+    if (this%nodes == 0) then
+      call store_error('ERROR.  MODEL DOES NOT HAVE ANY ACTIVE NODES.')
+      call store_error('MAKE SURE IDOMAIN ARRAY HAS SOME VALUES GREATER &
+        &THAN ZERO.')
+      call this%parser%StoreErrorUnit()
+      call ustop()
+    end if
+    !
     ! -- Check cell thicknesses
     n = 0
     do k = 1, this%nlay

src/Model/GroundWaterFlow/gwf3disv8.f90

@@ -459,6 +459,15 @@ subroutine read_griddata(this)
       enddo
     endif
     !
+    ! -- Check to make sure nodes is a valid number
+    if (this%nodes == 0) then
+      call store_error('ERROR.  MODEL DOES NOT HAVE ANY ACTIVE NODES.')
+      call store_error('MAKE SURE IDOMAIN ARRAY HAS SOME VALUES GREATER &
+        &THAN ZERO.')
+      call this%parser%StoreErrorUnit()
+      call ustop()
+    end if
+    !
     ! -- Check cell thicknesses
     do k = 1, this%nlay
       do j = 1, this%ncpl

src/Utilities/version.f90

@@ -3,7 +3,7 @@ module VersionModule
   public
   ! -- modflow 6 version
   integer(I4B), parameter :: IDEVELOPMODE = 1
-  character(len=40), parameter :: VERSION = '6.0.4.6 03/20/2019'
+  character(len=40), parameter :: VERSION = '6.0.4.8 03/30/2019'
   character(len=10), parameter :: MFVNAM = ' 6'
   character(len=*), parameter  :: MFTITLE =                                     &
     'U.S. GEOLOGICAL SURVEY MODULAR HYDROLOGIC MODEL'

version.txt

@@ -1,12 +1,12 @@
 # MODFLOW 6 version file automatically created using...pre-commit.py
-# created on...March 20, 2019 13:00:43
+# created on...March 30, 2019 21:25:10
 
 # add some comments on how this version file
 # should be manually updated and used
 
 major = 6
 minor = 0
 micro = 4
-build = 6
-commit = 204
+build = 8
+commit = 206