Skip to content

Commit a950ad8

Browse files
sbryngelsonsbryngelson
committed
get rid of a pointer
1 parent 4457102 commit a950ad8

3 files changed

Lines changed: 9 additions & 48 deletions

File tree

‎src/pre_process/m_assign_patches.fpp‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,6 @@ module m_assign_patches
1212

1313
implicit none
1414

15-
!> Abstract interface to the two subroutines that assign the patch primitive
16-
!! variables, either mixture or species, depending on the subroutine, to a
17-
!! particular cell in the computational domain
18-
abstract interface
19-
20-
!> Skeleton of s_assign_patch_mixture_primitive_variables
21-
!! and s_assign_patch_species_primitive_variables
22-
!! @param patch_id is the patch identifier
23-
!! @param j (x) cell index in which the mixture or species primitive variables from the indicated patch areassigned
24-
!! @param k (y,th) cell index in which the mixture or species primitive variables from the indicated patch areassigned
25-
!! @param l (z) cell index in which the mixture or species primitive variables from the indicated patch areassigned
26-
subroutine s_assign_patch_xxxxx_primitive_variables(patch_id, j, k)
27-
28-
integer, intent(IN) :: patch_id
29-
integer, intent(IN) :: j, k
30-
31-
end subroutine s_assign_patch_xxxxx_primitive_variables
32-
33-
end interface
34-
3515
! NOTE: The abstract interface allows for the declaration of a pointer to
3616
! a procedure such that the choice of the model equations does not have to
3717
! be queried every time the patch primitive variables are to be assigned in
@@ -55,9 +35,6 @@ module m_assign_patches
5535
!! with each of the cells in the computational domain. Note that only one
5636
!! patch identity may be associated with any one cell.
5737

58-
procedure(s_assign_patch_xxxxx_primitive_variables), &
59-
pointer :: s_assign_patch_primitive_variables => null() !<
60-
6138
contains
6239

6340
!> This subroutine assigns the species primitive variables
@@ -222,14 +199,6 @@ contains
222199
! when it is being applied in the domain.
223200
patch_id_fp = 0
224201
225-
! Depending on multicomponent flow model, the appropriate procedure
226-
! for assignment of the patch mixture or species primitive variables
227-
! to a cell in the domain is targeted by the procedure pointer
228-
229-
s_assign_patch_primitive_variables => &
230-
s_assign_patch_species_primitive_variables
231-
232-
233202
end subroutine s_initialize_assign_patches_module ! -----------------
234203
235204
@@ -250,11 +219,6 @@ contains
250219
! Deallocating the patch identities bookkeeping variable
251220
deallocate (patch_id_fp)
252221
253-
! Nullifying procedure pointer to the subroutine assigning either
254-
! the patch mixture or species primitive variables to a cell in the
255-
! computational domain
256-
s_assign_patch_primitive_variables => null()
257-
258222
end subroutine s_finalize_assign_patches_module ! -------------------
259223
260224
end module m_assign_patches

‎src/pre_process/m_check_patches.fpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
2-
3-
41
!> @brief This module contains subroutines that read, and check consistency
52
!! of, the user provided inputs and data.
63
module m_check_patches

‎src/pre_process/m_create_patches.fpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ contains
8181
x_boundary%end >= x_cc(i) .and. &
8282
patch_icpp(patch_id)%alter_patch(patch_id_fp(i, 0))) then
8383
84-
call s_assign_patch_primitive_variables(patch_id, i, 0)
84+
call s_assign_patch_species_primitive_variables(patch_id, i, 0)
8585
8686
end if
8787
end do
@@ -137,7 +137,7 @@ contains
137137
patch_id_fp(i, j) == smooth_patch_id) &
138138
then
139139
140-
call s_assign_patch_primitive_variables(patch_id, i, j)
140+
call s_assign_patch_species_primitive_variables(patch_id, i, j)
141141
142142
end if
143143
@@ -186,7 +186,7 @@ contains
186186
myr >= radius - thickness/2.d0 .and. &
187187
patch_icpp(patch_id)%alter_patch(patch_id_fp(i, j))) then
188188
189-
call s_assign_patch_primitive_variables(patch_id, i, j)
189+
call s_assign_patch_species_primitive_variables(patch_id, i, j)
190190
end if
191191
192192
end do
@@ -243,7 +243,7 @@ contains
243243
patch_id_fp(i, j) == smooth_patch_id) &
244244
then
245245
246-
call s_assign_patch_primitive_variables(patch_id, i, j)
246+
call s_assign_patch_species_primitive_variables(patch_id, i, j)
247247
end if
248248
end do
249249
end do
@@ -305,7 +305,7 @@ contains
305305
patch_icpp(patch_id)%alter_patch(patch_id_fp(i, j))) &
306306
then
307307

308-
call s_assign_patch_primitive_variables(patch_id, i, j)
308+
call s_assign_patch_species_primitive_variables(patch_id, i, j)
309309

310310
end if
311311
end do
@@ -362,7 +362,7 @@ contains
362362
.or. &
363363
patch_id_fp(i, j) == smooth_patch_id) &
364364
then
365-
call s_assign_patch_primitive_variables(patch_id, i, j)
365+
call s_assign_patch_species_primitive_variables(patch_id, i, j)
366366
367367
end if
368368
@@ -409,7 +409,7 @@ contains
409409
patch_icpp(patch_id)%alter_patch(patch_id_fp(i, j))) &
410410
then
411411

412-
call s_assign_patch_primitive_variables(patch_id, &
412+
call s_assign_patch_species_primitive_variables(patch_id, &
413413
i, j)
414414

415415
end if
@@ -461,7 +461,7 @@ contains
461461
x_boundary%end >= x_cc(i) .and. &
462462
patch_icpp(patch_id)%alter_patch(patch_id_fp(i, 0))) then
463463

464-
call s_assign_patch_primitive_variables(patch_id, i, 0)
464+
call s_assign_patch_species_primitive_variables(patch_id, i, 0)
465465

466466
!what variables to alter
467467
!bump in pressure
@@ -522,7 +522,7 @@ contains
522522
y_boundary%end >= y_cc(j) .and. &
523523
patch_icpp(patch_id)%alter_patch(patch_id_fp(i, j))) then
524524

525-
call s_assign_patch_primitive_variables(patch_id, i, j)
525+
call s_assign_patch_species_primitive_variables(patch_id, i, j)
526526

527527
!what variables to alter
528528
!x-y bump in pressure

0 commit comments

Comments
 (0)