lp:~s-parkinson11/fluidity/SU_SUPG_stress_form_fix
- Get this branch:
- bzr branch lp:~s-parkinson11/fluidity/SU_SUPG_stress_form_fix
Branch merges
- Stephan Kramer: Approve
-
Diff: 136 lines (+58/-18)2 files modifiedassemble/Momentum_CG.F90 (+39/-17)
femtools/Diagnostic_Fields.F90 (+19/-1)
Branch information
Recent revisions
- 4031. By Samuel Parkinson
-
capitalised u in calculate_
grid_reynolds_ number to match the rest of the algorithm - 4030. By Samuel Parkinson
-
fixed calculate_
grid_reynolds_ number in the same way as stabilisations in previous commit. This algorithm involves inverting the stress tensor which cannot be done when all components of the viscosity tensor are the same - 4029. By Samuel Parkinson
-
zero off diagonal terms of viscosity tensor when calculating upwind stabilisations
- 4027. By Lawrence Mitchell
-
Fix DG momentum assembly corner case
Since r3984 we would assemble elements in DG momentum if
element_neighbour_ owned returned true. However, for some corner cases
element_neighbour_ owned need not return true if the element is owned
(consider the case of a process with one owned element). In this
situation we would not correctly assemble all elements. To fix this,
change the test for element assembly to directly check for element
ownership.At the same time, update the documentation for element_
neighbour_ owned
to note this issue. - 4026. By Christian Jacobs
-
- Updated the tephra_settling example's .flml file to use the new multiphase_
interaction schema structure.
- Corrected a small typo in the manual. - 4024. By Christian Jacobs
-
Merging compressible-
multiphase branch revisions r3955 to r4067 (inclusive) into trunk. Summary of changes:
===================- Added multiphase support for the compressible projection method (currently only for CG Pressure).
- Small changes to the logic in Momentum_
Equation. F90. Replaced the use_compressibl e_projection logical with compressible_eos which is .true. if option_ count(" /material_ phase/equation_ of_state/ compressible" ) > 0, and .false. otherwise. - Added multiphase support for the InternalEnergy equation. Note that the whole state array is now passed to solve_field_
equation_ cg. - Implemented the heat transfer term by Gunn (1978).
- Added three P2-P1 multiphase MMS tests for model verification: one without InternalEnergy fields, one with InternalEnergy fields, and one with InternalEnergy fields and heat transfer. The tests will become longtests after merging into the trunk.
- The manual now has documentation on the compressible multiphase model, including the multiphase version of the InternalEnergy equation.
- Added a diagnostic field called CompressibleCon
tinuityResidual which computes the residual of the compressible multiphase continuity equation. This is similar to the SumVelocityDive rgence field for incompressible multiphase flow which computes \sum{div(vfrac*u)}. - Added two gas-solid shock tube tests to help to validate the model: mphase_
rogue_shock_ tube_dense_ bed_glass and mphase_ rogue_shock_ tube_dense_ bed_nylon. - Added another gas-solid shock tube test (mphase_
dusty_gas_ shock_tube) which uses the setup by Miura & Glass (1982). - Implemented two new correlations for fluid-particle drag. The one by Wen & Yu (1966) can support higher Reynolds numbers (compared to the existing Stokes' law correlation). The one by Ergun (1952) can support dense flows where the volume fraction of the particle phase is greater than 0.2, like in the dense bed shock tube tests (and in the pyroclastic flow tests which will hopefully come later).
- Changed the structure of the schema. Users now explicitly select which interaction terms they wish to include, as well as the drag correlation, under "/multiphase_
interaction" in Diamond. These options are stored in the new files multiphase_ interaction. rnc and multiphase_ interaction. rng. - Added a test for the Wen & Yu (1966) drag correlation. This is similar to mphase_stokes_law.
- Added a test to check if inlet velocity boundary conditions work with the incompressible multiphase flow model.
- Added a test for the flux boundary condition.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:fluidity