refactor(sfr): Refactor SFR Package to remove use of Geometry objects

.travis.yml

@@ -22,7 +22,7 @@ before_install:
     texlive-latex-recommended texlive-science texlive-fonts-extra
 - sudo apt-get install -y graphviz python3-pip python3-setuptools
     python3-matplotlib python3-netcdf4 python3-pyproj python3-pyshp
-    python3-shapely
+    python3-shapely python3-tk
 install:
 - if [[ ! -d "$HOME/.local/bin" ]]; then mkdir "$HOME/.local/bin"; fi
 - ln -fs /usr/bin/$FC $HOME/.local/bin/gfortran
@@ -33,14 +33,16 @@ install:
 - pip --version
 - pip config --user set global.progress_bar off
 - pip install --user nose-timer pydotplus
-- pip install --user https://github.com/modflowpy/flopy/zipball/develop
-- pip install --user https://github.com/modflowpy/pymake/zipball/master
+- git clone https://github.com/modflowpy/flopy --depth 1 --branch=develop ~/flopy
+- pip install --user -e ~/flopy
+- git clone https://github.com/modflowpy/pymake --depth 1 --branch=master ~/pymake
+- pip install --user -e ~/pymake
 script:
 - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH;
   else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
 - echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, PR=$PR, BRANCH=$BRANCH"
 - pwd
-- git clone https://github.com/MODFLOW-USGS/modflow6-examples.git ../modflow6-examples
+- git clone https://github.com/MODFLOW-USGS/modflow6-examples ../modflow6-examples
 - cd ../modflow6-examples
 - if git show-ref -q --heads $BRANCH; then
   git checkout $BRANCH; echo switched to modflow6-examples branch $BRANCH;

doc/ReleaseNotes/ReleaseNotes.tex

@@ -122,6 +122,11 @@ \section{History}
 \underline{BASIC FUNCTIONALITY}
 
 \underline{STRESS PACKAGES}
+\begin{itemize}
+	\item Fixed a bug in binary budget file header for CSUB Package budget data written using IMETH=6 (CSUB-ELASTIC and CSUB-INELASTIC) .
+	\item Added information on the CSUB Package budget terms and compaction data written the the Input/Output document in the `Description of Groundwater Flow (GWF) Model Binary Output Files' section.
+	\item Refactored the SFR Package to remove use of RectangularChGeometry objects and added required functionality as private methods in the SFR module.
+\end{itemize}
 
 \underline{ADVANCED STRESS PACKAGES}
 \begin{itemize}

doc/mf6io/mf6ivar/dfn/gwf-chd.dfn

@@ -180,7 +180,7 @@ in_record true
 reader urword
 time_series true
 longname head value assigned to constant head
-description is the head at the boundary.
+description is the head at the boundary. If the Options block includes a TIMESERIESFILE entry (see the ``Time-Variable Input'' section), values can be obtained from a time series by entering the time-series name in place of a numeric value.
 
 block period
 name aux

doc/mf6io/mf6ivar/dfn/gwf-csub.dfn

@@ -544,7 +544,7 @@ description is the specific gravity of saturated sediments. If not specified, th
 block packagedata
 name packagedata
 type recarray icsubno cellid cdelay pcs0 thick_frac rnb ssv_cc sse_cr theta kv h0 boundname
-shape (ncsubcells)
+shape (ninterbeds)
 reader urword
 longname
 description
@@ -557,7 +557,7 @@ tagged false
 in_record true
 reader urword
 longname CSUB id number for this entry
-description integer value that defines the CSUB interbed number associated with the specified PACKAGEDATA data on the line. CSUBNO must be greater than zero and less than or equal to NCSUBCELLS.  CSUB information must be specified for every CSUB cell or the program will terminate with an error.  The program will also terminate with an error if information for a CSUB interbed number is specified more than once.
+description integer value that defines the CSUB interbed number associated with the specified PACKAGEDATA data on the line. CSUBNO must be greater than zero and less than or equal to NINTERBEDS.  CSUB information must be specified for every CSUB cell or the program will terminate with an error.  The program will also terminate with an error if information for a CSUB interbed number is specified more than once.
 numeric_index true
 
 block packagedata
@@ -577,7 +577,7 @@ shape
 tagged false
 in_record true
 reader urword
-longname initial water content
+longname delay type
 description character string that defines the subsidence delay type for the interbed. Possible subsidence package CDELAY strings include: NODELAY--character keyword to indicate that delay will not be simulated in the interbed.  DELAY--character keyword to indicate that delay will be simulated in the interbed.
 
 block packagedata
@@ -627,7 +627,7 @@ shape
 tagged false
 in_record true
 reader urword
-longname initial elastic interbed specific storage
+longname initial interbed elastic specific storage
 description is the initial elastic coarse-grained material specific storage or recompression index of the interbed. The recompression index is specified if COMPRESSION\_INDICES is specified in the OPTIONS block. Specified or calculated interbed elastic specific storage values are not adjusted from initial values if HEAD\_BASED is specified in the OPTIONS block.
 
 block packagedata
@@ -714,4 +714,4 @@ in_record true
 reader urword
 time_series true
 longname well stress offset
-description is the stress offset for the cell. SIG0 is added to the calculated geostatic stress for the cell. SIG0 is specified only if MAXSIG0 is specified to be greater than 0 in the DIMENSIONS block.
+description is the stress offset for the cell. SIG0 is added to the calculated geostatic stress for the cell. SIG0 is specified only if MAXSIG0 is specified to be greater than 0 in the DIMENSIONS block. If the Options block includes a TIMESERIESFILE entry (see the ``Time-Variable Input'' section), values can be obtained from a time series by entering the time-series name in place of a numeric value.

doc/mf6io/mf6ivar/dfn/gwf-evt.dfn

@@ -203,7 +203,7 @@ in_record true
 reader urword
 time_series true
 longname ET surface
-description is the elevation of the ET surface ($L$). A time-series name may be specified. 
+description is the elevation of the ET surface ($L$). If the Options block includes a TIMESERIESFILE entry (see the ``Time-Variable Input'' section), values can be obtained from a time series by entering the time-series name in place of a numeric value.
 
 block period
 name rate
@@ -214,7 +214,7 @@ in_record true
 reader urword
 time_series true
 longname maximum ET rate
-description is the maximum ET flux rate ($LT^{-1}$).  A time-series name may be specified. 
+description is the maximum ET flux rate ($LT^{-1}$). If the Options block includes a TIMESERIESFILE entry (see the ``Time-Variable Input'' section), values can be obtained from a time series by entering the time-series name in place of a numeric value.
 
 block period
 name depth
@@ -225,7 +225,7 @@ in_record true
 reader urword
 time_series true
 longname ET extinction depth
-description is the ET extinction depth ($L$).  A time-series name may be specified. 
+description is the ET extinction depth ($L$). If the Options block includes a TIMESERIESFILE entry (see the ``Time-Variable Input'' section), values can be obtained from a time series by entering the time-series name in place of a numeric value.
 
 block period
 name pxdp
@@ -236,7 +236,7 @@ in_record true
 reader urword
 time_series true
 longname proportion of ET extinction depth
-description is the proportion of the ET extinction depth at the bottom of a segment (dimensionless).  A time-series name may be specified. 
+description is the proportion of the ET extinction depth at the bottom of a segment (dimensionless). If the Options block includes a TIMESERIESFILE entry (see the ``Time-Variable Input'' section), values can be obtained from a time series by entering the time-series name in place of a numeric value.
 
 block period
 name petm
@@ -247,7 +247,7 @@ in_record true
 reader urword
 time_series true
 longname proportion of maximum ET rate
-description is the proportion of the maximum ET flux rate at the bottom of a segment (dimensionless).  A time-series name may be specified. 
+description is the proportion of the maximum ET flux rate at the bottom of a segment (dimensionless). If the Options block includes a TIMESERIESFILE entry (see the ``Time-Variable Input'' section), values can be obtained from a time series by entering the time-series name in place of a numeric value.
 
 block period
 name petm0
@@ -259,7 +259,7 @@ reader urword
 optional true
 time_series true
 longname proportion of maximum ET rate at ET surface
-description is the proportion of the maximum ET flux rate that will apply when head is at or above the ET surface (dimensionless). PETM0 is read only when the SURF\_RATE\_SPECIFIED option is used. A time-series name may be specified.
+description is the proportion of the maximum ET flux rate that will apply when head is at or above the ET surface (dimensionless). PETM0 is read only when the SURF\_RATE\_SPECIFIED option is used. If the Options block includes a TIMESERIESFILE entry (see the ``Time-Variable Input'' section), values can be obtained from a time series by entering the time-series name in place of a numeric value.
 
 block period
 name aux

doc/mf6io/mf6ivar/dfn/gwf-rch.dfn

@@ -188,7 +188,7 @@ in_record true
 reader urword
 time_series true
 longname recharge rate
-description is the recharge flux rate ($LT^{-1}$).  This rate is multiplied inside the program by the surface area of the cell to calculate the volumetric recharge rate. A time-series name may be specified.
+description is the recharge flux rate ($LT^{-1}$).  This rate is multiplied inside the program by the surface area of the cell to calculate the volumetric recharge rate. If the Options block includes a TIMESERIESFILE entry (see the ``Time-Variable Input'' section), values can be obtained from a time series by entering the time-series name in place of a numeric value.
 
 block period
 name aux