- 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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
cartmesh2polarmesh.py |
2655 | 13 years ago | jemma | script for producing a .node file in spherical pol | 1.6 KB |
|
|
|
clean_mayavi_mesh.py |
3470 | 13 years ago | Timothy Bond | A patch applied in direct response to bug 780439 f | 2.6 KB |
|
|
|
create_aligned_mesh |
2287 | 13 years ago | cwilson | Some very small changes: - gmsh2triangle should g | 4.1 KB |
|
|
|
create_makefile.py |
3534 | 12 years ago | david.ham at ac | Typo in default value of --test option | 8.4 KB |
|
|
|
create_param_sweep.py |
3532 | 12 years ago | Jon Hill | New script to generate a parameter sweep based on | 7.5 KB |
|
|
|
edge_length_distribution.py |
3527 | 12 years ago | Stephan Kramer | I presume this was committed by mistake to the tru | 7 KB |
|
|
|
encode.bash |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 4.4 KB |
|
|
|
f2f90 |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 3.1 KB |
|
|
|
f90_extract_docs |
2827 | 13 years ago | dham | Fix the documentation extraction routine to know a | 28 KB |
|
|
|
fl_mayavi_animate.py |
2392 | 13 years ago | tmb1 | Changing isntances of Chris' person email address | 5.8 KB |
|
|
|
gcovifs2.py |
1339 | 14 years ago | tmb1 | Reinstating a couple of scripts needed for 'make g | 3.5 KB |
|
|
gen_square_meshes |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 2.1 KB |
|
|
|
genpvtu |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 1.2 KB |
|
|
|
gmsh2triangle |
3098 | 13 years ago | jemma | A different way of having mesh dim!=geometry dim. | 6.4 KB |
|
|
|
gmsh2triangle_large |
239 | 14 years ago | maddison | In statplot: Sort the paths into alphabetical orde | 4.8 KB |
|
|
|
gmsh2vtu |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 3.5 KB |
|
|
|
gmsh_mesh_transform |
1564 | 13 years ago | adam | A new script for applying general coordinate trans | 3.9 KB |
|
|
|
interval |
3098 | 13 years ago | jemma | A different way of having mesh dim!=geometry dim. | 4.3 KB |
|
|
|
linear_interpolation.py |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 762 bytes |
|
|
|
make_check_options |
3510 | 12 years ago | Lawrence Mitchell | Don't use hashlib module in make_{check_options,re | 1.8 KB |
|
|
|
make_diagnostic_fields |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 4.9 KB |
|
|
|
make_periodic_2D_flml |
1088 | 14 years ago | am2008 | modified | 3.8 KB |
|
|
|
make_register_diagnostics |
3510 | 12 years ago | Lawrence Mitchell | Don't use hashlib module in make_{check_options,re | 1.9 KB |
|
|
|
Makefile.in |
2392 | 13 years ago | tmb1 | Changing isntances of Chris' person email address | 1.2 KB |
|
|
|
mean_flow |
2392 | 13 years ago | tmb1 | Changing isntances of Chris' person email address | 6.1 KB |
|
|
|
memwrap |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 1.8 KB |
|
|
|
mms_tracer_error.py |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 1.5 KB |
|
|
|
nodecount.py |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 1.1 KB |
|
|
|
optimality.py |
3425.2.143 | 12 years ago | Patrick Farrell | A few fixes for Simon's optimality test. Write out | 31.8 KB |
|
|
|
options_test_options_report.sh |
1339 | 14 years ago | tmb1 | Reinstating a couple of scripts needed for 'make g | 779 bytes |
|
|
|
pbswrapper.py |
2507 | 13 years ago | tmb1 | Correction to string; this should now be working O | 505 bytes |
|
|
|
pod.py |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 1.5 KB |
|
|
|
pvtu2vtu |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 1.3 KB |
|
|
|
rename_checkpoint.py |
2356 | 13 years ago | hhiester | Update to this script needed for the new way paral | 5.9 KB |
|
|
|
runut |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 338 bytes |
|
|
|
silenteval |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 253 bytes |
|
|
|
stat2csv |
239 | 14 years ago | maddison | In statplot: Sort the paths into alphabetical orde | 3.6 KB |
|
|
|
statplot |
590 | 14 years ago | maddison | Have statplot automatically join .stat files toget | 6 KB |
|
|
|
switch_balance_pressure |
835 | 14 years ago | maddison | Script to switch BalancePressure -> GeostrophicPre | 1.7 KB |
|
|
|
transform_mesh |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 1.8 KB |
|
|
|
txtclean |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 8.2 KB |
|
|
|
update_discretisation_names.py |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 4.9 KB |
|
|
|
update_io_options.py |
1165 | 14 years ago | hhiester | here's hoping these tests will be happy now, had c | 2.4 KB |
|
|
|
update_mixing_bin_bounds_options.py |
1601 | 13 years ago | hhiester | Adding the option to set the mixing stats mixing_b | 1.5 KB |
|
|
|
update_options |
2948 | 13 years ago | jemma | fixes for the diamond_validation test from James, | 2.7 KB |
|
|
|
vtudecomp |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 1.6 KB |
|
|
|
vtudiff |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 2.9 KB |
|
|
|
watchpbs.py |
3469 | 13 years ago | Patrick Farrell | A long-standing spelling mistake (that has never b | 3.8 KB |
|
|
|
whendiditbreak.py |
1 | 14 years ago | hhiester | deleting initialisation as none of tools are used | 3.5 KB |
|
|