Fluidity

Merge lp://staging/~ctjacobs-multiphase/fluidity/ctjacobs-multiphase into lp://staging/fluidity

  1. ctjacobs-multiphase
  2. Merge into dev-trunk
Proposed by Christian Jacobs
Status: Merged
Approved by: Christian Jacobs
Approved revision: 3568
Merged at revision: 3594
Proposed branch: lp://staging/~ctjacobs-multiphase/fluidity/ctjacobs-multiphase
Merge into: lp://staging/fluidity
Diff against target: 1466 lines (+514/-130)
23 files modified
assemble/Divergence_Matrix_CG.F90 (+22/-1)
assemble/Divergence_Matrix_CV.F90 (+116/-17)
assemble/Makefile.dependencies (+1/-1)
assemble/Momentum_CG.F90 (+30/-6)
assemble/Momentum_Equation.F90 (+23/-1)
assemble/Multimaterials.F90 (+16/-12)
assemble/Multiphase.F90 (+1/-1)
diagnostics/Multiphase_Diagnostics.F90 (+65/-14)
manual/configuring_fluidity.tex (+2/-1)
manual/model_equations.tex (+6/-6)
preprocessor/Populate_State.F90 (+1/-1)
schemas/diagnostic_algorithms.rnc (+13/-2)
schemas/diagnostic_algorithms.rng (+18/-2)
schemas/prognostic_field_options.rnc (+1/-1)
schemas/prognostic_field_options.rng (+1/-1)
tests/mphase_sedimentation_1d/Makefile (+1/-1)
tests/mphase_sedimentation_1d/mphase_sedimentation_1d.flml (+47/-11)
tests/mphase_sedimentation_1d/mphase_sedimentation_1d.xml (+23/-9)
tests/mphase_sedimentation_2d/Makefile (+3/-3)
tests/mphase_sedimentation_2d/mphase_sedimentation_2d.flml (+2/-2)
tests/mphase_sedimentation_2d/mphase_sedimentation_2d.xml (+11/-11)
tests/mphase_tephra_settling/mphase_tephra_settling.flml (+67/-17)
tests/mphase_tephra_settling/mphase_tephra_settling.xml (+44/-9)
To merge this branch: bzr merge lp://staging/~ctjacobs-multiphase/fluidity/ctjacobs-multiphase
Reviewer Review Type Date Requested Status
Cian Wilson Approve
Stephan Kramer Approve
Review via email: mp+76449@code.staging.launchpad.net

Description of the change

Proposing merge of ctjacobs-multiphase branch revisions r3533 to 3556 (inclusive) into trunk.

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.

- 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.

To post a comment you must log in.
lp://staging/~ctjacobs-multiphase/fluidity/ctjacobs-multiphase updated
3557. By Christian Jacobs

Updated manual/model_equations.tex to give the single continuity equation we use.

Revision history for this message
Stephan Kramer (s-kramer) wrote :

Great stuff

review: Approve
Revision history for this message
Cian Wilson (cwilson) wrote :

Hi Christian,

Sorry for the delay.

I have a couple of quick questions/points:
1. I don't understand the bulk_density diagnostic algorithm. What are you trying to do here?
2. In the manual I'm not convinced that equations 2.55 and 2.56 are actually what we're solving. There appear to be densities floating around in derivatives that we don't include (in incompressible at least).

Cheers,
Cian

review: Needs Information
lp://staging/~ctjacobs-multiphase/fluidity/ctjacobs-multiphase updated
3558. By Christian Jacobs

Merging trunk revisions (from r3584 to r3592 inclusive) into branch.

3559. By Christian Jacobs

Corrected the multiphase flow model equations in the manual.

3560. By Christian Jacobs

The bulk_density diagnostic algorithm computes PhaseVolumeFraction*Density, whereas the definition of bulk density in the context of multi-material simulations is \sum{MaterialVolumeFraction * material density from EoS}.

Renamed the bulk_density algorithm to apparent_density to avoid confusion, and updated the tests accordingly.

3561. By Christian Jacobs

Calculating the apparent density node-wise. Not sure if this is right though.

3562. By Christian Jacobs

We now correctly calculate the apparent density node-wise. Thanks to Cian for his help with this.

3563. By Christian Jacobs

Placing the ApparentDensity field on a P2 mesh, and placing the Density fields on a P1 mesh.

3564. By Christian Jacobs

If we are running a multiphase flow simulation, the stress term can only be in tensor form and viscosity must be isotropic. Added an options check to check this.

3565. By Christian Jacobs

- Added another limitation of the multiphase flow model to the manual: "The stress term must be in tensor form, and only works with an isotropic viscosity."

- Changed the stress term to tensor form in the multiphase flow model equations.

3566. By Christian Jacobs

Corrected a typo under stress_terms in the schema.

3567. By Christian Jacobs

Removing unnecessary \cdot's from the multiphase flow model equations.

Revision history for this message
Christian Jacobs (ctjacobs) wrote :

After clarifying a few things with Cian, improvements have now been committed to the branch which will also be included in the merge (r3559 to r3567 inclusive).

Revision history for this message
Cian Wilson (cwilson) wrote :

Looks good to me, pending a green light on the branch from buildbot with all the latest changes included.

review: Approve
lp://staging/~ctjacobs-multiphase/fluidity/ctjacobs-multiphase updated
3568. By Christian Jacobs

Merging trunk revision r3593 into branch.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.