lp:~ctjacobs-multiphase/fluidity/compressible-multiphase
- Get this branch:
- bzr branch lp:~ctjacobs-multiphase/fluidity/compressible-multiphase
Branch merges
- Stephan Kramer: Approve
-
Diff: 22932 lines (+21540/-246)66 files modifiedassemble/Advection_Diffusion_CG.F90 (+41/-28)
assemble/Compressible_Projection.F90 (+1/-1)
assemble/Divergence_Matrix_CG.F90 (+1/-1)
assemble/Divergence_Matrix_CV.F90 (+15/-3)
assemble/Field_Equations_CV.F90 (+182/-85)
assemble/Makefile.dependencies (+3/-2)
assemble/Momentum_Equation.F90 (+12/-1)
main/Fluids.F90 (+1/-2)
manual/bibliography.bib (+11/-0)
manual/configuring_fluidity.tex (+9/-3)
manual/examples.tex (+17/-10)
manual/model_equations.tex (+3/-3)
schemas/prognostic_field_options.rnc (+3/-5)
schemas/prognostic_field_options.rng (+3/-5)
tests/mphase_dusty_gas_shock_tube/mphase_dusty_gas_shock_tube.flml (+5/-5)
tests/mphase_dusty_gas_shock_tube/single_phase_frozen_flow_test.flml (+5/-5)
tests/mphase_mms_p2p1_compressible_ie_heat_flux/MMS_X.flml (+1296/-0)
tests/mphase_mms_p2p1_compressible_ie_heat_flux/Makefile (+8/-0)
tests/mphase_mms_p2p1_compressible_ie_heat_flux/README (+25/-0)
tests/mphase_mms_p2p1_compressible_ie_heat_flux/copy_script (+23/-0)
tests/mphase_mms_p2p1_compressible_ie_heat_flux/function_printer.py (+40/-0)
tests/mphase_mms_p2p1_compressible_ie_heat_flux/mphase_mms_p2p1_compressible_ie.py (+141/-0)
tests/mphase_mms_p2p1_compressible_ie_heat_flux/mphase_mms_p2p1_compressible_ie.sage (+138/-0)
tests/mphase_mms_p2p1_compressible_ie_heat_flux/mphase_mms_p2p1_compressible_ie_tools.py (+68/-0)
tests/mphase_mms_p2p1_compressible_ie_heat_flux/src/MMS_A.geo (+15/-0)
tests/mphase_mms_p2p1_compressible_ie_heat_flux/src/MMS_B.geo (+15/-0)
tests/mphase_mms_p2p1_compressible_ie_heat_flux/src/MMS_C.geo (+15/-0)
tests/mphase_mms_p2p1_compressible_ie_heat_flux/src/MMS_X.geo (+18/-0)
tests/mphase_mms_p2p1_compressible_ie_p1cv/MMS_X.flml (+1235/-0)
tests/mphase_mms_p2p1_compressible_ie_p1cv/Makefile (+8/-0)
tests/mphase_mms_p2p1_compressible_ie_p1cv/copy_script (+23/-0)
tests/mphase_mms_p2p1_compressible_ie_p1cv/mphase_mms_p2p1_compressible_ie_p1cv.sage (+156/-0)
tests/mphase_mms_p2p1_compressible_ie_p1cv/mphase_mms_p2p1_compressible_ie_p1cv.xml (+142/-0)
tests/mphase_mms_p2p1_compressible_ie_p1cv/mphase_mms_p2p1_compressible_ie_p1cv_tools.py (+68/-0)
tests/mphase_mms_p2p1_compressible_ie_p1cv/src/MMS_A.geo (+15/-0)
tests/mphase_mms_p2p1_compressible_ie_p1cv/src/MMS_B.geo (+15/-0)
tests/mphase_mms_p2p1_compressible_ie_p1cv/src/MMS_C.geo (+15/-0)
tests/mphase_mms_p2p1_compressible_ie_p1cv/src/MMS_X.geo (+18/-0)
tests/mphase_mms_p2p1_compressible_ie_p1cv_heat_transfer/MMS_X.flml (+1216/-0)
tests/mphase_mms_p2p1_compressible_ie_p1cv_heat_transfer/Makefile (+8/-0)
tests/mphase_mms_p2p1_compressible_ie_p1cv_heat_transfer/copy_script (+23/-0)
tests/mphase_mms_p2p1_compressible_ie_p1cv_heat_transfer/mphase_mms_p2p1_compressible_ie_p1cv_heat_transfer.sage (+146/-0)
tests/mphase_mms_p2p1_compressible_ie_p1cv_heat_transfer/mphase_mms_p2p1_compressible_ie_p1cv_heat_transfer.xml (+142/-0)
tests/mphase_mms_p2p1_compressible_ie_p1cv_heat_transfer/mphase_mms_p2p1_compressible_ie_p1cv_heat_transfer_tools.py (+68/-0)
tests/mphase_mms_p2p1_compressible_ie_p1cv_heat_transfer/src/MMS_A.geo (+15/-0)
tests/mphase_mms_p2p1_compressible_ie_p1cv_heat_transfer/src/MMS_B.geo (+15/-0)
tests/mphase_mms_p2p1_compressible_ie_p1cv_heat_transfer/src/MMS_C.geo (+15/-0)
tests/mphase_mms_p2p1_compressible_ie_p1cv_heat_transfer/src/MMS_X.geo (+18/-0)
tests/mphase_mms_p2p1_stress_form/Makefile (+1/-1)
tests/mphase_mms_p2p1_vfrac/MMS_X.flml (+1065/-0)
tests/mphase_mms_p2p1_vfrac/Makefile (+8/-0)
tests/mphase_mms_p2p1_vfrac/copy_script (+23/-0)
tests/mphase_mms_p2p1_vfrac/mphase_mms_p2p1_vfrac.sage (+124/-0)
tests/mphase_mms_p2p1_vfrac/mphase_mms_p2p1_vfrac.xml (+134/-0)
tests/mphase_mms_p2p1_vfrac/mphase_mms_p2p1_vfrac_tools.py (+59/-0)
tests/mphase_mms_p2p1_vfrac/src/MMS_A.geo (+15/-0)
tests/mphase_mms_p2p1_vfrac/src/MMS_B.geo (+15/-0)
tests/mphase_mms_p2p1_vfrac/src/MMS_C.geo (+15/-0)
tests/mphase_mms_p2p1_vfrac/src/MMS_X.geo (+18/-0)
tests/mphase_rogue_shock_tube_dense_bed_glass/mphase_rogue_shock_tube_dense_bed_glass.flml (+58/-40)
tests/mphase_rogue_shock_tube_dense_bed_glass/mphase_rogue_shock_tube_dense_bed_glass.xml (+1/-1)
tests/mphase_rogue_shock_tube_dense_bed_glass/src/mphase_rogue_shock_tube_dense_bed_glass.msh (+7183/-0)
tests/mphase_rogue_shock_tube_dense_bed_nylon/get_cloud_front.py (+100/-0)
tests/mphase_rogue_shock_tube_dense_bed_nylon/mphase_rogue_shock_tube_dense_bed_nylon.flml (+62/-44)
tests/mphase_rogue_shock_tube_dense_bed_nylon/mphase_rogue_shock_tube_dense_bed_nylon.xml (+1/-1)
tests/mphase_rogue_shock_tube_dense_bed_nylon/src/mphase_rogue_shock_tube_dense_bed_nylon.msh (+7183/-0)
Branch information
Recent revisions
- 4129. By Christian Jacobs
-
Bug fix: there should be brackets surrounding the material_phase index in this options check.
- 4127. By Christian Jacobs
-
The code now includes the p*div(u) term based on the compressible logical only. The include_
pressure_ term option has been removed. - 4124. By Christian Jacobs
-
Added a Python script to track the position of the lower and upper front of the 2 cm particle bed in the mphase_
rogue_shock_ tube_dense_ bed_nylon simulation. The upper front is defined as the position where the particle PhaseVolumeFraction reaches 0.3 (approximately the same value used in the article by Rogue et al. (1998)). For the lower front, a PhaseVolumeFraction value of 0.01 is used since this area is more dilute in comparison to the upper front.
Fluidity's results do not match well with the experimental data, probably because the mesh has been kept quite coarse. Furthermore, Rogue et al. (1998) point out that "the important dilution of the cloud in the lower front area makes the comparison with the experimental position quite ambiguous", so the numerical results should be viewed with caution: http://
amcg.ese. ic.ac.uk/ ~ctj10/ images/ fronts. png - 4122. By Christian Jacobs
-
Added an MMS test to check the implementation of the heat transfer term by Gunn (1978). This will be moved to the longtests directory once the compressible-
multiphase branch is merged with the trunk.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:fluidity