Skip to content

Commit

Permalink
bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
wilfonba committed Feb 15, 2024
1 parent 3c42479 commit e35f4ed
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 9 deletions.
3 changes: 2 additions & 1 deletion src/common/m_mpi_common.fpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ contains
do i = 1, sys_size
MPI_IO_DATA%var(i)%sf => q_cons_vf(i)%sf(0:m, 0:n, 0:p)
end do
print*, "Printing"
!Additional variables pb and mv for non-polytropic qbmm
#ifdef MFC_PRE_PROCESS
if (qbmm .and. .not. polytropic) then
Expand Down
2 changes: 1 addition & 1 deletion src/post_process/m_data_input.f90
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ subroutine s_read_parallel_data_files(t_step) ! ---------------------------
MPI_DOUBLE_PRECISION, status, ierr)
end do
else
do i = 1, adv_idx%end
do i = 1, sys_size
var_MOK = int(i, MPI_OFFSET_KIND)

! Initial displacement to skip at beginning of file
Expand Down
2 changes: 1 addition & 1 deletion src/post_process/m_start_up.f90
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ subroutine s_save_data(t_step, varname, pres, c, H)
q_sf = q_cons_vf(c_idx)%sf(-offset_x%beg:m + offset_x%end, &
-offset_y%beg:n + offset_y%end, &
-offset_z%beg:p + offset_z%end)

write (varname, '(A)') 'color_func'
call s_write_variable_to_formatted_database_file(varname, t_step)

Expand Down
5 changes: 3 additions & 2 deletions src/pre_process/m_data_output.fpp
Original file line number Diff line number Diff line change
Expand Up @@ -561,13 +561,14 @@ contains
call MPI_FILE_CLOSE(ifile, ierr)

else

! Initialize MPI data I/O
if (ib) then
call s_initialize_mpi_data(q_cons_vf, ib_markers)
else
call s_initialize_mpi_data(q_cons_vf)
end if

! Open the file to write all flow variables
write (file_loc, '(I0,A)') t_step_start, '.dat'
file_loc = trim(restart_dir)//trim(mpiiofs)//trim(file_loc)
Expand Down Expand Up @@ -621,7 +622,7 @@ contains
do i = 1, sys_size !TODO: check if this is right
! do i = 1, adv_idx%end
var_MOK = int(i, MPI_OFFSET_KIND)

! Initial displacement to skip at beginning of file
disp = m_MOK*max(MOK, n_MOK)*max(MOK, p_MOK)*WP_MOK*(var_MOK - 1)

Expand Down
2 changes: 1 addition & 1 deletion src/pre_process/m_start_up.fpp
Original file line number Diff line number Diff line change
Expand Up @@ -843,7 +843,7 @@ contains

call s_relaxation_solver(q_cons_vf)
end if

call s_write_data_files(q_cons_vf, ib_markers)

call cpu_time(finish)
Expand Down
2 changes: 1 addition & 1 deletion src/simulation/m_start_up.fpp
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@ contains
end do
end if
else
do i = 1, adv_idx%end
do i = 1, sys_size
var_MOK = int(i, MPI_OFFSET_KIND)

! Initial displacement to skip at beginning of file
Expand Down
5 changes: 3 additions & 2 deletions toolchain/mfc/run/case_dicts.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@
for attribute in ["geometry", "radius", "radii", "epsilon", "beta",
"normal", "smoothen", "smooth_patch_id", "alpha_rho",
"smooth_coeff", "rho", "vel", "pres", "alpha", "gamma",
"pi_inf", "r0", "v0", "p0", "m0", "hcid", "cv", "qv", "qvp" ]:
"pi_inf", "r0", "v0", "p0", "m0", "hcid", "cv", "qv",
"qvp", "cf_val" ]:
PRE_PROCESS.append(f"patch_icpp({p_id})%{attribute}")

PRE_PROCESS.append(f"patch_icpp({p_id})%model%filepath")
Expand Down Expand Up @@ -151,7 +152,7 @@
'mom_wrt', 'vel_wrt', 'flux_lim', 'flux_wrt', 'E_wrt', 'pres_wrt',
'alpha_wrt', 'kappa_wrt', 'gamma_wrt', 'heat_ratio_wrt', 'pi_inf_wrt',
'pres_inf_wrt', 'cons_vars_wrt', 'prim_vars_wrt', 'c_wrt', 'omega_wrt','qbmm',
'qm_wrt'
'qm_wrt', 'cf_wrt'
]

for cmp_id in range(1,3+1):
Expand Down

0 comments on commit e35f4ed

Please sign in to comment.