- 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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
adaptivity_options.rnc |
3405.4.32 | 12 years ago | Paul Woodhams | Switch the default final partitioner to ParMETIS. | 84.3 KB |
|
|
|
adaptivity_options.rng |
3405.4.32 | 12 years ago | Paul Woodhams | Switch the default final partitioner to ParMETIS. | 101 KB |
|
|
|
adjoint_options.rnc |
3425.2.168 | 12 years ago | Patrick Farrell | Implement David's suggestions during the code revi | 10.1 KB |
|
|
|
adjoint_options.rng |
3425.2.168 | 12 years ago | Patrick Farrell | Implement David's suggestions during the code revi | 12.1 KB |
|
|
|
burgers_equation.rnc |
3120 | 13 years ago | sf1409 | adjoint/Adjoint_Functional_Evaluation.F90 and main | 9.5 KB |
|
|
|
burgers_equation.rng |
3120 | 13 years ago | sf1409 | adjoint/Adjoint_Functional_Evaluation.F90 and main | 13.6 KB |
|
|
|
diagnostic_algorithms.rnc |
3408.1.152 | 12 years ago | Christian Jacobs | The bulk_density diagnostic algorithm computes Pha | 46.1 KB |
|
|
|
diagnostic_algorithms.rng |
3408.1.152 | 12 years ago | Christian Jacobs | The bulk_density diagnostic algorithm computes Pha | 71.2 KB |
|
|
|
embedded_models.rnc |
3229 | 13 years ago | btollit | Include an embedded_models element in the schema a | 175 bytes |
|
|
|
embedded_models.rng |
3229 | 13 years ago | btollit | Include an embedded_models element in the schema a | 456 bytes |
|
|
|
flredecomp.rnc |
3574.1.8 | 12 years ago | Paul Woodhams | Tidying up the flredecomp option descriptions. | 3.5 KB |
|
|
|
flredecomp.rng |
3574.1.8 | 12 years ago | Paul Woodhams | Tidying up the flredecomp option descriptions. | 4.3 KB |
|
|
|
fluidity_options.rnc |
3462.1.86 | 12 years ago | Michael Lange | Merge from trunk | 263 KB |
|
|
|
fluidity_options.rng |
3462.1.86 | 12 years ago | Michael Lange | Merge from trunk | 343 KB |
|
|
|
input_output.rnc |
3541 | 12 years ago | Rhodri Nelson | Updating the NetCDF reader so that it can handle f | 18.5 KB |
|
|
|
input_output.rng |
3541 | 12 years ago | Rhodri Nelson | Updating the NetCDF reader so that it can handle f | 24.2 KB |
|
|
|
mesh_options.rnc |
3425.19.62 | 12 years ago | Colin Cotter | Make hybridized_helmholtz build when shallow_water | 9.7 KB |
|
|
|
mesh_options.rng |
3425.19.62 | 12 years ago | Colin Cotter | Make hybridized_helmholtz build when shallow_water | 14.4 KB |
|
|
|
multiphase.rnc |
3457 | 13 years ago | Jon Saunders | Adding structures to the multiphase schema to enab | 118 KB |
|
|
|
multiphase.rng |
3457 | 13 years ago | Jon Saunders | Adding structures to the multiphase schema to enab | 148 KB |
|
|
|
optimality.rnc |
3425.2.134 | 12 years ago | Patrick Farrell | Add a NULL optimisation algorithm which does no op | 7.2 KB |
|
|
|
optimality.rng |
3425.2.134 | 12 years ago | Patrick Farrell | Add a NULL optimisation algorithm which does no op | 8.8 KB |
|
|
|
physical_parameters.rnc |
2249 | 13 years ago | tmb1 | Adding a new schemas/ directory following discussi | 3.8 KB |
|
|
|
physical_parameters.rng |
2249 | 13 years ago | tmb1 | Adding a new schemas/ directory following discussi | 4.6 KB |
|
|
|
prescribed_field_options.rnc |
2249 | 13 years ago | tmb1 | Adding a new schemas/ directory following discussi | 5.1 KB |
|
|
|
prescribed_field_options.rng |
2249 | 13 years ago | tmb1 | Adding a new schemas/ directory following discussi | 6.9 KB |
|
|
|
prognostic_field_options.rnc |
3408.1.158 | 12 years ago | Christian Jacobs | Corrected a typo under stress_terms in the schema. | 84.9 KB |
|
|
|
prognostic_field_options.rng |
3408.1.158 | 12 years ago | Christian Jacobs | Corrected a typo under stress_terms in the schema. | 100 KB |
|
|
|
radiation.rnc |
3408 | 13 years ago | Brendan Tollit | Include in the radiation diffusion model a general | 37 KB |
|
|
|
radiation.rng |
3408 | 13 years ago | Brendan Tollit | Include in the radiation diffusion model a general | 49.4 KB |
|
|
|
reduced_model.rnc |
2249 | 13 years ago | tmb1 | Adding a new schemas/ directory following discussi | 799 bytes |
|
|
|
reduced_model.rng |
2249 | 13 years ago | tmb1 | Adding a new schemas/ directory following discussi | 1.2 KB |
|
|
|
shallow_water_options.rnc |
3425.19.64 | 12 years ago | Colin Cotter | Retired trace_space test as it is superceded by th | 191 KB |
|
|
|
shallow_water_options.rng |
3425.19.64 | 12 years ago | Colin Cotter | Retired trace_space test as it is superceded by th | 240 KB |
|
|
|
solvers.rnc |
2249 | 13 years ago | tmb1 | Adding a new schemas/ directory following discussi | 17.2 KB |
|
|
|
solvers.rng |
2249 | 13 years ago | tmb1 | Adding a new schemas/ directory following discussi | 21.8 KB |
|
|
|
spatial_discretisation.rnc |
3059 | 13 years ago | btollit | Break the spatial discretisation options up into m | 26.9 KB |
|
|
|
spatial_discretisation.rng |
3059 | 13 years ago | btollit | Break the spatial discretisation options up into m | 31.4 KB |
|
|
|
stabilisation.rnc |
2482 | 13 years ago | cwilson | Removing the replaces attributes from all schemas | 4.4 KB |
|
|
|
stabilisation.rng |
2482 | 13 years ago | cwilson | Removing the replaces attributes from all schemas | 6.2 KB |
|
|
|
temporal_discretisation.rnc |
2482 | 13 years ago | cwilson | Removing the replaces attributes from all schemas | 3.8 KB |
|
|
|
temporal_discretisation.rng |
2482 | 13 years ago | cwilson | Removing the replaces attributes from all schemas | 4.7 KB |
|
|
|
test_advection_diffusion_options.rnc |
2541 | 13 years ago | cwilson | No idea why this schema even has a legacy_stress_f | 287 KB |
|
|
|
test_advection_diffusion_options.rng |
2541 | 13 years ago | cwilson | No idea why this schema even has a legacy_stress_f | 354 KB |
|
|
|
test_coupler.rnc |
3434 | 13 years ago | Simon Mouradian | Updates to the test_coupler code .cml files. Test | 7.5 KB |
|
|
|
test_coupler.rng |
3434 | 13 years ago | Simon Mouradian | Updates to the test_coupler code .cml files. Test | 11.3 KB |
|
|
|
test_options.rnc |
2249 | 13 years ago | tmb1 | Adding a new schemas/ directory following discussi | 1.4 KB |
|
|
|
test_options.rng |
2249 | 13 years ago | tmb1 | Adding a new schemas/ directory following discussi | 3 KB |
|
|
|
visualise_elements.rnc |
2482 | 13 years ago | cwilson | Removing the replaces attributes from all schemas | 10 KB |
|
|
|
visualise_elements.rng |
2482 | 13 years ago | cwilson | Removing the replaces attributes from all schemas | 14.6 KB |
|
|