Skip to content

Commit 694ad71

Browse files
henryleberrehenryleberre
authored
Merge pull request #55 from sbryngelson/master
Use fypp in m_mpi_proxy.
2 parents f7c1172 + ecd0c1c commit 694ad71

File tree

4 files changed

+147
-706
lines changed

4 files changed

+147
-706
lines changed

‎src/post_process/m_mpi_proxy.f90‎ renamed to ‎src/post_process/m_mpi_proxy.fpp‎

Lines changed: 33 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -245,156 +245,46 @@ end subroutine s_initialize_mpi_proxy_module ! ----------------------------
245245
subroutine s_mpi_bcast_user_inputs() ! ---------------------------------
246246
247247
#ifdef MFC_MPI
248-
249248
integer :: i !< Generic loop iterator
250249
251250
! Logistics
252-
call MPI_BCAST(case_dir, len(case_dir), MPI_CHARACTER, &
253-
0, MPI_COMM_WORLD, ierr)
251+
call MPI_BCAST(case_dir, len(case_dir), MPI_CHARACTER, 0, MPI_COMM_WORLD, ierr)
252+
253+
#:for VAR in [ 'm', 'n', 'p', 'm_glb', 'n_glb', 'p_glb', &
254+
& 't_step_start', 't_step_stop', 't_step_save', 'weno_order', &
255+
& 'model_eqns', 'num_fluids', 'bc_x%beg', 'bc_x%end', 'bc_y%beg', &
256+
& 'bc_y%end', 'bc_z%beg', 'bc_z%end', 'flux_lim', 'format', &
257+
& 'precision', 'fd_order', 'thermal', 'nb' ]
258+
call MPI_BCAST(${VAR}$, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
259+
#:endfor
260+
261+
#:for VAR in [ 'cyl_coord', 'adv_alphan', 'mpp_lim', 'mixture_err', &
262+
& 'alt_soundspeed', 'hypoelasticity', 'parallel_io', 'rho_wrt', &
263+
& 'coarsen_silo', 'E_wrt', 'pres_wrt', 'gamma_wrt', &
264+
& 'heat_ratio_wrt', 'pi_inf_wrt', 'pres_inf_wrt', 'cons_vars_wrt', &
265+
& 'prim_vars_wrt', 'c_wrt', 'schlieren_wrt', 'bubbles', &
266+
& 'polytropic', 'fourier_decomp', 'polydisperse' ]
267+
call MPI_BCAST(${VAR}$, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
268+
#:endfor
269+
270+
call MPI_BCAST(flux_wrt(1), 3, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
271+
call MPI_BCAST(omega_wrt(1), 3, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
272+
call MPI_BCAST(mom_wrt(1), 3, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
273+
call MPI_BCAST(vel_wrt(1), 3, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
274+
call MPI_BCAST(alpha_rho_wrt(1), num_fluids_max, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
275+
call MPI_BCAST(alpha_wrt(1), num_fluids_max, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
254276
255-
! Computational domain parameters
256-
call MPI_BCAST(m, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
257-
call MPI_BCAST(n, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
258-
call MPI_BCAST(p, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
259-
call MPI_BCAST(m_glb, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
260-
call MPI_BCAST(n_glb, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
261-
call MPI_BCAST(p_glb, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
262-
263-
call MPI_BCAST(cyl_coord, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
264-
265-
call MPI_BCAST(t_step_start, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
266-
call MPI_BCAST(t_step_stop, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
267-
call MPI_BCAST(t_step_save, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
268-
269-
! Simulation algorithm parameters
270-
call MPI_BCAST(model_eqns, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
271-
call MPI_BCAST(num_fluids, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
272-
call MPI_BCAST(adv_alphan, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
273-
call MPI_BCAST(mpp_lim, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
274-
call MPI_BCAST(weno_order, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
275-
call MPI_BCAST(mixture_err, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
276-
call MPI_BCAST(alt_soundspeed, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
277-
call MPI_BCAST(hypoelasticity, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
278-
279-
call MPI_BCAST(bc_x%beg, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
280-
call MPI_BCAST(bc_x%end, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
281-
call MPI_BCAST(bc_y%beg, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
282-
call MPI_BCAST(bc_y%end, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
283-
call MPI_BCAST(bc_z%beg, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
284-
call MPI_BCAST(bc_z%end, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
285-
286-
call MPI_BCAST(parallel_io, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
287-
288-
! Fluids physical parameters
289277
do i = 1, num_fluids_max
290-
call MPI_BCAST(fluid_pp(i)%gamma, 1, &
291-
MPI_DOUBLE_PRECISION, 0, &
292-
MPI_COMM_WORLD, ierr)
293-
call MPI_BCAST(fluid_pp(i)%pi_inf, 1, &
294-
MPI_DOUBLE_PRECISION, 0, &
295-
MPI_COMM_WORLD, ierr)
296-
call MPI_BCAST(fluid_pp(i)%G, 1, &
297-
MPI_DOUBLE_PRECISION, 0, &
298-
MPI_COMM_WORLD, ierr)
278+
call MPI_BCAST(fluid_pp(i)%gamma, 1, MPI_DOUBLE_PRECISION, 0, MPI_COMM_WORLD, ierr)
279+
call MPI_BCAST(fluid_pp(i)%pi_inf, 1, MPI_DOUBLE_PRECISION, 0, MPI_COMM_WORLD, ierr)
280+
call MPI_BCAST(fluid_pp(i)%G, 1, MPI_DOUBLE_PRECISION, 0, MPI_COMM_WORLD, ierr)
299281
end do
300282
301-
! Formatted database file(s) structure parameters
302-
call MPI_BCAST(format, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
303-
304-
call MPI_BCAST(precision, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
305-
306-
call MPI_BCAST(coarsen_silo, 1, MPI_LOGICAL, &
307-
0, MPI_COMM_WORLD, ierr)
308-
309-
call MPI_BCAST(rho_wrt, 1, MPI_LOGICAL, &
310-
0, MPI_COMM_WORLD, ierr)
311-
call MPI_BCAST(mom_wrt(1), 3, MPI_LOGICAL, &
312-
0, MPI_COMM_WORLD, ierr)
313-
call MPI_BCAST(vel_wrt(1), 3, MPI_LOGICAL, &
314-
0, MPI_COMM_WORLD, ierr)
315-
call MPI_BCAST(flux_lim, 1, MPI_INTEGER, &
316-
0, MPI_COMM_WORLD, ierr)
317-
call MPI_BCAST(flux_wrt(1), 3, MPI_LOGICAL, &
318-
0, MPI_COMM_WORLD, ierr)
319-
call MPI_BCAST(E_wrt, 1, MPI_LOGICAL, &
320-
0, MPI_COMM_WORLD, ierr)
321-
call MPI_BCAST(pres_wrt, 1, MPI_LOGICAL, &
322-
0, MPI_COMM_WORLD, ierr)
323-
call MPI_BCAST(gamma_wrt, 1, MPI_LOGICAL, &
324-
0, MPI_COMM_WORLD, ierr)
325-
call MPI_BCAST(heat_ratio_wrt, 1, MPI_LOGICAL, &
326-
0, MPI_COMM_WORLD, ierr)
327-
call MPI_BCAST(pi_inf_wrt, 1, MPI_LOGICAL, &
328-
0, MPI_COMM_WORLD, ierr)
329-
call MPI_BCAST(pres_inf_wrt, 1, MPI_LOGICAL, &
330-
0, MPI_COMM_WORLD, ierr)
331-
call MPI_BCAST(cons_vars_wrt, 1, MPI_LOGICAL, &
332-
0, MPI_COMM_WORLD, ierr)
333-
call MPI_BCAST(prim_vars_wrt, 1, MPI_LOGICAL, &
334-
0, MPI_COMM_WORLD, ierr)
335-
call MPI_BCAST(c_wrt, 1, MPI_LOGICAL, &
336-
0, MPI_COMM_WORLD, ierr)
337-
call MPI_BCAST(omega_wrt(1), 3, MPI_LOGICAL, &
338-
0, MPI_COMM_WORLD, ierr)
339-
call MPI_BCAST(schlieren_wrt, 1, MPI_LOGICAL, &
340-
0, MPI_COMM_WORLD, ierr)
341-
call MPI_BCAST(alpha_rho_wrt(1), num_fluids_max, MPI_LOGICAL, &
342-
0, MPI_COMM_WORLD, &
343-
ierr)
344-
call MPI_BCAST(alpha_wrt(1), num_fluids_max, MPI_LOGICAL, &
345-
0, MPI_COMM_WORLD, &
346-
ierr)
347-
348-
call MPI_BCAST(schlieren_alpha(1), num_fluids_max, &
349-
MPI_DOUBLE_PRECISION, 0, &
350-
MPI_COMM_WORLD, ierr)
351-
352-
call MPI_BCAST(fd_order, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
353-
354-
call MPI_BCAST(fourier_decomp, 1, MPI_LOGICAL, &
355-
0, MPI_COMM_WORLD, ierr)
356-
357-
! Tait EOS
358-
call MPI_BCAST(pref, 1, &
359-
MPI_DOUBLE_PRECISION, 0, &
360-
MPI_COMM_WORLD, ierr)
361-
call MPI_BCAST(rhoref, 1, &
362-
MPI_DOUBLE_PRECISION, 0, &
363-
MPI_COMM_WORLD, ierr)
364-
365-
! Bubble modeling
366-
call MPI_BCAST(bubbles, 1, &
367-
MPI_LOGICAL, 0, &
368-
MPI_COMM_WORLD, ierr)
369-
call MPI_BCAST(polytropic, 1, &
370-
MPI_LOGICAL, 0, &
371-
MPI_COMM_WORLD, ierr)
372-
call MPI_BCAST(thermal, 1, &
373-
MPI_INTEGER, 0, &
374-
MPI_COMM_WORLD, ierr)
375-
call MPI_BCAST(R0ref, 1, &
376-
MPI_DOUBLE_PRECISION, 0, &
377-
MPI_COMM_WORLD, ierr)
378-
call MPI_BCAST(nb, 1, &
379-
MPI_INTEGER, 0, &
380-
MPI_COMM_WORLD, ierr)
381-
call MPI_BCAST(polydisperse, 1, &
382-
MPI_LOGICAL, 0, &
383-
MPI_COMM_WORLD, ierr)
384-
call MPI_BCAST(poly_sigma, 1, &
385-
MPI_DOUBLE_PRECISION, 0, &
386-
MPI_COMM_WORLD, ierr)
387-
388-
call MPI_BCAST(Web, 1, &
389-
MPI_DOUBLE_PRECISION, 0, &
390-
MPI_COMM_WORLD, ierr)
391-
call MPI_BCAST(Ca, 1, &
392-
MPI_DOUBLE_PRECISION, 0, &
393-
MPI_COMM_WORLD, ierr)
394-
call MPI_BCAST(Re_inv, 1, &
395-
MPI_DOUBLE_PRECISION, 0, &
396-
MPI_COMM_WORLD, ierr)
397-
283+
#:for VAR in [ 'pref', 'rhoref', 'R0ref', 'poly_sigma', 'Web', 'Ca', &
284+
& 'Re_inv' ]
285+
call MPI_BCAST(${VAR}$, 1, MPI_DOUBLE_PRECISION, 0, MPI_COMM_WORLD, ierr)
286+
#:endfor
287+
call MPI_BCAST(schlieren_alpha(1), num_fluids_max, MPI_DOUBLE_PRECISION, 0, MPI_COMM_WORLD, ierr)
398288
#endif
399289
400290
end subroutine s_mpi_bcast_user_inputs ! -------------------------------

0 commit comments

Comments
 (0)