Skip to content

Commit b94f563

Browse files
authored
chore(various): accumulated lints (#2239)
* chore(various): accumulated lints * fprettify
1 parent 1822b8e commit b94f563

File tree

3 files changed

+264
-325
lines changed

3 files changed

+264
-325
lines changed

src/Model/GroundWaterEnergy/gwe-est.f90

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
!> -- @ brief Energy Storage and Transfer (EST) Module
1+
!> @ brief Energy Storage and Transfer (EST) Module
22
!!
3-
!! The GweEstModule contains the GweEstType, which is related
4-
!! to GwtEstModule; however, there are some important differences
5-
!! owing to the fact that a sorbed phase is not considered.
6-
!! Instead, a single temperature is simulated for each grid
7-
!! cell and is representative of both the aqueous and solid
8-
!! phases (i.e., instantaneous thermal equilibrium is
9-
!! assumed). Also, "thermal bleeding" is accommodated, where
10-
!! conductive processes can transport into, through, or
11-
!! out of dry cells that are part of the active domain.
3+
!! The GweEstModule contains the GweEstType, which is related
4+
!! to GwtEstModule; however, there are some important differences
5+
!! owing to the fact that a sorbed phase is not considered.
6+
!! Instead, a single temperature is simulated for each grid
7+
!! cell and is representative of both the aqueous and solid
8+
!! phases (i.e., instantaneous thermal equilibrium is
9+
!! assumed). Also, "thermal bleeding" is accommodated, where
10+
!! conductive processes can transport into, through, or
11+
!! out of dry cells that are part of the active domain.
1212
!<
1313
module GweEstModule
1414

@@ -489,7 +489,7 @@ subroutine est_cq_dcy_solid(this, nodes, cnew, cold, flowja)
489489
real(DP) :: vcell
490490
real(DP) :: decay_rate
491491
!
492-
! -- Calculate decay change
492+
! -- calculate decay change
493493
do n = 1, nodes
494494
!
495495
! -- skip if transport inactive
@@ -515,7 +515,6 @@ subroutine est_cq_dcy_solid(this, nodes, cnew, cold, flowja)
515515
this%ratedcys(n) = rate
516516
idiag = this%dis%con%ia(n)
517517
flowja(idiag) = flowja(idiag) + rate
518-
!
519518
end do
520519
end subroutine est_cq_dcy_solid
521520

@@ -641,8 +640,6 @@ subroutine est_da(this)
641640
this%fmi => null()
642641
end if
643642
!
644-
! -- Scalars
645-
!
646643
! -- deallocate parent
647644
call this%NumericalPackageType%da()
648645
end subroutine est_da

src/Model/GroundWaterFlow/TvBase.f90

Lines changed: 17 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -49,25 +49,23 @@ module TvBaseModule
4949
!! Deferred procedure called by the TvBaseType code to announce the
5050
!! specific package version and set any required array and variable
5151
!! pointers from other packages.
52-
!!
5352
!<
5453
subroutine ar_set_pointers(this)
5554
! -- modules
5655
import TvBaseType
57-
! -- dummy variables
56+
! -- dummy
5857
class(TvBaseType) :: this
5958
end subroutine
6059

6160
!> @brief Announce package and set pointers to variables
6261
!!
6362
!! Deferred procedure called by the TvBaseType code to process a single
6463
!! keyword from the OPTIONS block of the package input file.
65-
!!
6664
!<
6765
function read_option(this, keyword) result(success)
6866
! -- modules
6967
import TvBaseType
70-
! -- dummy variables
68+
! -- dummy
7169
class(TvBaseType) :: this
7270
character(len=*), intent(in) :: keyword
7371
! -- return
@@ -78,13 +76,12 @@ function read_option(this, keyword) result(success)
7876
!!
7977
!! Deferred procedure called by the TvBaseType code to retrieve a pointer
8078
!! to a given node's value for a given named variable.
81-
!!
8279
!<
8380
function get_pointer_to_value(this, n, varName) result(bndElem)
8481
! -- modules
8582
use KindModule, only: I4B, DP
8683
import TvBaseType
87-
! -- dummy variables
84+
! -- dummy
8885
class(TvBaseType) :: this
8986
integer(I4B), intent(in) :: n
9087
character(len=*), intent(in) :: varName
@@ -96,13 +93,12 @@ function get_pointer_to_value(this, n, varName) result(bndElem)
9693
!!
9794
!! Deferred procedure called by the TvBaseType code when a property value
9895
!! change occurs at (kper, kstp).
99-
!!
10096
!<
10197
subroutine set_changed_at(this, kper, kstp)
10298
! -- modules
10399
use KindModule, only: I4B
104100
import TvBaseType
105-
! -- dummy variables
101+
! -- dummy
106102
class(TvBaseType) :: this
107103
integer(I4B), intent(in) :: kper
108104
integer(I4B), intent(in) :: kstp
@@ -113,12 +109,11 @@ subroutine set_changed_at(this, kper, kstp)
113109
!! Deferred procedure called by the TvBaseType code when a new time step
114110
!! commences, indicating that any previously set per-node property value
115111
!! change flags should be reset.
116-
!!
117112
!<
118113
subroutine reset_change_flags(this)
119114
! -- modules
120115
import TvBaseType
121-
! -- dummy variables
116+
! -- dummy
122117
class(TvBaseType) :: this
123118
end subroutine
124119

@@ -128,13 +123,12 @@ subroutine reset_change_flags(this)
128123
!! change occurs to perform any required validity checks on the value of
129124
!! the given variable at the given node. Perform any required updates to
130125
!! the property value if it is valid, or log an error if not.
131-
!!
132126
!<
133127
subroutine validate_change(this, n, varName)
134128
! -- modules
135129
use KindModule, only: I4B
136130
import TvBaseType
137-
! -- dummy variables
131+
! -- dummy
138132
class(TvBaseType) :: this
139133
integer(I4B), intent(in) :: n
140134
character(len=*), intent(in) :: varName
@@ -144,13 +138,12 @@ subroutine validate_change(this, n, varName)
144138

145139
contains
146140

147-
!> @brief Initialise the TvBaseType object
141+
!> @brief Initialize the TvBaseType object
148142
!!
149143
!! Allocate and initialize data members of the object.
150-
!!
151144
!<
152145
subroutine init(this, name_model, pakname, ftype, inunit, iout)
153-
! -- dummy variables
146+
! -- dummy
154147
class(TvBaseType) :: this
155148
character(len=*), intent(in) :: name_model
156149
character(len=*), intent(in) :: pakname
@@ -168,10 +161,9 @@ end subroutine init
168161
!> @brief Allocate scalar variables
169162
!!
170163
!! Allocate scalar data members of the object.
171-
!!
172164
!<
173165
subroutine tvbase_allocate_scalars(this)
174-
! -- dummy variables
166+
! -- dummy
175167
class(TvBaseType) :: this
176168
!
177169
! -- Call standard NumericalPackageType allocate scalars
@@ -184,10 +176,9 @@ end subroutine tvbase_allocate_scalars
184176
!> @brief Allocate and read method for package
185177
!!
186178
!! Allocate and read static data for the package.
187-
!!
188179
!<
189180
subroutine ar(this, dis)
190-
! -- dummy variables
181+
! -- dummy
191182
class(TvBaseType) :: this
192183
class(DisBaseType), pointer, intent(in) :: dis
193184
!
@@ -219,12 +210,11 @@ end subroutine ar
219210
!!
220211
!! Reads the OPTIONS block of the package's input file, deferring to the
221212
!! derived type to process any package-specific keywords.
222-
!!
223213
!<
224214
subroutine read_options(this)
225-
! -- dummy variables
215+
! -- dummy
226216
class(TvBaseType) :: this
227-
! -- local variables
217+
! -- local
228218
character(len=LINELENGTH) :: keyword
229219
character(len=MAXCHARLEN) :: fname
230220
logical :: isfound
@@ -286,12 +276,11 @@ end subroutine read_options
286276
!> @brief Read and prepare method for package
287277
!!
288278
!! Read and prepare stress period data for the package.
289-
!!
290279
!<
291280
subroutine rp(this)
292-
! -- dummy variables
281+
! -- dummy
293282
class(TvBaseType) :: this
294-
! -- local variables
283+
! -- local
295284
character(len=LINELENGTH) :: line, cellid, varName, text
296285
logical :: isfound, endOfBlock, haveChanges
297286
integer(I4B) :: ierr, node
@@ -407,12 +396,11 @@ end subroutine rp
407396
!> @brief Advance the package
408397
!!
409398
!! Advance data for a new time step.
410-
!!
411399
!<
412400
subroutine ad(this)
413-
! -- dummy variables
401+
! -- dummy
414402
class(TvBaseType) :: this
415-
! -- local variables
403+
! -- local
416404
integer(I4B) :: i, n, numlinks
417405
type(TimeSeriesLinkType), pointer :: tsLink
418406
!
@@ -454,10 +442,9 @@ end subroutine ad
454442
!> @brief Deallocate package memory
455443
!!
456444
!! Deallocate package scalars and arrays.
457-
!!
458445
!<
459446
subroutine tvbase_da(this)
460-
! -- dummy variables
447+
! -- dummy
461448
class(TvBaseType) :: this
462449
!
463450
! -- Deallocate time series manager

0 commit comments

Comments
 (0)