Merge lp:~amcg-stokes/fluidity/remove_compressible_projection_option into lp:fluidity

[Cian Wilson]

This merge would remove the use_compressible_projection_method option from underneath scalar_field::Pressure/prognostic/scheme. This option was already half deprecated and replaced with checking if the eos was compressible or not so this just completes that task. The only functionality lost is a normalization option that was not used.

Green buildbot queue available here: http://buildbot-ocean.ese.ic.ac.uk:8080/waterfall?show=remove_compressible_projection_option

Updates to long tests to follow.

[Stephan Kramer (s-kramer)]

Looks eminently sensible to me. Maybe should check with Tim what the status of the release is - don't think this necessarily needs to go in before?

review: Approve

[Rhodri Davies (rhodri-davies)]

Looks fantastic to me.

review: Approve

=== modified file 'assemble/Compressible_Projection.F90'
--- assemble/Compressible_Projection.F90	2013-03-03 01:36:16 +0000
+++ assemble/Compressible_Projection.F90	2013-10-28 23:25:09 +0000
@@ -104,15 +104,11 @@
     logical, intent(in) :: cmcget
 
     ! local:
-    integer :: norm_stat
-    character(len=FIELD_NAME_LEN) :: normalisation_field
-
     type(scalar_field) :: eospressure, drhodp
-    type(scalar_field), pointer :: normalisation, &
-                                   density, olddensity
+    type(scalar_field), pointer :: density, olddensity
     type(scalar_field), pointer :: pressure
     type(scalar_field), pointer :: p_cvmass
-    type(scalar_field) :: lhsfield, invnorm, absrhs
+    type(scalar_field) :: lhsfield, absrhs
     
     type(scalar_field), pointer :: source, absorption
     integer :: stat
@@ -135,24 +131,6 @@
 
       ewrite_minmax(p_cvmass)
       
-      call get_option(trim(pressure%option_path)//"/prognostic/scheme/use_compressible_projection_method/normalisation/name", &
-                      normalisation_field, stat=norm_stat)
-      if(norm_stat==0) then
-        normalisation=>extract_scalar_field(state, trim(normalisation_field))
-      else
-        allocate(normalisation)
-        call allocate(normalisation, pressure%mesh, "DummyNormalisation", field_type=FIELD_TYPE_CONSTANT)
-        call set(normalisation, 1.0)
-      end if
-      
-      call allocate(invnorm, normalisation%mesh, "InverseNormalisation", field_type=normalisation%field_type)
-      call invert(normalisation, invnorm)
-      
-      if(norm_stat/=0) then
-        call deallocate(normalisation)
-        deallocate(normalisation)
-      end if
-
       call allocate(lhsfield, pressure%mesh, "LHSField")
 
       call allocate(eospressure, pressure%mesh, 'EOSPressure')
@@ -172,10 +150,9 @@
 
       call set(lhsfield, p_cvmass)
       call scale(lhsfield, drhodp)
-      call scale(lhsfield, invnorm)
       call addto_diag(cmc, lhsfield, scale=1./(dt*dt*theta_divergence*theta_pg))
       
-!     rhs = invnorm*p_cvmass* &
+!     rhs = p_cvmass* &
 !      ( (1./dt)*(olddensity - density + drhodp*(eospressure - (pressure + atmospheric_pressure)))
 !       +(absorption)*(drhodp*theta_pg*(eospressure - (pressure + atmospheric_pressure)) - theta_pg*density - (1-theta_pg)*olddensity)
 !       +source)
@@ -216,13 +193,11 @@
       end if
       
       call scale(rhs, p_cvmass)
-      call scale(rhs, invnorm)
       
       call deallocate(eospressure)
       call deallocate(drhodp)
 
       call deallocate(lhsfield)
-      call deallocate(invnorm)
 
     end if
 
@@ -241,14 +216,12 @@
     logical, intent(in) :: cmcget
 
     ! local:
-    integer :: i, stat, norm_stat
+    integer :: i, stat
     character(len=OPTION_PATH_LEN) :: pressure_option_path
-    character(len=FIELD_NAME_LEN) :: normalisation_field
 
-    type(scalar_field) :: materialpressure, materialdrhodp, normdensity, &
-                          normolddensity, normmatdrhodpp, normdrhodp
-    type(scalar_field), pointer :: normalisation, &
-                                   volumefraction, oldvolumefraction, materialdensity, oldmaterialdensity
+    type(scalar_field) :: materialpressure, materialdrhodp, density, &
+                          olddensity, matdrhodpp, drhodp
+    type(scalar_field), pointer :: volumefraction, oldvolumefraction, materialdensity, oldmaterialdensity
     type(scalar_field), pointer :: dummy_ones
 
     type(scalar_field), pointer :: pressure
@@ -256,6 +229,8 @@
     type(scalar_field) :: cv_mass, tempfield
 
     real :: atmospheric_pressure
+    ! Do we want to use the compressible projection method?
+    logical :: have_compressible_eos
 
     ewrite(1,*) 'Entering assemble_mmat_compressible_projection_cv'
 
@@ -266,9 +241,17 @@
     end if
     pressure_option_path=trim(pressure%option_path)
     
+    have_compressible_eos = .false.
+    state_loop: do i = 1, size(state)
+      have_compressible_eos = have_option("/material_phase::"//trim(state(i)%name)//"/equation_of_state/compressible")
+      if(have_compressible_eos) then
+        exit state_loop
+      end if
+    end do state_loop
+
     call zero(rhs)
    
-    if(have_option(trim(pressure_option_path)//"/prognostic/scheme/use_compressible_projection_method")) THEN
+    if(have_compressible_eos) THEN
 
       ! only do all this if we need to make cmc (otherwise we'd be adding repeatedly)
       if(cmcget) then
@@ -285,21 +268,18 @@
         call get_option(trim(pressure_option_path)//'/prognostic/atmospheric_pressure', &
                         atmospheric_pressure, default=0.0)
 
-        call get_option(trim(pressure_option_path)//"/prognostic/scheme/use_compressible_projection_method/normalisation/name", &
-                        normalisation_field, stat=norm_stat)
-
         call allocate(materialpressure, pressure%mesh, 'MaterialEOSPressure')
         call allocate(materialdrhodp, pressure%mesh, 'DerivativeMaterialdensityWRTBulkPressure')
 
-        call allocate(normdensity, pressure%mesh, 'NormalisedMaterialDensity')
-        call allocate(normolddensity, pressure%mesh, 'NormalisedOldMaterialDensity')
-        call allocate(normmatdrhodpp, pressure%mesh, 'NormalisedMaterialPressure')
-        call allocate(normdrhodp, pressure%mesh, 'NormalisedDrhodp')
+        call allocate(density, pressure%mesh, 'MaterialDensity')
+        call allocate(olddensity, pressure%mesh, 'OldMaterialDensity')
+        call allocate(matdrhodpp, pressure%mesh, 'MaterialPressure')
+        call allocate(drhodp, pressure%mesh, 'Drhodp')
 
-        normdensity%val = 0.0
-        normolddensity%val = 0.0
-        normmatdrhodpp%val = 0.0
-        normdrhodp%val=0.0
+        density%val = 0.0
+        olddensity%val = 0.0
+        matdrhodpp%val = 0.0
+        drhodp%val=0.0
 
         do i = 1,size(state)
 
@@ -314,48 +294,38 @@
             materialdensity=>extract_scalar_field(state(i),'MaterialDensity')
             oldmaterialdensity=>extract_scalar_field(state(i),'OldMaterialDensity')
 
-            if(norm_stat==0) then
-              normalisation=>extract_scalar_field(state(i), trim(normalisation_field))
-            else
-              normalisation=>dummy_ones
-            end if
-
-            normdensity%val = normdensity%val &
-                              + materialdensity%val*volumefraction%val/ &
-                                normalisation%val
-            normolddensity%val = normolddensity%val &
-                                + oldmaterialdensity%val*oldvolumefraction%val/ &
-                                  normalisation%val
-            normmatdrhodpp%val = normmatdrhodpp%val &
-                                  + materialpressure%val*materialdrhodp%val*volumefraction%val/ &
-                                    normalisation%val
-            normdrhodp%val = normdrhodp%val &
-                              + materialdrhodp%val*volumefraction%val/ &
-                                normalisation%val
+            density%val = density%val &
+                              + materialdensity%val*volumefraction%val
+            olddensity%val = olddensity%val &
+                                + oldmaterialdensity%val*oldvolumefraction%val
+            matdrhodpp%val = matdrhodpp%val &
+                                  + materialpressure%val*materialdrhodp%val*volumefraction%val
+            drhodp%val = drhodp%val &
+                              + materialdrhodp%val*volumefraction%val
           endif
 
         end do
 
         call zero(tempfield)
-        tempfield%val = (1./(dt*dt))*cv_mass%val*normdrhodp%val
+        tempfield%val = (1./(dt*dt))*cv_mass%val*drhodp%val
 
         call addto_diag(cmc, tempfield)
 
         rhs%val = (1./dt)*cv_mass%val* &
                           ( &
-                            normolddensity%val &
-                          - normdensity%val &
+                            olddensity%val &
+                          - density%val &
                           ) &
                +(1./dt)*cv_mass%val* &
                           ( &
-                            normmatdrhodpp%val &
-                          - normdrhodp%val*(pressure%val+atmospheric_pressure) &
+                            matdrhodpp%val &
+                          - drhodp%val*(pressure%val+atmospheric_pressure) &
                           )
 
-        call deallocate(normdensity)
-        call deallocate(normolddensity)
-        call deallocate(normmatdrhodpp)
-        call deallocate(normdrhodp)
+        call deallocate(density)
+        call deallocate(olddensity)
+        call deallocate(matdrhodpp)
+        call deallocate(drhodp)
 
         call deallocate(materialpressure)
         call deallocate(materialdrhodp)
@@ -667,15 +637,17 @@
 
   subroutine compressible_projection_check_options
 
-    character(len=OPTION_PATH_LEN):: prognostic_pressure_path
-    integer:: i
+    character(len=OPTION_PATH_LEN):: pressure_option_path
+    integer:: iphase
+    logical:: have_compressible_eos
 
-    do i=0, option_count("/material_phase")-1
-      prognostic_pressure_path="/material_phase["//int2str(i)//"]/scalar_field::Pressure/prognostic"
-      if (have_option(trim(prognostic_pressure_path)//"/spatial_discretisation/discontinuous_galerkin") &
-        .and. have_option(trim(prognostic_pressure_path)//"/scheme/use_compressible_projection_method")) then
-        FLExit("With a DG pressure you cannot have use_compressible_projection_method")
-      end if
+    do iphase=0, option_count("/material_phase")-1
+       have_compressible_eos = have_option("/material_phase["//int2str(iphase)//"]/equation_of_state/compressible")
+       pressure_option_path = "/material_phase["//int2str(iphase)//"]/scalar_field::Pressure"
+       if(have_compressible_eos.and. &
+            have_option(trim(pressure_option_path)//"/prognostic/spatial_discretisation/discontinuous_galerkin")) then
+          FLExit("With a DG pressure you cannot have use a compressible eos")
+       end if
     end do
 
   end subroutine compressible_projection_check_options

=== modified file 'assemble/Divergence_Matrix_CV.F90'
--- assemble/Divergence_Matrix_CV.F90	2013-03-06 13:20:27 +0000
+++ assemble/Divergence_Matrix_CV.F90	2013-10-28 23:25:09 +0000
@@ -499,10 +499,8 @@
       real :: dens_theta_val
       real :: dens_face_val
       real :: olddens_face_val
-      real, dimension(:), allocatable :: dens_ele, olddens_ele, &
-                                         norm_ele
-      real, dimension(:), allocatable :: dens_ele_bdy, olddens_ele_bdy, &
-                                         norm_ele_bdy
+      real, dimension(:), allocatable :: dens_ele, olddens_ele
+      real, dimension(:), allocatable :: dens_ele_bdy, olddens_ele_bdy
       real, dimension(:), allocatable :: ghost_dens_ele_bdy, ghost_olddens_ele_bdy
 
       logical, dimension(:), allocatable :: notvisited
@@ -540,10 +538,6 @@
 
       type(cv_options_type) :: dens_options
 
-      type(scalar_field), pointer :: normalisation
-      character(len=FIELD_NAME_LEN) :: normalisation_field
-      integer :: norm_stat
-
       integer, dimension(:,:), allocatable :: velocity_bc_type
       real, dimension(:,:), allocatable :: velocity_bc_val
       type(vector_field) :: velocity_bc
@@ -610,18 +604,6 @@
 
       end if
 
-      call get_option(trim(p%option_path)//"/prognostic/scheme/use_compressible_projection_method/normalisation/name", &
-                      normalisation_field, stat=norm_stat)
-
-      ! get the normalisation field (if we need one)
-      if(norm_stat==0) then
-        normalisation=>extract_scalar_field(state, trim(normalisation_field))
-      else
-        allocate(normalisation)
-        call allocate(normalisation, p%mesh, name="DummyNormalisation", field_type=FIELD_TYPE_CONSTANT)
-        call set(normalisation, 1.0)
-      end if
-
       ! find courant number (if needed)
       option_path_array(1) = trim(dens%option_path)  ! temporary hack for compiler failure
       call cv_disc_get_cfl_no(option_path_array, &
@@ -639,8 +621,7 @@
                normgi(x%dim))
       allocate(cfl_ele(ele_loc(p,1)), &
                dens_ele(ele_loc(p,1)), &
-               olddens_ele(ele_loc(p,1)), &
-               norm_ele(ele_loc(normalisation,1)))
+               olddens_ele(ele_loc(p,1)))
       allocate(notvisited(x_cvshape%ngi))
       allocate(ctp_mat_local(x%dim, p%mesh%shape%loc, u_cvshape%loc))
 
@@ -659,8 +640,6 @@
         dens_ele = ele_val(dens, ele)
         olddens_ele = ele_val(olddens, ele)
 
-        norm_ele = ele_val(normalisation, ele)
-
         notvisited=.true.
 
         ctp_mat_local = 0.0
@@ -710,9 +689,9 @@
                     inner_dimension_loop: do dim = 1, size(normgi)
 
                       ctp_mat_local(dim, iloc, jloc) = ctp_mat_local(dim, iloc, jloc) &
-                                                      + face_value*normgi(dim)/norm_ele(iloc)
+                                                      + face_value*normgi(dim)
                       ctp_mat_local(dim, oloc, jloc) = ctp_mat_local(dim, oloc, jloc) &
-                                                      + face_value*(-normgi(dim))/norm_ele(oloc) ! notvisited
+                                                      + face_value*(-normgi(dim)) ! notvisited
 
                     end do inner_dimension_loop
 
@@ -743,8 +722,7 @@
                dens_ele_bdy(face_loc(dens,1)), &
                olddens_ele_bdy(face_loc(dens,1)), &
                ghost_dens_ele_bdy(face_loc(dens,1)), &
-               ghost_olddens_ele_bdy(face_loc(dens,1)), &
-               norm_ele_bdy(face_loc(normalisation,1)))
+               ghost_olddens_ele_bdy(face_loc(dens,1)))
       allocate(dens_bc_type(surface_element_count(dens)), &
                u_nodes_bdy(face_loc(u,1)), &
                p_nodes_bdy(face_loc(p,1)), &
@@ -798,8 +776,6 @@
         dens_ele_bdy=face_val(dens, sele)
         olddens_ele_bdy=face_val(olddens, sele)
 
-        norm_ele_bdy=face_val(normalisation, sele)
-
         ctp_mat_local_bdy = 0.0
         ct_rhs_local = 0.0
 
@@ -821,8 +797,7 @@
                   income=1.0
                 end if
 
-                face_value = (income*ghost_dens_ele_bdy(iloc) + (1.-income)*dens_ele_bdy(iloc))/&
-                              norm_ele_bdy(iloc)
+                face_value = (income*ghost_dens_ele_bdy(iloc) + (1.-income)*dens_ele_bdy(iloc))
 
                 surface_nodal_loop_j: do jloc = 1, u_cvbdyshape%loc
 
@@ -876,7 +851,7 @@
       call deallocate(dens_cvbdyshape)
       deallocate(x_ele_bdy, detwei_bdy, normal_bdy, u_bdy_f)
       deallocate(u_nodes_bdy, p_nodes_bdy)
-      deallocate(dens_ele_bdy, olddens_ele_bdy, norm_ele_bdy)
+      deallocate(dens_ele_bdy, olddens_ele_bdy)
       deallocate(ghost_dens_ele_bdy, ghost_olddens_ele_bdy)
       call deallocate(dens_bc)
       deallocate(dens_bc_type)
@@ -888,16 +863,12 @@
       call deallocate(cvfaces)
       call deallocate(relu)
       deallocate(x_ele, x_f, detwei, normal, normgi, u_f)
-      deallocate(cfl_ele, dens_ele, olddens_ele, norm_ele)
+      deallocate(cfl_ele, dens_ele, olddens_ele)
       deallocate(notvisited)
 
       call deallocate(dens_upwind)
       call deallocate(olddens_upwind)
       call deallocate(cfl_no)
-      if(norm_stat/=0) then
-        call deallocate(normalisation)
-        deallocate(normalisation)
-      end if
       call deallocate(x_p)
 
     end subroutine assemble_1mat_compressible_divergence_matrix_cv
@@ -927,11 +898,9 @@
       real :: matvfrac_face_val, matdens_face_val
       real :: oldmatvfrac_face_val, oldmatdens_face_val
       real, dimension(:), allocatable :: matdens_ele, oldmatdens_ele, &
-                                         matvfrac_ele, oldmatvfrac_ele, &
-                                         norm_ele
+                                         matvfrac_ele, oldmatvfrac_ele
       real, dimension(:), allocatable :: matdens_ele_bdy, oldmatdens_ele_bdy, &
-                                         matvfrac_ele_bdy, oldmatvfrac_ele_bdy, &
-                                         norm_ele_bdy
+                                         matvfrac_ele_bdy, oldmatvfrac_ele_bdy
       real, dimension(:), allocatable :: ghost_matdens_ele_bdy, ghost_oldmatdens_ele_bdy, &
                                          ghost_matvfrac_ele_bdy, ghost_oldmatvfrac_ele_bdy
 
@@ -979,10 +948,6 @@
       type(cv_options_type) :: matvfrac_options
       type(cv_options_type) :: matdens_options
 
-      type(scalar_field), pointer :: normalisation, dummyones
-      character(len=FIELD_NAME_LEN) :: normalisation_field
-      integer :: norm_stat
-
       integer, dimension(:,:), allocatable :: velocity_bc_type
       type(vector_field) :: velocity_bc
 
@@ -1034,8 +999,7 @@
                matvfrac_ele(ele_loc(p,1)), &
                oldmatvfrac_ele(ele_loc(p,1)), &
                matdens_ele(ele_loc(p,1)), &
-               oldmatdens_ele(ele_loc(p,1)), &
-               norm_ele(ele_loc(x,1)))
+               oldmatdens_ele(ele_loc(p,1)))
       allocate(visited(x_cvshape%ngi))
       allocate(ctp_mat_local(x%dim, p%mesh%shape%loc, u_cvshape%loc))
 
@@ -1050,13 +1014,6 @@
       call allocate(dummyvfrac, p%mesh, name="DummyVFrac", field_type=FIELD_TYPE_CONSTANT)
       call set(dummyvfrac, 1.0)
 
-      allocate(dummyones)
-      call allocate(dummyones, p%mesh, name="DummyOnes", field_type=FIELD_TYPE_CONSTANT)
-      call set(dummyones, 1.0)
-
-      call get_option(trim(p%option_path)//"/prognostic/scheme/use_compressible_projection_method/normalisation/name", &
-                      normalisation_field, stat=norm_stat)
-
       allocate(dummyvfrac_bc_type(surface_element_count(dummyvfrac)))
       bc_mesh=>get_dg_surface_mesh(p%mesh)
       call allocate(summatvfrac_bc, bc_mesh, name="SumVolumeFractionsBCs")
@@ -1178,13 +1135,6 @@
             matvfrac_options = get_cv_options(vfrac_option_path, matvfrac%mesh%shape%numbering%family, mesh_dim(matvfrac))
           end if
 
-          ! get the normalisation field (if we need one)
-          if(norm_stat==0) then
-            normalisation=>extract_scalar_field(state(i), trim(normalisation_field))
-          else
-            normalisation=>dummyones
-          end if
-
           do ele=1, element_count(p)
             x_ele=ele_val(x, ele)
             x_f=ele_val_at_quad(x, ele, x_cvshape)
@@ -1202,8 +1152,6 @@
             matdens_ele = ele_val(matdens, ele)
             oldmatdens_ele = ele_val(oldmatdens, ele)
 
-            norm_ele = ele_val(normalisation, ele)
-
             visited=0
 
             ctp_mat_local = 0.0
@@ -1287,9 +1235,9 @@
                         do dim = 1, size(normgi)
 
                           ctp_mat_local(dim, iloc, jloc) = ctp_mat_local(dim, iloc, jloc) &
-                                                         + face_value*normgi(dim)/norm_ele(iloc)
+                                                         + face_value*normgi(dim)
                           ctp_mat_local(dim, oloc, jloc) = ctp_mat_local(dim, oloc, jloc) &
-                                                         + face_value*(-normgi(dim))/norm_ele(oloc) ! notvisited
+                                                         + face_value*(-normgi(dim)) ! notvisited
 
                         end do
 
@@ -1324,8 +1272,7 @@
                   ghost_matdens_ele_bdy(face_loc(p,1)), &
                   ghost_oldmatdens_ele_bdy(face_loc(p,1)), &
                   ghost_matvfrac_ele_bdy(face_loc(p,1)), &
-                  ghost_oldmatvfrac_ele_bdy(face_loc(p,1)), &
-                  norm_ele_bdy(face_loc(x,1)))
+                  ghost_oldmatvfrac_ele_bdy(face_loc(p,1)))
           allocate(matvfrac_bc_type(surface_element_count(matvfrac)), &
                     matdens_bc_type(surface_element_count(matdens)), &
                     nodes_bdy(face_loc(u,1)), &
@@ -1387,8 +1334,6 @@
             matdens_ele_bdy=face_val(matdens, sele)
             oldmatdens_ele_bdy=face_val(oldmatdens, sele)
 
-            norm_ele_bdy=face_val(normalisation, sele)
-
             ctp_mat_local_bdy = 0.0
 
             do iloc = 1, p%mesh%faces%shape%loc
@@ -1410,8 +1355,7 @@
                     end if
 
                     face_value = (income*ghost_matvfrac_ele_bdy(iloc) + (1.-income)*matvfrac_ele_bdy(iloc))* &
-                                  (income*ghost_matdens_ele_bdy(iloc) + (1.-income)*matdens_ele_bdy(iloc))/&
-                                  norm_ele_bdy(iloc)
+                                  (income*ghost_matdens_ele_bdy(iloc) + (1.-income)*matdens_ele_bdy(iloc))
 
                     do jloc = 1, u_cvbdyshape%loc
 
@@ -1448,7 +1392,7 @@
           call deallocate(p_cvbdyshape)
           deallocate(x_ele_bdy, detwei_bdy, normal_bdy, u_bdy_f)
           deallocate(nodes_bdy)
-          deallocate(matdens_ele_bdy, oldmatdens_ele_bdy, matvfrac_ele_bdy, oldmatvfrac_ele_bdy, norm_ele_bdy)
+          deallocate(matdens_ele_bdy, oldmatdens_ele_bdy, matvfrac_ele_bdy, oldmatvfrac_ele_bdy)
           deallocate(ghost_matdens_ele_bdy, ghost_oldmatdens_ele_bdy, &
                       ghost_matvfrac_ele_bdy, ghost_oldmatvfrac_ele_bdy)
           call deallocate(matvfrac_bc)
@@ -1466,7 +1410,7 @@
       call deallocate(cvfaces)
       call deallocate(relu)
       deallocate(x_ele, x_f, detwei, normal, normgi, u_f)
-      deallocate(cfl_ele, matvfrac_ele, oldmatvfrac_ele, matdens_ele, oldmatdens_ele, norm_ele)
+      deallocate(cfl_ele, matvfrac_ele, oldmatvfrac_ele, matdens_ele, oldmatdens_ele)
       deallocate(visited)
 
       call deallocate(matdens_upwind)
@@ -1480,8 +1424,6 @@
       call deallocate(dummyvfrac)
       deallocate(dummyvfrac)
       deallocate(dummyvfrac_bc_type)
-      call deallocate(dummyones)
-      deallocate(dummyones)
       call deallocate(x_p)
 
       call clean_deferred_deletion(state)

=== modified file 'assemble/Momentum_Equation.F90'
--- assemble/Momentum_Equation.F90	2013-10-07 16:23:35 +0000
+++ assemble/Momentum_Equation.F90	2013-10-28 23:25:09 +0000
@@ -2011,13 +2011,6 @@
                      ewrite(-1,*) "mass_terms/lump_mass_matrix"
                      FLExit("Good luck!")
                   end if
-
-               else if(have_option("/material_phase["//int2str(i)//&
-                                 &"]/scalar_field::Pressure/prognostic"//&
-                                 &"/scheme/use_compressible_projection_method")) then
-                  ewrite(-1,*) "You must lump the velocity mass matrix with the"
-                  ewrite(-1,*) "compressible projection method."
-                  FLExit("Sorry.")
                end if
 
             end if

=== modified file 'preprocessor/Populate_State.F90'
--- preprocessor/Populate_State.F90	2013-10-07 16:23:35 +0000
+++ preprocessor/Populate_State.F90	2013-10-28 23:25:09 +0000
@@ -3908,11 +3908,11 @@
     if (have_option(trim(pressure_path))) then
 
        ! Check that compressible projection method is used:
-       compressible_projection = have_option(trim(pressure_path)//&
-            "/scheme/use_compressible_projection_method")
+       compressible_projection = have_option("/material_phase[0]"//&
+            "/equation_of_state/compressible")
 
        if(.not.(compressible_projection)) then
-          FLExit("For foam problems you need to use the compressible projection method.")
+          FLExit("For foam problems you need to use a compressible eos.")
        end if
     end if
 

=== modified file 'schemas/fluidity_options.rng'
--- schemas/fluidity_options.rng	2013-10-11 10:48:07 +0000
+++ schemas/fluidity_options.rng	2013-10-28 23:25:09 +0000
@@ -3788,7 +3788,9 @@
         <empty/>
       </element>
       <element name="type">
-        <a:documentation>Implements a prescribed normal flow. Works for DG only.</a:documentation>
+        <a:documentation>Implements a prescribed normal flow. Works for DG only. This
+implements a weakly imposed bounadry condition normal to the surface.
+Note: Positive points out of the domain, negative into the domain.</a:documentation>
         <attribute name="name">
           <value>prescribed_normal_flow</value>
         </attribute>

=== modified file 'schemas/prognostic_field_options.rnc'
--- schemas/prognostic_field_options.rnc	2013-10-07 16:23:35 +0000
+++ schemas/prognostic_field_options.rnc	2013-10-28 23:25:09 +0000
@@ -1360,107 +1360,71 @@
                comment
             )
          },
-         (
-            ## Use the incompressible projection method to determine
-            ## the pressure and satisfy continuity
-            element use_projection_method {
-               ## Assemble and use the full schur complement.
-               ## This allows you to not lump the mass matrix if you're using
-               ## cg and to use the full momentum matrix in the projection if
-               ## you so desire.
-               element full_schur_complement {
-                 ( 
-                   ## Specify the inner matrix (IM) to form the projection schur complement (C^T*IM^{-1}*C). 
-                   ## Use the full mass matrix.
-                   ##
-                   ## Make sure you've not lumped your mass in the velocity spatial_discretisation if you want to be consistent!
-                   element inner_matrix {
-                     attribute name { "FullMassMatrix" },
-                     element solver {
-                       linear_solver_options_sym
-                     }
-                   }|
-                   ## Specify the inner matrix (IM) to form the projection schur complement (C^T*IM^{-1}*C). 
-                   ## Use the full momentum matrix.
-                   ##
-                   ## Doesn't really matter if you've lumped your mass or not but why would you if you're doing a full inner solve anyway?
-                   element inner_matrix {
-                     attribute name { "FullMomentumMatrix" },
-                     element solver {
-                       linear_solver_options_asym_vector
-                     }
-                   }
-                 ),
-                 (
-                   ## Specify the preconditioner matrix to use on the schur complement.
-                   ##
-                   ## For DG, the LumpedSchurComplement is our best approximation to CMC.
-                   element preconditioner_matrix {
-                     attribute name { "LumpedSchurComplement" },
-                     element lump_on_submesh {
-                       empty
-                     }?
-                   }|
-                   ## Specify the preconditioner matrix to use on the schur complement.
-                   ##
-                   ## DiagonalSchurComplement = C_P^T * [(Big_m)_diagonal]^-1 * C
-                   element preconditioner_matrix {
-                     attribute name { "DiagonalSchurComplement" },
-                     empty
-                   }|
-                   ## Specify the preconditioner matrix to use on the schur complement.
-                   ##
-                   ## Pressure Mass Matrix, scaled with the inverse of viscosity. This is
-                   ## shown to be spectrally equivalent to the Schur complement.
-                   ## Note that this currently only works with isoviscous and/or isotropic
-                   ## viscosity tensors.
-                   element preconditioner_matrix {
-                     attribute name { "ScaledPressureMassMatrix" },
-                     empty
-                   }|
-                   ## Specify the preconditioner matrix to use on the schur complement.
-                   element preconditioner_matrix {
-                     attribute name { "NoPreconditionerMatrix" },
-                     empty
-                   }
-                 )
-               }?
-            }|
-            ## Use the compressible projection method to determine the
-            ## pressure and satisfy continuity and the eos.
-            ## This is only currently compatible with control volume
-            ## pressure spatial discretisations and requires a
-            ## multimaterial eos.
-            element use_compressible_projection_method {
-               (
-                  ## Variable (normally a density) used to normalise
-                  ## each materials contribution
-                  ## to the C_P^T matrix.  Leave unselected for no normalisation.
-                  ## Selects the MaterialDensity field.
-                  element normalisation {
-                     attribute name{ "MaterialDensity" },
-                     empty
-                  }|
-                  ## Variable (normally a density) used to normalise
-                  ## each materials contribution
-                  ## to the C_P^T matrix.  Leave unselected for no normalisation.
-                  ## Selects the bulk Density field.
-                  element normalisation {
-                     attribute name{ "Density" },
-                     empty
-                  }|
-                  ## Variable (normally a density) used to normalise
-                  ## each materials contribution
-                  ## to the C_P^T matrix.  Leave unselected for no normalisation.
-                  ## Allows the selection of an arbitrary field.
-                  element normalisation {
-                     attribute name{ string },
-                     empty
-                  }
-               )?
-
-            }
-         ),
+         ## Use the incompressible projection method to determine
+         ## the pressure and satisfy continuity
+         element use_projection_method {
+            ## Assemble and use the full schur complement.
+            ## This allows you to not lump the mass matrix if you're using
+            ## cg and to use the full momentum matrix in the projection if
+            ## you so desire.
+            element full_schur_complement {
+              ( 
+                ## Specify the inner matrix (IM) to form the projection schur complement (C^T*IM^{-1}*C). 
+                ## Use the full mass matrix.
+                ##
+                ## Make sure you've not lumped your mass in the velocity spatial_discretisation if you want to be consistent!
+                element inner_matrix {
+                  attribute name { "FullMassMatrix" },
+                  element solver {
+                    linear_solver_options_sym
+                  }
+                }|
+                ## Specify the inner matrix (IM) to form the projection schur complement (C^T*IM^{-1}*C). 
+                ## Use the full momentum matrix.
+                ##
+                ## Doesn't really matter if you've lumped your mass or not but why would you if you're doing a full inner solve anyway?
+                element inner_matrix {
+                  attribute name { "FullMomentumMatrix" },
+                  element solver {
+                    linear_solver_options_asym_vector
+                  }
+                }
+              ),
+              (
+                ## Specify the preconditioner matrix to use on the schur complement.
+                ##
+                ## For DG, the LumpedSchurComplement is our best approximation to CMC.
+                element preconditioner_matrix {
+                  attribute name { "LumpedSchurComplement" },
+                  element lump_on_submesh {
+                    empty
+                  }?
+                }|
+                ## Specify the preconditioner matrix to use on the schur complement.
+                ##
+                ## DiagonalSchurComplement = C_P^T * [(Big_m)_diagonal]^-1 * C
+                element preconditioner_matrix {
+                  attribute name { "DiagonalSchurComplement" },
+                  empty
+                }|
+                ## Specify the preconditioner matrix to use on the schur complement.
+                ##
+                ## Pressure Mass Matrix, scaled with the inverse of viscosity. This is
+                ## shown to be spectrally equivalent to the Schur complement.
+                ## Note that this currently only works with isoviscous and/or isotropic
+                ## viscosity tensors.
+                element preconditioner_matrix {
+                  attribute name { "ScaledPressureMassMatrix" },
+                  empty
+                }|
+                ## Specify the preconditioner matrix to use on the schur complement.
+                element preconditioner_matrix {
+                  attribute name { "NoPreconditionerMatrix" },
+                  empty
+                }
+              )
+            }?
+         },
          ## rediscretise the equations at every timestep and iteration
          ## (this is useful as a debugging tool but shouldn't be necessary for any application runs)
          element update_discretised_equation {

=== modified file 'schemas/prognostic_field_options.rng'
--- schemas/prognostic_field_options.rng	2013-10-07 16:23:35 +0000
+++ schemas/prognostic_field_options.rng	2013-10-28 23:25:09 +0000
@@ -1676,130 +1676,87 @@
         </element>
         <ref name="comment"/>
       </element>
-      <choice>
-        <element name="use_projection_method">
-          <a:documentation>Use the incompressible projection method to determine
+      <element name="use_projection_method">
+        <a:documentation>Use the incompressible projection method to determine
 the pressure and satisfy continuity</a:documentation>
-          <optional>
-            <element name="full_schur_complement">
-              <a:documentation>Assemble and use the full schur complement.
+        <optional>
+          <element name="full_schur_complement">
+            <a:documentation>Assemble and use the full schur complement.
 This allows you to not lump the mass matrix if you're using
 cg and to use the full momentum matrix in the projection if
 you so desire.</a:documentation>
-              <choice>
-                <element name="inner_matrix">
-                  <a:documentation>Specify the inner matrix (IM) to form the projection schur complement (C^T*IM^{-1}*C). 
+            <choice>
+              <element name="inner_matrix">
+                <a:documentation>Specify the inner matrix (IM) to form the projection schur complement (C^T*IM^{-1}*C). 
 Use the full mass matrix.
 
 Make sure you've not lumped your mass in the velocity spatial_discretisation if you want to be consistent!</a:documentation>
-                  <attribute name="name">
-                    <value>FullMassMatrix</value>
-                  </attribute>
-                  <element name="solver">
-                    <ref name="linear_solver_options_sym"/>
-                  </element>
+                <attribute name="name">
+                  <value>FullMassMatrix</value>
+                </attribute>
+                <element name="solver">
+                  <ref name="linear_solver_options_sym"/>
                 </element>
-                <element name="inner_matrix">
-                  <a:documentation>Specify the inner matrix (IM) to form the projection schur complement (C^T*IM^{-1}*C). 
+              </element>
+              <element name="inner_matrix">
+                <a:documentation>Specify the inner matrix (IM) to form the projection schur complement (C^T*IM^{-1}*C). 
 Use the full momentum matrix.
 
 Doesn't really matter if you've lumped your mass or not but why would you if you're doing a full inner solve anyway?</a:documentation>
-                  <attribute name="name">
-                    <value>FullMomentumMatrix</value>
-                  </attribute>
-                  <element name="solver">
-                    <ref name="linear_solver_options_asym_vector"/>
-                  </element>
+                <attribute name="name">
+                  <value>FullMomentumMatrix</value>
+                </attribute>
+                <element name="solver">
+                  <ref name="linear_solver_options_asym_vector"/>
                 </element>
-              </choice>
-              <choice>
-                <element name="preconditioner_matrix">
-                  <a:documentation>Specify the preconditioner matrix to use on the schur complement.
+              </element>
+            </choice>
+            <choice>
+              <element name="preconditioner_matrix">
+                <a:documentation>Specify the preconditioner matrix to use on the schur complement.
 
 For DG, the LumpedSchurComplement is our best approximation to CMC.</a:documentation>
-                  <attribute name="name">
-                    <value>LumpedSchurComplement</value>
-                  </attribute>
-                  <optional>
-                    <element name="lump_on_submesh">
-                      <empty/>
-                    </element>
-                  </optional>
-                </element>
-                <element name="preconditioner_matrix">
-                  <a:documentation>Specify the preconditioner matrix to use on the schur complement.
+                <attribute name="name">
+                  <value>LumpedSchurComplement</value>
+                </attribute>
+                <optional>
+                  <element name="lump_on_submesh">
+                    <empty/>
+                  </element>
+                </optional>
+              </element>
+              <element name="preconditioner_matrix">
+                <a:documentation>Specify the preconditioner matrix to use on the schur complement.
 
 DiagonalSchurComplement = C_P^T * [(Big_m)_diagonal]^-1 * C</a:documentation>
-                  <attribute name="name">
-                    <value>DiagonalSchurComplement</value>
-                  </attribute>
-                  <empty/>
-                </element>
-                <element name="preconditioner_matrix">
-                  <a:documentation>Specify the preconditioner matrix to use on the schur complement.
+                <attribute name="name">
+                  <value>DiagonalSchurComplement</value>
+                </attribute>
+                <empty/>
+              </element>
+              <element name="preconditioner_matrix">
+                <a:documentation>Specify the preconditioner matrix to use on the schur complement.
 
 Pressure Mass Matrix, scaled with the inverse of viscosity. This is
 shown to be spectrally equivalent to the Schur complement.
 Note that this currently only works with isoviscous and/or isotropic
 viscosity tensors.</a:documentation>
-                  <attribute name="name">
-                    <value>ScaledPressureMassMatrix</value>
-                  </attribute>
-                  <empty/>
-                </element>
-                <element name="preconditioner_matrix">
-                  <a:documentation>Specify the preconditioner matrix to use on the schur complement.</a:documentation>
-                  <attribute name="name">
-                    <value>NoPreconditionerMatrix</value>
-                  </attribute>
-                  <empty/>
-                </element>
-              </choice>
-            </element>
-          </optional>
-        </element>
-        <element name="use_compressible_projection_method">
-          <a:documentation>Use the compressible projection method to determine the
-pressure and satisfy continuity and the eos.
-This is only currently compatible with control volume
-pressure spatial discretisations and requires a
-multimaterial eos.</a:documentation>
-          <optional>
-            <choice>
-              <element name="normalisation">
-                <a:documentation>Variable (normally a density) used to normalise
-each materials contribution
-to the C_P^T matrix.  Leave unselected for no normalisation.
-Selects the MaterialDensity field.</a:documentation>
-                <attribute name="name">
-                  <value>MaterialDensity</value>
-                </attribute>
-                <empty/>
-              </element>
-              <element name="normalisation">
-                <a:documentation>Variable (normally a density) used to normalise
-each materials contribution
-to the C_P^T matrix.  Leave unselected for no normalisation.
-Selects the bulk Density field.</a:documentation>
-                <attribute name="name">
-                  <value>Density</value>
-                </attribute>
-                <empty/>
-              </element>
-              <element name="normalisation">
-                <a:documentation>Variable (normally a density) used to normalise
-each materials contribution
-to the C_P^T matrix.  Leave unselected for no normalisation.
-Allows the selection of an arbitrary field.</a:documentation>
-                <attribute name="name">
-                  <data type="string" datatypeLibrary=""/>
+                <attribute name="name">
+                  <value>ScaledPressureMassMatrix</value>
+                </attribute>
+                <empty/>
+              </element>
+              <element name="preconditioner_matrix">
+                <a:documentation>Specify the preconditioner matrix to use on the schur complement.</a:documentation>
+                <attribute name="name">
+                  <value>NoPreconditionerMatrix</value>
                 </attribute>
                 <empty/>
               </element>
             </choice>
-          </optional>
-        </element>
-      </choice>
+          </element>
+        </optional>
+      </element>
       <optional>
         <element name="update_discretised_equation">
           <a:documentation>rediscretise the equations at every timestep and iteration

=== modified file 'schemas/test_advection_diffusion_options.rnc'
--- schemas/test_advection_diffusion_options.rnc	2013-09-23 20:07:28 +0000
+++ schemas/test_advection_diffusion_options.rnc	2013-10-28 23:25:09 +0000
@@ -1470,97 +1470,61 @@
                comment
             )
          },
-         (
-            ## Use the incompressible projection method to determine
-            ## the pressure and satisfy continuity
-            element use_projection_method {
-               ## Assemble and use the full schur complement.
-               ## This allows you to not lump the mass matrix if you're using
-               ## cg and to use the full momentum matrix in the projection if
-               ## you so desire.
-               element full_schur_complement {
-                 ( 
-                   ## Specify the inner matrix (IM) to form the projection schur complement (C^T*IM^{-1}*C). 
-                   ## Use the full mass matrix.
-                   ##
-                   ## Make sure you've not lumped your mass in the velocity spatial_discretisation if you want to be consistent!
-                   element inner_matrix {
-                     attribute name { "FullMassMatrix" },
-                     element solver {
-                       linear_solver_options_sym
-                     }
-                   }|
-                   ## Specify the inner matrix (IM) to form the projection schur complement (C^T*IM^{-1}*C). 
-                   ## Use the full momentum matrix.
-                   ##
-                   ## Doesn't really matter if you've lumped your mass or not but why would you if you're doing a full inner solve anyway?
-                   element inner_matrix {
-                     attribute name { "FullMomentumMatrix" },
-                     element solver {
-                       linear_solver_options_asym
-                     }
-                   }
-                 ),
-                 (
-                   ## Specify the preconditioner matrix to use on the schur complement.
-                   ##
-                   ## For DG, the LumpedSchurComplement is our best approximation to CMC.
-                   element preconditioner_matrix {
-                     attribute name { "LumpedSchurComplement" },
-                     element lump_on_submesh {
-                       empty
-                     }?
-                   }|
-                   ## Specify the preconditioner matrix to use on the schur complement.
-                   ##
-                   ## DiagonalSchurComplement = C_P^T * [(Big_m)_diagonal]^-1 * C
-                   element preconditioner_matrix {
-                     attribute name { "DiagonalSchurComplement" },
-                     empty
-                   }|
-                   ## Specify the preconditioner matrix to use on the schur complement.
-                   element preconditioner_matrix {
-                     attribute name { "NoPreconditionerMatrix" },
-                     empty
-                   }
-                 )
-               }?
-            }|
-            ## Use the compressible projection method to determine the
-            ## pressure and satisfy continuity and the eos.
-            ## This is only currently compatible with control volume
-            ## pressure spatial discretisations and requires a
-            ## multimaterial eos.
-            element use_compressible_projection_method {
-               (
-                  ## Variable (normally a density) used to normalise
-                  ## each materials contribution
-                  ## to the C_P^T matrix.  Leave unselected for no normalisation.
-                  ## Selects the MaterialDensity field.
-                  element normalisation {
-                     attribute name{ "MaterialDensity" },
-                     empty
-                  }|
-                  ## Variable (normally a density) used to normalise
-                  ## each materials contribution
-                  ## to the C_P^T matrix.  Leave unselected for no normalisation.
-                  ## Selects the bulk Density field.
-                  element normalisation {
-                     attribute name{ "Density" },
-                     empty
-                  }|
-                  ## Variable (normally a density) used to normalise
-                  ## each materials contribution
-                  ## to the C_P^T matrix.  Leave unselected for no normalisation.
-                  ## Allows the selection of an arbitrary field.
-                  element normalisation {
-                     attribute name{ string },
-                     empty
-                  }
-               )?
-
-            }
-         ),
+         ## Use the incompressible projection method to determine
+         ## the pressure and satisfy continuity
+         element use_projection_method {
+            ## Assemble and use the full schur complement.
+            ## This allows you to not lump the mass matrix if you're using
+            ## cg and to use the full momentum matrix in the projection if
+            ## you so desire.
+            element full_schur_complement {
+              ( 
+                ## Specify the inner matrix (IM) to form the projection schur complement (C^T*IM^{-1}*C). 
+                ## Use the full mass matrix.
+                ##
+                ## Make sure you've not lumped your mass in the velocity spatial_discretisation if you want to be consistent!
+                element inner_matrix {
+                  attribute name { "FullMassMatrix" },
+                  element solver {
+                    linear_solver_options_sym
+                  }
+                }|
+                ## Specify the inner matrix (IM) to form the projection schur complement (C^T*IM^{-1}*C). 
+                ## Use the full momentum matrix.
+                ##
+                ## Doesn't really matter if you've lumped your mass or not but why would you if you're doing a full inner solve anyway?
+                element inner_matrix {
+                  attribute name { "FullMomentumMatrix" },
+                  element solver {
+                    linear_solver_options_asym
+                  }
+                }
+              ),
+              (
+                ## Specify the preconditioner matrix to use on the schur complement.
+                ##
+                ## For DG, the LumpedSchurComplement is our best approximation to CMC.
+                element preconditioner_matrix {
+                  attribute name { "LumpedSchurComplement" },
+                  element lump_on_submesh {
+                    empty
+                  }?
+                }|
+                ## Specify the preconditioner matrix to use on the schur complement.
+                ##
+                ## DiagonalSchurComplement = C_P^T * [(Big_m)_diagonal]^-1 * C
+                element preconditioner_matrix {
+                  attribute name { "DiagonalSchurComplement" },
+                  empty
+                }|
+                ## Specify the preconditioner matrix to use on the schur complement.
+                element preconditioner_matrix {
+                  attribute name { "NoPreconditionerMatrix" },
+                  empty
+                }
+              )
+            }?
+         },
          ## rediscretise the equations at every timestep and iteration
          ## (for instance if using a compressible formulation
          ## or if density varies a lot or if not using a Boussinesque approximation)

=== modified file 'schemas/test_advection_diffusion_options.rng'
--- schemas/test_advection_diffusion_options.rng	2013-09-23 20:07:28 +0000
+++ schemas/test_advection_diffusion_options.rng	2013-10-28 23:25:09 +0000
@@ -1725,118 +1725,75 @@
         </element>
         <ref name="comment"/>
       </element>
-      <choice>
-        <element name="use_projection_method">
-          <a:documentation>Use the incompressible projection method to determine
+      <element name="use_projection_method">
+        <a:documentation>Use the incompressible projection method to determine
 the pressure and satisfy continuity</a:documentation>
-          <optional>
-            <element name="full_schur_complement">
-              <a:documentation>Assemble and use the full schur complement.
+        <optional>
+          <element name="full_schur_complement">
+            <a:documentation>Assemble and use the full schur complement.
 This allows you to not lump the mass matrix if you're using
 cg and to use the full momentum matrix in the projection if
 you so desire.</a:documentation>
-              <choice>
-                <element name="inner_matrix">
-                  <a:documentation>Specify the inner matrix (IM) to form the projection schur complement (C^T*IM^{-1}*C). 
+            <choice>
+              <element name="inner_matrix">
+                <a:documentation>Specify the inner matrix (IM) to form the projection schur complement (C^T*IM^{-1}*C). 
 Use the full mass matrix.
 
 Make sure you've not lumped your mass in the velocity spatial_discretisation if you want to be consistent!</a:documentation>
-                  <attribute name="name">
-                    <value>FullMassMatrix</value>
-                  </attribute>
-                  <element name="solver">
-                    <ref name="linear_solver_options_sym"/>
-                  </element>
+                <attribute name="name">
+                  <value>FullMassMatrix</value>
+                </attribute>
+                <element name="solver">
+                  <ref name="linear_solver_options_sym"/>
                 </element>
-                <element name="inner_matrix">
-                  <a:documentation>Specify the inner matrix (IM) to form the projection schur complement (C^T*IM^{-1}*C). 
+              </element>
+              <element name="inner_matrix">
+                <a:documentation>Specify the inner matrix (IM) to form the projection schur complement (C^T*IM^{-1}*C). 
 Use the full momentum matrix.
 
 Doesn't really matter if you've lumped your mass or not but why would you if you're doing a full inner solve anyway?</a:documentation>
-                  <attribute name="name">
-                    <value>FullMomentumMatrix</value>
-                  </attribute>
-                  <element name="solver">
-                    <ref name="linear_solver_options_asym"/>
-                  </element>
+                <attribute name="name">
+                  <value>FullMomentumMatrix</value>
+                </attribute>
+                <element name="solver">
+                  <ref name="linear_solver_options_asym"/>
                 </element>
-              </choice>
-              <choice>
-                <element name="preconditioner_matrix">
-                  <a:documentation>Specify the preconditioner matrix to use on the schur complement.
+              </element>
+            </choice>
+            <choice>
+              <element name="preconditioner_matrix">
+                <a:documentation>Specify the preconditioner matrix to use on the schur complement.
 
 For DG, the LumpedSchurComplement is our best approximation to CMC.</a:documentation>
-                  <attribute name="name">
-                    <value>LumpedSchurComplement</value>
-                  </attribute>
-                  <optional>
-                    <element name="lump_on_submesh">
-                      <empty/>
-                    </element>
-                  </optional>
-                </element>
-                <element name="preconditioner_matrix">
-                  <a:documentation>Specify the preconditioner matrix to use on the schur complement.
+                <attribute name="name">
+                  <value>LumpedSchurComplement</value>
+                </attribute>
+                <optional>
+                  <element name="lump_on_submesh">
+                    <empty/>
+                  </element>
+                </optional>
+              </element>
+              <element name="preconditioner_matrix">
+                <a:documentation>Specify the preconditioner matrix to use on the schur complement.
 
 DiagonalSchurComplement = C_P^T * [(Big_m)_diagonal]^-1 * C</a:documentation>
-                  <attribute name="name">
-                    <value>DiagonalSchurComplement</value>
-                  </attribute>
-                  <empty/>
-                </element>
-                <element name="preconditioner_matrix">
-                  <a:documentation>Specify the preconditioner matrix to use on the schur complement.</a:documentation>
-                  <attribute name="name">
-                    <value>NoPreconditionerMatrix</value>
-                  </attribute>
-                  <empty/>
-                </element>
-              </choice>
-            </element>
-          </optional>
-        </element>
-        <element name="use_compressible_projection_method">
-          <a:documentation>Use the compressible projection method to determine the
-pressure and satisfy continuity and the eos.
-This is only currently compatible with control volume
-pressure spatial discretisations and requires a
-multimaterial eos.</a:documentation>
-          <optional>
-            <choice>
-              <element name="normalisation">
-                <a:documentation>Variable (normally a density) used to normalise
-each materials contribution
-to the C_P^T matrix.  Leave unselected for no normalisation.
-Selects the MaterialDensity field.</a:documentation>
-                <attribute name="name">
-                  <value>MaterialDensity</value>
-                </attribute>
-                <empty/>
-              </element>
-              <element name="normalisation">
-                <a:documentation>Variable (normally a density) used to normalise
-each materials contribution
-to the C_P^T matrix.  Leave unselected for no normalisation.
-Selects the bulk Density field.</a:documentation>
-                <attribute name="name">
-                  <value>Density</value>
-                </attribute>
-                <empty/>
-              </element>
-              <element name="normalisation">
-                <a:documentation>Variable (normally a density) used to normalise
-each materials contribution
-to the C_P^T matrix.  Leave unselected for no normalisation.
-Allows the selection of an arbitrary field.</a:documentation>
-                <attribute name="name">
-                  <data type="string" datatypeLibrary=""/>
+                <attribute name="name">
+                  <value>DiagonalSchurComplement</value>
+                </attribute>
+                <empty/>
+              </element>
+              <element name="preconditioner_matrix">
+                <a:documentation>Specify the preconditioner matrix to use on the schur complement.</a:documentation>
+                <attribute name="name">
+                  <value>NoPreconditionerMatrix</value>
                 </attribute>
                 <empty/>
               </element>
             </choice>
-          </optional>
-        </element>
-      </choice>
+          </element>
+        </optional>
+      </element>
       <optional>
         <element name="update_discretised_equation">
           <a:documentation>rediscretise the equations at every timestep and iteration

=== modified file 'tests/1mat-shocktube-gmsh/1material_shocktube.flml'
--- tests/1mat-shocktube-gmsh/1material_shocktube.flml	2013-01-27 03:54:57 +0000
+++ tests/1mat-shocktube-gmsh/1material_shocktube.flml	2013-10-28 23:25:09 +0000
@@ -98,7 +98,7 @@
           <poisson_pressure_solution>
             <string_value lines="1">never</string_value>
           </poisson_pressure_solution>
-          <use_compressible_projection_method/>
+          <use_projection_method/>
         </scheme>
         <solver>
           <iterative_method name="gmres">

=== modified file 'tests/1mat-shocktube/1material_shocktube.flml'
--- tests/1mat-shocktube/1material_shocktube.flml	2013-01-27 03:54:57 +0000
+++ tests/1mat-shocktube/1material_shocktube.flml	2013-10-28 23:25:09 +0000
@@ -98,7 +98,7 @@
           <poisson_pressure_solution>
             <string_value lines="1">never</string_value>
           </poisson_pressure_solution>
-          <use_compressible_projection_method/>
+          <use_projection_method/>
         </scheme>
         <solver>
           <iterative_method name="gmres">

=== modified file 'tests/foam_2d_p1dgp2_weak_strong/drainage_a.flml'
--- tests/foam_2d_p1dgp2_weak_strong/drainage_a.flml	2013-05-30 11:47:42 +0000
+++ tests/foam_2d_p1dgp2_weak_strong/drainage_a.flml	2013-10-28 23:25:09 +0000
@@ -114,7 +114,7 @@
           <poisson_pressure_solution>
             <string_value lines="1">never</string_value>
           </poisson_pressure_solution>
-          <use_compressible_projection_method/>
+          <use_projection_method/>
           <update_discretised_equation/>
         </scheme>
         <solver>

=== modified file 'tests/inlet_velocity_bc_compressible/inlet_velocity_bc_compressible_1d.flml'
--- tests/inlet_velocity_bc_compressible/inlet_velocity_bc_compressible_1d.flml	2013-07-04 19:47:22 +0000
+++ tests/inlet_velocity_bc_compressible/inlet_velocity_bc_compressible_1d.flml	2013-10-28 23:25:09 +0000
@@ -173,7 +173,7 @@
           <poisson_pressure_solution>
             <string_value lines="1">never</string_value>
           </poisson_pressure_solution>
-          <use_compressible_projection_method/>
+          <use_projection_method/>
         </scheme>
         <solver>
           <iterative_method name="gmres">

=== modified file 'tests/inlet_velocity_bc_compressible_without_gravity/inlet_velocity_bc_compressible_without_gravity_1d.flml'
--- tests/inlet_velocity_bc_compressible_without_gravity/inlet_velocity_bc_compressible_without_gravity_1d.flml	2013-06-10 21:48:04 +0000
+++ tests/inlet_velocity_bc_compressible_without_gravity/inlet_velocity_bc_compressible_without_gravity_1d.flml	2013-10-28 23:25:09 +0000
@@ -154,7 +154,7 @@
           <poisson_pressure_solution>
             <string_value lines="1">never</string_value>
           </poisson_pressure_solution>
-          <use_compressible_projection_method/>
+          <use_projection_method/>
         </scheme>
         <solver>
           <iterative_method name="gmres">

=== modified file 'tests/inlet_velocity_bc_compressible_without_gravity/inlet_velocity_bc_compressible_without_gravity_pseudo1d.flml'
--- tests/inlet_velocity_bc_compressible_without_gravity/inlet_velocity_bc_compressible_without_gravity_pseudo1d.flml	2013-06-10 21:48:04 +0000
+++ tests/inlet_velocity_bc_compressible_without_gravity/inlet_velocity_bc_compressible_without_gravity_pseudo1d.flml	2013-10-28 23:25:09 +0000
@@ -125,7 +125,7 @@
           <poisson_pressure_solution>
             <string_value lines="1">never</string_value>
           </poisson_pressure_solution>
-          <use_compressible_projection_method/>
+          <use_projection_method/>
         </scheme>
         <solver>
           <iterative_method name="gmres">

=== modified file 'tests/inlet_velocity_bc_incompressible/inlet_velocity_bc_incompressible.flml'
--- tests/inlet_velocity_bc_incompressible/inlet_velocity_bc_incompressible.flml	2013-06-10 21:48:04 +0000
+++ tests/inlet_velocity_bc_incompressible/inlet_velocity_bc_incompressible.flml	2013-10-28 23:25:09 +0000
@@ -169,7 +169,7 @@
           <poisson_pressure_solution>
             <string_value lines="1">never</string_value>
           </poisson_pressure_solution>
-          <use_compressible_projection_method/>
+          <use_projection_method/>
         </scheme>
         <solver>
           <iterative_method name="gmres">

=== modified file 'tests/mmat-impact/2material_impact.flml'
--- tests/mmat-impact/2material_impact.flml	2012-12-11 18:13:04 +0000
+++ tests/mmat-impact/2material_impact.flml	2013-10-28 23:25:09 +0000
@@ -115,7 +115,7 @@
           <poisson_pressure_solution>
             <string_value lines="1">never</string_value>
           </poisson_pressure_solution>
-          <use_compressible_projection_method/>
+          <use_projection_method/>
           <update_discretised_equation/>
         </scheme>
         <solver>

=== modified file 'tests/mmat-shocktube/1material_shocktube.flml'
--- tests/mmat-shocktube/1material_shocktube.flml	2013-01-27 03:54:57 +0000
+++ tests/mmat-shocktube/1material_shocktube.flml	2013-10-28 23:25:09 +0000
@@ -98,7 +98,7 @@
           <poisson_pressure_solution>
             <string_value lines="1">never</string_value>
           </poisson_pressure_solution>
-          <use_compressible_projection_method/>
+          <use_projection_method/>
         </scheme>
         <solver>
           <iterative_method name="gmres">

=== modified file 'tests/mphase_dusty_gas_shock_tube/mphase_dusty_gas_shock_tube.flml'
--- tests/mphase_dusty_gas_shock_tube/mphase_dusty_gas_shock_tube.flml	2013-01-27 03:54:57 +0000
+++ tests/mphase_dusty_gas_shock_tube/mphase_dusty_gas_shock_tube.flml	2013-10-28 23:25:09 +0000
@@ -121,7 +121,7 @@
           <poisson_pressure_solution>
             <string_value lines="1">never</string_value>
           </poisson_pressure_solution>
-          <use_compressible_projection_method/>
+          <use_projection_method/>
         </scheme>
         <solver>
           <iterative_method name="preonly"/>

=== modified file 'tests/mphase_dusty_gas_shock_tube/single_phase_frozen_flow_test.flml'
--- tests/mphase_dusty_gas_shock_tube/single_phase_frozen_flow_test.flml	2012-10-26 20:16:46 +0000
+++ tests/mphase_dusty_gas_shock_tube/single_phase_frozen_flow_test.flml	2013-10-28 23:25:09 +0000
@@ -121,7 +121,7 @@
           <poisson_pressure_solution>
             <string_value lines="1">never</string_value>
           </poisson_pressure_solution>
-          <use_compressible_projection_method/>
+          <use_projection_method/>
         </scheme>
         <solver>
           <iterative_method name="preonly"/>

=== modified file 'tests/mphase_inlet_velocity_bc_compressible/mphase_inlet_velocity_bc_compressible.flml'
--- tests/mphase_inlet_velocity_bc_compressible/mphase_inlet_velocity_bc_compressible.flml	2013-07-04 19:47:22 +0000
+++ tests/mphase_inlet_velocity_bc_compressible/mphase_inlet_velocity_bc_compressible.flml	2013-10-28 23:25:09 +0000
@@ -146,7 +146,7 @@
           <poisson_pressure_solution>
             <string_value lines="1">never</string_value>
           </poisson_pressure_solution>
-          <use_compressible_projection_method/>
+          <use_projection_method/>
         </scheme>
         <solver>
           <iterative_method name="gmres">

=== modified file 'tests/mphase_rogue_shock_tube_dense_bed_glass/mphase_rogue_shock_tube_dense_bed_glass.flml'
--- tests/mphase_rogue_shock_tube_dense_bed_glass/mphase_rogue_shock_tube_dense_bed_glass.flml	2013-04-24 14:56:59 +0000
+++ tests/mphase_rogue_shock_tube_dense_bed_glass/mphase_rogue_shock_tube_dense_bed_glass.flml	2013-10-28 23:25:09 +0000
@@ -105,7 +105,7 @@
           <poisson_pressure_solution>
             <string_value lines="1">never</string_value>
           </poisson_pressure_solution>
-          <use_compressible_projection_method/>
+          <use_projection_method/>
         </scheme>
         <solver>
           <iterative_method name="gmres">

=== modified file 'tests/mphase_rogue_shock_tube_dense_bed_nylon/mphase_rogue_shock_tube_dense_bed_nylon.flml'
--- tests/mphase_rogue_shock_tube_dense_bed_nylon/mphase_rogue_shock_tube_dense_bed_nylon.flml	2013-04-24 14:56:59 +0000
+++ tests/mphase_rogue_shock_tube_dense_bed_nylon/mphase_rogue_shock_tube_dense_bed_nylon.flml	2013-10-28 23:25:09 +0000
@@ -105,7 +105,7 @@
           <poisson_pressure_solution>
             <string_value lines="1">never</string_value>
           </poisson_pressure_solution>
-          <use_compressible_projection_method/>
+          <use_projection_method/>
         </scheme>
         <solver>
           <iterative_method name="gmres">

=== modified file 'tests/mphase_strong_pressure_bc_compressible/mphase_strong_pressure_bc_compressible_p0p1.flml'
--- tests/mphase_strong_pressure_bc_compressible/mphase_strong_pressure_bc_compressible_p0p1.flml	2013-06-10 22:28:16 +0000
+++ tests/mphase_strong_pressure_bc_compressible/mphase_strong_pressure_bc_compressible_p0p1.flml	2013-10-28 23:25:09 +0000
@@ -148,7 +148,7 @@
           <poisson_pressure_solution>
             <string_value lines="1">never</string_value>
           </poisson_pressure_solution>
-          <use_compressible_projection_method/>
+          <use_projection_method/>
         </scheme>
         <solver>
           <iterative_method name="gmres">

=== modified file 'tests/mphase_strong_pressure_bc_compressible/mphase_strong_pressure_bc_compressible_p2p1.flml'
--- tests/mphase_strong_pressure_bc_compressible/mphase_strong_pressure_bc_compressible_p2p1.flml	2013-06-10 22:28:16 +0000
+++ tests/mphase_strong_pressure_bc_compressible/mphase_strong_pressure_bc_compressible_p2p1.flml	2013-10-28 23:25:09 +0000
@@ -145,7 +145,7 @@
           <poisson_pressure_solution>
             <string_value lines="1">never</string_value>
           </poisson_pressure_solution>
-          <use_compressible_projection_method/>
+          <use_projection_method/>
         </scheme>
         <solver>
           <iterative_method name="gmres">

=== modified file 'tests/mphase_subtract_out_reference_profile/mphase_subtract_out_reference_profile_1d.flml'
--- tests/mphase_subtract_out_reference_profile/mphase_subtract_out_reference_profile_1d.flml	2013-07-05 00:58:58 +0000
+++ tests/mphase_subtract_out_reference_profile/mphase_subtract_out_reference_profile_1d.flml	2013-10-28 23:25:09 +0000
@@ -160,7 +160,7 @@
           <poisson_pressure_solution>
             <string_value lines="1">never</string_value>
           </poisson_pressure_solution>
-          <use_compressible_projection_method/>
+          <use_projection_method/>
         </scheme>
         <solver>
           <iterative_method name="gmres">

=== modified file 'tests/shocktube_1d/shocktube.flml'
--- tests/shocktube_1d/shocktube.flml	2013-01-27 03:54:57 +0000
+++ tests/shocktube_1d/shocktube.flml	2013-10-28 23:25:09 +0000
@@ -74,7 +74,7 @@
           <poisson_pressure_solution>
             <string_value lines="1">never</string_value>
           </poisson_pressure_solution>
-          <use_compressible_projection_method/>
+          <use_projection_method/>
         </scheme>
         <solver>
           <iterative_method name="preonly"/>

=== modified file 'tests/strong_pressure_bc_compressible/strong_pressure_bc_compressible.flml'
--- tests/strong_pressure_bc_compressible/strong_pressure_bc_compressible.flml	2013-06-10 21:15:35 +0000
+++ tests/strong_pressure_bc_compressible/strong_pressure_bc_compressible.flml	2013-10-28 23:25:09 +0000
@@ -132,7 +132,7 @@
           <poisson_pressure_solution>
             <string_value lines="1">never</string_value>
           </poisson_pressure_solution>
-          <use_compressible_projection_method/>
+          <use_projection_method/>
         </scheme>
         <solver>
           <iterative_method name="gmres">

=== modified file 'tests/subtract_out_reference_profile/subtract_out_reference_profile_1d.flml'
--- tests/subtract_out_reference_profile/subtract_out_reference_profile_1d.flml	2013-07-05 00:58:58 +0000
+++ tests/subtract_out_reference_profile/subtract_out_reference_profile_1d.flml	2013-10-28 23:25:09 +0000
@@ -172,7 +172,7 @@
           <poisson_pressure_solution>
             <string_value lines="1">never</string_value>
           </poisson_pressure_solution>
-          <use_compressible_projection_method/>
+          <use_projection_method/>
         </scheme>
         <solver>
           <iterative_method name="gmres">

=== modified file 'tests/subtract_out_reference_profile/subtract_out_reference_profile_pseudo1d.flml'
--- tests/subtract_out_reference_profile/subtract_out_reference_profile_pseudo1d.flml	2013-07-05 00:58:58 +0000
+++ tests/subtract_out_reference_profile/subtract_out_reference_profile_pseudo1d.flml	2013-10-28 23:25:09 +0000
@@ -147,7 +147,7 @@
           <poisson_pressure_solution>
             <string_value lines="1">never</string_value>
           </poisson_pressure_solution>
-          <use_compressible_projection_method/>
+          <use_projection_method/>
         </scheme>
         <solver>
           <iterative_method name="gmres">