From 392fb392afa9fefd38fe35b6d09e5a79c0dbb73f Mon Sep 17 00:00:00 2001 From: Ed Hartnett Date: Wed, 10 Jul 2019 13:35:02 -0600 Subject: [PATCH] cleanup --- configure.ac | 1 - src/Makefile.am | 5 +---- src/fncint/Makefile.am | 12 ------------ tests/fncint/ftst_pio.f90 | 4 ++-- 4 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 src/fncint/Makefile.am diff --git a/configure.ac b/configure.ac index 7bdced12fd7..612fc8a5f42 100644 --- a/configure.ac +++ b/configure.ac @@ -297,7 +297,6 @@ AC_OUTPUT(Makefile src/Makefile src/clib/Makefile src/ncint/Makefile - src/fncint/Makefile src/flib/Makefile src/gptl/Makefile tests/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index 4a194379393..eab6ab0d2f1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -15,12 +15,9 @@ endif # Are we building with netCDF integration? if BUILD_NCINT NCINT = ncint -if BUILD_FORTRAN -FNCINT = fncint -endif # BUILD_FORTRAN endif # BUILD_NCINT # Build these subdirectories. -SUBDIRS = ${NCINT} clib ${GPTL} $(FNCINT) $(FLIB) +SUBDIRS = ${NCINT} clib ${GPTL} $(FLIB) EXTRA_DIST = CMakeLists.txt diff --git a/src/fncint/Makefile.am b/src/fncint/Makefile.am deleted file mode 100644 index d635e6e86b3..00000000000 --- a/src/fncint/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -## This is the automake file to build the PIO netCDF integration -## layer for the PIO fortran library. -# Ed Hartnett 7/7/19 - -# Find pio.h. -AM_CPPFLAGS = -I$(top_srcdir)/src/clib - -# This is our output. The ncint convenience library. -#noinst_LTLIBRARIES = libfncint.la - -# The source files. -#libfncint_la_SOURCES = ncintdispatch.c ncintdispatch.h ncint_pio.c diff --git a/tests/fncint/ftst_pio.f90 b/tests/fncint/ftst_pio.f90 index 1172cd65534..b55fc80454e 100644 --- a/tests/fncint/ftst_pio.f90 +++ b/tests/fncint/ftst_pio.f90 @@ -19,8 +19,8 @@ program ftst_pio call MPI_Comm_rank(MPI_COMM_WORLD, myRank, ierr) call MPI_Comm_size(MPI_COMM_WORLD, ntasks, ierr) - ierr = pio_set_log_level(2) - ierr = nf_set_log_level(2) + ! ierr = pio_set_log_level(2) + ! ierr = nf_set_log_level(2) call nf_init_intracom(myRank, MPI_COMM_WORLD, niotasks, numAggregator, & stride, PIO_rearr_subset, ioSystem, base)