Skip to content

Commit

Permalink
fix(typos): fixed a variety of typos throughout project (#82)
Browse files Browse the repository at this point in the history
  • Loading branch information
mwtoews authored and langevin-usgs committed Jan 31, 2019
1 parent f1af12b commit b4a9360
Show file tree
Hide file tree
Showing 18 changed files with 60 additions and 60 deletions.
4 changes: 2 additions & 2 deletions doc/ReleaseNotes/ReleaseNotes.tex
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ \section{History}
\item Added functionality to pass SFR leakage to the aquifer to the highest active layer.
\item Converted SFR Manning's to a time-varying, time series aware variable.
\item Updated LAK package so that conductance calculations correctly account for THICKSTRT in the NPF package for layers that use THICKSTRT (and are confined). Also updated EMBEDDEDH and EMBEDDEDV so that the conductance for these connection types are constant for confined layers.
\item Converted UZF stress-period data to time series aware data.
\item Converted UZF stress period data to time series aware data.
\item Added time-series aware AUXILIARY variables to UZF package.
\item Implemented AUXMULTNAME in options block for UZF package (AUXILIARY variables have to be specified). AUXMULTNAME is applied to the GWF cell area and is used to simulated more than one UZF cell per GWF cell. This could be used to simulate different land use classifications (i.e., agricultural and natural land use types) in the same GWF cell.
\end{itemize}
Expand Down Expand Up @@ -463,4 +463,4 @@ \section{References Cited}
\clearpage
\pagestyle{backofreport}
\makebackcover
\end{document}
\end{document}
4 changes: 2 additions & 2 deletions doc/mf6io/gwf/tsi.tex
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,9 @@ \subsubsection{Using Time-Array Series in a Package}
END OPTIONS
\end{lstlisting}

A time-array series is linked to an array in one or more stress-period blocks used to define package input. To indicate that an array is to be controlled by a time-array series, the array property word is followed by the keyword TIMEARRAYSERIES and the time-array series name. When the TIMEARRAYSERIES keyword is found (and the array to be populated supports time-array series), the array reader is not invoked. Consequently, the array-control record and any associated input are omitted. The syntax to define the link is:
A time-array series is linked to an array in one or more stress period blocks used to define package input. To indicate that an array is to be controlled by a time-array series, the array property word is followed by the keyword TIMEARRAYSERIES and the time-array series name. When the TIMEARRAYSERIES keyword is found (and the array to be populated supports time-array series), the array reader is not invoked. Consequently, the array-control record and any associated input are omitted. The syntax to define the link is:

% Syntax for stress-period block
% Syntax for stress period block
\begin{lstlisting}[style=blockdefinition]
BEGIN PERIOD kper
property-name TIMEARRAYSERIES time-array-series-name
Expand Down
2 changes: 1 addition & 1 deletion doc/mf6io/mf6ivar/dfn/gwf-lak.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ description REPLACE boundname {'{#1}': 'lake'}
block connectiondata
name connectiondata
type recarray lakeno iconn cellid claktype bedleak belev telev connlen connwidth
shape (sum(nlakecon))
shape (sum(nlakeconn))
reader urword
longname
description
Expand Down
4 changes: 2 additions & 2 deletions doc/mf6io/mf6ivar/dfn/gwf-sto.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ valid
reader urword
optional true
longname steady state indicator
description keyword to indicate that stress-period IPER is steady-state. Steady-state conditions will apply until the TRANSIENT keyword is specified in a subsequent BEGIN PERIOD block.
description keyword to indicate that stress period IPER is steady-state. Steady-state conditions will apply until the TRANSIENT keyword is specified in a subsequent BEGIN PERIOD block.

block period
name transient
Expand All @@ -88,5 +88,5 @@ valid
reader urword
optional true
longname transient indicator
description keyword to indicate that stress-period IPER is transient. Transient conditions will apply until the STEADY-STATE keyword is specified in a subsequent BEGIN PERIOD block.
description keyword to indicate that stress period IPER is transient. Transient conditions will apply until the STEADY-STATE keyword is specified in a subsequent BEGIN PERIOD block.

2 changes: 1 addition & 1 deletion doc/mf6io/mf6ivar/dfn/gwf-uzf.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ type integer
reader urword
optional false
longname number of wave sets
description is the number of UZF cells specified. NWAVSETS has a default value of 40 and can be increased if more waves are required to resolve variations in water content within the unsaturated zone.
description is the number of UZF cells specified. NWAVESETS has a default value of 40 and can be increased if more waves are required to resolve variations in water content within the unsaturated zone.


# --------------------- gwf uzf packagedata ---------------------
Expand Down
2 changes: 1 addition & 1 deletion doc/mf6io/mf6ivar/dfn/utl-lak-tab.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ type integer
reader urword
optional false
longname number of table columns
description integer value specifying the number of colums in the lake table. There must be NCOL columns of data in the TABLE block. For lakes with HORIZONTAL and/or VERTICAL CTYPE connections, NCOL must be equal to 3. For lakes with EMBEDDEDH or EMBEDDEDV CTYPE connections, NCOL must be equal to 4.
description integer value specifying the number of columns in the lake table. There must be NCOL columns of data in the TABLE block. For lakes with HORIZONTAL and/or VERTICAL CTYPE connections, NCOL must be equal to 3. For lakes with EMBEDDEDH or EMBEDDEDV CTYPE connections, NCOL must be equal to 4.


# --------------------- gwf laktab table ---------------------
Expand Down
2 changes: 1 addition & 1 deletion doc/mf6io/mf6ivar/examples/gwf-ghb-example.dat
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ BEGIN DIMENSIONS
MAXBOUND 15
END DIMENSIONS

# Stress-period block(s)
# Stress period block(s)
BEGIN PERIOD 1
#Lay Row Col Bhead Cond boundname
2 1 10 tides 15.0 Estuary-L2
Expand Down
8 changes: 4 additions & 4 deletions doc/mf6io/mf6ivar/md/mf6ivar.md
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@
| GWF | STO | GRIDDATA | SS | DOUBLE PRECISION (NODES) | is specific storage (or the storage coefficient if STORAGECOEFFICIENT is specified as an option). Specific storage values must be greater than or equal to 0. |
| GWF | STO | GRIDDATA | SY | DOUBLE PRECISION (NODES) | is specific yield. Specific yield values must be greater than or equal to 0. Specific yield does not have to be specified if there are no convertible cells (ICONVERT=0 in every cell). |
| GWF | STO | PERIOD | IPER | INTEGER | integer value specifying the starting stress period number for which the data specified in the PERIOD block apply. IPER must be less than or equal to NPER in the TDIS Package and greater than zero. The IPER value assigned to a stress period block must be greater than the IPER value assigned for the previous PERIOD block. The information specified in the PERIOD block will continue to apply for all subsequent stress periods, unless the program encounters another PERIOD block. |
| GWF | STO | PERIOD | STEADY-STATE | KEYWORD | keyword to indicate that stress-period IPER is steady-state. Steady-state conditions will apply until the TRANSIENT keyword is specified in a subsequent BEGIN PERIOD block. |
| GWF | STO | PERIOD | TRANSIENT | KEYWORD | keyword to indicate that stress-period IPER is transient. Transient conditions will apply until the STEADY-STATE keyword is specified in a subsequent BEGIN PERIOD block. |
| GWF | STO | PERIOD | STEADY-STATE | KEYWORD | keyword to indicate that stress period IPER is steady-state. Steady-state conditions will apply until the TRANSIENT keyword is specified in a subsequent BEGIN PERIOD block. |
| GWF | STO | PERIOD | TRANSIENT | KEYWORD | keyword to indicate that stress period IPER is transient. Transient conditions will apply until the STEADY-STATE keyword is specified in a subsequent BEGIN PERIOD block. |
| GWF | HFB | OPTIONS | PRINT_INPUT | KEYWORD | keyword to indicate that the list of horizontal flow barriers will be written to the listing file immediately after it is read. |
| GWF | HFB | DIMENSIONS | MAXHFB | INTEGER | integer value specifying the maximum number of horizontal flow barriers that will be entered in this input file. The value of MAXHFB is used to allocate memory for the horizontal flow barriers. |
| GWF | HFB | PERIOD | IPER | INTEGER | integer value specifying the starting stress period number for which the data specified in the PERIOD block apply. IPER must be less than or equal to NPER in the TDIS Package and greater than zero. The IPER value assigned to a stress period block must be greater than the IPER value assigned for the previous PERIOD block. The information specified in the PERIOD block will continue to apply for all subsequent stress periods, unless the program encounters another PERIOD block. |
Expand Down Expand Up @@ -554,7 +554,7 @@
| GWF | UZF | OPTIONS | UNSAT_ETAE | KEYWORD | keyword specifying that ET in the unsaturated zone will be simulated simulated using a capillary pressure based formulation. Capillary pressure is calculated using the Brooks-Corey retention function. |
| GWF | UZF | DIMENSIONS | NUZFCELLS | INTEGER | is the number of UZF cells. More than 1 UZF cell can be assigned to a GWF cell; however, only 1 GWF cell can be assigned to a single UZF cell. If the MULTILAYER option is used then UZF cells can be assigned to GWF cells below (in deeper layers than) the upper most active GWF cells. |
| GWF | UZF | DIMENSIONS | NTRAILWAVES | INTEGER | is the number of trailing waves. NTRAILWAVES has a default value of 7 and can be increased to lower mass balance error in the unsaturated zone. |
| GWF | UZF | DIMENSIONS | NWAVESETS | INTEGER | is the number of UZF cells specified. NWAVSETS has a default value of 40 and can be increased if more waves are required to resolve variations in water content within the unsaturated zone. |
| GWF | UZF | DIMENSIONS | NWAVESETS | INTEGER | is the number of UZF cells specified. NWAVESETS has a default value of 40 and can be increased if more waves are required to resolve variations in water content within the unsaturated zone. |
| GWF | UZF | PACKAGEDATA | IUZNO | INTEGER | integer value that defines the UZF cell number associated with the specified PACKAGEDATA data on the line. IUZNO must be greater than zero and less than or equal to NUZFCELLS. UZF information must be specified for every UZF cell or the program will terminate with an error. The program will also terminate with an error if information for a UZF cell is specified more than once. |
| GWF | UZF | PACKAGEDATA | CELLID | INTEGER (NCELLDIM) | is the cell identifier, and depends on the type of grid that is used for the simulation. For a structured grid that uses the DIS input file, CELLID is the layer, row, and column. For a grid that uses the DISV input file, CELLID is the layer and CELL2D number. If the model uses the unstructured discretization (DISU) input file, CELLID is the node number for the cell. |
| GWF | UZF | PACKAGEDATA | LANDFLAG | INTEGER | integer value set to one for land surface cells indicating that boundary conditions can be applied and data can be specified in the PERIOD block. A value of 0 specifies a non-land surface cell. |
Expand Down Expand Up @@ -625,7 +625,7 @@
| GWF | OC | PERIOD | FREQUENCY | INTEGER | save at the specified time step frequency. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps. |
| GWF | OC | PERIOD | STEPS | INTEGER (<NSTP) | save for each step specified in STEPS. This keyword may be used in conjunction with other keywords to print or save results for multiple time steps. |
| UTL | LAK | DIMENSIONS | NROW | INTEGER | integer value specifying the number of rows in the lake table. There must be NROW rows of data in the TABLE block. |
| UTL | LAK | DIMENSIONS | NCOL | INTEGER | integer value specifying the number of colums in the lake table. There must be NCOL columns of data in the TABLE block. For lakes with HORIZONTAL and/or VERTICAL CTYPE connections, NCOL must be equal to 3. For lakes with EMBEDDEDH or EMBEDDEDV CTYPE connections, NCOL must be equal to 4. |
| UTL | LAK | DIMENSIONS | NCOL | INTEGER | integer value specifying the number of columns in the lake table. There must be NCOL columns of data in the TABLE block. For lakes with HORIZONTAL and/or VERTICAL CTYPE connections, NCOL must be equal to 3. For lakes with EMBEDDEDH or EMBEDDEDV CTYPE connections, NCOL must be equal to 4. |
| UTL | LAK | TABLE | STAGE | DOUBLE PRECISION | real value that defines the stage corresponding to the remaining data on the line. |
| UTL | LAK | TABLE | VOLUME | DOUBLE PRECISION | real value that defines the lake volume corresponding to the stage specified on the line. |
| UTL | LAK | TABLE | SAREA | DOUBLE PRECISION | real value that defines the lake surface area corresponding to the stage specified on the line. |
Expand Down
4 changes: 2 additions & 2 deletions doc/mf6io/mf6ivar/tex/gwf-sto-desc.tex
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
\begin{description}
\item \texttt{iper}---integer value specifying the starting stress period number for which the data specified in the PERIOD block apply. IPER must be less than or equal to NPER in the TDIS Package and greater than zero. The IPER value assigned to a stress period block must be greater than the IPER value assigned for the previous PERIOD block. The information specified in the PERIOD block will continue to apply for all subsequent stress periods, unless the program encounters another PERIOD block.

\item \texttt{STEADY-STATE}---keyword to indicate that stress-period IPER is steady-state. Steady-state conditions will apply until the TRANSIENT keyword is specified in a subsequent BEGIN PERIOD block.
\item \texttt{STEADY-STATE}---keyword to indicate that stress period IPER is steady-state. Steady-state conditions will apply until the TRANSIENT keyword is specified in a subsequent BEGIN PERIOD block.

\item \texttt{TRANSIENT}---keyword to indicate that stress-period IPER is transient. Transient conditions will apply until the STEADY-STATE keyword is specified in a subsequent BEGIN PERIOD block.
\item \texttt{TRANSIENT}---keyword to indicate that stress period IPER is transient. Transient conditions will apply until the STEADY-STATE keyword is specified in a subsequent BEGIN PERIOD block.

\end{description}

2 changes: 1 addition & 1 deletion doc/mf6io/mf6ivar/tex/gwf-uzf-desc.tex
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

\item \texttt{ntrailwaves}---is the number of trailing waves. NTRAILWAVES has a default value of 7 and can be increased to lower mass balance error in the unsaturated zone.

\item \texttt{nwavesets}---is the number of UZF cells specified. NWAVSETS has a default value of 40 and can be increased if more waves are required to resolve variations in water content within the unsaturated zone.
\item \texttt{nwavesets}---is the number of UZF cells specified. NWAVESETS has a default value of 40 and can be increased if more waves are required to resolve variations in water content within the unsaturated zone.

\end{description}
\item \textbf{Block: PACKAGEDATA}
Expand Down
2 changes: 1 addition & 1 deletion doc/mf6io/mf6ivar/tex/utl-lak-tab-desc.tex
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
\begin{description}
\item \texttt{nrow}---integer value specifying the number of rows in the lake table. There must be NROW rows of data in the TABLE block.

\item \texttt{ncol}---integer value specifying the number of colums in the lake table. There must be NCOL columns of data in the TABLE block. For lakes with HORIZONTAL and/or VERTICAL CTYPE connections, NCOL must be equal to 3. For lakes with EMBEDDEDH or EMBEDDEDV CTYPE connections, NCOL must be equal to 4.
\item \texttt{ncol}---integer value specifying the number of columns in the lake table. There must be NCOL columns of data in the TABLE block. For lakes with HORIZONTAL and/or VERTICAL CTYPE connections, NCOL must be equal to 3. For lakes with EMBEDDEDH or EMBEDDEDV CTYPE connections, NCOL must be equal to 4.

\end{description}
\item \textbf{Block: TABLE}
Expand Down
2 changes: 1 addition & 1 deletion src/Model/GroundWaterFlow/gwf3lak8.f90
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ subroutine lak_read_lakes(this)

if (ival < 0) then
write(errmsg,'(4x,a,1x,i6)') &
'****ERROR. nlakecon MUST BE >= 0 for lake ', n
'****ERROR. nlakeconn MUST BE >= 0 for lake ', n
call store_error(errmsg)
end if

Expand Down
4 changes: 2 additions & 2 deletions src/Model/GroundWaterFlow/gwf3uzf8.f90
Original file line number Diff line number Diff line change
Expand Up @@ -1419,7 +1419,7 @@ subroutine uzf_bd(this, x, idvfl, icbcfl, ibudfl, icbcun, iprobs, &
qgwformvr,sumaet,ierr)
if ( ierr > 0 ) then
if ( ierr == 1 ) &
msg = 'Error: UZF variable NWAVSETS needs to be increased.'
msg = 'Error: UZF variable NWAVESETS needs to be increased.'
call store_error(msg)
call ustop()
end if
Expand Down Expand Up @@ -2305,7 +2305,7 @@ subroutine uzf_solve(this)
qfrommvr,qformvr,ierr,sumaet,ivertflag)
if ( ierr > 0 ) then
if ( ierr == 1 ) &
msg = 'Error: UZF variable NWAVSETS needs to be increased '
msg = 'Error: UZF variable NWAVESETS needs to be increased '
call store_error(msg)
call ustop()
end if
Expand Down
2 changes: 1 addition & 1 deletion utils/mf5to6/src/EvtPackageWriter.f90
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ subroutine WriteStressPeriodListData(this, lineList)
! format
10 format(a,' boundary removed at (',i0,',',i0,',',i0,')')
!
! Write stress-period data for MF6
! Write stress period data for MF6
! Loop through rows and columns to generate list of EVT input
rowloop: do i=1,NROW
colloop: do j=1,NCOL
Expand Down
4 changes: 2 additions & 2 deletions utils/mf5to6/src/OutputControlWriter.f90
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ subroutine WriteFile(this, Mf6FileList, igrid)
call this%process_options(Mf6FileList)
! Write the Options block
call this%write_options()
! Generate stress-period input
! Generate stress period input
call this%ProcessStressLoop(igrid)
else
! Ned todo: There probably should be something in an OC file
Expand Down Expand Up @@ -494,7 +494,7 @@ subroutine process_stress_loop(this, igrid)
end subroutine process_stress_loop

subroutine WriteStressPeriodListData(this, lineList)
! Write stress-period data for MF6 Output Control
! Write stress period data for MF6 Output Control
implicit none
! dummy
class(OutputControlWriterType) :: this
Expand Down
4 changes: 2 additions & 2 deletions utils/mf5to6/src/PackageWriter.f90
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ subroutine WriteBlockIfNeeded(this, kper, option, forceWrite)
endif
!
if (needToWrite) then
! write block of stress-period input for MF6
! write block of stress period input for MF6
iu = this%fileobj%IUnit
write(iu,5)
if (present(option)) then
Expand Down Expand Up @@ -341,7 +341,7 @@ subroutine WriteStressPeriodListData(this, lineList)
! format
10 format(a,' boundary removed at (',i0,',',i0,',',i0,')')
!
! Write stress-period data for MF6
! Write stress period data for MF6
do ii=1,this%NBndPeriod
kold = nint(this%rlist(1,ii))
k = this%Layptr(kold)
Expand Down
Loading

0 comments on commit b4a9360

Please sign in to comment.