MultiFluids_Dev : Code : Fluidity

Get this branch:: bzr branch lp:~fluidity-core/fluidity/MultiFluids_Dev

Members of Fluidity Core Team can upload to this branch. Log in for directions.

Branch merges

No branches dependent on this one.

Merged into lp:~fluidity-core/fluidity/MultiFluids at revision 3616

Dimitrios Pavlidis: Approve on 2013-02-18

Diff: 78288 lines (+58618/-16492)

115 files modified

configure (+97/-101)
femtools/Solvers.F90 (+1/-1)
legacy_reservoir_prototype/Makefile.in (+22/-15)
legacy_reservoir_prototype/doc/model_description.tex (+85/-1)
legacy_reservoir_prototype/src/Copy_Into_State.F90 (+397/-0)
legacy_reservoir_prototype/src/Copy_Outof_Into_State.F90 (+0/-1994)
legacy_reservoir_prototype/src/Extract_From_State.F90 (+1784/-0)
legacy_reservoir_prototype/src/Mapping_OCVFEM_DG.F90 (+209/-20)
legacy_reservoir_prototype/src/Multi_MakeCVTetrahedra.F90 (+60/-58)
legacy_reservoir_prototype/src/Multiphase_Mom_Press_Volf.F90 (+0/-914)
legacy_reservoir_prototype/src/Multiphase_Prototype.F90 (+0/-458)
legacy_reservoir_prototype/src/Multiphase_Prototype_Wrapper.F90 (+8/-4)
legacy_reservoir_prototype/src/Multiphase_TimeLoop.F90 (+1574/-0)
legacy_reservoir_prototype/src/OutOfState_2_Adapt.F90 (+49/-0)
legacy_reservoir_prototype/src/cv-adv-dif.F90 (+9854/-6705)
legacy_reservoir_prototype/src/multi_IO.F90 (+167/-0)
legacy_reservoir_prototype/src/multi_compositional.F90 (+799/-755)
legacy_reservoir_prototype/src/multi_dyncore_dg.F90 (+6313/-3281)
legacy_reservoir_prototype/src/multi_eos.F90 (+889/-197)
legacy_reservoir_prototype/src/multi_matrix_operations.F90 (+84/-52)
legacy_reservoir_prototype/src/multi_shape_fct.F90 (+459/-446)
legacy_reservoir_prototype/src/multi_shape_fct_ND.F90 (+6679/-778)
legacy_reservoir_prototype/src/multi_solvers.F90 (+415/-43)
legacy_reservoir_prototype/src/multi_sparsity.F90 (+600/-399)
legacy_reservoir_prototype/tests/Advection_Bubble_2D_P1DGP1DG/Advection_Bubble_2D.mpml (+721/-0)
legacy_reservoir_prototype/tests/Advection_Bubble_2D_P1DGP1DG/Makefile (+16/-0)
legacy_reservoir_prototype/tests/Advection_Bubble_2D_P1DGP1DG/src/2d_mesh.geo (+17/-0)
legacy_reservoir_prototype/tests/Advection_Bubble_2D_P1DGP2/Advection_Bubble_2D.mpml (+721/-0)
legacy_reservoir_prototype/tests/Advection_Bubble_2D_P1DGP2/Makefile (+16/-0)
legacy_reservoir_prototype/tests/Advection_Bubble_2D_P1DGP2/src/2d_mesh.geo (+17/-0)
legacy_reservoir_prototype/tests/Advection_DomeHat_2D/Advection_DomeHat_2D.mpml (+1146/-0)
legacy_reservoir_prototype/tests/Advection_DomeHat_2D/Makefile (+16/-0)
legacy_reservoir_prototype/tests/Advection_DomeHat_2D/src/2d_mesh.geo (+17/-0)
legacy_reservoir_prototype/tests/Advection_DomeHat_2D_SinglePhase/Advection_DomeHat_2D.mpml (+687/-0)
legacy_reservoir_prototype/tests/Advection_DomeHat_2D_SinglePhase/Makefile (+16/-0)
legacy_reservoir_prototype/tests/Advection_DomeHat_2D_SinglePhase/src/2d_mesh.geo (+17/-0)
legacy_reservoir_prototype/tests/Advection_SinglePhase_Adaptive/Advection_SinglePhase_Adaptive.mpml (+744/-0)
legacy_reservoir_prototype/tests/Advection_SinglePhase_Adaptive/Makefile (+16/-0)
legacy_reservoir_prototype/tests/Advection_SinglePhase_Adaptive/src/2d_mesh.geo (+17/-0)
legacy_reservoir_prototype/tests/BL_1d/BL_1d_A.mpml (+43/-229)
legacy_reservoir_prototype/tests/BL_2d_compressible_cylinder_P1DGP1/BL_2d_compressible.mpml (+889/-0)
legacy_reservoir_prototype/tests/BL_2d_compressible_cylinder_P1DGP1/Makefile (+16/-0)
legacy_reservoir_prototype/tests/BL_2d_compressible_cylinder_P1DGP1/src/2d_mesh.geo (+31/-0)
legacy_reservoir_prototype/tests/BL_3d_unstructured_P1DGP1/BL_3d.mpml (+868/-0)
legacy_reservoir_prototype/tests/BL_3d_unstructured_P1DGP1/Makefile (+16/-0)
legacy_reservoir_prototype/tests/BL_3d_unstructured_P1DGP1/src/3d_mesh.geo (+20/-0)
legacy_reservoir_prototype/tests/BL_3d_unstructured_P1DGP2/BL_3d.mpml (+867/-0)
legacy_reservoir_prototype/tests/BL_3d_unstructured_P1DGP2/Makefile (+17/-0)
legacy_reservoir_prototype/tests/BL_3d_unstructured_P1DGP2/src/3d_mesh.geo (+20/-0)
legacy_reservoir_prototype/tests/BL_3d_unstructured_P1DGP2DG/BL_3d.mpml (+882/-0)
legacy_reservoir_prototype/tests/BL_3d_unstructured_P1DGP2DG/Makefile (+17/-0)
legacy_reservoir_prototype/tests/BL_3d_unstructured_P1DGP2DG/src/3d_mesh.geo (+20/-0)
legacy_reservoir_prototype/tests/BL_test_10elements_2d/BL_test_10elements_2d.mpml (+101/-22)
legacy_reservoir_prototype/tests/BL_test_10elements_2d/src/2d_mesh.geo (+2/-2)
legacy_reservoir_prototype/tests/BL_test_10elements_2d_P1DGP1DG/BL_test_10elements_2d.mpml (+768/-0)
legacy_reservoir_prototype/tests/BL_test_10elements_2d_P1DGP1DG/Makefile (+16/-0)
legacy_reservoir_prototype/tests/BL_test_10elements_2d_P1DGP1DG/src/2d_mesh.geo (+11/-0)
legacy_reservoir_prototype/tests/BL_test_10elements_2d_P1DGP2/BL_test_10elements_2d.mpml (+795/-0)
legacy_reservoir_prototype/tests/BL_test_10elements_2d_P1DGP2/Makefile (+16/-0)
legacy_reservoir_prototype/tests/BL_test_10elements_2d_P1DGP2/src/2d_mesh.geo (+11/-0)
legacy_reservoir_prototype/tests/BL_test_10elements_2d_P1DGP2DG/BL_test_10elements_2d.mpml (+768/-0)
legacy_reservoir_prototype/tests/BL_test_10elements_2d_P1DGP2DG/Makefile (+16/-0)
legacy_reservoir_prototype/tests/BL_test_10elements_2d_P1DGP2DG/src/2d_mesh.geo (+11/-0)
legacy_reservoir_prototype/tests/BL_test_10elements_2d_unstructured/BL_test_10elements_2d.mpml (+798/-0)
legacy_reservoir_prototype/tests/BL_test_10elements_2d_unstructured/BL_test_10elements_2d_pbc.mpml (+757/-0)
legacy_reservoir_prototype/tests/BL_test_10elements_2d_unstructured/Makefile (+16/-0)
legacy_reservoir_prototype/tests/BL_test_10elements_2d_unstructured/src/2d_mesh.geo (+11/-0)
legacy_reservoir_prototype/tests/BL_test_2d_adapt/BL_test_2d_adapt.mpml (+841/-0)
legacy_reservoir_prototype/tests/BL_test_2d_adapt/Makefile (+16/-0)
legacy_reservoir_prototype/tests/BL_test_2d_adapt/src/2d_mesh.geo (+11/-0)
legacy_reservoir_prototype/tests/BL_test_2d_highres/BL_test_10elements_2d.mpml (+779/-0)
legacy_reservoir_prototype/tests/BL_test_2d_highres/Makefile (+16/-0)
legacy_reservoir_prototype/tests/BL_test_2d_highres/src/2d_mesh.geo (+11/-0)
legacy_reservoir_prototype/tests/Collapsing_Water_Column_P1DGP1/Collapsing_Water_Column_2D.mpml (+714/-0)
legacy_reservoir_prototype/tests/Collapsing_Water_Column_P1DGP1/Makefile (+16/-0)
legacy_reservoir_prototype/tests/Collapsing_Water_Column_P1DGP1/src/2d_mesh.geo (+17/-0)
legacy_reservoir_prototype/tests/Collapsing_Water_Column_P1DGP1_Adaptive/Collapsing_Water_Column_2D.mpml (+776/-0)
legacy_reservoir_prototype/tests/Collapsing_Water_Column_P1DGP1_Adaptive/Makefile (+16/-0)
legacy_reservoir_prototype/tests/Collapsing_Water_Column_P1DGP1_Adaptive/src/2d_mesh.geo (+46/-0)
legacy_reservoir_prototype/tests/CompModel_2d_2Phases_2Components_P1DGP1/CompModel_2d_2Phases_2Components_P1DGP1.mpml (+1067/-0)
legacy_reservoir_prototype/tests/CompModel_2d_2Phases_2Components_P1DGP1/CompModel_2d_2Phases_2Components_P1DGP1_nonequil.mpml (+1067/-0)
legacy_reservoir_prototype/tests/CompModel_2d_2Phases_2Components_P1DGP1/CompModel_2d_2Phases_2Components_semianalytical_P1DGP1.mpml (+1067/-0)
legacy_reservoir_prototype/tests/CompModel_2d_2Phases_2Components_P1DGP1/Makefile (+16/-0)
legacy_reservoir_prototype/tests/CompModel_2d_2Phases_2Components_P1DGP1/src/2d_mesh.geo (+15/-0)
legacy_reservoir_prototype/tests/CompModel_2d_2Phases_2Components_P1DGP2/CompModel_2d_2Phases_2Components_P1DGP2.mpml (+1067/-0)
legacy_reservoir_prototype/tests/CompModel_2d_2Phases_2Components_P1DGP2/Makefile (+16/-0)
legacy_reservoir_prototype/tests/CompModel_2d_2Phases_2Components_P1DGP2/src/2d_mesh.geo (+15/-0)
legacy_reservoir_prototype/tests/CompModel_2d_2Phases_3Components_LVI_P1DGP2/CompModel_2d_2Phases_3Components_P1DGP2_LVI.mpml (+1222/-0)
legacy_reservoir_prototype/tests/CompModel_2d_2Phases_3Components_LVI_P1DGP2/Makefile (+16/-0)
legacy_reservoir_prototype/tests/CompModel_2d_2Phases_3Components_LVI_P1DGP2/src/2d_mesh.geo (+15/-0)
legacy_reservoir_prototype/tests/Pressure_Wave_2d/Makefile (+16/-0)
legacy_reservoir_prototype/tests/Pressure_Wave_2d/Pressure_wave_2d.mpml (+789/-0)
legacy_reservoir_prototype/tests/Pressure_Wave_2d/src/2d_mesh.geo (+11/-0)
legacy_reservoir_prototype/tests/Rising_Bubble_2D_P1DGP2/Makefile (+16/-0)
legacy_reservoir_prototype/tests/Rising_Bubble_2D_P1DGP2/Rising_Bubble_2D.mpml (+738/-0)
legacy_reservoir_prototype/tests/Rising_Bubble_2D_P1DGP2/Stationary_Bubble_2D.mpml (+738/-0)
legacy_reservoir_prototype/tests/Rising_Bubble_2D_P1DGP2/Stationary_Droplet_2D.mpml (+738/-0)
legacy_reservoir_prototype/tests/Rising_Bubble_2D_P1DGP2/src/2d_mesh.geo (+17/-0)
legacy_reservoir_prototype/tests/Shock_Tube_2D/Makefile (+15/-0)
legacy_reservoir_prototype/tests/Shock_Tube_2D/Shock_Tube_2D.mpml (+1108/-0)
legacy_reservoir_prototype/tests/Shock_Tube_2D/src/2d_mesh.geo (+17/-0)
legacy_reservoir_prototype/tests/Sod_Shock_Tube/Makefile (+15/-0)
legacy_reservoir_prototype/tests/Sod_Shock_Tube/Sod_Shock_Tube.mpml (+947/-0)
legacy_reservoir_prototype/tests/Sod_Shock_Tube/Sod_Shock_Tube_isothermal.mpml (+971/-0)
legacy_reservoir_prototype/tests/Sod_Shock_Tube/src/2d_mesh.geo (+11/-0)
legacy_reservoir_prototype/tests/WaterFaucet_2D/Makefile (+15/-0)
legacy_reservoir_prototype/tests/WaterFaucet_2D/Water_Faucet_2D.mpml (+771/-0)
legacy_reservoir_prototype/tests/WaterFaucet_2D/src/2d_mesh.geo (+11/-0)
main/Fluids.F90 (+2/-1)
schemas/multiphase.rnc (+77/-7)
schemas/multiphase.rng (+97/-9)
schemas/prognostic_field_options.rnc (+45/-0)
schemas/prognostic_field_options.rng (+59/-0)
schemas/temporal_discretisation.rnc (+9/-0)
schemas/temporal_discretisation.rng (+11/-0)

Related bugs

Link a bug report

Related blueprints

Branch information

Owner:: Fluidity Core Team

Project:: Fluidity

Status:: Development

Recent revisions

4763. By Dimitrios Pavlidis on 2014-06-12: last bzr commit...
4762. By Christopher Pain on 2014-06-12: minor bug fix - used the wrong density for the solid-fluid coupling
4761. By Christopher Pain on 2014-06-10: fixed a bug in the treatment of the source term of the energy eqn with solid-fluid coupling
4760. By Christopher Pain on 2014-06-10: generalized solid-fluid coupling
4759. By Christopher Pain on 2014-06-10: generalized solid-fluid coupling
4758. By Christopher Pain on 2014-06-10: generalized solid-fluid coupling
4757. By Dimitrios Pavlidis on 2014-06-10: mu + solid fluid stuff...
4756. By Dimitrios Pavlidis on 2014-06-10: les stuff...
4755. By Dimitrios Pavlidis on 2014-06-09: les stuff...
4754. By Christopher Pain on 2014-06-09: generalized code for les_disopt=5 for multiphases

»

Branch metadata

Branch format:: Branch format 7

Repository format:: Bazaar repository format 2a (needs bzr 1.16 or later)

Stacked on:: lp:fluidity

Fluidity

lp:~fluidity-core/fluidity/MultiFluids_Dev

Branch merges

Related source package recipes

Related snap packages

Related bugs

Related blueprints

Branch information

Recent revisions

Branch metadata

Nearby

Subscribers