Merge branch 'update_fft' of github.com:xcompact3d/2decomp-fft into u…

…pdate_fft

examples/Makefile

@@ -1,7 +1,7 @@
-.PHONY: init_test test2d fft_physical_x fft_physical_z io_test halo_test
+.PHONY: init_test test2d fft_physical_x fft_physical_z halo_test io_test 
 
 # Just build the examples
-examples: init_test test2d fft_physical_x fft_physical_z io_test halo_test
+examples: init_test test2d fft_physical_x fft_physical_z halo_test io_test
 	@echo "Built the examples"
 
 init_test:
@@ -12,6 +12,8 @@ fft_physical_x:
 	$(MAKE) -C $@ all
 fft_physical_z:
 	$(MAKE) -C $@ all
+halo_test:
+	$(MAKE) -C $@ $@
 io_test:
 	$(MAKE) -C $@ all
 halo_test:
@@ -22,15 +24,15 @@ check:
 	cd test2d; $(MAKE) $@
 	cd fft_physical_x; $(MAKE) $@
 	cd fft_physical_z; $(MAKE) $@
-	cd io_test; $(MAKE) $@
 	cd halo_test; $(MAKE) $@
+	cd io_test; $(MAKE) $@
 
 clean:
 	cd init_test; $(MAKE) $@
 	cd test2d; $(MAKE) $@
 	cd fft_physical_x; $(MAKE) $@
 	cd fft_physical_z; $(MAKE) $@
-	cd io_test; $(MAKE) $@
 	cd halo_test; $(MAKE) $@
+	cd io_test; $(MAKE) $@
 
 export

examples/halo_test/halo_test.f90

@@ -33,9 +33,15 @@ program halo_test
 
    logical :: passing, all_pass
 
+#if defined(_GPU)
+   write(*,*) 'Halo is not currently support on GPU. This test is not performed'
+   return
+#endif
+
    call MPI_INIT(ierror)
    call decomp_2d_init(nx, ny, nz, p_row, p_col)
 
+
    xlast = xsize(1) - 1
    if (xend(2) == ny) then
       ylast = xsize(2) - 1