- Committer: Christian Jacobs
- Date: 2011-09-29 22:38:40 UTC
- mfrom: (3408.1.160 ctjacobs-multiphase)
- Revision ID: c.jacobs10@imperial.ac.uk-20110929223840-yiwz4nt5hfuraqey
Merging ctjacobs-multiphase branch revisions (from r3533 to r3568 inclusive) into trunk. Branch queue passes all unit, short and medium tests on buildbot.
Summary of changes:
===================
- Added multiphase support to the CV discretisation of the Pressure field. A multiphase MMS longtest for the P0-P1CV element pair has been added and shows first order convergence for Velocity and Pressure.
- When checking the field_bc_type in assemble_divergence_matrix_cv, we now compare against the more meaningful integer parameters BC_TYPE_WEAKDIRICHLET (=1), BC_TYPE_NO_NORMAL_FLOW (=2), etc.
- In Momentum_CG.F90: Using dnvfrac_t instead of du_t if PhaseVolumeFraction and Velocity are on different meshes.
In Divergence_Matrix_CG.F90: Using dnvfrac_t instead of dfield_t if nvfrac and field are on different meshes.
- A few minor changes to multiphase test cases and the manual.
- Added a multiphase diagnostic algorithm called apparent_density, which computes Density*PhaseVolumeFraction.
- Bug fix: The logical 'prognostic_velocity' was assigned a value of .true. regardless of whether the Velocity field was prognostic, prescribed or aliased. Now fixed.
- Bug fix for lp:854398: In Multimaterials.F90, we now only count the number of diagnostic MaterialVolumeFraction fields in the submaterials array instead of the entire state array.
- Bug fix for the particle_reynolds_number diagnostic algorithm: Including the continuous phase's PhaseVolumeFraction and using the magnitude of the relative velocity. Also updated the related comments in the schema.
Summary of changes:
===================
- Added multiphase support to the CV discretisation of the Pressure field. A multiphase MMS longtest for the P0-P1CV element pair has been added and shows first order convergence for Velocity and Pressure.
- When checking the field_bc_type in assemble_divergence_matrix_cv, we now compare against the more meaningful integer parameters BC_TYPE_WEAKDIRICHLET (=1), BC_TYPE_NO_NORMAL_FLOW (=2), etc.
- In Momentum_CG.F90: Using dnvfrac_t instead of du_t if PhaseVolumeFraction and Velocity are on different meshes.
In Divergence_Matrix_CG.F90: Using dnvfrac_t instead of dfield_t if nvfrac and field are on different meshes.
- A few minor changes to multiphase test cases and the manual.
- Added a multiphase diagnostic algorithm called apparent_density, which computes Density*PhaseVolumeFraction.
- Bug fix: The logical 'prognostic_velocity' was assigned a value of .true. regardless of whether the Velocity field was prognostic, prescribed or aliased. Now fixed.
- Bug fix for lp:854398: In Multimaterials.F90, we now only count the number of diagnostic MaterialVolumeFraction fields in the submaterials array instead of the entire state array.
- Bug fix for the particle_reynolds_number diagnostic algorithm: Including the continuous phase's PhaseVolumeFraction and using the magnitude of the relative velocity. Also updated the related comments in the schema.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
Makefile.dependencies |
3530.1.4 | 12 years ago | david.ham at ac | cause the dependencies to be sorted. This hopefull | 928 bytes |
|
|
Makefile.in |
3540.1.1 | 12 years ago | Jon Hill | Fix for the ext3 bug. libfluidity now built by the | 1.6 KB |
|
|
|
Sediment.F90 |
3301 | 13 years ago | jhill1 | Fixes to the option mangling in sediments | 16.5 KB |
|
|
|
Sediment_Diagnostics.F90 |
3273 | 13 years ago | jhill1 | Change to how sediment fields are constructed from | 8.6 KB |
|
|