Cleanup of variable definitions. Still more cleaning required.

README.md

@@ -7,7 +7,7 @@
 
 ## Automated Testing Status on Travis-CI
 
-### Version 6.0.3 develop — build 6
+### Version 6.0.3 develop — build 7
 [![Build Status](https://travis-ci.org/MODFLOW-USGS/modflow6.svg?branch=develop)](https://travis-ci.org/MODFLOW-USGS/modflow6)
 
 ## Introduction

code.json

@@ -1,24 +1,24 @@
 [
  {
  "status": "Release Candidate", 
- "downloadURL": "https://code.usgs.gov/usgs/modflow/modflow6/archive/master.zip", 
+ "languages": [
+ "Fortran2008"
+ ], 
  "repositoryURL": "https://code.usgs.gov/usgs/modflow/modflow6.git", 
- "laborHours": -1, 
  "disclaimerURL": "https://code.usgs.gov/usgs/modflow/modflow6/blob/master/DISCLAIMER.md", 
  "tags": [
  "MODFLOW", 
  "groundwater model"
  ], 
- "description": "MODFLOW is the USGS's modular hydrologic model. MODFLOW is considered an international standard for simulating and predicting groundwater conditions and groundwater/surface-water interactions.", 
- "languages": [
- "Fortran2008"
- ], 
+ "vcs": "git", 
+ "name": "modflow6", 
+ "downloadURL": "https://code.usgs.gov/usgs/modflow/modflow6/archive/master.zip", 
  "contact": {
  "name": "Christian D. Langevin", 
  "email": "[email protected]"
  }, 
- "vcs": "git", 
- "version": "6.0.3.6", 
+ "laborHours": -1, 
+ "version": "6.0.3.7", 
  "date": {
  "metadataLastUpdated": "2018-08-28"
  }, 
@@ -33,6 +33,6 @@
  "usageType": "openSource"
  }, 
  "homepageURL": "https://code.usgs.gov/usgs/modflow/modflow6/", 
- "name": "modflow6"
+ "description": "MODFLOW is the USGS's modular hydrologic model. MODFLOW is considered an international standard for simulating and predicting groundwater conditions and groundwater/surface-water interactions."
  }
 ]

doc/version.tex

@@ -1,3 +1,3 @@
-\newcommand{\modflowversion}{mf6.0.3.6}
+\newcommand{\modflowversion}{mf6.0.3.7}
 \newcommand{\modflowdate}{August 28, 2018}
 \newcommand{\currentmodflowversion}{Version \modflowversion---\modflowdate}

src/Model/GroundWaterFlow/gwf3dis8.f90

@@ -16,15 +16,15 @@ module GwfDisModule
  public dis_cr, GwfDisType
 
  type, extends(DisBaseType) :: GwfDisType
- integer(I4B), pointer   :: nlay => null() ! number of layers
- integer(I4B), pointer   :: nrow => null() ! number of rows
- integer(I4B), pointer   :: ncol => null() ! number of columns
- integer(I4B), dimension(:), pointer, contiguous  :: nodereduced  => null()  ! (size:nodesuser)contains reduced nodenumber (size 0 if not reduced); -1 means vertical pass through, 0 is idomain = 0
- integer(I4B), dimension(:), pointer, contiguous  :: nodeuser  => null()  ! (size:nodes) given a reduced nodenumber, provide the user nodenumber (size 0 if not reduced)
- real(DP), dimension(:), pointer, contiguous  :: delr   => null() ! spacing along a row
- real(DP), dimension(:), pointer, contiguous  :: delc   => null() ! spacing along a column
- real(DP), dimension(:, :, :), pointer  :: botm => null() ! top and bottom elevations for each cell (ncol, nrow, nlay)
- integer(I4B), dimension(:, :, :), pointer :: idomain  => null() ! idomain (ncol, nrow, nlay)
+ integer(I4B), pointer :: nlay => null()     ! number of layers
+ integer(I4B), pointer :: nrow => null()     ! number of rows
+ integer(I4B), pointer :: ncol => null()     ! number of columns
+ integer(I4B), dimension(:), pointer, contiguous :: nodereduced => null() ! (size:nodesuser)contains reduced nodenumber (size 0 if not reduced); -1 means vertical pass through, 0 is idomain = 0
+ integer(I4B), dimension(:), pointer, contiguous :: nodeuser => null() ! (size:nodes) given a reduced nodenumber, provide the user nodenumber (size 0 if not reduced)
+ real(DP), dimension(:), pointer, contiguous :: delr => null() ! spacing along a row
+ real(DP), dimension(:), pointer, contiguous :: delc => null() ! spacing along a column
+ real(DP), dimension(:, :, :), pointer :: botm => null()    ! top and bottom elevations for each cell (ncol, nrow, nlay)
+ integer(I4B), dimension(:, :, :), pointer :: idomain => null()  ! idomain (ncol, nrow, nlay)
  contains
  procedure :: dis_df => dis3d_df
  procedure :: dis_da => dis3d_da

src/Model/GroundWaterFlow/gwf3disu8.f90

@@ -18,11 +18,11 @@ module GwfDisuModule
  public :: disu_cr
 
  type, extends(DisBaseType) :: GwfDisuType
- integer(I4B), pointer   :: nvert => null() ! number of x,y vertices
- real(DP), dimension(:,:), pointer, contiguous    :: vertices => null() ! cell vertices stored as 2d array of x and y
- real(DP), dimension(:,:), pointer, contiguous    :: cellxy => null() ! cell center stored as 2d array of x and y
- integer(I4B), dimension(:), pointer, contiguous    :: iavert => null() ! cell vertex pointer ia array
- integer(I4B), dimension(:), pointer, contiguous   :: javert => null() ! cell vertex pointer ja array
+ integer(I4B), pointer :: nvert => null()     ! number of x,y vertices
+ real(DP), dimension(:,:), pointer, contiguous :: vertices => null() ! cell vertices stored as 2d array of x and y
+ real(DP), dimension(:,:), pointer, contiguous :: cellxy => null() ! cell center stored as 2d array of x and y
+ integer(I4B), dimension(:), pointer, contiguous :: iavert => null() ! cell vertex pointer ia array
+ integer(I4B), dimension(:), pointer, contiguous:: javert => null() ! cell vertex pointer ja array
  contains
  procedure :: dis_df => disu_df
  procedure :: dis_da => disu_da

src/Model/GroundWaterFlow/gwf3disv8.f90

@@ -17,19 +17,19 @@ module GwfDisvModule
  public disv_cr, GwfDisvType
 
  type, extends(DisBaseType) :: GwfDisvType
- integer(I4B), pointer   :: nlay => null() ! number of layers
- integer(I4B), pointer   :: ncpl => null() ! number of cells per layer
- integer(I4B), pointer   :: nvert => null() ! number of x,y vertices
- integer(I4B), dimension(:), pointer, contiguous  :: nodereduced => null() ! (size:nodesuser)contains reduced nodenumber (size 0 if not reduced); -1 means vertical pass through, 0 is idomain = 0
- integer(I4B), dimension(:), pointer, contiguous  :: nodeuser  => null() ! (size:nodes) given a reduced nodenumber, provide the user nodenumber (size 0 if not reduced)
- real(DP), dimension(:,:), pointer, contiguous  :: vertices  => null() ! cell vertices stored as 2d array of x and y
- real(DP), dimension(:,:), pointer, contiguous  :: cellxy  => null() ! cell center stored as 2d array of x and y
- integer(I4B), dimension(:), pointer, contiguous  :: iavert  => null() ! cell vertex pointer ia array
- integer(I4B), dimension(:), pointer, contiguous  :: javert  => null() ! cell vertex pointer ja array
- real(DP), dimension(:, :, :), pointer   :: botm => null() ! top and bottom elevations for each cell (ncpl, 1, 0:nlay)
- integer(I4B), dimension(:, :, :), pointer  :: idomain  => null() ! idomain (ncpl, 1, nlay)
- type(DisvGeomType)   :: cell1 ! cell object used to calculate geometric properties
- type(DisvGeomType)   :: cell2 ! cell object used to calculate geometric properties
+ integer(I4B), pointer :: nlay => null()     ! number of layers
+ integer(I4B), pointer :: ncpl => null()     ! number of cells per layer
+ integer(I4B), pointer :: nvert => null()     ! number of x,y vertices
+ integer(I4B), dimension(:), pointer, contiguous :: nodereduced => null() ! (size:nodesuser)contains reduced nodenumber (size 0 if not reduced); -1 means vertical pass through, 0 is idomain = 0
+ integer(I4B), dimension(:), pointer, contiguous :: nodeuser => null()  ! (size:nodes) given a reduced nodenumber, provide the user nodenumber (size 0 if not reduced)
+ real(DP), dimension(:,:), pointer, contiguous :: vertices => null()  ! cell vertices stored as 2d array of x and y
+ real(DP), dimension(:,:), pointer, contiguous :: cellxy => null()  ! cell center stored as 2d array of x and y
+ integer(I4B), dimension(:), pointer, contiguous :: iavert => null()  ! cell vertex pointer ia array
+ integer(I4B), dimension(:), pointer, contiguous :: javert => null()  ! cell vertex pointer ja array
+ real(DP), dimension(:, :, :), pointer :: botm => null()     ! top and bottom elevations for each cell (ncpl, 1, 0:nlay)
+ integer(I4B), dimension(:, :, :), pointer :: idomain => null()  ! idomain (ncpl, 1, nlay)
+ type(DisvGeomType) :: cell1   ! cell object used to calculate geometric properties
+ type(DisvGeomType) :: cell2   ! cell object used to calculate geometric properties
  contains
  procedure :: dis_df => disv_df
  procedure :: dis_da => disv_da

src/Model/GroundWaterFlow/gwf3evt8.f90

@@ -20,13 +20,13 @@ module EvtModule
  !
  type, extends(BndType) :: EvtType
  ! -- logicals
- logical, private  :: segsdefined = .true.
- logical, private  :: fixed_cell = .false.
- logical, private  :: read_as_arrays = .false.
- logical, private :: surfratespecified = .false.
+ logical, private :: segsdefined = .true.
+ logical, private :: fixed_cell = .false.
+ logical, private :: read_as_arrays = .false.
+ logical, private:: surfratespecified = .false.
  ! -- integers
- integer(I4B), pointer  :: inievt => null()
- integer(I4B), pointer, private  :: nseg => null()
+ integer(I4B), pointer :: inievt => null()
+ integer(I4B), pointer, private :: nseg => null()
  ! -- arrays
  integer(I4B), dimension(:), pointer, contiguous :: nodesontop => null()
  contains

src/Model/GroundWaterFlow/gwf3hfb8.f90

@@ -14,27 +14,27 @@ module GwfHfbModule
  public :: hfb_cr
 
  type, extends(NumericalPackageType) :: GwfHfbType
- integer(I4B), pointer   :: maxhfb => null() !max number of hfb's
- integer(I4B), pointer   :: nhfb => null() !number of hfb's
- integer(I4B), dimension(:), pointer, contiguous  :: noden  => null() !first cell
- integer(I4B), dimension(:), pointer, contiguous  :: nodem  => null() !second cell
- integer(I4B), dimension(:), pointer, contiguous  :: idxloc  => null() !position in model ja
- real(DP), dimension(:), pointer, contiguous   :: hydchr => null() !hydraulic characteristic of the barrier
- real(DP), dimension(:), pointer, contiguous   :: csatsav => null() !value of condsat prior to hfb modification
- real(DP), dimension(:), pointer, contiguous   :: condsav => null() !saved conductance of combined npf and hfb
- type(Xt3dType), pointer   :: xt3d => null() !pointer to xt3d object
- !
- integer(I4B), dimension(:), pointer, contiguous  :: ibound  => null() !pointer to model ibound
- integer(I4B), dimension(:), pointer, contiguous  :: icelltype  => null() !pointer to model icelltype
- integer(I4B), dimension(:), pointer, contiguous  :: ihc   => null() !pointer to model ihc
- integer(I4B), dimension(:), pointer, contiguous  :: ia   => null() !pointer to model ia
- integer(I4B), dimension(:), pointer, contiguous  :: ja   => null() !pointer to model ja
- integer(I4B), dimension(:), pointer, contiguous  :: jas   => null() !pointer to model jas
- integer(I4B), dimension(:), pointer, contiguous  :: isym   => null() !pointer to model isym
- real(DP), dimension(:), pointer, contiguous   :: condsat => null() !pointer to model condsat
- real(DP), dimension(:), pointer, contiguous   :: top  => null() !pointer to model top
- real(DP), dimension(:), pointer, contiguous   :: bot  => null() !pointer to model bot
- real(DP), dimension(:), pointer, contiguous   :: hwva => null() !pointer to model hwva
+ integer(I4B), pointer :: maxhfb => null()     !max number of hfb's
+ integer(I4B), pointer :: nhfb => null()     !number of hfb's
+ integer(I4B), dimension(:), pointer, contiguous :: noden => null()  !first cell
+ integer(I4B), dimension(:), pointer, contiguous :: nodem => null()  !second cell
+ integer(I4B), dimension(:), pointer, contiguous :: idxloc => null()  !position in model ja
+ real(DP), dimension(:), pointer, contiguous :: hydchr => null()   !hydraulic characteristic of the barrier
+ real(DP), dimension(:), pointer, contiguous :: csatsav => null() !value of condsat prior to hfb modification
+ real(DP), dimension(:), pointer, contiguous :: condsav => null() !saved conductance of combined npf and hfb
+ type(Xt3dType), pointer :: xt3d => null()     !pointer to xt3d object
+ !
+ integer(I4B), dimension(:), pointer, contiguous :: ibound => null()  !pointer to model ibound
+ integer(I4B), dimension(:), pointer, contiguous :: icelltype => null()  !pointer to model icelltype
+ integer(I4B), dimension(:), pointer, contiguous :: ihc => null()   !pointer to model ihc
+ integer(I4B), dimension(:), pointer, contiguous :: ia => null()   !pointer to model ia
+ integer(I4B), dimension(:), pointer, contiguous :: ja => null()   !pointer to model ja
+ integer(I4B), dimension(:), pointer, contiguous :: jas => null()   !pointer to model jas
+ integer(I4B), dimension(:), pointer, contiguous :: isym => null()   !pointer to model isym
+ real(DP), dimension(:), pointer, contiguous :: condsat => null() !pointer to model condsat
+ real(DP), dimension(:), pointer, contiguous :: top => null()   !pointer to model top
+ real(DP), dimension(:), pointer, contiguous :: bot => null()   !pointer to model bot
+ real(DP), dimension(:), pointer, contiguous :: hwva => null()   !pointer to model hwva
  contains
  procedure :: hfb_ar
  procedure :: hfb_rp

src/Model/GroundWaterFlow/gwf3ic8.f90

@@ -11,7 +11,7 @@ module GwfIcModule
  public :: ic_cr
 
  type, extends(NumericalPackageType) :: GwfIcType
- real(DP), dimension(:), pointer, contiguous :: strt   => null() ! starting head
+ real(DP), dimension(:), pointer, contiguous :: strt => null()   ! starting head
  contains
  procedure :: ic_ar
  procedure :: ic_da

src/Model/GroundWaterFlow/gwf3lak8.f90

@@ -77,17 +77,20 @@ module LakModule
  real(DP), dimension(:), pointer, contiguous :: laketop => null()
  real(DP), dimension(:), pointer, contiguous :: lakebot => null()
  real(DP), dimension(:), pointer, contiguous :: sareamax => null()
- character(len=LENBOUNDNAME), dimension(:), pointer, contiguous :: lakename => null()
+ character(len=LENBOUNDNAME), dimension(:), pointer, &
+ contiguous :: lakename => null()
  character (len=8), dimension(:), pointer, contiguous :: status => null()
  real(DP), dimension(:), pointer, contiguous :: avail => null()
  real(DP), dimension(:), pointer, contiguous :: lkgwsink => null()
  ! -- time series aware data
  type (MemoryTSType), dimension(:), pointer, contiguous :: stage => null()
  type (MemoryTSType), dimension(:), pointer, contiguous :: rainfall => null()
- type (MemoryTSType), dimension(:), pointer, contiguous :: evaporation => null()
+ type (MemoryTSType), dimension(:), pointer, &
+ contiguous :: evaporation => null()
  type (MemoryTSType), dimension(:), pointer, contiguous :: runoff => null()
  type (MemoryTSType), dimension(:), pointer, contiguous :: inflow => null()
- type (MemoryTSType), dimension(:), pointer, contiguous :: withdrawal => null()
+ type (MemoryTSType), dimension(:), pointer, &
+ contiguous :: withdrawal => null()
  type (MemoryTSType), dimension(:), pointer, contiguous :: lauxvar => null()
  !
  ! -- table data
@@ -145,7 +148,8 @@ module LakModule
  integer(I4B), dimension(:), pointer, contiguous :: lakeout => null()
  integer(I4B), dimension(:), pointer, contiguous :: iouttype => null()
  type (MemoryTSType), dimension(:), pointer, contiguous :: outrate => null()
- type (MemoryTSType), dimension(:), pointer, contiguous :: outinvert => null()
+ type (MemoryTSType), dimension(:), pointer, &
+ contiguous :: outinvert => null()
  type (MemoryTSType), dimension(:), pointer, contiguous :: outwidth => null()
  type (MemoryTSType), dimension(:), pointer, contiguous :: outrough => null()
  type (MemoryTSType), dimension(:), pointer, contiguous :: outslope => null()
@@ -167,9 +171,9 @@ module LakModule
  integer(I4B), pointer :: gwfik33 => NULL()
  !
  ! -- package x, xold, and ibound
- integer(I4B), dimension(:), pointer, contiguous :: iboundpak  => null() !package ibound
- real(DP), dimension(:), pointer, contiguous  :: xnewpak => null() !package x vector
- real(DP), dimension(:), pointer, contiguous  :: xoldpak => null() !package xold vector
+ integer(I4B), dimension(:), pointer, contiguous :: iboundpak => null()  !package ibound
+ real(DP), dimension(:), pointer, contiguous :: xnewpak => null()    !package x vector
+ real(DP), dimension(:), pointer, contiguous :: xoldpak => null()    !package xold vector
  !
  ! -- type bound procedures
  contains