Skip to content

Commit b2b34a5

Browse files
anshgupta1234anshgupta1234
committed
vf->sf
1 parent ac51aee commit b2b34a5

File tree

8 files changed

+38
-38
lines changed

8 files changed

+38
-38
lines changed

‎src/common/m_derived_types.fpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ module m_derived_types
4040

4141
!> Derived type for levelset norm
4242
type levelset_norm_field
43-
real(kind(0d0)), pointer, dimension(:, :, :, :, :) :: vf => null()
43+
real(kind(0d0)), pointer, dimension(:, :, :, :, :) :: sf => null()
4444
end type levelset_norm_field
4545

4646
type mpi_io_var

‎src/common/m_mpi_common.fpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,13 @@ contains
148148
#ifdef MFC_PRE_PROCESS
149149
MPI_IO_IB_DATA%var%sf => ib_markers%sf
150150
MPI_IO_levelset_DATA%var%sf => levelset%sf
151-
MPI_IO_levelsetnorm_DATA%var%vf => levelset_norm%vf
151+
MPI_IO_levelsetnorm_DATA%var%sf => levelset_norm%sf
152152
#else
153153
MPI_IO_IB_DATA%var%sf => ib_markers%sf(0:m, 0:n, 0:p)
154154
155155
#ifndef MFC_POST_PROCESS
156156
MPI_IO_levelset_DATA%var%sf => levelset%sf(0:m, 0:n, 0:p, 1:num_ibs)
157-
MPI_IO_levelsetnorm_DATA%var%vf => levelset_norm%vf(0:m, 0:n, 0:p, 1:num_ibs, 1:3)
157+
MPI_IO_levelsetnorm_DATA%var%sf => levelset_norm%sf(0:m, 0:n, 0:p, 1:num_ibs, 1:3)
158158
#endif
159159
160160
#endif

‎src/pre_process/m_compute_levelset.fpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ contains
6363
dist = dsqrt(sum(dist_vec**2))
6464
levelset%sf(i, j, 0, ib_patch_id) = dist - radius
6565
if (dist == 0) then
66-
levelset_norm%vf(i, j, 0, ib_patch_id, :) = 0
66+
levelset_norm%sf(i, j, 0, ib_patch_id, :) = 0
6767
else
68-
levelset_norm%vf(i, j, 0, ib_patch_id, :) = &
68+
levelset_norm%sf(i, j, 0, ib_patch_id, :) = &
6969
dist_vec(:)/dist
7070
end if
7171

@@ -146,9 +146,9 @@ contains
146146

147147
levelset%sf(i, j, 0, ib_patch_id) = dist
148148
if (dist == 0) then
149-
levelset_norm%vf(i, j, 0, ib_patch_id, :) = 0
149+
levelset_norm%sf(i, j, 0, ib_patch_id, :) = 0
150150
else
151-
levelset_norm%vf(i, j, 0, ib_patch_id, :) = &
151+
levelset_norm%sf(i, j, 0, ib_patch_id, :) = &
152152
dist_vec(:)/dist
153153
end if
154154

@@ -238,16 +238,16 @@ contains
238238
if (dist_side < dist_surf) then
239239
levelset%sf(i, j, l, ib_patch_id) = dist_side
240240
if (dist_side == abs(z_cc(l) - z_min)) then
241-
levelset_norm%vf(i, j, l, ib_patch_id, :) = (/0, 0, -1/)
241+
levelset_norm%sf(i, j, l, ib_patch_id, :) = (/0, 0, -1/)
242242
else
243-
levelset_norm%vf(i, j, l, ib_patch_id, :) = (/0, 0, 1/)
243+
levelset_norm%sf(i, j, l, ib_patch_id, :) = (/0, 0, 1/)
244244
end if
245245
else
246246
levelset%sf(i, j, l, ib_patch_id) = dist_surf
247247
if (dist == 0) then
248-
levelset_norm%vf(i, j, l, ib_patch_id, :) = 0
248+
levelset_norm%sf(i, j, l, ib_patch_id, :) = 0
249249
else
250-
levelset_norm%vf(i, j, l, ib_patch_id, :) = &
250+
levelset_norm%sf(i, j, l, ib_patch_id, :) = &
251251
dist_vec(:)/dist_surf
252252
end if
253253
end if
@@ -304,34 +304,34 @@ contains
304304
if (min_dist == abs(side_dists(1))) then
305305
levelset%sf(i, j, 0, ib_patch_id) = side_dists(1)
306306
if (side_dists(1) == 0) then
307-
levelset_norm%vf(i, j, 0, ib_patch_id, 1) = 0d0
307+
levelset_norm%sf(i, j, 0, ib_patch_id, 1) = 0d0
308308
else
309-
levelset_norm%vf(i, j, 0, ib_patch_id, 1) = side_dists(1)/ &
309+
levelset_norm%sf(i, j, 0, ib_patch_id, 1) = side_dists(1)/ &
310310
abs(side_dists(1))
311311
end if
312312

313313
else if (min_dist == abs(side_dists(2))) then
314314
levelset%sf(i, j, 0, ib_patch_id) = side_dists(2)
315315
if (side_dists(2) == 0) then
316-
levelset_norm%vf(i, j, 0, ib_patch_id, 1) = 0d0
316+
levelset_norm%sf(i, j, 0, ib_patch_id, 1) = 0d0
317317
else
318-
levelset_norm%vf(i, j, 0, ib_patch_id, 1) = side_dists(2)/ &
318+
levelset_norm%sf(i, j, 0, ib_patch_id, 1) = side_dists(2)/ &
319319
abs(side_dists(2))
320320
end if
321321

322322
else if (min_dist == abs(side_dists(3))) then
323323
if (side_dists(3) == 0) then
324-
levelset_norm%vf(i, j, 0, ib_patch_id, 1) = 0d0
324+
levelset_norm%sf(i, j, 0, ib_patch_id, 1) = 0d0
325325
else
326-
levelset_norm%vf(i, j, 0, ib_patch_id, 1) = side_dists(3)/ &
326+
levelset_norm%sf(i, j, 0, ib_patch_id, 1) = side_dists(3)/ &
327327
abs(side_dists(3))
328328
end if
329329

330330
else if (min_dist == abs(side_dists(4))) then
331331
if (side_dists(4) == 0) then
332-
levelset_norm%vf(i, j, 0, ib_patch_id, 1) = 0d0
332+
levelset_norm%sf(i, j, 0, ib_patch_id, 1) = 0d0
333333
else
334-
levelset_norm%vf(i, j, 0, ib_patch_id, 1) = side_dists(4)/ &
334+
levelset_norm%sf(i, j, 0, ib_patch_id, 1) = side_dists(4)/ &
335335
abs(side_dists(4))
336336
end if
337337

@@ -370,9 +370,9 @@ contains
370370
dist = dsqrt(sum(dist_vec**2))
371371
levelset%sf(i, j, k, ib_patch_id) = dist - radius
372372
if (dist == 0) then
373-
levelset_norm%vf(i, j, k, ib_patch_id, :) = (/1, 0, 0/)
373+
levelset_norm%sf(i, j, k, ib_patch_id, :) = (/1, 0, 0/)
374374
else
375-
levelset_norm%vf(i, j, k, ib_patch_id, :) = &
375+
levelset_norm%sf(i, j, k, ib_patch_id, :) = &
376376
dist_vec(:)/dist
377377
end if
378378
end do
@@ -435,18 +435,18 @@ contains
435435
if (dist_side < abs(dist_surface)) then
436436
levelset%sf(i, j, k, ib_patch_id) = -dist_side
437437
if (dist_side == abs(side_pos - boundary%beg)) then
438-
levelset_norm%vf(i, j, k, ib_patch_id, :) = -dist_sides_vec
438+
levelset_norm%sf(i, j, k, ib_patch_id, :) = -dist_sides_vec
439439
else
440-
levelset_norm%vf(i, j, k, ib_patch_id, :) = dist_sides_vec
440+
levelset_norm%sf(i, j, k, ib_patch_id, :) = dist_sides_vec
441441
end if
442442
else
443443
levelset%sf(i, j, k, ib_patch_id) = dist_surface
444444

445-
levelset_norm%vf(i, j, k, ib_patch_id, :) = &
445+
levelset_norm%sf(i, j, k, ib_patch_id, :) = &
446446
(pos_vec - centroid_vec)*dist_surface_vec
447-
levelset_norm%vf(i, j, k, ib_patch_id, :) = &
448-
levelset_norm%vf(i, j, k, ib_patch_id, :)/ &
449-
norm2(levelset_norm%vf(i, j, k, ib_patch_id, :))
447+
levelset_norm%sf(i, j, k, ib_patch_id, :) = &
448+
levelset_norm%sf(i, j, k, ib_patch_id, :)/ &
449+
norm2(levelset_norm%sf(i, j, k, ib_patch_id, :))
450450
end if
451451
end do
452452
end do

‎src/pre_process/m_data_output.fpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ contains
206206
file_loc = trim(t_step_dir)//'/levelset_norm.dat'
207207

208208
open (1, FILE=trim(file_loc), FORM='unformatted', STATUS=status)
209-
write (1) levelset_norm%vf
209+
write (1) levelset_norm%sf
210210
close (1)
211211

212212
! Outputting Conservative Variables ================================
@@ -771,7 +771,7 @@ contains
771771

772772
call MPI_FILE_SET_VIEW(ifile, disp, MPI_INTEGER, MPI_IO_levelsetnorm_DATA%view, &
773773
'native', mpi_info_int, ierr)
774-
call MPI_FILE_WRITE_ALL(ifile, MPI_IO_levelsetnorm_DATA%var%vf, data_size, &
774+
call MPI_FILE_WRITE_ALL(ifile, MPI_IO_levelsetnorm_DATA%var%sf, data_size, &
775775
MPI_DOUBLE_PRECISION, status, ierr)
776776

777777
call MPI_FILE_CLOSE(ifile, ierr)

‎src/pre_process/m_global_parameters.fpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ contains
750750
if (ib) then
751751
allocate (MPI_IO_IB_DATA%var%sf(0:m, 0:n, 0:p))
752752
allocate (MPI_IO_levelset_DATA%var%sf(0:m, 0:n, 0:p, 1:num_ibs))
753-
allocate (MPI_IO_levelsetnorm_DATA%var%vf(0:m, 0:n, 0:p, 1:num_ibs, 1:3))
753+
allocate (MPI_IO_levelsetnorm_DATA%var%sf(0:m, 0:n, 0:p, 1:num_ibs, 1:3))
754754
end if
755755
#endif
756756

‎src/pre_process/m_initial_condition.fpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ contains
8585
allocate (ib_markers%sf(0:m, 0:n, 0:p))
8686

8787
allocate (levelset%sf(0:m, 0:n, 0:p, 1:num_ibs))
88-
allocate (levelset_norm%vf(0:m, 0:n, 0:p, 1:num_ibs, 1:3))
88+
allocate (levelset_norm%sf(0:m, 0:n, 0:p, 1:num_ibs, 1:3))
8989

9090
if (qbmm .and. .not. polytropic) then
9191
!Allocate bubble pressure pb and vapor mass mv for non-polytropic qbmm at all quad nodes and R0 bins

‎src/simulation/m_ibm.fpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ contains
7070
-gp_layers:n+gp_layers, -gp_layers:p+gp_layers))
7171
@:ALLOCATE(levelset%sf(-gp_layers:m+gp_layers, &
7272
-gp_layers:n+gp_layers, -gp_layers:p+gp_layers, num_ibs))
73-
@:ALLOCATE(levelset_norm%vf(-gp_layers:m+gp_layers, &
73+
@:ALLOCATE(levelset_norm%sf(-gp_layers:m+gp_layers, &
7474
-gp_layers:n+gp_layers, -gp_layers:p+gp_layers, num_ibs, 3))
7575
else
7676
@:ALLOCATE(ib_markers%sf(-gp_layers:m+gp_layers, &
7777
-gp_layers:n+gp_layers, 0:0))
7878
@:ALLOCATE(levelset%sf(-gp_layers:m+gp_layers, &
7979
-gp_layers:n+gp_layers, 0:0, num_ibs))
80-
@:ALLOCATE(levelset_norm%vf(-gp_layers:m+gp_layers, &
80+
@:ALLOCATE(levelset_norm%sf(-gp_layers:m+gp_layers, &
8181
-gp_layers:n+gp_layers, 0:0, num_ibs, 3))
8282
end if
8383

@@ -410,7 +410,7 @@ contains
410410
! Calculate and store the precise location of the image point
411411
patch_id = gp%ib_patch_id
412412
dist = abs(levelset%sf(i, j, k, patch_id))
413-
norm(:) = levelset_norm%vf(i, j, k, patch_id, :)
413+
norm(:) = levelset_norm%sf(i, j, k, patch_id, :)
414414
ghost_points(q)%ip_loc(:) = physical_loc(:) + 2*dist*norm(:)
415415

416416
! Find the closest grid point to the image point
@@ -948,7 +948,7 @@ contains
948948

949949
@:DEALLOCATE(ib_markers%sf)
950950
@:DEALLOCATE(levelset%sf)
951-
@:DEALLOCATE(levelset_norm%vf)
951+
@:DEALLOCATE(levelset_norm%sf)
952952
end subroutine s_finalize_ibm_module
953953

954954
end module m_ibm

‎src/simulation/m_start_up.fpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ contains
437437
FORM='unformatted', &
438438
ACTION='read', &
439439
STATUS='old')
440-
read (2) levelset_norm%vf(0:m, 0:n, 0:p, 1:num_ibs, 1:3); close (2)
440+
read (2) levelset_norm%sf(0:m, 0:n, 0:p, 1:num_ibs, 1:3); close (2)
441441
else
442442
call s_mpi_abort(trim(file_path)//' is missing. Exiting ...')
443443
end if
@@ -705,7 +705,7 @@ contains
705705

706706
call MPI_FILE_SET_VIEW(ifile, disp, MPI_INTEGER, MPI_IO_levelset_DATA%view, &
707707
'native', mpi_info_int, ierr)
708-
call MPI_FILE_READ(ifile, MPI_IO_levelsetnorm_DATA%var%vf, data_size, &
708+
call MPI_FILE_READ(ifile, MPI_IO_levelsetnorm_DATA%var%sf, data_size, &
709709
MPI_DOUBLE_PRECISION, status, ierr)
710710

711711
else
@@ -855,7 +855,7 @@ contains
855855

856856
call MPI_FILE_SET_VIEW(ifile, disp, MPI_INTEGER, MPI_IO_levelset_DATA%view, &
857857
'native', mpi_info_int, ierr)
858-
call MPI_FILE_READ(ifile, MPI_IO_levelsetnorm_DATA%var%vf, data_size, &
858+
call MPI_FILE_READ(ifile, MPI_IO_levelsetnorm_DATA%var%sf, data_size, &
859859
MPI_DOUBLE_PRECISION, status, ierr)
860860

861861
else

0 commit comments

Comments
 (0)