Silence new GCC 7 warnings.

Author: jrper

assemble/Free_Surface.F90

@@ -195,7 +195,7 @@ subroutine insert_original_distance_to_bottom(state)
     type(scalar_field) :: original_bottomdist, original_bottomdist_remap
 
     if (.not. has_scalar_field(state, "OriginalDistanceToBottom")) then
-       ewrite(2, *), "Inserting OriginalDistanceToBottom field into state."   
+       ewrite(2, *) "Inserting OriginalDistanceToBottom field into state."   
        bottomdist => extract_scalar_field(state, "DistanceToBottom")
        call allocate(original_bottomdist, bottomdist%mesh, "OriginalDistanceToBottom")
        call zero(original_bottomdist)
@@ -204,7 +204,7 @@ subroutine insert_original_distance_to_bottom(state)
        call deallocate(original_bottomdist)
 
        ! We also cache  the OriginalDistanceToBottom on the pressure mesh
-       ewrite(2, *), "Inserting OriginalDistanceToBottomPressureMesh field into state."   
+       ewrite(2, *) "Inserting OriginalDistanceToBottomPressureMesh field into state."   
        p_mesh => extract_pressure_mesh(state)
        call allocate(original_bottomdist_remap, p_mesh, "OriginalDistanceToBottomPressureMesh")
        call remap_field(original_bottomdist, original_bottomdist_remap)

assemble/Geostrophic_Pressure.F90

@@ -1986,7 +1986,7 @@ subroutine derive_interpolated_p_dirichlet_multiple(base_ps, base_positions, ps,
 
     call clear_boundary_conditions(ps)
 
-    ewrite(2, *), "Adding strong Dirichlet bc for field " // trim(ps(1)%name)
+    ewrite(2, *) "Adding strong Dirichlet bc for field " // trim(ps(1)%name)
     do i = 1, size(surface_eles)
       surface_eles(i) = i
     end do
@@ -1999,7 +1999,7 @@ subroutine derive_interpolated_p_dirichlet_multiple(base_ps, base_positions, ps,
     call insert_surface_field(ps(1), 1, b_ps(1))
     call deallocate(b_ps(1))
     do i = 2, size(ps)
-      ewrite(2, *), "Adding strong Dirichlet bc for field " // trim(ps(i)%name) 
+      ewrite(2, *) "Adding strong Dirichlet bc for field " // trim(ps(i)%name) 
       call add_boundary_condition_surface_elements(ps(i), "InterpolatedBoundary", "dirichlet", surface_eles) 
       ewrite_minmax(b_ps(i))
       call insert_surface_field(ps(i), 1, b_ps(i))
@@ -2165,7 +2165,7 @@ subroutine decompose_p_mean_multiple(matrices, base_ps, positions, ps, solver_pa
       end do
       do i = 1, size(bc_ps, 1)
         call clear_boundary_conditions(bc_ps(i))
-        ewrite(2, *), "Adding strong Dirichlet bc for field " // trim(bc_ps(i)%name)
+        ewrite(2, *) "Adding strong Dirichlet bc for field " // trim(bc_ps(i)%name)
         call add_boundary_condition_surface_elements(bc_ps(i), "ConstantBoundary", "dirichlet", surface_eles) 
         call get_boundary_condition(bc_ps(i), 1, surface_mesh = bc_mesh, &
           & surface_element_list = bc_surface_element_list) 
@@ -2373,7 +2373,7 @@ subroutine decompose_p_optimal_multiple(matrices, base_ps, positions, ps, solver
       end do
       do i = 1, size(bc_ps, 1)
         call clear_boundary_conditions(bc_ps(i))
-        ewrite(2, *), "Adding strong Dirichlet bc for field " // trim(bc_ps(i)%name)
+        ewrite(2, *) "Adding strong Dirichlet bc for field " // trim(bc_ps(i)%name)
         call add_boundary_condition_surface_elements(bc_ps(i), "ConstantBoundary", "dirichlet", surface_eles) 
         call get_boundary_condition(bc_ps(i), 1, surface_mesh = bc_mesh, &
           & surface_element_list = bc_surface_element_list) 

diagnostics/Tidal_Diagnostics.F90

@@ -103,7 +103,7 @@ subroutine calculate_free_surface_history(state, s_field)
     real :: spin_up_time, current_time, timestep
     real, dimension(:), allocatable :: saved_snapshots_times
 
-    ewrite(3,*),'in free_surface_history_diagnostics'
+    ewrite(3,*) 'in free_surface_history_diagnostics'
 
     fs_field => extract_scalar_field(state,"FreeSurface",stat)
     call halo_update(fs_field)
@@ -158,13 +158,13 @@ subroutine calculate_free_surface_history(state, s_field)
    ! Note this is after the options check above as we add options to the tree if
    ! they aren't there and they are needed in tidal_harmonics diagnostics
    if(current_time+timestep<spin_up_time) then
-       ewrite(4,*), "Still spinning up."
+       ewrite(4,*) "Still spinning up."
        return
    endif
 
    ! check if we want to save the current timestep at all
    if (mod(timestep_counter,stride)/=0) then
-       ewrite(4,*), "Ignoring this timestep"
+       ewrite(4,*) "Ignoring this timestep"
        return
    end if
 
@@ -181,7 +181,7 @@ subroutine calculate_free_surface_history(state, s_field)
   saved_snapshots_times(new_snapshot_index)=current_time+timestep
   call set_option(trim(base_path) // "saved_snapshots_times", saved_snapshots_times, stat)
   assert(any(stat == (/SPUD_NO_ERROR, SPUD_NEW_KEY_WARNING/)))
-  ewrite(4,*), 'Filling history level: ', min(timestep_counter/stride+1,levels), '/', levels
+  ewrite(4,*) 'Filling history level: ', min(timestep_counter/stride+1,levels), '/', levels
 
   ! lets copy a snapshot of freesurface to s_field(new_snapshot_index)
   hist_fs_field => extract_scalar_field(state,'harmonic'//int2str(new_snapshot_index))
@@ -220,7 +220,7 @@ subroutine calculate_tidal_harmonics(state, s_field)
 
    ! Only if Harmonics weren't already calculated in this timestep
    if (last_update/=timestep) then 
-      ewrite(3,*), "In tidal_harmonics"
+      ewrite(3,*) "In tidal_harmonics"
       allocate(harmonic_fields(get_number_of_harmonic_fields(state)))
       allocate(sigma(nLevels_))
 
@@ -229,9 +229,9 @@ subroutine calculate_tidal_harmonics(state, s_field)
       if (.not. ignoretimestep) then
          ! Initialize the harmonic fields and frequencies if not already done.
          call getHarmonicFields(state, harmonic_fields, nohfs, sigma, M)
-         ewrite(4,*), 'Frequencies to analyse:'
+         ewrite(4,*) 'Frequencies to analyse:'
          do i=1,M
-            ewrite(4,*), sigma(i)
+            ewrite(4,*) sigma(i)
          end do
          ! Calculate harmonics and update (all!) harmonic fields
          call update_harmonic_fields(state, saved_snapshots_times, size(saved_snapshots_times), current_snapshot_index, sigma, M, harmonic_fields, nohfs)
@@ -268,12 +268,12 @@ subroutine getFreeSurfaceHistoryData(state, ignoretimestep, saved_snapshots_time
    call get_option(trim(free_surface_history_path) // "levels", levels)
 
    if( mod(timestep_counter,stride)/=0) then
-        ewrite(4,*),'Do nothing in this timestep.'
+        ewrite(4,*) 'Do nothing in this timestep.'
         ignoretimestep=.true.
         return
    end if
    if(timestep_counter/stride+1 .lt. levels) then
-        ewrite(4,*), 'Do nothing until levels are filled up.'
+        ewrite(4,*) 'Do nothing until levels are filled up.'
         ignoretimestep=.true.
         return
    end if
@@ -350,8 +350,8 @@ subroutine getHarmonicFields(state, harmonic_fields, nohfs, sigma, M)
            end if
        end if
     end do s_field_loop
-    ewrite(4,*), 'Found ',  nohfs, ' constituents to analyse.' 
-    ewrite(4,*), 'Found ', M, ' frequencies to analyse.'
+    ewrite(4,*) 'Found ',  nohfs, ' constituents to analyse.' 
+    ewrite(4,*) 'Found ', M, ' frequencies to analyse.'
 
    if ( M .le. 0 ) then
       FLExit("Internal error in calculate_tidal_harmonics(). No harmonic constituents were found in option tree.")

femtools/Coordinates.F90

@@ -1004,7 +1004,7 @@ subroutine higher_order_sphere_projection(positions, s_positions)
     type(scalar_field):: radius, s_radius
     real, dimension(positions%dim):: xyz
 
-    ewrite(1,*), 'In higher_order_sphere_projection'
+    ewrite(1,*) 'In higher_order_sphere_projection'
 
     call allocate(s_radius, s_positions%mesh, "HigherOrderRadius")
     radius=magnitude(positions)

femtools/Diagnostic_variables.F90

@@ -592,13 +592,13 @@ subroutine initialise_diagnostics(filename, state)
         if(stat_mesh(mesh)) then
           column = column + 1
           buffer = field_tag(name = mesh%name, column = column, statistic = "nodes")
-          write(default_stat%diag_unit, "(a)"), trim(buffer)
+          write(default_stat%diag_unit, "(a)") trim(buffer)
           column = column + 1
           buffer = field_tag(name = mesh%name, column = column, statistic = "elements")
-          write(default_stat%diag_unit, "(a)"), trim(buffer)
+          write(default_stat%diag_unit, "(a)") trim(buffer)
           column = column + 1
           buffer = field_tag(name = mesh%name, column = column, statistic = "surface_elements")
-          write(default_stat%diag_unit, "(a)"), trim(buffer)
+          write(default_stat%diag_unit, "(a)") trim(buffer)
         end if
       end do
 

femtools/Read_GMSH.F90

@@ -387,7 +387,7 @@ subroutine read_nodes_coords( fd, filename, gmshFormat, nodes )
 
     ! Skip newline character when in binary mode
     if( gmshFormat == binaryFormat ) then
-       read(fd), newlineChar
+       read(fd) newlineChar
        call ascii_formatting(fd, filename, "read")
     end if
 
@@ -477,7 +477,7 @@ subroutine read_node_column_IDs( fd, filename, gmshFormat, nodes )
 
     ! Skip newline character when in binary mode
     if( gmshFormat == binaryFormat ) then
-      read(fd), newlineChar
+      read(fd) newlineChar
       call ascii_formatting(fd, filename, "read")
     end if
 

ocean_forcing/FluxesReader.cpp

@@ -438,11 +438,11 @@ int FluxesReader::Read(int time_index){
 
     short fill_value;
     err = nc_get_att_short(ncid, id, "_FillValue", &fill_value);
-    if (err != NC_NOERR) fill_value = std::numeric_limits<double>::quiet_NaN();
+    if (err != NC_NOERR) fill_value = std::numeric_limits<short>::quiet_NaN();
 
     short missing_value;
     err = nc_get_att_short(ncid, id, "missing_value", &missing_value);
-    if (err != NC_NOERR) missing_value = std::numeric_limits<double>::quiet_NaN();
+    if (err != NC_NOERR) missing_value = std::numeric_limits<short>::quiet_NaN();
 
     if(verbose){
       cout<<*ifield<<" scale_factor = "<<scale_factor<<endl