Skip to content

Commit bdb68ea

Browse files
committed
reversing unnecessary changes
1 parent a0e14da commit bdb68ea

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

src/common/m_mpi_common.fpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,20 +151,26 @@ contains
151151
MPI_IO_levelsetnorm_DATA%var%vf => levelset_norm%vf
152152
#else
153153
MPI_IO_IB_DATA%var%sf => ib_markers%sf(0:m, 0:n, 0:p)
154+
155+
#ifndef MFC_POST_PROCESS
154156
MPI_IO_levelset_DATA%var%sf => levelset%sf(0:m, 0:n, 0:p, 1:num_ibs)
155157
MPI_IO_levelsetnorm_DATA%var%vf => levelset_norm%vf(0:m, 0:n, 0:p, 1:num_ibs, 1:3)
158+
#endif
159+
156160
#endif
157161
call MPI_TYPE_CREATE_SUBARRAY(num_dims, sizes_glb, sizes_loc, start_idx, &
158162
MPI_ORDER_FORTRAN, MPI_INTEGER, MPI_IO_IB_DATA%view, ierr)
163+
call MPI_TYPE_COMMIT(MPI_IO_IB_DATA%view, ierr)
164+
165+
#ifndef MFC_POST_PROCESS
159166
call MPI_TYPE_CREATE_SUBARRAY(num_dims, sizes_glb, sizes_loc, start_idx, &
160167
MPI_ORDER_FORTRAN, MPI_DOUBLE_PRECISION, MPI_IO_levelset_DATA%view, ierr)
161168
call MPI_TYPE_CREATE_SUBARRAY(num_dims, sizes_glb, sizes_loc, start_idx, &
162169
MPI_ORDER_FORTRAN, MPI_DOUBLE_PRECISION, MPI_IO_levelsetnorm_DATA%view, ierr)
163170
164-
call MPI_TYPE_COMMIT(MPI_IO_IB_DATA%view, ierr)
165171
call MPI_TYPE_COMMIT(MPI_IO_levelset_DATA%view, ierr)
166172
call MPI_TYPE_COMMIT(MPI_IO_levelsetnorm_DATA%view, ierr)
167-
173+
#endif
168174
end if
169175
170176
#ifndef MFC_POST_PROCESS

src/pre_process/m_compute_levelset.fpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ contains
9494
do i = 0, m
9595
do j = 0, n
9696

97-
if (patch_ib(ib_patch_id)%theta /= dflt_real) then
97+
if (.not. f_is_default(patch_ib(ib_patch_id)%theta)) then
9898
x_act = (x_cc(i) - x_centroid)*cos(theta) - (y_cc(j) - y_centroid)*sin(theta) + x_centroid
9999
y_act = (x_cc(i) - x_centroid)*sin(theta) + (y_cc(j) - y_centroid)*cos(theta) + y_centroid
100100
else
@@ -183,7 +183,7 @@ contains
183183
do j = 0, n
184184
do i = 0, m
185185

186-
if (patch_ib(ib_patch_id)%theta /= dflt_real) then
186+
if (.not. f_is_default(patch_ib(ib_patch_id)%theta)) then
187187
x_act = (x_cc(i) - x_centroid)*cos(theta) - (y_cc(j) - y_centroid)*sin(theta) + x_centroid
188188
y_act = (x_cc(i) - x_centroid)*sin(theta) + (y_cc(j) - y_centroid)*cos(theta) + y_centroid
189189
else

src/simulation/m_start_up.fpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,11 @@ contains
720720
else
721721

722722
! Open the file to read conservative variables
723-
write (file_loc, '(I0,A)') t_step_start, '.dat'
723+
if (cfl_dt) then
724+
write (file_loc, '(I0,A)') n_start, '.dat'
725+
else
726+
write (file_loc, '(I0,A)') t_step_start, '.dat'
727+
end if
724728
file_loc = trim(case_dir)//'/restart_data'//trim(mpiiofs)//trim(file_loc)
725729
inquire (FILE=trim(file_loc), EXIST=file_exist)
726730

0 commit comments

Comments
 (0)