Removed timer code - isn't supported on Apple Silicon at present

examples/xdsl/benchmarks/pw_advection/advection_mpi.F90 → examples/xdsl/pw_advection/advection_mpi.F90

@@ -1,36 +1,29 @@
 subroutine main()
     use mpi
-    use timer
     real*8, dimension(:,:,:), allocatable :: su, sv, sw, u, v, w
-    real*8, dimension(:), allocatable :: tzc1, tzc2, tzd1, tzd2
-    integer :: k, j, i, nx, ny, nz, rank
-    integer :: itimer0, itimer1, mpi_err
+    real*8, dimension(:,:,:), allocatable :: tzc1, tzc2, tzd1, tzd2
+    integer :: k, j, i, nx, ny, nz, rank, fixed
 
-    call MPI_Init(mpi_err)
+    call MPI_Init()
 
     rank=MPI_CommRank()
 
     nx=256
     ny=512
     nz=256
+
+    fixed=1
 
     allocate(su(nz, ny, nx))
     allocate(sv(nz, ny, nx))
     allocate(sw(nz, ny, nx))
     allocate(u(nz, ny, nx))
     allocate(v(nz, ny, nx))
     allocate(w(nz, ny, nx))
-    allocate(tzc1(nz))
-    allocate(tzc2(nz))
-    allocate(tzd1(nz))
-    allocate(tzd2(nz))
-
-    !itimer0 = setup_timer()
-
-    if (rank == 0) then
-      !call timer_init()
-      !call timer_start(itimer0, label='Initialise')
-    end if
+    allocate(tzc1(nz, 1, 1))
+    allocate(tzc2(nz, 1, 1))
+    allocate(tzd1(nz, 1, 1))
+    allocate(tzd2(nz, 1, 1))
 
     do i=1, nx
       do j=1, ny
@@ -43,43 +36,33 @@ subroutine main()
     end do
 
     do k=1, nz
-      tzc1(k)=50.0
-      tzc2(k)=15.0
-      tzd1(k)=100.0
-      tzd2(k)=5.0
+      tzc1(k, fixed, fixed)=50.0
+      tzc2(k, fixed, fixed)=15.0
+      tzd1(k, fixed, fixed)=100.0
+      tzd2(k, fixed, fixed)=5.0
     end do
 
-    if (rank == 0) then
-      !call timer_stop(itimer0)
-      !call timer_start(itimer1, label='Compute')
-    end if
-
     do i=2,nx-1
       do j=2,ny-1
         do k=2,nz-1
           su(k, j, i)=&
             (2.0*(u(k, j, i-1)*(u(k, j, i)+u(k, j, i-1))-u(k, j, i+1)*(u(k, j, i)+u(k, j, i+1)))) + &
             (1.0*(u(k, j-1, i)*(v(k, j-1, i)+v(k, j-1, i+1))-u(k, j+1, i)*(v(k, j, i)+v(k, j, i+1)))) + &
-            (tzc1(k)*u(k-1, j, i)*(w(k-1, j, i)+w(k-1, j, i+1))-tzc2(k)*u(k+1, j, i)*(w(k, j, i)+w(k, j, i+1)))
+            (tzc1(k, fixed, fixed)*u(k-1, j, i)*(w(k-1, j, i)+w(k-1, j, i+1))-tzc2(k, fixed, fixed)*u(k+1, j, i)*(w(k, j, i)+w(k, j, i+1)))
 
           sv(k, j, i)=&
             (2.0*(v(k, j-1, i)*(v(k, j, i)+v(k, j-1, i))-v(k, j+1, i)*(v(k, j, i)+v(k, j+1, i)))) + &
             (2.0*(v(k, j, i-1)*(u(k, j, i-1)+u(k, j+1, i-1))-v(k, j, i+1)*(u(k, j, i)+u(k, j+1, i)))) + &
-            (tzc1(k)*v(k-1, j, i)*(w(k-1, j, i)+w(k-1, j+1, i))-tzc2(k)*v(k+1, j, i)*(w(k, j, i)+w(k, j+1, i)))
+            (tzc1(k, fixed, fixed)*v(k-1, j, i)*(w(k-1, j, i)+w(k-1, j+1, i))-tzc2(k, fixed, fixed)*v(k+1, j, i)*(w(k, j, i)+w(k, j+1, i)))
 
           sw(k, j, i)=&
-            (tzd1(k)*w(k-1, j, i)*(w(k, j, i)+w(k-1, j, i))-tzd2(k)*w(k+1, j, i)*(w(k, j, i)+w(k+1, j, i))) + &
+            (tzd1(k, fixed, fixed)*w(k-1, j, i)*(w(k, j, i)+w(k-1, j, i))-tzd2(k, fixed, fixed)*w(k+1, j, i)*(w(k, j, i)+w(k+1, j, i))) + &
             (2.0*(w(k, j, i-1)*(u(k, j, i-1)+u(k+1, j, i-1))-w(k, j, i+1)*(u(k, j, i)+u(k+1, j, i)))) + &
             (2.0*(w(k, j-1, i)*(v(k, j-1, i)+v(k+1, j-1, i))-w(k, j+1, i)*(v(k, j, i)+v(k+1, j, i))))
         end do
       end do
     end do
 
-    if (rank == 0) then
-      !call timer_stop(itimer1)
-      !call timer_report()
-    end if
-
     deallocate(su)
     deallocate(sv)
     deallocate(sw)