Skip to content

Commit

Permalink
reversing unnecessary changes
Browse files Browse the repository at this point in the history
  • Loading branch information
anshgupta1234 committed Oct 28, 2024
1 parent 316b05e commit 14f1dda
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
10 changes: 8 additions & 2 deletions src/common/m_mpi_common.fpp
Original file line number Diff line number Diff line change
Expand Up @@ -151,20 +151,26 @@ contains
MPI_IO_levelsetnorm_DATA%var%vf => levelset_norm%vf
#else
MPI_IO_IB_DATA%var%sf => ib_markers%sf(0:m, 0:n, 0:p)
#ifndef MFC_POST_PROCESS
MPI_IO_levelset_DATA%var%sf => levelset%sf(0:m, 0:n, 0:p, 1:num_ibs)
MPI_IO_levelsetnorm_DATA%var%vf => levelset_norm%vf(0:m, 0:n, 0:p, 1:num_ibs, 1:3)
#endif
#endif
call MPI_TYPE_CREATE_SUBARRAY(num_dims, sizes_glb, sizes_loc, start_idx, &
MPI_ORDER_FORTRAN, MPI_INTEGER, MPI_IO_IB_DATA%view, ierr)
call MPI_TYPE_COMMIT(MPI_IO_IB_DATA%view, ierr)
#ifndef MFC_POST_PROCESS
call MPI_TYPE_CREATE_SUBARRAY(num_dims, sizes_glb, sizes_loc, start_idx, &
MPI_ORDER_FORTRAN, MPI_DOUBLE_PRECISION, MPI_IO_levelset_DATA%view, ierr)
call MPI_TYPE_CREATE_SUBARRAY(num_dims, sizes_glb, sizes_loc, start_idx, &
MPI_ORDER_FORTRAN, MPI_DOUBLE_PRECISION, MPI_IO_levelsetnorm_DATA%view, ierr)
call MPI_TYPE_COMMIT(MPI_IO_IB_DATA%view, ierr)
call MPI_TYPE_COMMIT(MPI_IO_levelset_DATA%view, ierr)
call MPI_TYPE_COMMIT(MPI_IO_levelsetnorm_DATA%view, ierr)
#endif
end if
#ifndef MFC_POST_PROCESS
Expand Down
4 changes: 2 additions & 2 deletions src/pre_process/m_compute_levelset.fpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ contains
do i = 0, m
do j = 0, n

if (patch_ib(ib_patch_id)%theta /= dflt_real) then
if (.not. f_is_default(patch_ib(ib_patch_id)%theta)) then
x_act = (x_cc(i) - x_centroid)*cos(theta) - (y_cc(j) - y_centroid)*sin(theta) + x_centroid
y_act = (x_cc(i) - x_centroid)*sin(theta) + (y_cc(j) - y_centroid)*cos(theta) + y_centroid
else
Expand Down Expand Up @@ -183,7 +183,7 @@ contains
do j = 0, n
do i = 0, m

if (patch_ib(ib_patch_id)%theta /= dflt_real) then
if (.not. f_is_default(patch_ib(ib_patch_id)%theta)) then
x_act = (x_cc(i) - x_centroid)*cos(theta) - (y_cc(j) - y_centroid)*sin(theta) + x_centroid
y_act = (x_cc(i) - x_centroid)*sin(theta) + (y_cc(j) - y_centroid)*cos(theta) + y_centroid
else
Expand Down
6 changes: 5 additions & 1 deletion src/simulation/m_start_up.fpp
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,11 @@ contains
else

! Open the file to read conservative variables
write (file_loc, '(I0,A)') t_step_start, '.dat'
if (cfl_dt) then
write (file_loc, '(I0,A)') n_start, '.dat'
else
write (file_loc, '(I0,A)') t_step_start, '.dat'
end if
file_loc = trim(case_dir)//'/restart_data'//trim(mpiiofs)//trim(file_loc)
inquire (FILE=trim(file_loc), EXIST=file_exist)

Expand Down

0 comments on commit 14f1dda

Please sign in to comment.