Merge remote-tracking branch 'fre/gpu_dev' into pre_create

NOAA-GFDL · Dec 22, 2023 · 597590a · 597590a
2 parents 8bbbb17 + a4c6920
commit 597590a
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 10 deletions.
diff --git a/tools/cubic_utils/Makefile.am b/tools/cubic_utils/Makefile.am
@@ -20,8 +20,7 @@
 bin_PROGRAMS = make_remap_file
 
 AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
-            $(NETCDF_CFLAGS) \
-            -I$(top_srcdir)/tools/fregrid
+            $(NETCDF_CFLAGS)
 LDADD = $(top_builddir)/tools/libfrencutils/libfrencutils.a \
         $(NETCDF_LDFLAGS) $(NETCDF_LIBS)  $(RPATH_FLAGS)
 

diff --git a/tools/fregrid/globals.h → tools/libfrencutils/globals.h b/tools/fregrid/globals.h → tools/libfrencutils/globals.h
diff --git a/tools/make_coupler_mosaic/Makefile.am b/tools/make_coupler_mosaic/Makefile.am
@@ -23,8 +23,7 @@ if WITH_MPI
 endif
 
 AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
-            $(NETCDF_CFLAGS) \
-            -I$(top_srcdir)/tools/fregrid
+            $(NETCDF_CFLAGS)
 LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS)  $(RPATH_FLAGS)
 
 make_coupler_mosaic_SOURCES = make_coupler_mosaic.c

diff --git a/tools/make_hgrid/Makefile.am b/tools/make_hgrid/Makefile.am
@@ -24,7 +24,7 @@ endif
 
 
 AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
-            $(NETCDF_CFLAGS) -I$(top_srcdir)/tools/fregrid
+            $(NETCDF_CFLAGS)
 LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)
 
 make_hgrid_SOURCES = create_conformal_cubic_grid.c \

diff --git a/tools/make_quick_mosaic/Makefile.am b/tools/make_quick_mosaic/Makefile.am
@@ -20,7 +20,7 @@
 bin_PROGRAMS = make_quick_mosaic
 
 AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
-            $(NETCDF_CFLAGS) -I$(top_srcdir)/tools/fregrid
+            $(NETCDF_CFLAGS)
 LDADD = $(top_builddir)/tools/libfrencutils/libfrencutils.a \
         $(NETCDF_LDFLAGS) $(NETCDF_LIBS)  $(RPATH_FLAGS)
 

diff --git a/tools/make_topog/Makefile.am b/tools/make_topog/Makefile.am
@@ -23,7 +23,7 @@ if WITH_MPI
 endif
 
 AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
-            $(NETCDF_CFLAGS) -I$(top_srcdir)/tools/fregrid
+            $(NETCDF_CFLAGS)
 LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)
 
 make_topog_SOURCES = make_topog.c \

diff --git a/tools/river_regrid/Makefile.am b/tools/river_regrid/Makefile.am
@@ -20,7 +20,7 @@
 bin_PROGRAMS = river_regrid
 
 AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
-            $(NETCDF_CFLAGS) -I$(top_srcdir)/tools/fregrid
+            $(NETCDF_CFLAGS)
 LDADD = $(top_builddir)/tools/libfrencutils/libfrencutils.a \
         $(NETCDF_LDFLAGS) $(NETCDF_LIBS)  $(RPATH_FLAGS)
 

diff --git a/tools/runoff_regrid/Makefile.am b/tools/runoff_regrid/Makefile.am
@@ -23,7 +23,7 @@ if WITH_MPI
 endif
 
 AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
-            $(NETCDF_CFLAGS) -I$(top_srcdir)/tools/fregrid
+            $(NETCDF_CFLAGS)
 LDADD = $(NETCDF_LDFLAGS) $(NETCDF_LIBS) $(RPATH_FLAGS)
 
 runoff_regrid_SOURCES = runoff_regrid.c

diff --git a/tools/transfer_to_mosaic_grid/Makefile.am b/tools/transfer_to_mosaic_grid/Makefile.am
@@ -20,7 +20,7 @@
 bin_PROGRAMS = transfer_to_mosaic_grid
 
 AM_CFLAGS = -I$(top_srcdir)/tools/libfrencutils \
-            $(NETCDF_CFLAGS) -I$(top_srcdir)/tools/fregrid
+            $(NETCDF_CFLAGS)
 LDADD = $(top_builddir)/tools/libfrencutils/libfrencutils.a \
         $(NETCDF_LDFLAGS) $(NETCDF_LIBS)  $(RPATH_FLAGS)