Merge lp:~fluidity-core/fluidity/fluidity-ss-bid-warnings into lp:fluidity

[Rhodri Davies]

Ok - I have fixed bug #1240921 in branch:

lp:~fluidity-core/fluidity/fluidity-ss-bid-warnings

by adding the optional suppress_warnings argument if populate boundary conditions is called from sub_state.

A green buildbot queue is here:

http://buildbot-ocean.ese.ic.ac.uk:8080/builders/fluidity-ss-bid-warnings

To me, it's fine to merge, but best that somebody takes a look through beforehand.

[lp:~fluidity-core/fluidity/fluidity-ss-bid-warnings]

4272. By Rhodri Davies on 2013-10-20

Merge trunk changes into branch.

[Stephan Kramer (s-kramer)]

Looks fine and dandy to me!

review: Approve

=== modified file 'femtools/Boundary_Conditions.F90'
--- femtools/Boundary_Conditions.F90	2013-03-03 01:34:34 +0000
+++ femtools/Boundary_Conditions.F90	2013-10-20 21:56:18 +0000
@@ -141,7 +141,7 @@
 contains
 
   subroutine add_scalar_boundary_condition(field, name, type, boundary_ids, &
-    option_path)
+    option_path, suppress_warnings)
   !!< Add boundary condition to scalar field
   type(scalar_field), intent(inout):: field
   !! all things should have a name
@@ -152,6 +152,8 @@
   integer, dimension(:), intent(in):: boundary_ids
   !! path to options for this b.c. in the options tree
   character(len=*), optional, intent(in) :: option_path
+  !! suppress warnings about non-existant surface ids:
+  logical, intent(in), optional:: suppress_warnings
   
     logical, dimension(1:size(boundary_ids)):: boundary_id_used
     integer, dimension(:), allocatable:: surface_element_list
@@ -174,7 +176,7 @@
       end if
     end do
       
-    if (.not. IsParallel() .and. .not. all(boundary_id_used)) then
+    if (.not. IsParallel() .and. .not. all(boundary_id_used)  .and. .not. present_and_true(suppress_warnings)) then
       ewrite(0,*) "WARNING: for boundary condition: ", trim(name)
       ewrite(0,*) "added to field: ", trim(field%name)
       ewrite(0,*) "The following boundary ids were specified, but they don't appear in the surface mesh:"
@@ -232,7 +234,7 @@
   end subroutine add_scalar_boundary_condition_surface_elements
     
   subroutine add_vector_boundary_condition(field, name, type, boundary_ids, &
-      applies, option_path)
+      applies, option_path, suppress_warnings)
   !!< Add boundary condition to vector field
   type(vector_field), intent(inout):: field
   !! all things should have a name
@@ -245,6 +247,8 @@
   logical, dimension(:), intent(in), optional:: applies
   !! path to options for this b.c. in the options tree
   character(len=*), optional, intent(in) :: option_path
+  !! suppress warnings about non-existant surface ids:
+  logical, intent(in), optional:: suppress_warnings
     
     logical, dimension(1:size(boundary_ids)):: boundary_id_used
     integer, dimension(:), allocatable:: surface_element_list
@@ -267,7 +271,7 @@
       end if
     end do
         
-    if (.not. IsParallel() .and. .not. all(boundary_id_used)) then
+    if (.not. IsParallel() .and. .not. all(boundary_id_used) .and. .not. present_and_true(suppress_warnings)) then
       ewrite(0,*) "WARNING: for boundary condition: ", trim(name)
       ewrite(0,*) "added to field: ", trim(field%name)
       ewrite(0,*) "The following boundary ids were specified, but they don't appear in the surface mesh:"

=== modified file 'preprocessor/Boundary_Conditions_From_Options.F90'
--- preprocessor/Boundary_Conditions_From_Options.F90	2013-08-02 08:43:04 +0000
+++ preprocessor/Boundary_Conditions_From_Options.F90	2013-10-20 21:56:18 +0000
@@ -71,11 +71,13 @@
 
 contains
 
-  subroutine populate_boundary_conditions(states)
+  subroutine populate_boundary_conditions(states, suppress_warnings)
     ! Populate the boundary conditions of all fields
     ! This is called as part of populate_state but also
     ! after an adapt.
     type(state_type), dimension(:), intent(in):: states
+    ! suppress warnings about non-existant surface ids
+    logical, optional, intent(in)  :: suppress_warnings
 
     ! these must be pointers as bc's should be added to the original field
     type(scalar_field), pointer:: sfield
@@ -104,9 +106,9 @@
           field_path=sfield%option_path
 
           call populate_scalar_boundary_conditions(sfield, &
-               trim(field_path)//'/prognostic/boundary_conditions', position)
+               trim(field_path)//'/prognostic/boundary_conditions', position, suppress_warnings=suppress_warnings)
           call populate_scalar_boundary_conditions(sfield, &
-               trim(field_path)//'/diagnostic/algorithm/boundary_conditions', position)
+               trim(field_path)//'/diagnostic/algorithm/boundary_conditions', position, suppress_warnings=suppress_warnings)
 
        end do
 
@@ -121,7 +123,7 @@
 
           ! only prognostic fields from here:
           call populate_vector_boundary_conditions(states(p+1),vfield, &
-               trim(field_path)//'/prognostic/boundary_conditions', position)
+               trim(field_path)//'/prognostic/boundary_conditions', position, suppress_warnings=suppress_warnings)
 
        end do
 
@@ -170,12 +172,14 @@
     
   end subroutine populate_boundary_conditions
 
-  subroutine populate_scalar_boundary_conditions(field, bc_path, position)
+  subroutine populate_scalar_boundary_conditions(field, bc_path, position, suppress_warnings)
     ! Populate the boundary conditions of one scalar field
     ! needs to be a pointer:
     type(scalar_field), pointer:: field
     character(len=*), intent(in):: bc_path
     type(vector_field), intent(in):: position
+    ! suppress warnings about non-existant surface ids
+    logical, optional, intent(in) :: suppress_warnings
 
     type(mesh_type), pointer:: surface_mesh
     type(scalar_field) surface_field
@@ -244,7 +248,7 @@
 
        ! Add boundary condition
        call add_boundary_condition(field, trim(bc_name), trim(bc_type), &
-            surface_ids, option_path=bc_path_i)
+            surface_ids, option_path=bc_path_i, suppress_warnings=suppress_warnings)
 
        ! mesh of only the part of the surface where this b.c. applies
        call get_boundary_condition(field, i+1, surface_mesh=surface_mesh, &
@@ -303,13 +307,15 @@
 
   end subroutine populate_scalar_boundary_conditions
 
-  subroutine populate_vector_boundary_conditions(state, field, bc_path, position)
+  subroutine populate_vector_boundary_conditions(state, field, bc_path, position, suppress_warnings)
     ! Populate the boundary conditions of one vector field
     ! needs to be a pointer:
     type(state_type), intent(in) :: state
     type(vector_field), pointer:: field
     character(len=*), intent(in):: bc_path
     type(vector_field), intent(in):: position
+    ! suppress warnings about non-existant surface ids
+    logical, optional, intent(in) :: suppress_warnings
 
     ! possible vector components for vector b.c.s
     ! either carteisan aligned or aligned with the surface
@@ -373,7 +379,7 @@
           call add_sem_bc(have_sem_bc)
           
           call add_boundary_condition(field, trim(bc_name), trim(bc_type),&
-               & surface_ids, applies=applies, option_path=bc_path_i)
+               & surface_ids, applies=applies, option_path=bc_path_i, suppress_warnings=suppress_warnings)
           deallocate(surface_ids)
           
           call get_boundary_condition(field, i+1, surface_mesh=surface_mesh)
@@ -412,7 +418,7 @@
           end do
 
           call add_boundary_condition(field, trim(bc_name), trim(bc_type),&
-               & surface_ids, applies=applies, option_path=bc_path_i)
+               & surface_ids, applies=applies, option_path=bc_path_i, suppress_warnings=suppress_warnings)
           deallocate(surface_ids)
 
           call get_boundary_condition(field, i+1, surface_mesh=surface_mesh)
@@ -427,7 +433,7 @@
        case("drag")
 
           call add_boundary_condition(field, trim(bc_name), trim(bc_type), &
-               & surface_ids, option_path=bc_path_i)
+               & surface_ids, option_path=bc_path_i, suppress_warnings=suppress_warnings)
           deallocate(surface_ids)
 
           call get_boundary_condition(field, i+1, surface_mesh=surface_mesh)
@@ -438,7 +444,7 @@
        case ("wind_forcing")
 
           call add_boundary_condition(field, trim(bc_name), trim(bc_type), &
-               & surface_ids, option_path=bc_path_i)
+               & surface_ids, option_path=bc_path_i, suppress_warnings=suppress_warnings)
           deallocate(surface_ids)
 
           call get_boundary_condition(field, i+1, surface_mesh=surface_mesh)
@@ -456,7 +462,8 @@
 
           ! Just add to the first dimension
           call add_boundary_condition(field, trim(bc_name), trim(bc_type),&
-               & surface_ids, applies=(/ .true., .false., .false. /) , option_path=bc_path_i)
+               & surface_ids, applies=(/ .true., .false., .false. /) , option_path=bc_path_i,&
+               & suppress_warnings=suppress_warnings)
           deallocate(surface_ids)
           call get_boundary_condition(field, i+1, surface_mesh=surface_mesh)
           call allocate(surface_field, field%dim, surface_mesh, name="value")
@@ -467,7 +474,7 @@
 
           ! The bulk_formulae type is actually a wind forcing on velocity...
           call add_boundary_condition(field, trim(bc_name) ,&
-                &'wind_forcing', surface_ids, option_path=bc_path_i)
+                &'wind_forcing', surface_ids, option_path=bc_path_i,suppress_warnings=suppress_warnings)
           deallocate(surface_ids)
           call get_boundary_condition(field, i+1, surface_mesh=surface_mesh)
           call allocate(surface_field, field%dim-1, surface_mesh, name="WindSurfaceField")
@@ -481,7 +488,7 @@
           ! applying in the tangential directions only
           call add_boundary_condition(field, trim(bc_name), trim(bc_type), &
                & surface_ids, option_path=bc_path_i, &
-               & applies=(/ .true., .false., .false. /) )
+               & applies=(/ .true., .false., .false. /),suppress_warnings=suppress_warnings)
           deallocate(surface_ids)
 
           if (trim(bc_type)=="free_surface") then
@@ -502,7 +509,7 @@
        case ("outflow")
           ! dummy bc for outflow planes
           call add_boundary_condition(field, trim(bc_name), trim(bc_type), surface_ids, option_path=bc_path_i, &
-                                       & applies=(/ .true., .true., .true. /) )
+                                       & applies=(/ .true., .true., .true. /),suppress_warnings=suppress_warnings )
           deallocate(surface_ids) 
  
        case default

=== modified file 'preprocessor/Populate_Sub_State.F90'
--- preprocessor/Populate_Sub_State.F90	2013-06-17 18:03:49 +0000
+++ preprocessor/Populate_Sub_State.F90	2013-10-20 21:56:18 +0000
@@ -106,7 +106,7 @@
 
     call allocate_and_insert_fields(sub_states)
 
-    call populate_boundary_conditions(sub_states)
+    call populate_boundary_conditions(sub_states, suppress_warnings=.true.)
 
     call set_boundary_conditions_values(sub_states)