lp:~g-bhutani12/fluidity/PBM

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:fluidity

sam: Pending requested 2013-08-30

Diff: 8540 lines (+7592/-53)

66 files modified

Makefile.in (+7/-0)
assemble/Adapt_State.F90 (+8/-2)
assemble/Diagnostic_fields_wrapper.F90 (+7/-1)
assemble/Multiphase.F90 (+86/-18)
configure (+2/-1)
configure.in (+1/-0)
diagnostics/Multiphase_Diagnostics.F90 (+21/-3)
examples/tephra_settling/tephra_settling.flml (+3/-1)
main/Fluids.F90 (+20/-1)
population_balance/DQMOM.F90 (+999/-0)
population_balance/Makefile.dependencies (+10/-0)
population_balance/Makefile.in (+66/-0)
preprocessor/Field_Priority_Lists.F90 (+42/-0)
preprocessor/Populate_State.F90 (+23/-2)
schemas/diagnostic_algorithms.rnc (+2/-1)
schemas/diagnostic_algorithms.rng (+8/-1)
schemas/fluidity_options.rnc (+448/-2)
schemas/fluidity_options.rng (+649/-1)
schemas/multiphase_interaction.rnc (+6/-1)
schemas/multiphase_interaction.rng (+7/-0)
tests/mphase_dusty_gas_shock_tube/mphase_dusty_gas_shock_tube.flml (+6/-2)
tests/mphase_inlet_velocity_bc_compressible/mphase_inlet_velocity_bc_compressible.flml (+3/-1)
tests/mphase_rogue_shock_tube_dense_bed_glass/mphase_rogue_shock_tube_dense_bed_glass.flml (+3/-1)
tests/mphase_rogue_shock_tube_dense_bed_nylon/mphase_rogue_shock_tube_dense_bed_nylon.flml (+3/-1)
tests/mphase_stokes_law/mphase_stokes_law.flml (+6/-2)
tests/mphase_strong_pressure_bc_compressible/mphase_strong_pressure_bc_compressible_p0p1.flml (+3/-1)
tests/mphase_strong_pressure_bc_compressible/mphase_strong_pressure_bc_compressible_p2p1.flml (+3/-1)
tests/mphase_subtract_out_reference_profile/mphase_subtract_out_reference_profile_1d.flml (+3/-1)
tests/mphase_tephra_settling/mphase_tephra_settling.flml (+6/-2)
tests/mphase_wen_yu_drag_correlation/mphase_wen_yu_drag_correlation.flml (+6/-2)
tests/popbal_homog_brk_aggr/Makefile (+5/-0)
tests/popbal_homog_brk_aggr/popbal_homog_N2.flml (+723/-0)
tests/popbal_homog_brk_aggr/popbal_homog_N2_brk_aggr.xml (+34/-0)
tests/popbal_homog_brk_aggr/src/minimal.geo (+28/-0)
tests/popbal_nonhomog2_2d_adapt/Makefile (+5/-0)
tests/popbal_nonhomog2_2d_adapt/popbal_nonhomog2_2d_adapt.flml (+670/-0)
tests/popbal_nonhomog2_2d_adapt/popbal_nonhomog2_2d_adapt.xml (+46/-0)
tests/popbal_nonhomog2_2d_adapt/readme (+13/-0)
tests/popbal_nonhomog2_2d_adapt/src/channel.geo (+16/-0)
tests/popbal_nonhomog2_2d_cg_p1/Makefile (+5/-0)
tests/popbal_nonhomog2_2d_cg_p1/popbal_nonhomog2_2d.flml (+614/-0)
tests/popbal_nonhomog2_2d_cg_p1/popbal_nonhomog2_2d_cg_p1.xml (+46/-0)
tests/popbal_nonhomog2_2d_cg_p1/readme (+12/-0)
tests/popbal_nonhomog2_2d_cg_p1/src/channel.geo (+16/-0)
tests/popbal_nonhomog2_2d_cg_p2/Makefile (+5/-0)
tests/popbal_nonhomog2_2d_cg_p2/popbal_nonhomog2_2d.flml (+633/-0)
tests/popbal_nonhomog2_2d_cg_p2/popbal_nonhomog2_2d_cg_p2.xml (+46/-0)
tests/popbal_nonhomog2_2d_cg_p2/readme (+12/-0)
tests/popbal_nonhomog2_2d_cg_p2/src/channel.geo (+16/-0)
tests/popbal_nonhomog2_2d_dg_p1/Makefile (+5/-0)
tests/popbal_nonhomog2_2d_dg_p1/popbal_nonhomog2_2d.flml (+630/-0)
tests/popbal_nonhomog2_2d_dg_p1/popbal_nonhomog2_2d_dg_p1.xml (+46/-0)
tests/popbal_nonhomog2_2d_dg_p1/readme (+11/-0)
tests/popbal_nonhomog2_2d_dg_p1/src/channel.geo (+16/-0)
tests/popbal_nonhomog2_2d_dg_p2/Makefile (+5/-0)
tests/popbal_nonhomog2_2d_dg_p2/popbal_nonhomog2_2d.flml (+630/-0)
tests/popbal_nonhomog2_2d_dg_p2/popbal_nonhomog2_2d_dg_p2.xml (+45/-0)
tests/popbal_nonhomog2_2d_dg_p2/readme (+11/-0)
tests/popbal_nonhomog2_2d_dg_p2/src/channel.geo (+16/-0)
tests/popbal_nonhomog2_2d_dg_p2/time_versus_norm (+20/-0)
tests/popbal_nonhomog_2d_cg_p1/Makefile (+5/-0)
tests/popbal_nonhomog_2d_cg_p1/popbal_nonhomog_2d.flml (+672/-0)
tests/popbal_nonhomog_2d_cg_p1/popbal_nonhomog_2d_cg_p1.xml (+46/-0)
tests/popbal_nonhomog_2d_cg_p1/readme (+12/-0)
tests/popbal_nonhomog_2d_cg_p1/src/channel.geo (+17/-0)
tools/Supermesh_Difference.F90 (+3/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

4223. By Gaurav Bhutani on 2013-12-12

Modified Multiphase_Diagnostics.F90 to allow particle_reynolds_number to take a scalar field for particle diameter. schemas/diagnostic_algorithms.rnc was also modified for the same reason. flml in 4 test cases in multiphase were modified as per the schema modifications.

4222. By Gaurav Bhutani on 2013-12-06

PBM: Added a sum_aggregation kernel as implemented by Abbasi et. al. (2013). Also added the population balance statistic called MeanDia10 (d_10). DQMOM.F90 and fluidity_oprions.rnc modified for the two changes.

4221. By Gaurav Bhutani on 2013-11-25

Slight change to Schiller-Naumann (1933) drag implementation - multiplied by the volume fraction of continuous phase in drag force term as done by Abbasi et. al. (2013).

4220. By Gaurav Bhutani on 2013-11-20

Added modified Schiller & Naumann (1933) interphase drag coefficient to Multiphase.F90 as implemented in ANSYS CFX. Changes made to diamond tree for the option for this new drag coefficient. Slight change in Multiphase.F90 to change defualt to default in a switch-case statement.

4219. By Gaurav Bhutani on 2013-11-15

Added saling factor to scale Sauter Mean Diameter in case of non-dimensional implementation of PBE.

4218. By Gaurav Bhutani on 2013-11-06

Added a test case for homogeneous population balance with breakage and aggregation. The analytical solution of McCoy and Madras (2003) was used to compare against the numerical results.

4217. By Gaurav Bhutani on 2013-11-05

Included a breakage kernel as used by McCoy and Madras (2003) for the daughter distribution function. Also corrected the aggregation birth term contribution into source to handle negative abscissas and their cube roots.

4216. By Gaurav Bhutani on 2013-10-31

Corrected the PD algorithm implementation in DQMOM.F90

4215. By Gaurav Bhutani on 2013-10-28

Changes to Fluids.F90 to call dqmom_calculate_moments() and dqmom_calculate_statistics inside the nonlinear loop. This updates the SauterMeanDia after every nonlinear iteration to be used in the drag force term in the momentum equation in next nonlinear iteration.

4214. By Gaurav Bhutani on 2013-10-28

Included the scalar field -- SauterMeanDia -- in the list of statistics. Modified the comparison conditions for other statistics to exact string comparison. Modified the rnc file to include the scalar field called SauterMeanDia in the list of statistics. SauterMeanDia has been added to the statistics so that it can be calculated after every non-linear iteration in Fluids.F90 and the new sauter mean diameter be used in the momentum calculations.