Skip to content

Commit

Permalink
style(source): remove older MODFLOW formatting (#1983)
Browse files Browse the repository at this point in the history
  • Loading branch information
langevin-usgs authored Aug 7, 2024
1 parent 6e3b3fd commit 86638db
Show file tree
Hide file tree
Showing 21 changed files with 415 additions and 789 deletions.
4 changes: 2 additions & 2 deletions src/Model/GroundWaterFlow/gwf-csub.f90
Original file line number Diff line number Diff line change
Expand Up @@ -5686,7 +5686,7 @@ function csub_calc_sat_derivative(this, node, hcell) result(satderv)
real(DP) :: satderv
real(DP) :: top
real(DP) :: bot
! ------------------------------------------------------------------------------

if (this%stoiconv(node) /= 0) then
top = this%dis%top(node)
bot = this%dis%bot(node)
Expand Down Expand Up @@ -6529,7 +6529,7 @@ function csub_delay_calc_sat_derivative(this, node, idelay, n, hcell) &
real(DP) :: dzhalf
real(DP) :: top
real(DP) :: bot
! ------------------------------------------------------------------------------

if (this%stoiconv(node) /= 0) then
dzhalf = DHALF * this%dbdzini(n, idelay)
top = this%dbz(n, idelay) + dzhalf
Expand Down
8 changes: 2 additions & 6 deletions src/Model/GroundWaterFlow/gwf-mvr.f90
Original file line number Diff line number Diff line change
Expand Up @@ -1180,13 +1180,9 @@ subroutine mvr_setup_budobj(this)
return
end subroutine mvr_setup_budobj

!> @brief Fill budget object
!<
subroutine fill_budobj(this)
! ******************************************************************************
! mvr_fill_budobj -- copy flow terms into this%budobj
! ******************************************************************************
!
! SPECIFICATIONS:
! ------------------------------------------------------------------------------
! -- modules
! -- dummy
class(GwfMvrType) :: this
Expand Down
1 change: 0 additions & 1 deletion src/Model/GroundWaterFlow/gwf-sto.f90
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ subroutine sto_rp(this)
! -- data
data css(0)/' TRANSIENT'/
data css(1)/' STEADY-STATE'/
! ------------------------------------------------------------------------------
!
! -- Store ss and sy values from end of last stress period if needed
if (this%integratechanges /= 0) then
Expand Down
22 changes: 17 additions & 5 deletions src/Model/GroundWaterFlow/gwf.f90
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ subroutine gwf_df(this)
end subroutine gwf_df

!> @brief Add the internal connections of this model to the sparse matrix
!<
subroutine gwf_ac(this, sparse)
! -- modules
use SparseModule, only: sparsematrix
Expand Down Expand Up @@ -462,6 +463,7 @@ subroutine gwf_ad(this)
end subroutine gwf_ad

!> @brief GroundWater Flow Model calculate coefficients
!<
subroutine gwf_cf(this, kiter)
! -- dummy
class(GwfModelType) :: this
Expand All @@ -484,6 +486,7 @@ subroutine gwf_cf(this, kiter)
end subroutine gwf_cf

!> @brief GroundWater Flow Model fill coefficients
!<
subroutine gwf_fc(this, kiter, matrix_sln, inwtflag)
! -- dummy
class(GwfModelType) :: this
Expand Down Expand Up @@ -866,6 +869,7 @@ subroutine gwf_bd(this, icnvg, isuppress_output)
end subroutine gwf_bd

!> @brief GroundWater Flow Model Output
!<
subroutine gwf_ot(this)
! -- modules
use TdisModule, only: kstp, kper, tdis_ot, endofperiod
Expand Down Expand Up @@ -924,6 +928,8 @@ subroutine gwf_ot(this)
return
end subroutine gwf_ot

!> @brief GroundWater Flow Model output observations
!<
subroutine gwf_ot_obs(this)
class(GwfModelType) :: this
class(BndType), pointer :: packobj
Expand All @@ -948,6 +954,8 @@ subroutine gwf_ot_obs(this)

end subroutine gwf_ot_obs

!> @brief Groundwater Flow Model output flows
!<
subroutine gwf_ot_flow(this, icbcfl, ibudfl, icbcun)
class(GwfModelType) :: this
integer(I4B), intent(in) :: icbcfl
Expand Down Expand Up @@ -997,6 +1005,8 @@ subroutine gwf_ot_flow(this, icbcfl, ibudfl, icbcun)

end subroutine gwf_ot_flow

!> @brief Groundwater Flow Model output dependent variable
!<
subroutine gwf_ot_dv(this, idvsave, idvprint, ipflag)
class(GwfModelType) :: this
integer(I4B), intent(in) :: idvsave
Expand Down Expand Up @@ -1031,6 +1041,8 @@ subroutine gwf_ot_dv(this, idvsave, idvprint, ipflag)
return
end subroutine gwf_ot_dv

!> @brief Groundwater Flow Model output budget summary
!<
subroutine gwf_ot_bdsummary(this, ibudfl, ipflag)
use TdisModule, only: kstp, kper, totim, delt
class(GwfModelType) :: this
Expand All @@ -1039,7 +1051,6 @@ subroutine gwf_ot_bdsummary(this, ibudfl, ipflag)
class(BndType), pointer :: packobj
integer(I4B) :: ip

!
! -- Package budget summary
do ip = 1, this%bndlist%Count()
packobj => GetBndFromList(this%bndlist, ip)
Expand All @@ -1064,6 +1075,7 @@ subroutine gwf_ot_bdsummary(this, ibudfl, ipflag)
end subroutine gwf_ot_bdsummary

!> @brief Final processing
!<
subroutine gwf_fp(this)
! -- modules
! -- dummy
Expand All @@ -1079,6 +1091,7 @@ subroutine gwf_fp(this)
end subroutine gwf_fp

!> @brief Deallocate
!<
subroutine gwf_da(this)
! -- modules
use MemoryManagerModule, only: mem_deallocate
Expand Down Expand Up @@ -1159,10 +1172,7 @@ end subroutine gwf_da
!!
!! This subroutine adds a budget entry to the flow budget. It was added as
!! a method for the gwf model object so that the exchange object could add its
!! contributions.
!!
!! (1) adds the entry to the budget object
!<
!< contributions.
subroutine gwf_bdentry(this, budterm, budtxt, rowlabel)
! -- modules
use ConstantsModule, only: LENBUDTXT
Expand Down Expand Up @@ -1214,6 +1224,7 @@ function gwf_get_iasym(this) result(iasym)
end function gwf_get_iasym

!> @brief Allocate memory for non-allocatable members
!<
subroutine allocate_scalars(this, modelname)
! -- modules
use MemoryManagerModule, only: mem_allocate
Expand Down Expand Up @@ -1349,6 +1360,7 @@ subroutine package_create(this, filtyp, ipakid, ipaknum, pakname, mempath, &
end subroutine package_create

!> @brief Check to make sure required input files have been specified
!<
subroutine ftype_check(this, indis)
! -- modules
use ConstantsModule, only: LINELENGTH
Expand Down
3 changes: 0 additions & 3 deletions src/Model/ModelUtilities/BoundaryPackage.f90
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,6 @@ subroutine bnd_cq(this, x, flowja, iadv)
integer(I4B), optional, intent(in) :: iadv !< flag that indicates if this is an advance package
! -- local variables
integer(I4B) :: imover
! ------------------------------------------------------------------------------
!
! -- check for iadv optional variable to indicate this is an advanced
! package and that mover calculations should not be done here
Expand Down Expand Up @@ -645,8 +644,6 @@ subroutine bnd_cq_simrate(this, hnew, flowja, imover)
integer(I4B) :: node
integer(I4B) :: idiag
real(DP) :: rrate
! -- formats
! ------------------------------------------------------------------------------
!
! -- If no boundaries, skip flow calculations.
if (this%nbound > 0) then
Expand Down
1 change: 0 additions & 1 deletion src/Model/ModelUtilities/BoundaryPackageExt.f90
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,6 @@ subroutine write_list(this)
type(TableType), pointer :: inputtab => null()
! -- formats
character(len=LINELENGTH) :: fmtlstbn
! ------------------------------------------------------------------------------
!
! -- Determine sizes
ldim = this%ncolbnd
Expand Down
2 changes: 0 additions & 2 deletions src/Model/ModelUtilities/GwtSpc.f90
Original file line number Diff line number Diff line change
Expand Up @@ -560,8 +560,6 @@ subroutine spc_rp_array(this, line)
! -- data
data aname(1)/' CONCENTRATION'/
!
! ------------------------------------------------------------------------------
!
! -- Initialize
jauxcol = 0
ivarsread = 0
Expand Down
1 change: 0 additions & 1 deletion src/Model/ModelUtilities/TrackData.f90
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ module TrackModule
! don't apply to PRT; for instance, MODPATH 7 distinguishes forwards
! and backwards tracking, but status value 4 is not used by PRT.
!
! --------------------------------------------------
! * is this necessary?
! ** unnecessary since PRT makes no distinction between forwards/backwards tracking
! *** e.g., released into an inactive cell, a stop zone cell, or a termination zone
Expand Down
Loading

0 comments on commit 86638db

Please sign in to comment.