Remove globals from poisson and update tests to handle this

Author: connoraird

src/poisson/main.f90

@@ -3,7 +3,7 @@ program main
 
     implicit none
 
-    integer       :: element_to_node(3,mxe), vb_index(mxe), boundary_node_num(2,mxb), num_side_nodes(4,mxb)
+    integer       :: num_nodes, num_elements, num_boundary_points, element_to_node(3,mxe), vb_index(mxe), boundary_node_num(2,mxb), num_side_nodes(4,mxb)
     real          :: coordinates(2, mxp), nodal_value_of_f(mxp), vb1(mxc), vb2(mxc), vb(3,mxc)
     integer       :: fname_io = 100, fname_out_io = 101
 
@@ -37,15 +37,15 @@ program main
     !!
     !! *** Reads the triangular mesh and problem constants: Kx,Ky,Q,fp,q
     !!
-    call inp(element_to_node,vb_index,coordinates,boundary_node_num,num_side_nodes,vb,vb1,vb2,fname_io)
+    call inp(num_nodes,num_elements,num_boundary_points,element_to_node,vb_index,coordinates,boundary_node_num,num_side_nodes,vb,vb1,vb2,fname_io)
 
     !!
     !! *** Assembles and solves the system of equations
     !!
-    call pcg(element_to_node,vb_index,coordinates,boundary_node_num,num_side_nodes,vb,vb1,vb2,nodal_value_of_f)
+    call pcg(num_nodes,num_elements,num_boundary_points,element_to_node,vb_index,coordinates,boundary_node_num,num_side_nodes,vb,vb1,vb2,nodal_value_of_f)
 
     !!
     !! *** Writes the computed solution
     !!
-    call out(element_to_node,coordinates,nodal_value_of_f,fname_out_io)
+    call out(num_nodes,num_elements,element_to_node,coordinates,nodal_value_of_f,fname_out_io)
 end program main

src/poisson/poisson.f90

@@ -94,9 +94,6 @@ module poisson
       integer, parameter :: mxb  =  5000 
       integer, parameter :: mxc  =   100
 
-      integer :: num_nodes, num_elements, num_boundary_points, num_sets, num_dirichlet_boundary_conditions, &
-                 num_neumann_boundary_conditions
-
 contains
 
       subroutine open_file(file_name, status, file_io)
@@ -124,15 +121,18 @@ end subroutine open_file
       !!    "inp" reads the input data: triangular mesh and problem parameters.      *
       !!                                                                             *
       !!-----------------------------------------------------------------------------*
-      subroutine inp(element_to_node,vb_index,coordinates,boundary_node_num,num_side_nodes,vb,vb1,vb2,file_io)
+      subroutine inp(num_nodes,num_elements,num_boundary_points,element_to_node,vb_index,coordinates, &
+                     boundary_node_num,num_side_nodes,vb,vb1,vb2,file_io)
             implicit none
 
-            integer, intent(out) :: element_to_node(3,mxp), vb_index(mxe), boundary_node_num(2,mxb), &
+            integer, intent(out) :: num_nodes, num_elements, num_boundary_points, &
+                                    element_to_node(3,mxp), vb_index(mxe), boundary_node_num(2,mxb), &
                                     num_side_nodes(4,mxb)
             real, intent(out)    :: vb(3,mxc), vb1(mxc), vb2(mxc), coordinates(2, mxp)
             integer, intent(in)  :: file_io
 
-            integer      :: mx, ib, ip, ie, jb, jp, je, icheck
+            integer      :: mx, ib, ip, ie, jb, jp, je, icheck, num_sets, num_dirichlet_boundary_conditions, &
+                            num_neumann_boundary_conditions
             character*80 :: text
 
             read(file_io,'(a)') text
@@ -237,12 +237,13 @@ end subroutine inp
       !!    method.                                                                  *
       !!                                                                             *
       !!-----------------------------------------------------------------------------*
-      subroutine pcg(element_to_node,vb_index,coordinates,boundary_node_num,num_side_nodes,vb,vb1,vb2,nodal_value_of_f)
+      subroutine pcg(num_nodes,num_elements,num_boundary_points,element_to_node,vb_index,coordinates,boundary_node_num,num_side_nodes,vb,vb1,vb2,nodal_value_of_f)
             implicit none
 
             real, parameter :: eps = 1.e-04
 
-            integer, intent(in) :: element_to_node(3,mxp), vb_index(mxe), boundary_node_num(2,mxb), num_side_nodes(4,mxb)
+            integer, intent(in) :: num_nodes, num_elements, num_boundary_points, &
+                                   element_to_node(3,mxp), vb_index(mxe), boundary_node_num(2,mxb), num_side_nodes(4,mxb)
             real, intent(in)    :: coordinates(2, mxp), vb(3,mxc), vb1(mxc), vb2(mxc)
             real, intent(out)   :: nodal_value_of_f(mxp)
 
@@ -444,7 +445,7 @@ subroutine pcg(element_to_node,vb_index,coordinates,boundary_node_num,num_side_n
 
                   is_converged = res.le.rh0*tol
                   if(is_converged) then
-                        write(*,'(a,i4)') ' *** PCG converged: iterations = ',it
+                        ! write(*,'(a,i4)') ' *** PCG converged: iterations = ',it
                         exit
                   endif
             end do nit_loop
@@ -461,10 +462,10 @@ end subroutine pcg
       !!-----------------------------------------------------------------------------*
       !!    "out" writes output results.                                             *
       !!-----------------------------------------------------------------------------*
-      subroutine out(element_to_node,coordinates,nodal_value_of_f,file_io)
+      subroutine out(num_nodes,num_elements,element_to_node,coordinates,nodal_value_of_f,file_io)
             implicit none
 
-            integer, intent(in) :: element_to_node(3,mxp), file_io
+            integer, intent(in) :: num_nodes,num_elements,element_to_node(3,mxp), file_io
             real, intent(in)    :: nodal_value_of_f(mxp), coordinates(2, mxp)
 
             integer :: ip, ie

testing/test-drive/test_poisson.f90

@@ -20,11 +20,11 @@ module test_drive_poisson
     !> inp test inputs
     type :: inp_inputs_t
         character(len=:), allocatable :: data_filename
-        type(mesh_scalars_t) :: mesh_scalars
     end type inp_inputs_t
 
     !> inp test expected outputs
     type :: inp_expected_outputs_t
+        type(mesh_scalars_t) :: mesh_scalars
         type(mesh_vectors_t) :: mesh_vectors
     end type inp_expected_outputs_t
 
@@ -40,6 +40,13 @@ module test_drive_poisson
         real :: nodal_value_of_f(mxp)
     end type pcg_expected_outputs_t
 
+    !> out test inputs
+    type :: out_inputs_t
+        type(mesh_scalars_t) :: mesh_scalars
+        type(mesh_vectors_t) :: mesh_vectors
+        real :: nodal_value_of_f(mxp)
+    end type out_inputs_t
+
 contains
 
     !> Collect all test in this module into a single test suite
@@ -98,7 +105,8 @@ subroutine verify_inp(error, inputs, expected_outputs)
         type(inp_inputs_t), intent(in)  :: inputs
         type(inp_expected_outputs_t), intent(in)  :: expected_outputs
 
-        integer :: actual_element_to_node(3,mxp), actual_vb_index(mxe), actual_boundary_node_num(2,mxb), &
+        integer :: actual_num_nodes, actual_num_elements, actual_num_boundary_points, &
+                   actual_element_to_node(3,mxp), actual_vb_index(mxe), actual_boundary_node_num(2,mxb), &
                    actual_num_side_nodes(4,mxb), file_io = 123, i, j
         real    :: actual_vb(3,mxc), actual_vb1(mxc), actual_vb2(mxc), actual_coordinates(2, mxp)
         character(len=200) :: failure_message
@@ -107,21 +115,31 @@ subroutine verify_inp(error, inputs, expected_outputs)
         ! Open the file ready to be read
         call open_file(inputs%data_filename, 'old', file_io)
 
-        call inp(                     &
-            actual_element_to_node,   &
-            actual_vb_index,          &
-            actual_coordinates,       &
-            actual_boundary_node_num, &
-            actual_num_side_nodes,    &
-            actual_vb,                &
-            actual_vb1,               &
-            actual_vb2,               &
-            file_io                   &
+        call inp(                       &
+            actual_num_nodes,           &
+            actual_num_elements,        &
+            actual_num_boundary_points, &
+            actual_element_to_node,     &
+            actual_vb_index,            &
+            actual_coordinates,         &
+            actual_boundary_node_num,   &
+            actual_num_side_nodes,      &
+            actual_vb,                  &
+            actual_vb1,                 &
+            actual_vb2,                 &
+            file_io                     &
         )
 
         close(file_io)
 
-        do i = 1, inputs%mesh_scalars%num_elements
+        call check(error, actual_num_nodes, expected_outputs%mesh_scalars%num_nodes)
+        if (allocated(error)) return
+        call check(error, actual_num_elements, expected_outputs%mesh_scalars%num_elements)
+        if (allocated(error)) return
+        call check(error, actual_num_boundary_points, expected_outputs%mesh_scalars%num_boundary_points)
+        if (allocated(error)) return
+
+        do i = 1, expected_outputs%mesh_scalars%num_elements
             do j = 1, 3
                 write(failure_message,'(a,i1,a,i1,a,i2,a,i2)') "Unexpected value for element_to_node(", j, ",", i, "), got ", actual_element_to_node(j, i), " expected ", expected_outputs%mesh_vectors%element_to_node(j, i)
                 call check(error, actual_element_to_node(j, i), expected_outputs%mesh_vectors%element_to_node(j, i), failure_message)
@@ -133,15 +151,15 @@ subroutine verify_inp(error, inputs, expected_outputs)
             if (allocated(error)) return
         end do
 
-        do i = 1, inputs%mesh_scalars%num_nodes
+        do i = 1, expected_outputs%mesh_scalars%num_nodes
             do j = 1, 2
                 write(failure_message,'(a,i1,a,i1,a,f5.2,a,f5.2)') "Unexpected value for coordinates(", j, ",", i, "), got ", actual_coordinates(j, i), " expected ", expected_outputs%mesh_vectors%coordinates(j, i)
                 call check(error, actual_coordinates(j, i), expected_outputs%mesh_vectors%coordinates(j, i), failure_message, thr=threshold)
                 if (allocated(error)) return
             end do 
         end do
 
-        do i = 1, inputs%mesh_scalars%num_boundary_points
+        do i = 1, expected_outputs%mesh_scalars%num_boundary_points
             do j = 1, 2
                 write(failure_message,'(a,i1,a,i1,a,i2,a,i2)') "Unexpected value for boundary_node_num(", j, ",", i, "), got ", actual_boundary_node_num(j, i), " expected ", expected_outputs%mesh_vectors%boundary_node_num(j, i)
                 call check(error, actual_boundary_node_num(j, i), expected_outputs%mesh_vectors%boundary_node_num(j, i), failure_message)
@@ -155,21 +173,21 @@ subroutine verify_inp(error, inputs, expected_outputs)
             end do
         end do
 
-        do i = 1, inputs%mesh_scalars%num_sets
+        do i = 1, expected_outputs%mesh_scalars%num_sets
             do j = 1, 3
                 write(failure_message,'(a,i1,a,i1,a,f5.2,a,f5.2)') "Unexpected value for vb(", j, ",", i, "), got ", actual_vb(j, i), " expected ", expected_outputs%mesh_vectors%vb(j, i)
                 call check(error, actual_vb(j, i), expected_outputs%mesh_vectors%vb(j, i), failure_message, thr=threshold)
                 if (allocated(error)) return
             end do
         end do
 
-        do i = 1, inputs%mesh_scalars%num_dirichlet_boundary_conditions
+        do i = 1, expected_outputs%mesh_scalars%num_dirichlet_boundary_conditions
             write(failure_message,'(a,i1,a,f5.2,a,f5.2)') "Unexpected value for vb1(", i, "), got ", actual_vb1(i), " expected ", expected_outputs%mesh_vectors%vb1(i)
             call check(error, actual_vb1(i), expected_outputs%mesh_vectors%vb1(i), failure_message, thr=threshold)
             if (allocated(error)) return
         end do
 
-        do i = 1, inputs%mesh_scalars%num_neumann_boundary_conditions
+        do i = 1, expected_outputs%mesh_scalars%num_neumann_boundary_conditions
             write(failure_message,'(a,i1,a,f5.2,a,f5.2)') "Unexpected value for vb2(", i, "), got ", actual_vb2(i), " expected ", expected_outputs%mesh_vectors%vb2(i)
             call check(error, actual_vb2(i), expected_outputs%mesh_vectors%vb2(i), failure_message, thr=threshold)
             if (allocated(error)) return
@@ -183,7 +201,7 @@ subroutine test_inp_15_05(error)
         type(inp_inputs_t) :: inputs
         type(inp_expected_outputs_t) :: expected_outputs
 
-        call get_15_05_mesh_values(inputs%data_filename, inputs%mesh_scalars, expected_outputs%mesh_vectors)
+        call get_15_05_mesh_values(inputs%data_filename, expected_outputs%mesh_scalars, expected_outputs%mesh_vectors)
 
         call verify_inp(error, inputs, expected_outputs)
 
@@ -202,16 +220,19 @@ subroutine verify_pcg(error, inputs, expected_outputs)
         real :: threshold = 1e-06
         integer :: i
 
-        call pcg(                                  &
-            inputs%mesh_vectors%element_to_node,   &
-            inputs%mesh_vectors%vb_index,          &
-            inputs%mesh_vectors%coordinates,       &
-            inputs%mesh_vectors%boundary_node_num, &
-            inputs%mesh_vectors%num_side_nodes,    &
-            inputs%mesh_vectors%vb,                &
-            inputs%mesh_vectors%vb1,               &
-            inputs%mesh_vectors%vb2,               &
-            actual_nodal_value_of_f                &
+        call pcg(&
+            inputs%mesh_scalars%num_nodes,           &
+            inputs%mesh_scalars%num_elements,        &
+            inputs%mesh_scalars%num_boundary_points, &
+            inputs%mesh_vectors%element_to_node,     &
+            inputs%mesh_vectors%vb_index,            &
+            inputs%mesh_vectors%coordinates,         &
+            inputs%mesh_vectors%boundary_node_num,   &
+            inputs%mesh_vectors%num_side_nodes,      &
+            inputs%mesh_vectors%vb,                  &
+            inputs%mesh_vectors%vb1,                 &
+            inputs%mesh_vectors%vb2,                 &
+            actual_nodal_value_of_f                  &
         )
 
         ! verify outputs
@@ -237,4 +258,15 @@ subroutine test_pcg_15_05(error)
 
         deallocate(inputs%data_filename)
     end subroutine test_pcg_15_05
+
+    subroutine verify_out(error, inputs, expected_outputs)
+        implicit none
+        type(error_type), allocatable, intent(out) :: error
+
+        type(inp_inputs_t), intent(in) :: inputs
+        type(inp_expected_outputs_t), intent(in) :: expected_outputs
+
+        ! Verification code for the out subroutine
+        ! This is a placeholder for the actual verification code
+    end subroutine verify_out
 end module