- 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 | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
adjoint
|
2889 | 13 years ago | cjc1 | merged in from shallow_water_sphere_linear_branch |
|
||
|
assemble
|
1539 | 13 years ago | sf1409 | revert accidentily commited changes. |
|
||
|
bathymetry
|
1073 | 14 years ago | rbn00 | Added the following functionalities: 1) Added a -s |
|
||
|
bin
|
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used |
|
||
|
climatology
|
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used |
|
||
|
debian
|
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used |
|
||
|
debug
|
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used |
|
||
|
diagnostics
|
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used |
|
||
|
error_measures
|
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used |
|
||
|
examples
|
1597 | 13 years ago | cwilson | Setting up an examples directory with the beginnin |
|
||
|
femtools
|
1539 | 13 years ago | sf1409 | revert accidentily commited changes. |
|
||
|
fldecomp
|
1559 | 13 years ago | acreech | Added GMSH support to fldecomp (EXPERIMENTAL) |
|
||
|
forward_interfaces
|
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used |
|
||
|
horizontal_adaptivity
|
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used |
|
||
|
hyperlight
|
2290 | 13 years ago | ml805 | Adding Hyperlight to configure. This is non-free t |
|
||
|
include
|
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used |
|
||
|
legacy_reservoir_prototype
|
3208 | 13 years ago | saunde01 | As discussed in the Dev meeting and in emails, thi |
|
||
|
libadaptivity
|
3393 | 13 years ago | Timothy Bond | Following the move from svn to bzr we change the n |
|
||
|
libalgencan
|
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used |
|
||
|
libjudy
|
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used |
|
||
|
libmba2d
|
3393 | 13 years ago | Timothy Bond | Following the move from svn to bzr we change the n |
|
||
|
libmba3d
|
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used |
|
||
|
libspud
|
3393 | 13 years ago | Timothy Bond | Following the move from svn to bzr we change the n |
|
||
|
libvtkfortran
|
3393 | 13 years ago | Timothy Bond | Following the move from svn to bzr we change the n |
|
||
|
libwm
|
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used |
|
||
|
main
|
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used |
|
||
|
manual
|
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used |
|
||
|
mayavi
|
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used |
|
||
|
ocean_forcing
|
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used |
|
||
|
parameterisation
|
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used |
|
||
|
preprocessor
|
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used |
|
||
|
python
|
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used |
|
||
|
qg_strat
|
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used |
|
||
|
radiation
|
3064 | 13 years ago | btollit | Add radiation and radiation/tests directories with |
|
||
|
reduced_modelling
|
238 | 14 years ago | fangf | add a new folder reduced_modelling |
|
||
|
schemas
|
2249 | 13 years ago | tmb1 | Adding a new schemas/ directory following discussi |
|
||
|
scripts
|
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used |
|
||
|
sediments
|
1984 | 13 years ago | jhill1 | Changes needed to add in sediment re-entrainment: |
|
||
|
spatialindex-1.5
|
1539 | 13 years ago | sf1409 | revert accidentily commited changes. |
|
||
|
tests
|
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used |
|
||
|
tools
|
1539 | 13 years ago | sf1409 | revert accidentily commited changes. |
|
||
.bzrignore |
3407 | 13 years ago | Jonathan Bull | Committed 2 sub-directories by accident. Removing | 109 bytes |
|
|
|
aclocal.m4 |
3425.2.65 | 13 years ago | Patrick Farrell | Turn on the adjoint by default, but if the user do | 32.2 KB |
|
|
|
acx_blas.m4 |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 7 KB |
|
|
|
acx_lapack.m4 |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 4.1 KB |
|
|
|
AUTHORS |
3410 | 13 years ago | Christian Jacobs | - Made a right hash of things again. Multiplied th | 1.3 KB |
|
|
config.guess |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 43.5 KB |
|
|
|
config.sub |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 31.9 KB |
|
|
|
configure |
3577.1.2 | 12 years ago | Jon Hill | Removed hector XT4 from configure as it no longer | 445 KB |
|
|
|
configure.in |
3577.1.2 | 12 years ago | Jon Hill | Removed hector XT4 from configure as it no longer | 44.7 KB |
|
|
|
INSTALL |
2575 | 13 years ago | pef | Some more tweaking commits | 735 bytes |
|
|
|
install-sh |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 5.4 KB |
|
|
|
LICENSE |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 25.3 KB |
|
|
|
main.cpp |
3578.1.2 | 12 years ago | Lawrence Mitchell | Introduce command line option to print timing prof | 2.7 KB |
|
|
|
Makefile.in |
3577.1.5 | 12 years ago | Jon Hill | No modifications to libspud needed.... | 17.8 KB |
|
|
|
petsc_makefile |
1056 | 14 years ago | skramer | Fluidity builds with petsc 3.1. Complete rewrite o | 383 bytes |
|
|
|
README |
2573 | 13 years ago | Patrick Farrell | Another minor change to test the reviewboard integ | 695 bytes |
|
|
|
VERSION |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 5 bytes |
|
|