add new executable for make_topog_gpu

Author: rem1776

tests/Makefile.am

@@ -26,7 +26,7 @@ endif
 
 AM_CFLAGS = $(NETCDF_CFLAGS) -I$(top_builddir)/src -I$(top_srcdir)/tools/libfrencutils
 AM_FCFLAGS = -I$(top_builddir)/src
-LDADD = -L$(top_builddir)/src -lver $(NETCDF_LDFLAGS) $(NETCDF_LIBS)
+LDADD = -L$(top_builddir)/src $(NETCDF_LDFLAGS) $(NETCDF_LIBS)
 
 check_PROGRAMS = \
   create_5degree_topog \

tools/make_topog/Makefile.am

@@ -22,17 +22,24 @@ if WITH_MPI
   bin_PROGRAMS += make_topog_parallel
 endif
 
-AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils $(OPENACC_CFLAGS) \
-             $(NETCDF_CFLAGS) -I$(top_srcdir)/tools/libfrencutils_gpu
+if ENABLE_GPU
+  bin_PROGRAMS += make_topog_gpu
+endif
+
+AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils  \
+             $(NETCDF_CFLAGS)
 LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)
 
 make_topog_SOURCES = make_topog.c \
                      topog.c \
                      topog.h
 make_topog_LDADD = $(top_builddir)/tools/libfrencutils/libfrencutils.a \
-                   $(top_builddir)/tools/libfrencutils_gpu/libfrencutils_gpu.a \
                    $(LDADD)
 
 make_topog_parallel_SOURCES = $(make_topog_SOURCES)
 make_topog_parallel_CFLAGS = -Duse_libMPI $(MPI_CFLAGS) $(AM_CFLAGS)
 make_topog_parallel_LDADD = $(top_builddir)/tools/libfrencutils/libfrencutils_mpi.a $(LDADD) $(MPI_CLDFLAGS)
+
+make_topog_gpu_SOURCES = $(make_topog_SOURCES)
+make_topog_gpu_CFLAGS = $(OPENACC_CFLAGS) $(AM_CFLAGS) -I$(top_srcdir)/tools/libfrencutils_gpu
+make_topog_gpu_LDADD = $(top_builddir)/tools/libfrencutils_gpu/libfrencutils_gpu.a $(make_topog_LDADD)

tools/make_topog/topog.c

@@ -24,7 +24,9 @@
 #include "create_xgrid.h"
 #include "mosaic_util.h"
 #include "interp.h"
+#ifdef _OPENACC
 #include "interp_gpu.h"
+#endif
 #include "mpp_io.h"
 #include "mpp.h"
 #include "mpp_domain.h"
@@ -517,8 +519,14 @@ void create_realistic_topog(int nx_dst, int ny_dst, const double *x_dst, const d
        conserve_interp_great_circle(nx_src, ny_now, nx_dst, ny_dst, x_src, y_src,
 	   	    x_out, y_out, mask_src, depth_src, depth );
      else
+     // use gpu accelerated routine for interpolations
+#ifdef _OPENACC
        conserve_interp_gpu(nx_src, ny_now, nx_dst, ny_dst, x_src, y_src,
 	   	    x_out, y_out, mask_src, depth_src, depth );
+#else
+       conserve_interp(nx_src, ny_now, nx_dst, ny_dst, x_src, y_src,
+	   	    x_out, y_out, mask_src, depth_src, depth );
+#endif
    }
 
   if (filter_topog) filter_topo(nx_dst, ny_dst, num_filter_pass, smooth_topo_allow_deepening, depth, domain);