Skip to content

Commit af9371e

Browse files
author
Diego Vaca
committed
fixing precision
2 parents 97e5af6 + d581949 commit af9371e

22 files changed

+235
-449
lines changed

src/post_process/m_data_output.fpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ module m_data_output
3333
s_open_energy_data_file, &
3434
s_write_grid_to_formatted_database_file, &
3535
s_write_variable_to_formatted_database_file, &
36+
s_write_lag_bubbles_results, &
3637
s_write_intf_data_file, &
3738
s_write_energy_data_file, &
38-
s_write_lag_bubbles_results, &
3939
s_close_formatted_database_file, &
4040
s_close_intf_data_file, &
4141
s_close_energy_data_file, &

src/post_process/m_mpi_proxy.fpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ contains
170170
& 'prim_vars_wrt', 'c_wrt', 'qm_wrt','schlieren_wrt', 'bubbles_euler', 'qbmm', &
171171
& 'polytropic', 'polydisperse', 'file_per_process', 'relax', 'cf_wrt', &
172172
& 'adv_n', 'ib', 'cfl_adap_dt', 'cfl_const_dt', 'cfl_dt', &
173-
& 'surface_tension', 'hyperelasticity', 'bubbles_lagrange', 'rkck_adap_dt' ]
173+
& 'surface_tension', 'hyperelasticity', 'bubbles_lagrange', 'rkck_adap_dt']
174174
call MPI_BCAST(${VAR}$, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
175175
#:endfor
176176

src/post_process/m_start_up.f90

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,8 @@ subroutine s_read_input_file
8484
polydisperse, poly_sigma, file_per_process, relax, &
8585
relax_model, cf_wrt, sigma, adv_n, ib, num_ibs, &
8686
cfl_adap_dt, cfl_const_dt, t_save, t_stop, n_start, &
87-
cfl_target, surface_tension, &
88-
sim_data, hyperelasticity, &
89-
bubbles_lagrange, rkck_adap_dt
87+
cfl_target, surface_tension, bubbles_lagrange, rkck_adap_dt, &
88+
sim_data, hyperelasticity
9089

9190
! Inquiring the status of the post_process.inp file
9291
file_loc = 'post_process.inp'
@@ -715,11 +714,6 @@ subroutine s_save_data(t_step, varname, pres, c, H)
715714
call s_write_lag_bubbles_results(t_step) !! Individual bubble evolution
716715
end if
717716

718-
! if (proc_rank == 0 .and. sim_data) then
719-
! close (211)
720-
! close (251)
721-
! end if
722-
723717
if (sim_data .and. proc_rank == 0) then
724718
call s_close_intf_data_file()
725719
call s_close_energy_data_file()

src/pre_process/m_assign_variables.fpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,6 @@ contains
517517
q_prim_vf(i + xibeg - 1)%sf(j, k, l) = eta*xi_cart(i) + &
518518
(1_wp - eta)*orig_prim_vf(i + xibeg - 1)
519519
end do
520-
521520
end if
522521
523522
if (mpp_lim .and. bubbles_euler) then

src/simulation/m_global_parameters.fpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1206,9 +1206,7 @@ contains
12061206
#:endif
12071207
12081208
!$acc enter data copyin(nb, R0ref, Ca, Web, Re_inv, weight, R0, V0, bubbles_euler, polytropic, polydisperse, qbmm, R0_type, ptil, bubble_model, thermal, poly_sigma)
1209-
12101209
!$acc enter data copyin(R_n, R_v, phi_vn, phi_nv, Pe_c, Tw, pv, M_n, M_v, k_n, k_v, pb0, mass_n0, mass_v0, Pe_T, Re_trans_T, Re_trans_c, Im_trans_T, Im_trans_c, omegaN, mul0, ss, gamma_v, mu_v, gamma_m, gamma_n, mu_n, gam)
1211-
12121210
!$acc enter data copyin(dir_idx, dir_flg, dir_idx_tau)
12131211
12141212
!$acc enter data copyin(relax, relax_model, palpha_eps,ptgalpha_eps)

src/simulation/m_mpi_proxy.fpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ contains
196196
& 'bc_y%grcbc_in', 'bc_y%grcbc_out', 'bc_y%grcbc_vel_out', &
197197
& 'bc_z%grcbc_in', 'bc_z%grcbc_out', 'bc_z%grcbc_vel_out', &
198198
& 'cfl_adap_dt', 'cfl_const_dt', 'cfl_dt', 'surface_tension', &
199-
& 'viscous', 'shear_stress', 'bulk_stress', &
200-
& 'hyperelasticity', 'bubbles_lagrange', 'rkck_adap_dt' ]
199+
& 'viscous', 'shear_stress', 'bulk_stress', 'bubbles_lagrange', &
200+
& 'hyperelasticity', 'rkck_adap_dt' ]
201201
call MPI_BCAST(${VAR}$, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
202202
#:endfor
203203
@@ -235,8 +235,8 @@ contains
235235
& 'bc_x%pres_in','bc_x%pres_out','bc_y%pres_in','bc_y%pres_out', 'bc_z%pres_in','bc_z%pres_out', &
236236
& 'x_domain%beg', 'x_domain%end', 'y_domain%beg', 'y_domain%end', &
237237
& 'z_domain%beg', 'z_domain%end', 'x_a', 'x_b', 'y_a', 'y_b', 'z_a', &
238-
& 'z_b', 't_stop', 't_save', 'cfl_target', 'rkck_tolerance' ]
239-
call MPI_BCAST(${VAR}$, 1, MPI_DOUBLE_PRECISION, 0, MPI_COMM_WORLD, ierr)
238+
& 'z_b', 't_stop', 't_save', 'cfl_target', 'rkck_tolerance']
239+
call MPI_BCAST(${VAR}$, 1, mpi_p, 0, MPI_COMM_WORLD, ierr)
240240
#:endfor
241241
242242
do i = 1, 3

src/simulation/m_riemann_solvers.fpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1717,11 +1717,10 @@ contains
17171717
end do
17181718
end do
17191719
!$acc end parallel loop
1720+
17201721
elseif (model_eqns == 2 .and. bubbles_euler) then
1721-
!$acc parallel loop collapse(3) gang vector default(present) private(R0_L, R0_R, V0_L, V0_R, &
1722-
!$acc P0_L, P0_R, pbw_L, pbw_R, vel_L, vel_R, rho_avg, alpha_L, alpha_R, h_avg, gamma_avg, &
1723-
!$acc s_L, s_R, s_S, nbub_L, nbub_R, ptilde_L, ptilde_R, vel_avg_rms, Re_L, Re_R, &
1724-
!$acc pcorr, zcoef, vel_L_tmp, vel_R_tmp)
1722+
!$acc parallel loop collapse(3) gang vector default(present) private(R0_L, R0_R, V0_L, V0_R, P0_L, P0_R, pbw_L, pbw_R, vel_L, vel_R, &
1723+
!$acc rho_avg, alpha_L, alpha_R, h_avg, gamma_avg, s_L, s_R, s_S, nbub_L, nbub_R, ptilde_L, ptilde_R, vel_avg_rms, Re_L, Re_R, pcorr, zcoef, vel_L_tmp, vel_R_tmp)
17251724
do l = is3%beg, is3%end
17261725
do k = is2%beg, is2%end
17271726
do j = is1%beg, is1%end

src/simulation/m_start_up.fpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,11 @@ contains
170170
pi_fac, adv_n, adap_dt, bf_x, bf_y, bf_z, &
171171
k_x, k_y, k_z, w_x, w_y, w_z, p_x, p_y, p_z, &
172172
g_x, g_y, g_z, n_start, t_save, t_stop, &
173-
cfl_adap_dt, cfl_const_dt, cfl_target, &
174-
viscous, surface_tension, &
175-
hyperelasticity, R0ref, &
173+
cfl_adap_dt, cfl_const_dt, cfl_target, &
174+
viscous, surface_tension, &
176175
bubbles_lagrange, lag_params, &
177-
rkck_adap_dt, rkck_tolerance
176+
rkck_adap_dt, rkck_tolerance, &
177+
hyperelasticity, R0ref
178178

179179
! Checking that an input file has been provided by the user. If it
180180
! has, then the input file is read in, otherwise, simulation exits.
@@ -629,7 +629,7 @@ contains
629629
NVARS_MOK = int(sys_size, MPI_OFFSET_KIND)
630630

631631
! Read the data for each variable
632-
if ( bubbles_euler .or. elasticity ) then
632+
if (bubbles_euler .or. elasticity) then
633633

634634
do i = 1, sys_size!adv_idx%end
635635
var_MOK = int(i, MPI_OFFSET_KIND)
@@ -765,8 +765,7 @@ contains
765765
NVARS_MOK = int(sys_size, MPI_OFFSET_KIND)
766766

767767
! Read the data for each variable
768-
if ( bubbles_euler .or. elasticity ) then
769-
768+
if (bubbles_euler .or. elasticity) then
770769
do i = 1, sys_size !adv_idx%end
771770
var_MOK = int(i, MPI_OFFSET_KIND)
772771
! Initial displacement to skip at beginning of file

tests/18A29336/golden-metadata.txt

Lines changed: 31 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/18A29336/golden.txt

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)