Skip to content
Commits on Source (21)
Expand all Show whitespace changes
Inline Side-by-side
.gitignore
View file @ cf46a4bb
......@@ -3,3 +3,6 @@ build*
\#.\#
*.*~
html
*.o
*.tmp
*.tmp2
\ No newline at end of file
CMakeExtras/Makefile.am
View file @ cf46a4bb
## This is a automake file, part of Unidata's netCDF package.
# Copyright 2012-2019, see the COPYRIGHT file for more information.
# This is the automake file for CMakeExtras dir. This holds extra
# stuff needed for the CMake build. Include them so the dist contains
# a working CMake build.
# Russ Rew, Ward Fisher
EXTRA_DIST = sizeof_ptrdiff_t.c test_c_ptrdiff_t.f90 \
MatchNetCDFFortranTypes.cmake \
check_relax_coord_bound.c check_pnetcdf.c check_parallel4.c
MatchNetCDFFortranTypes.cmake check_relax_coord_bound.c \
check_pnetcdf.c check_parallel4.c check_cdf5.c
CMakeExtras/Makefile.in
View file @ cf46a4bb
......@@ -13,6 +13,12 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
# Copyright 2012-2019, see the COPYRIGHT file for more information.
# This is the automake file for CMakeExtras dir. This holds extra
# stuff needed for the CMake build. Include them so the dist contains
# a working CMake build.
VPATH = @srcdir@
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
......@@ -98,8 +104,6 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h \
$(top_builddir)/libsrc/nfconfig1.inc
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
AM_V_P = $(am__v_P_@AM_V@)
......@@ -121,6 +125,10 @@ am__can_run_installinfo = \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__extra_recursive_targets = check-valgrind-recursive \
check-valgrind-memcheck-recursive \
check-valgrind-helgrind-recursive check-valgrind-drd-recursive \
check-valgrind-sgcheck-recursive
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
am__DIST_COMMON = $(srcdir)/Makefile.in
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
......@@ -151,6 +159,10 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
ENABLE_VALGRIND_drd = @ENABLE_VALGRIND_drd@
ENABLE_VALGRIND_helgrind = @ENABLE_VALGRIND_helgrind@
ENABLE_VALGRIND_memcheck = @ENABLE_VALGRIND_memcheck@
ENABLE_VALGRIND_sgcheck = @ENABLE_VALGRIND_sgcheck@
EXEEXT = @EXEEXT@
F77 = @F77@
FC = @FC@
......@@ -206,6 +218,8 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VALGRIND = @VALGRIND@
VALGRIND_ENABLED = @VALGRIND_ENABLED@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
......@@ -253,6 +267,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
......@@ -265,9 +280,13 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
valgrind_enabled_tools = @valgrind_enabled_tools@
valgrind_tools = @valgrind_tools@
# Russ Rew, Ward Fisher
EXTRA_DIST = sizeof_ptrdiff_t.c test_c_ptrdiff_t.f90 \
MatchNetCDFFortranTypes.cmake \
check_relax_coord_bound.c check_pnetcdf.c check_parallel4.c
MatchNetCDFFortranTypes.cmake check_relax_coord_bound.c \
check_pnetcdf.c check_parallel4.c check_cdf5.c
all: all-am
......@@ -307,6 +326,11 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
check-valgrind-local:
check-valgrind-memcheck-local:
check-valgrind-helgrind-local:
check-valgrind-drd-local:
check-valgrind-sgcheck-local:
tags TAGS:
ctags CTAGS:
......@@ -381,6 +405,26 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
check-valgrind: check-valgrind-am
check-valgrind-am: check-valgrind-local
check-valgrind-drd: check-valgrind-drd-am
check-valgrind-drd-am: check-valgrind-drd-local
check-valgrind-helgrind: check-valgrind-helgrind-am
check-valgrind-helgrind-am: check-valgrind-helgrind-local
check-valgrind-memcheck: check-valgrind-memcheck-am
check-valgrind-memcheck-am: check-valgrind-memcheck-local
check-valgrind-sgcheck: check-valgrind-sgcheck-am
check-valgrind-sgcheck-am: check-valgrind-sgcheck-local
clean: clean-am
clean-am: clean-generic clean-libtool mostlyclean-am
......@@ -449,7 +493,12 @@ uninstall-am:
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
.PHONY: all all-am check check-am check-valgrind-am \
check-valgrind-drd-am check-valgrind-drd-local \
check-valgrind-helgrind-am check-valgrind-helgrind-local \
check-valgrind-local check-valgrind-memcheck-am \
check-valgrind-memcheck-local check-valgrind-sgcheck-am \
check-valgrind-sgcheck-local clean clean-generic clean-libtool \
cscopelist-am ctags-am distclean distclean-generic \
distclean-libtool distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am install-dvi \
......
CMakeExtras/MatchNetCDFFortranTypes.cmake
View file @ cf46a4bb
......@@ -5,6 +5,7 @@
# check sizes of C types
check_type_size(int SIZEOF_INT)
check_type_size(long SIZEOF_LONG)
check_type_size("long long" SIZEOF_LONG_LONG)
check_type_size(float SIZEOF_FLOAT)
check_type_size(double SIZEOF_DOUBLE)
check_type_size("signed char" SIZEOF_SIGNED_CHAR)
......@@ -16,6 +17,7 @@ SET(NCBYTE_T "byte") # 1 byte
SET(NCSHORT_T "integer*2") # 2 bytes
SET(NF_INT1_T "integer*1") # 1 byte
SET(NF_INT2_T "integer*2") # 2 bytes
SET(NF_INT8_T "integer*8") # 8 bytes
# Checks the provided C types to see which ones have the number of bytes passed
# Roughly equivalent to the Automake function UD_CHECK_CTYPE_FORTRAN
......@@ -59,6 +61,7 @@ message("Matching Fortran types to C types")
find_c_type_with_size(1 INT1 "signed char" short int long)
find_c_type_with_size(2 INT2 short int long)
find_c_type_with_size(4 INT int long)
find_c_type_with_size(8 INT8 int "long long")
find_c_type_with_size(4 REAL float double)
find_c_type_with_size(8 DOUBLEPRECISION float double)
......
CMakeLists.txt
View file @ cf46a4bb
......@@ -6,7 +6,7 @@
##################################
#Minimum required CMake Version
cmake_minimum_required(VERSION 2.8.9)
cmake_minimum_required(VERSION 3.0.0)
#Project Name for netCDF-Fortran
PROJECT (NC4F Fortran C)
......@@ -16,13 +16,13 @@ set(PACKAGE "${NC4F_CTEST_PROJECT_NAME}" CACHE STRING "")
#Project Version
SET(NC4F_VERSION_MAJOR 4)
SET(NC4F_VERSION_MINOR 4)
SET(NC4F_VERSION_PATCH 5)
SET(NC4F_VERSION_MINOR 5)
SET(NC4F_VERSION_PATCH 2)
SET(NC4F_VERSION_NOTE "")
SET(NC4F_VERSION ${NC4F_VERSION_MAJOR}.${NC4F_VERSION_MINOR}.${NC4F_VERSION_PATCH}${NC4F_VERSION_NOTE})
SET(VERSION ${NC4F_VERSION})
SET(NC4F_LIB_VERSION 6.2.1)
SET(NC4F_SO_VERSION 6)
SET(NC4F_LIB_VERSION 7.0.0)
SET(NC4F_SO_VERSION 7)
SET(PACKAGE_VERSION ${VERSION})
# Set known dependencies.
......@@ -75,6 +75,16 @@ ENDIF()
FIND_PACKAGE(Doxygen)
FIND_PROGRAM(NC_DOT NAMES dot)
# A basic script used to convert m4 files
FIND_PROGRAM(NF_M4 NAMES m4 m4.exe)
IF(NF_M4)
MESSAGE(STATUS "Found m4: ${NF_M4}")
SET(HAVE_M4 TRUE)
ELSE()
MESSAGE(STATUS "m4 not found.")
ENDIF()
# For CMAKE_INSTALL_LIBDIR
INCLUDE(GNUInstallDirs)
......@@ -376,7 +386,7 @@ ENDMACRO()
# Build a binary used by a script, but don't make a test out of it.
MACRO(build_bin_test F ext)
ADD_EXECUTABLE(${F} ${F}${ext})
TARGET_LINK_LIBRARIES(${F} ncfortran netcdff ${NETCDF_C_LIBRARY})
TARGET_LINK_LIBRARIES(${F} netcdff ${NETCDF_C_LIBRARY})
IF(MSVC)
SET_TARGET_PROPERTIES(${F}
PROPERTIES LINK_FLAGS_DEBUG " /NODEFAULTLIB:MSVCRT"
......@@ -384,7 +394,8 @@ MACRO(build_bin_test F ext)
ENDIF()
ENDMACRO()
OPTION(LARGE_FILE_TESTS "Run large file tests, which are slow and take lots of disk." OFF)
OPTION(ENABLE_LARGE_FILE_TESTS "Run large file tests, which are slow and take lots of disk." OFF)
SET(LARGE_FILE_TESTS ${ENABLE_LARGE_FILE_TESTS})
OPTION(BUILD_BENCHMARKS "Run F90 I/O Benchmarks" OFF)
OPTION(TEST_WITH_VALGRIND "Run extra tests with valgrind" OFF)
OPTION(ENABLE_PARALLEL_TESTS "Run parallel I/O tests for F90 and F77" OFF)
......@@ -460,6 +471,27 @@ CHECK_INCLUDE_FILE("netcdf.h" HAVE_NETCDF_H)
# End Check for various system header files.
###
ADD_DEFINITIONS(-DNCSHORT_T=integer*2)
ADD_DEFINITIONS(-DNCBYTE_T=byte)
ADD_DEFINITIONS(-DNF_RELAX_COORD_BOUND)
ADD_DEFINITIONS(-DNF_HAS_PARALLEL4)
ADD_DEFINITIONS(-DNF_HAS_PNETCDF)
#ADD_DEFINITIONS(-DENABLE_CDF5)
ADD_DEFINITIONS(-DNF_INT1_IS_C_SIGNED_CHAR)
#ADD_DEFINITIONS(-DNF_INT1_IS_C_SHORT)
#ADD_DEFINITIONS(-DNF_INT1_IS_C_INT)
#ADD_DEFINITIONS(-DNF_INT1_IS_C_LONG)
ADD_DEFINITIONS(-DNF_INT2_IS_C_SHORT)
#ADD_DEFINITIONS(-DNF_INT2_IS_C_INT)
#ADD_DEFINITIONS(-DNF_INT2_IS_C_LONG)
ADD_DEFINITIONS(-DNF_INT_IS_C_INT)
#ADD_DEFINITIONS(-DNF_INT_IS_C_LONG)
ADD_DEFINITIONS(-DNF_INT8_IS_C_LONG_LONG)
ADD_DEFINITIONS(-DNF_REAL_IS_C_FLOAT)
#ADD_DEFINITIONS(-DNF_REAL_IS_C_DOUBLE)
ADD_DEFINITIONS(-DNF_DOUBLEPRECISION_IS_C_DOUBLE)
#ADD_DEFINITIONS(-DNF_DOUBLEPRECISION_IS_C_FLOAT)
###
# Type checks
###
......@@ -509,30 +541,37 @@ ENDIF()
CHECK_FUNCTION_EXISTS(alloca HAVE_ALLOCA)
CHECK_LIBRARY_EXISTS(${NETCDF_C_LIBRARY} nc_def_opaque "" USE_NETCDF4)
CHECK_LIBRARY_EXISTS(${NETCDF_C_LIBRARY} nc_get_chunk_cache_ints "" USE_NETCDF4)
CHECK_LIBRARY_EXISTS(${NETCDF_C_LIBRARY} nccreate "" USE_NETCDF_V2)
CHECK_LIBRARY_EXISTS(${NETCDF_C_LIBRARY} nc_set_log_level "" USE_LOGGING)
CHECK_LIBRARY_EXISTS(${NETCDF_C_LIBRARY} oc_open "" BUILD_DAP)
SET(HAS_NC4 FALSE)
IF(USE_NETCDF4)
SET(NC_BUILD_V4 TRUE)
SET(HAVE_NC_DEF_OPAQUE TRUE)
SET(HAS_NC4 TRUE)
ENDIF(USE_NETCDF4)
SET(HAS_NC2 FALSE)
IF(USE_NETCDF_V2)
SET(HAVE_NCCREATE TRUE)
SET(USE_NC2 TRUE)
SET(HAS_NC2 TRUE)
ENDIF(USE_NETCDF_V2)
SET(STATUS_LOGGING OFF)
SET(STATUS_LOGGING FALSE)
IF(USE_LOGGING)
SET(HAVE_NC_SET_LOG_LEVEL TRUE)
SET(STATUS_LOGGING ON)
ENDIF(USE_LOGGING)
SET(ENABLE_DAP OFF)
SET(HAS_DAP FALSE)
IF(BUILD_DAP)
SET(HAVE_OC_OPEN TRUE)
SET(ENABLE_DAP ON)
SET(HAS_DAP TRUE)
ENDIF(BUILD_DAP)
##
......@@ -555,8 +594,10 @@ IF (UNIX AND ${CMAKE_SIZEOF_VOID_P} MATCHES "8")
ADD_DEFINITIONS(-DLONGLONG_IS_LONG)
# for easier debugging of cfortran.h
IF (APPLE)
IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fmacro-backtrace-limit=0")
endif ()
ENDIF()
ENDIF(APPLE)
ENDIF()
# Determine C library setting for NC_RELAX_COORD_BOUND
......@@ -591,6 +632,17 @@ IF(NF_HAS_PNETCDF)
ENDIF()
IF(NF_HAS_PNETCDF OR NF_HAS_PARALLEL4)
CHECK_FUNCTION_EXISTS(MPI_File_open HAVE_MPI_IO)
IF(NOT HAVE_MPI_IO)
MESSAGE(FATAL_ERROR
" -----------------------------------------------------------------------\n"
" The NetCDF C library is built with parallel I/O feature enabled, but\n"
" the Fortran compiler 'gfortran' supplied in this configure command\n"
" does not support MPI-IO. Please use one that does. If parallel I/O\n"
" feature is not desired, please use a NetCDF C library with parallel\n"
" I/O feature disabled. Abort.\n"
" -----------------------------------------------------------------------")
ENDIF(NOT HAVE_MPI_IO)
SET(BUILD_PARALLEL ON)
SET(HAVE_NC_USE_PARALLEL_ENABLED TRUE)
ELSE(NF_HAS_PNETCDF OR NF_HAS_PARALLEL4)
......@@ -648,6 +700,18 @@ SET(BUILD_F90 "ON")
SET(BUILD_V2 "ON")
SET(BUILD_F03 "OFF")
IF(BUILD_F90)
SET(HAS_F90 TRUE)
ELSE()
SET(HAS_F90 FALSE)
ENDIF(BUILD_F90)
IF(BUILD_F03)
SET(HAS_F03 TRUE)
ELSE()
SET(HAS_F03 FALSE)
ENDIF(BUILD_F03)
IF(ENABLE_FORTRAN_TYPE_CHECKS)
# Do tests to determine which Fortran types correspond to NCBYTE, NCSHORT, ...
# The configure file got these by testing an F77 program, invoking
......@@ -661,29 +725,25 @@ ELSE()
SET(NCSHORT_T "integer*2")
SET(NF_INT1_T "byte")
SET(NF_INT2_T "integer*2")
SET(NF_INT8_T "integer*8")
# Default is for following to be true. TODO: test instead
SET(NF_INT1_IS_C_SIGNED_CHAR "1")
SET(NF_INT2_IS_C_SHORT "1")
SET(NF_INT_IS_C_INT "1")
SET(NF_INT8_IS_C_LONG_LONG "1")
SET(NF_REAL_IS_C_FLOAT "1")
SET(NF_DOUBLEPRECISION_IS_C_DOUBLE "1")
ENDIF(ENABLE_FORTRAN_TYPE_CHECKS)
# Create libsrc/nfconfig.inc (don't need nfconfig1.inc temporary file used with autoconf)
configure_file("${NC4F_SOURCE_DIR}/libsrc/nfconfig.in.cmake"
"${NC4F_BINARY_DIR}/libsrc/nfconfig.inc")
# Create config.h file
configure_file("${NC4F_SOURCE_DIR}/config.h.cmake.in"
"${NC4F_BINARY_DIR}/config.h")
# For now, just copy a stub file
FILE(COPY "${NC4F_SOURCE_DIR}/nf-config.cmake.in"
DESTINATION "${NC4F_BINARY_DIR}"
FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
FILE(RENAME "${NC4F_BINARY_DIR}/nf-config.cmake.in" "${NC4F_BINARY_DIR}/nf-config")
# configure_file("${NC4F_SOURCE_DIR}/libsrc/nfconfig.in.cmake"
# "${NC4F_BINARY_DIR}/libsrc/nfconfig.inc")
# # Create config.h file
# configure_file("${NC4F_SOURCE_DIR}/config.h.cmake.in"
# "${NC4F_BINARY_DIR}/config.h")
# make sure previous two files get cleaned up...
SET_DIRECTORY_PROPERTIES (DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${netcdf-fortran_BINARY_DIR}/config.h ${netcdf-fortran_BINARY_DIR}/nf-config)
#SET_DIRECTORY_PROPERTIES (DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES ${netcdf-fortran_BINARY_DIR}/config.h ${netcdf-fortran_BINARY_DIR}/nf-config)
##
# Configuration for post-install RPath
......@@ -732,7 +792,13 @@ CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/CTestConfig.cmake.in"
"${CMAKE_SOURCE_DIR}/CTestConfig.cmake"
@ONLY)
# Generate nf-config form template.
CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/nf-config.cmake.in"
"${CMAKE_BINARY_DIR}/tmp/nf-config" @ONLY
NEWLINE_STYLE LF)
FILE(COPY "${CMAKE_BINARY_DIR}/tmp/nf-config"
DESTINATION ${CMAKE_BINARY_DIR}/
FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
###
# Allow the user to specify libraries
# to link against, similar to automakes 'LIBS' variable.
......@@ -805,6 +871,21 @@ IF(CMAKE_LINK_FLAGS)
SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${CMAKE_LINK_FLAGS}")
ENDIF()
# Set
SET(prefix ${CMAKE_INSTALL_PREFIX})
SET(exec_prefix ${CMAKE_INSTALL_PREFIX})
SET(libdir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
SET(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
SET(CC ${CMAKE_C_COMPILER})
SET(FC ${CMAKE_Fortran_COMPILER})
configure_file(
${CMAKE_SOURCE_DIR}/netcdf-fortran.pc.in
${CMAKE_BINARY_DIR}/netcdf-fortran.pc @ONLY)
INSTALL(FILES ${CMAKE_BINARY_DIR}/netcdf-fortran.pc
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
COMPONENT utilities)
INSTALL(PROGRAMS ${NC4F_BINARY_DIR}/nf-config
DESTINATION "${CMAKE_INSTALL_BINDIR}"
......@@ -821,6 +902,8 @@ ADD_SUBDIRECTORY(libsrc)
IF(ENABLE_TESTS)
ADD_SUBDIRECTORY(nf_test)
ADD_SUBDIRECTORY(nf03_test)
ADD_SUBDIRECTORY(nf_test4)
ADD_SUBDIRECTORY(nf03_test4)
ENDIF()
# Build the Fortran examples
......
Makefile.am
View file @ cf46a4bb
## This is a automake file, part of Unidata's netCDF package.
# Copyright 2012, see the COPYRIGHT file for more information.
# Copyright 2012-2019, see the COPYRIGHT file for more information.
# This is the main automake file for netCDF-Fortran. It builds the
# different netcdf directories. Not all directories are built,
# depending on the options selected during configure.
# This is the main automake file for netCDF-Fortran.
# Ed Hartnett, Russ Rew, Dennis Heimbigner, Ward Fisher
# This directory stores libtool macros, put there by aclocal.
ACLOCAL_AMFLAGS = -I m4
# These files get added to the distribution.
EXTRA_DIST = README.md RELEASE_NOTES.md netcdf-fortran.pc.in F03Interfaces_LICENSE CMakeLists.txt COPYRIGHT nf-config.in config.h.cmake.in CTestConfig.cmake.in nf-config.cmake.in
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = netcdf-fortran.pc
# All the fortran source
FTN_DIR = fortran
if BUILD_F03
F03_TESTS = nf03_test
else
# All the C/H source
LIBSRC_DIR = libsrc
endif
# Run these tests for netCDF-4 builds.
if USE_NETCDF4
NF_TEST4 = nf_test4 # netCDF-4 F77 API tests
NF03_TEST4 = nf03_test4 # netCDF-4 F90 API tests
endif # USE_NETCDF4
# This is the list of subdirs for which Makefiles will be constructed
# and run.
SUBDIRS = $(LIBSRC_DIR) $(FTN_DIR) . nf_test $(F03_TESTS) docs examples \
CMakeExtras
# Remove these generated files, for a distclean.
DISTCLEANFILES = VERSION comps.txt test_prog
SUBDIRS = libsrc fortran nf_test nf03_test $(NF_TEST4) $(NF03_TEST4) \
docs examples CMakeExtras
# The nf-config script helps the user build programs with netCDF.
bin_SCRIPTS = nf-config
check_nc_config:
$(F90) `./nf-config --fflags` test_prog.f90 -o test_prog `./nf-config --libs`
./test_prog
if BUILD_F03
$(F03) `./nf-config --fflags` test_prog.f03 -o test_prog `./nf-config --libs`
./test_prog
endif
# These files get added to the distribution.
EXTRA_DIST = README.md RELEASE_NOTES.md netcdf-fortran.pc.in \
F03Interfaces_LICENSE CMakeLists.txt COPYRIGHT nf-config.in \
config.h.cmake.in CTestConfig.cmake.in nf-config.cmake.in
# Remove these generated files, for a distclean.
DISTCLEANFILES = VERSION
install-data-hook:
@echo ''
......
Makefile.in
View file @ cf46a4bb
......@@ -14,11 +14,11 @@
@SET_MAKE@
# Copyright 2012, see the COPYRIGHT file for more information.
# Copyright 2012-2019, see the COPYRIGHT file for more information.
# This is the main automake file for netCDF-Fortran. It builds the
# different netcdf directories. Not all directories are built,
# depending on the options selected during configure.
# This is the main automake file for netCDF-Fortran.
# Ed Hartnett, Russ Rew, Dennis Heimbigner, Ward Fisher
VPATH = @srcdir@
......@@ -109,7 +109,6 @@ DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h $(top_builddir)/libsrc/nfconfig1.inc
CONFIG_CLEAN_FILES = nf-config netcdf-fortran.pc
CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
......@@ -177,8 +176,11 @@ am__recursive_targets = \
$(am__extra_recursive_targets)
AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
cscope distdir distdir-am dist dist-all distcheck
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
$(LISP)config.h.in
am__extra_recursive_targets = check-valgrind-recursive \
check-valgrind-memcheck-recursive \
check-valgrind-helgrind-recursive check-valgrind-drd-recursive \
check-valgrind-sgcheck-recursive
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
# *not* preserved.
......@@ -198,11 +200,11 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = libsrc fortran . nf_test nf03_test docs examples \
CMakeExtras
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(srcdir)/netcdf-fortran.pc.in $(srcdir)/nf-config.in compile \
config.guess config.sub install-sh ltmain.sh missing
DIST_SUBDIRS = libsrc fortran nf_test nf03_test nf_test4 nf03_test4 \
docs examples CMakeExtras
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/netcdf-fortran.pc.in \
$(srcdir)/nf-config.in compile config.guess config.sub \
install-sh ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
......@@ -272,6 +274,10 @@ ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
ENABLE_VALGRIND_drd = @ENABLE_VALGRIND_drd@
ENABLE_VALGRIND_helgrind = @ENABLE_VALGRIND_helgrind@
ENABLE_VALGRIND_memcheck = @ENABLE_VALGRIND_memcheck@
ENABLE_VALGRIND_sgcheck = @ENABLE_VALGRIND_sgcheck@
EXEEXT = @EXEEXT@
F77 = @F77@
FC = @FC@
......@@ -327,6 +333,8 @@ SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VALGRIND = @VALGRIND@
VALGRIND_ENABLED = @VALGRIND_ENABLED@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
......@@ -374,6 +382,7 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
......@@ -386,34 +395,36 @@ target_vendor = @target_vendor@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
valgrind_enabled_tools = @valgrind_enabled_tools@
valgrind_tools = @valgrind_tools@
# This directory stores libtool macros, put there by aclocal.
ACLOCAL_AMFLAGS = -I m4
# These files get added to the distribution.
EXTRA_DIST = README.md RELEASE_NOTES.md netcdf-fortran.pc.in F03Interfaces_LICENSE CMakeLists.txt COPYRIGHT nf-config.in config.h.cmake.in CTestConfig.cmake.in nf-config.cmake.in
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = netcdf-fortran.pc
# All the fortran source
FTN_DIR = fortran
@BUILD_F03_TRUE@F03_TESTS = nf03_test
# All the C/H source
@BUILD_F03_FALSE@LIBSRC_DIR = libsrc
# Run these tests for netCDF-4 builds.
@USE_NETCDF4_TRUE@NF_TEST4 = nf_test4 # netCDF-4 F77 API tests
@USE_NETCDF4_TRUE@NF03_TEST4 = nf03_test4 # netCDF-4 F90 API tests
# This is the list of subdirs for which Makefiles will be constructed
# and run.
SUBDIRS = $(LIBSRC_DIR) $(FTN_DIR) . nf_test $(F03_TESTS) docs examples \
CMakeExtras
SUBDIRS = libsrc fortran nf_test nf03_test $(NF_TEST4) $(NF03_TEST4) \
docs examples CMakeExtras
# Remove these generated files, for a distclean.
DISTCLEANFILES = VERSION comps.txt test_prog
# The nf-config script helps the user build programs with netCDF.
bin_SCRIPTS = nf-config
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
# These files get added to the distribution.
EXTRA_DIST = README.md RELEASE_NOTES.md netcdf-fortran.pc.in \
F03Interfaces_LICENSE CMakeLists.txt COPYRIGHT nf-config.in \
config.h.cmake.in CTestConfig.cmake.in nf-config.cmake.in
# Remove these generated files, for a distclean.
DISTCLEANFILES = VERSION
all: all-recursive
.SUFFIXES:
am--refresh: Makefile
......@@ -449,21 +460,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
$(am__aclocal_m4_deps):
config.h: stamp-h1
@test -f $@ || rm -f stamp-h1
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
rm -f stamp-h1
touch $@
distclean-hdr:
-rm -f config.h stamp-h1
nf-config: $(top_builddir)/config.status $(srcdir)/nf-config.in
cd $(top_builddir) && $(SHELL) ./config.status $@
netcdf-fortran.pc: $(top_builddir)/config.status $(srcdir)/netcdf-fortran.pc.in
......@@ -567,6 +563,11 @@ $(am__recursive_targets):
if test "$$dot_seen" = "no"; then \
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
check-valgrind-local:
check-valgrind-memcheck-local:
check-valgrind-helgrind-local:
check-valgrind-drd-local:
check-valgrind-sgcheck-local:
ID: $(am__tagged_files)
$(am__define_uniq_tagged_files); mkid -fID $$unique
......@@ -832,7 +833,7 @@ distcleancheck: distclean
exit 1; } >&2
check-am: all-am
check: check-recursive
all-am: Makefile $(SCRIPTS) $(DATA) config.h
all-am: Makefile $(SCRIPTS) $(DATA)
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"; do \
......@@ -869,6 +870,26 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
check-valgrind: check-valgrind-recursive
check-valgrind-am: check-valgrind-local
check-valgrind-drd: check-valgrind-drd-recursive
check-valgrind-drd-am: check-valgrind-drd-local
check-valgrind-helgrind: check-valgrind-helgrind-recursive
check-valgrind-helgrind-am: check-valgrind-helgrind-local
check-valgrind-memcheck: check-valgrind-memcheck-recursive
check-valgrind-memcheck-am: check-valgrind-memcheck-local
check-valgrind-sgcheck: check-valgrind-sgcheck-recursive
check-valgrind-sgcheck-am: check-valgrind-sgcheck-local
clean: clean-recursive
clean-am: clean-generic clean-libtool mostlyclean-am
......@@ -876,8 +897,8 @@ clean-am: clean-generic clean-libtool mostlyclean-am
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -f Makefile
distclean-am: clean-am distclean-generic distclean-hdr \
distclean-libtool distclean-tags
distclean-am: clean-am distclean-generic distclean-libtool \
distclean-tags
dvi: dvi-recursive
......@@ -940,17 +961,22 @@ ps-am:
uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA
.MAKE: $(am__recursive_targets) all install-am install-data-am \
.MAKE: $(am__recursive_targets) install-am install-data-am \
install-strip
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
am--refresh check check-am clean clean-cscope clean-generic \
am--refresh check check-am check-valgrind-am \
check-valgrind-drd-am check-valgrind-drd-local \
check-valgrind-helgrind-am check-valgrind-helgrind-local \
check-valgrind-local check-valgrind-memcheck-am \
check-valgrind-memcheck-local check-valgrind-sgcheck-am \
check-valgrind-sgcheck-local clean clean-cscope clean-generic \
clean-libtool cscope cscopelist-am ctags ctags-am dist \
dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
dist-xz dist-zip distcheck distclean distclean-generic \
distclean-hdr distclean-libtool distclean-tags distcleancheck \
distdir distuninstallcheck dvi dvi-am html html-am info \
info-am install install-am install-binSCRIPTS install-data \
distclean-libtool distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am html html-am info info-am \
install install-am install-binSCRIPTS install-data \
install-data-am install-data-hook install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man install-pdf \
......@@ -965,10 +991,8 @@ uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA
check_nc_config:
$(F90) `./nf-config --fflags` test_prog.f90 -o test_prog `./nf-config --libs`
$(F03) `./nf-config --fflags` test_prog.f03 -o test_prog `./nf-config --libs`
./test_prog
@BUILD_F03_TRUE@ $(F03) `./nf-config --fflags` test_prog.f03 -o test_prog `./nf-config --libs`
@BUILD_F03_TRUE@ ./test_prog
install-data-hook:
@echo ''
......
README.md
View file @ cf46a4bb
......@@ -17,6 +17,10 @@ For more information about netCDF, see the netCDF Web page at
* http://www.unidata.ucar.edu/netcdf/
The netCDF Fortran libraries contain both F77 and F90 APIs. For documentation see
* https://www.unidata.ucar.edu/software/netcdf/docs-fortran/
### Code Status
NetCDF-Fortran uses [Travis-CI](http://travis-ci.org) for continuous integration testing. This helps to ensure that developer changes do not break the netCDF-Fortran code base.
......@@ -47,12 +51,11 @@ To install this package, please see the document:
Additional Documentation
------------------------
The netCDF-3 C and FORTRAN-77 interfaces are documented at
Previous varsions of the netCDF-3 C and FORTRAN-77 interfaces are
documented at
* http://www.unidata.ucar.edu/netcdf/documentation/historic/
User's Guides are also available in several forms from the same location.
Mailing List
------------
......
RELEASE_NOTES.md
View file @ cf46a4bb
......@@ -6,19 +6,59 @@ Release Notes {#nf_release_notes}
This file contains a high-level description of this package's evolution.
Entries are in reverse chronological order (most recent first).
## 4.4.5 - January 9, 2019
## 4.5.2 - September 18, 2019
### Requirements
* netCDF-C: 4.6.2
* netCDF-C: 4.6.0 or greater
### Changes
* Corrected an issue where netCDF-Fortran would fail to build correctly on some platforms when the underlying `libnetcdf` lacked netCDF-4 support. See [GitHub #200](https://github.com/Unidata/netcdf-fortran/issues/200) for more information.
* Corrected an issue where cmake-specific large file tests weren't being captured by `make dist`. See [Github #198](https://github.com/Unidata/netcdf-fortran/issues/198) for more details.
## 4.5.1 - September 4, 2019
### Requirements
* netCDF-C: 4.6.0 or greater
### Changes
* Corrected an issue where a cmake-specific file wasn't being captured by `make dist`.
* Corrected an issue where nf-config wasn't being generated by cmake-based builds. Corrected a couple of other missing files. See [Github #108](https://github.com/Unidata/netcdf-fortran/issues/108) for more information.
## 4.5.0 - August 28, 2019
### Requirements
* netCDF-C: 4.6.0 or greater
### Changes
* Moved netCDF classic F90 API tests to new subdirectory nf03_test.
* Moved netCDF-4 F77 API tests to new subdirectory nf_test4.
* Moved netCDF-4 F90 API tests to new subdirectory nf03_test4.
* Fixed bug which caused parallel I/O tests to not be run. See [#155](https://github.com/Unidata/netcdf-fortran/issues/155) and [#157](https://github.com/Unidata/netcdf-fortran/issues/157).
* Fixed bug in the setting of file cache preemption for netCDF-4 files. See [#146](https://github.com/Unidata/netcdf-fortran/issues/146).
* Removed many near-duplicate tests files, now they are created at build time with sed. See [#165](https://github.com/Unidata/netcdf-fortran/issues/165).
* Removed no longer needed configure options --enable-dll (see [#161](https://github.com/Unidata/netcdf-fortran/issues/161)), `--enable-extra-tests` (see [#114](https://github.com/Unidata/netcdf-fortran/issues/114)), `--enable-extra-example-tests` (see [#126](https://github.com/Unidata/netcdf-fortran/issues/126)), and `--enable-valgrind` (see [#118](https://github.com/Unidata/netcdf-fortran/issues/118)).
* Moved handling of F77 man page to the docs directory. See [#141](https://github.com/Unidata/netcdf-fortran/issues/141).
## 4.4.5 - Release Jan 9, 2019
### Requirements
* netCDF-C: 4.6.0 or greater
### Changes
* Removed legacy cfortran.h based build, which allowed F77-only compilers to build the F77 API (only). Since all compilers now support F2003, we can use F2003 features to build the F77 API. Full backwards-compatibility with all existing F77 API code is assured. See [#85](https://github.com/Unidata/netcdf-fortran/issues/85) for more information.
* Added an option in cmake builds, `BUILD_EXAMPLES`, `TRUE` by default. When disabled, the examples will not be built. See [#93](https://github.com/Unidata/netcdf-fortran/issues/92) for more information.
* Misc. Bugfixes to bring netCDF-Fortran in line with the features in netCDF-C.
* Updated CMakeLists.txt to check for C types that match Fortran ones. See [GitHub #67](https://github.com/Unidata/netcdf-fortran/pull/67) for more information.
## 4.4.4 - May 13, 2016
## 4.4.4 Released May 13, 2016
* Corrected an issue where cmake-based builds specifying `USE_LOGGING` were not seeing expected behavior. The issue was reported, and subsequently fixed, by Neil Carlson at Los Alamos Nat'l Laboratory. See [Github Pull Request #44](https://github.com/Unidata/netcdf-fortran/pull/44) for more information.
* Integrated improvements provided by Richard Weed. For a *complete* list of modifications, see the file `docs/netcdf_fortran_4.4.2dev_notes_RW.pdf`. **It is highly detailed and worth reading!**
......
acinclude.m4
View file @ cf46a4bb
This diff is collapsed.
aclocal.m4
View file @ cf46a4bb
......@@ -396,6 +396,23 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
# AM_EXTRA_RECURSIVE_TARGETS -*- Autoconf -*-
# Copyright (C) 2012-2018 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# AM_EXTRA_RECURSIVE_TARGETS
# --------------------------
# Define the list of user recursive targets. This macro exists only to
# be traced by Automake, which will ensure that a proper definition of
# user-defined recursive targets (and associated rules) is propagated
# into all the generated Makefiles.
# TODO: We should really reject non-literal arguments here...
AC_DEFUN([AM_EXTRA_RECURSIVE_TARGETS], [])
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996-2018 Free Software Foundation, Inc.
......
config.guess
View file @ cf46a4bb
......@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2018 Free Software Foundation, Inc.
timestamp='2018-03-08'
timestamp='2018-02-24'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -1046,7 +1046,11 @@ EOF
echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
exit ;;
x86_64:Linux:*:*)
if objdump -f /bin/sh | grep -q elf32-x86-64; then
echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
else
echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
fi
exit ;;
xtensa*:Linux:*:*)
echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
......@@ -1469,7 +1473,7 @@ EOF
exit 1
# Local variables:
# eval: (add-hook 'before-save-hook 'time-stamp)
# eval: (add-hook 'write-file-functions 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
......
config.h.in deleted 100644 → 0
View file @ b93c5f24
/* config.h.in. Generated from configure.ac by autoheader. */
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
systems. This function is required for `alloca.c' support on those systems.
*/
#undef CRAY_STACKSEG_END
/* Define to 1 if using `alloca.c'. */
#undef C_ALLOCA
/* set this only when building a DLL under MinGW */
#undef DLL_NETCDF
/* Enable CDF-5 file format */
#undef ENABLE_CDF5
/* if true, run extra tests which may not work yet */
#undef EXTRA_TESTS
/* Define to 1 if you have `alloca', as a function or macro. */
#undef HAVE_ALLOCA
/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
*/
#undef HAVE_ALLOCA_H
/* Define to 1 if you have the <ctype.h> header file. */
#undef HAVE_CTYPE_H
/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
*/
#undef HAVE_DIRENT_H
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
#undef HAVE_DOPRNT
/* Define to 1 if you have the <errno.h> header file. */
#undef HAVE_ERRNO_H
/* if true, use Fortran 2008 ISO_FORTRAN_ENV additions */
#undef HAVE_F2008
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
/* Define to 1 if you have the <getopt.h> header file. */
#undef HAVE_GETOPT_H
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 if you have the `curl' library (-lcurl). */
#undef HAVE_LIBCURL
/* Define to 1 if you have the `m' library (-lm). */
#undef HAVE_LIBM
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
/* Define to 1 if the system has the type `longlong'. */
#undef HAVE_LONGLONG
/* Define to 1 if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the `nccreate' function. */
#undef HAVE_NCCREATE
/* Define to 1 if you have the `nc_def_opaque' function. */
#undef HAVE_NC_DEF_OPAQUE
/* Define to 1 if you have the `nc_set_log_level' function. */
#undef HAVE_NC_SET_LOG_LEVEL
/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
#undef HAVE_NDIR_H
/* Define to 1 if you have the <netcdf.h> header file. */
#undef HAVE_NETCDF_H
/* Define to 1 if you have the `oc_open' function. */
#undef HAVE_OC_OPEN
/* Define to 1 if the system has the type `ptrdiff_t'. */
#undef HAVE_PTRDIFF_T
/* Define to 1 if the system has the type `ssize_t'. */
#undef HAVE_SSIZE_T
/* Define to 1 if you have the <stdarg.h> header file. */
#undef HAVE_STDARG_H
/* Define to 1 if stdbool.h conforms to C99. */
#undef HAVE_STDBOOL_H
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdio.h> header file. */
#undef HAVE_STDIO_H
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
*/
#undef HAVE_SYS_DIR_H
/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
*/
#undef HAVE_SYS_NDIR_H
/* Define to 1 if you have the <sys/param.h> header file. */
#undef HAVE_SYS_PARAM_H
/* Define to 1 if you have the <sys/resource.h> header file. */
#undef HAVE_SYS_RESOURCE_H
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/time.h> header file. */
#undef HAVE_SYS_TIME_H
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
#undef HAVE_SYS_WAIT_H
/* if true, Fortran compiler supports TS29113 extension */
#undef HAVE_TS29113_SUPPORT
/* Define to 1 if the system has the type `uchar'. */
#undef HAVE_UCHAR
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
/* Define to 1 if you have the `vprintf' function. */
#undef HAVE_VPRINTF
/* Define to 1 if the system has the type `_Bool'. */
#undef HAVE__BOOL
/* do large file tests */
#undef LARGE_FILE_TESTS
/* if true, C library contains logging */
#undef LOGGING
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* type definition */
#undef NCBYTE_T
/* type definition */
#undef NCSHORT_T
/* default */
#undef NF_DOUBLEPRECISION_IS_C_DOUBLE
/* Enable parallel I/O support via HDF5 */
#undef NF_HAS_PARALLEL4
/* Enable parallel I/O support via PnetCDF */
#undef NF_HAS_PNETCDF
/* default */
#undef NF_INT1_IS_C_SIGNED_CHAR
/* type thing */
#undef NF_INT1_T
/* default */
#undef NF_INT2_IS_C_SHORT
/* type thing */
#undef NF_INT2_T
/* default */
#undef NF_INT_IS_C_INT
/* default */
#undef NF_REAL_IS_C_FLOAT
/* Enable a more relaxed boundary error check NF_EINVALCOORDS */
#undef NF_RELAX_COORD_BOUND
/* no stdlib.h */
#undef NO_STDLIB_H
/* no sys_types.h */
#undef NO_SYS_TYPES_H
/* Name of package */
#undef PACKAGE
/* Define to the address where bug reports for this package should be sent. */
#undef PACKAGE_BUGREPORT
/* Define to the full name of this package. */
#undef PACKAGE_NAME
/* Define to the full name and version of this package. */
#undef PACKAGE_STRING
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
/* Define to the home page for this package. */
#undef PACKAGE_URL
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* The size of `double', as computed by sizeof. */
#undef SIZEOF_DOUBLE
/* The size of `float', as computed by sizeof. */
#undef SIZEOF_FLOAT
/* The size of `int', as computed by sizeof. */
#undef SIZEOF_INT
/* The size of `long', as computed by sizeof. */
#undef SIZEOF_LONG
/* The size of `off_t', as computed by sizeof. */
#undef SIZEOF_OFF_T
/* The size of `ptrdiff_t', as computed by sizeof. */
#undef SIZEOF_PTRDIFF_T
/* The size of `short', as computed by sizeof. */
#undef SIZEOF_SHORT
/* The size of `size_t', as computed by sizeof. */
#undef SIZEOF_SIZE_T
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
automatically deduced at runtime.
STACK_DIRECTION > 0 => grows toward higher addresses
STACK_DIRECTION < 0 => grows toward lower addresses
STACK_DIRECTION = 0 => direction of growth unknown */
#undef STACK_DIRECTION
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
/* Place to put very large netCDF test files. */
#undef TEMP_LARGE
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#undef TIME_WITH_SYS_TIME
/* if true, build netCDF-4 */
#undef USE_NETCDF4
/* Version number of package */
#undef VERSION
/* Enable large inode numbers on Mac OS X 10.5. */
#ifndef _DARWIN_USE_64_BIT_INODE
# define _DARWIN_USE_64_BIT_INODE 1
#endif
/* Number of bits in a file offset, on hosts where this is settable. */
#undef _FILE_OFFSET_BITS
/* Define for large files, on AIX-style hosts. */
#undef _LARGE_FILES
/* Define to 1 if type `char' is unsigned and you are not using gcc. */
#ifndef __CHAR_UNSIGNED__
# undef __CHAR_UNSIGNED__
#endif
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
/* Turned on by netCDF configure. */
#undef f2cFortran
/* Turned on by netCDF configure. */
#undef gFortran
/* Define to `long int' if <sys/types.h> does not define. */
#undef off_t
/* Turned on by netCDF configure. */
#undef pgiFortran
/* Define to `unsigned int' if <sys/types.h> does not define. */
#undef size_t
config.sub
View file @ cf46a4bb
......@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2018 Free Software Foundation, Inc.
timestamp='2018-03-08'
timestamp='2018-02-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -1376,7 +1376,7 @@ case $os in
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
......@@ -1794,7 +1794,7 @@ echo "$basic_machine$os"
exit
# Local variables:
# eval: (add-hook 'before-save-hook 'time-stamp)
# eval: (add-hook 'write-file-functions 'time-stamp)
# time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'"
......
configure
View file @ cf46a4bb
This diff is collapsed.
configure.ac
View file @ cf46a4bb
This diff is collapsed.
debian/changelog
View file @ cf46a4bb
netcdf-fortran (4.4.5-2) UNRELEASED; urgency=medium
netcdf-fortran (4.5.2+ds-1) unstable; urgency=medium
* Bump Standards-Version to 4.4.1, no changes.
* Drop Name field from upstream metadata.
* Move from experimental to unstable.
-- Bas Couwenberg <sebastic@debian.org> Thu, 23 Jan 2020 05:38:53 +0100
netcdf-fortran (4.5.2+ds-1~exp1) experimental; urgency=medium
* New upstream release.
-- Bas Couwenberg <sebastic@debian.org> Thu, 19 Sep 2019 07:09:46 +0200
netcdf-fortran (4.5.1+ds-1~exp1) experimental; urgency=medium
* New upstream release.
-- Bas Couwenberg <sebastic@debian.org> Thu, 05 Sep 2019 06:03:45 +0200
netcdf-fortran (4.5.0+ds-1~exp1) experimental; urgency=medium
* New upstream release.
* Add fortran-compiler as alternative build dependency.
(closes: #922645)
* Update gbp.conf to use --source-only-changes by default.
* Bump Standards-Version to 4.4.0, no changes.
* Update copyright file, changes:
- Update copyright years for UCAR
- Drop license & copyright for removed files
* Rename library package for SONAME bump.
* Refresh patches.
* Update symbols for 4.5.0.
-- Bas Couwenberg <sebastic@debian.org> Tue, 19 Feb 2019 06:25:41 +0100
-- Bas Couwenberg <sebastic@debian.org> Fri, 30 Aug 2019 07:54:45 +0200
netcdf-fortran (4.4.5-1) unstable; urgency=medium
......
debian/control
View file @ cf46a4bb
......@@ -13,12 +13,12 @@ Build-Depends: debhelper (>= 9.20160114),
graphviz,
libnetcdf-dev (>= 1:4.6.2),
pkg-config
Standards-Version: 4.4.0
Standards-Version: 4.4.1
Vcs-Browser: https://salsa.debian.org/debian-gis-team/netcdf-fortran
Vcs-Git: https://salsa.debian.org/debian-gis-team/netcdf-fortran.git
Homepage: http://www.unidata.ucar.edu/software/netcdf/
Package: libnetcdff6
Package: libnetcdff7
Architecture: any
Section: libs
Depends: ${shlibs:Depends},
......@@ -37,7 +37,7 @@ Description: Fortran interface for scientific data access to large binary data
Package: libnetcdff-dev
Architecture: any
Section: libdevel
Depends: libnetcdff6 (= ${binary:Version}),
Depends: libnetcdff7 (= ${binary:Version}),
libnetcdf-dev,
${misc:Depends}
Recommends: pkg-config
......
debian/copyright
View file @ cf46a4bb
......@@ -5,7 +5,7 @@ Source: https://github.com/Unidata/netcdf-fortran/releases
Files-Excluded: autom4te.cache/*
Files: *
Copyright: 1993-2014, University Corporation for Atmospheric Research/Unidata
Copyright: 1993-2019, University Corporation for Atmospheric Research/Unidata
License: NetCDF
Files: fortran/module_netcdf4_f03.f90
......@@ -30,18 +30,10 @@ Files: fortran/module_netcdf4_f03.f90
fortran/nf_vario.F90
fortran/nf_varmio.F90
fortran/nf_varsio.F90
nf03_test/f03lib_f_interfaces.f90
nf_test/f03lib_f_interfaces.f90
Copyright: Richard Weed, Ph.D. <rweed@cavs.msstate.edu>, Center for Advanced Vehicular Systems, Mississippi State University
License: Apache-2.0
Files: docs/cfortran.doc
libsrc/cfortran.h
Copyright: 1990-2002, Burkhard Burow <burow@desy.de>
Comment: License is documented in docs/cfortran.doc.
See also: https://github.com/Unidata/netcdf-fortran/issues/27
License: LGPL-2 or CFORTRAN
Files: docs/texinfo.tex
Copyright: 1985-1986, 1988, 1990-2013, Free Software Foundation, Inc.
License: GPL-3+ with Texinfo exception
......@@ -142,43 +134,3 @@ License: Apache-2.0
.
On Debian systems, the complete text of the Apache License can be found
in `/usr/share/common-licenses/Apache-2.0'.
License: LGPL-2
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License
version 2 as published by the Free Software Foundation.
.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Library General Public License for more details.
.
On Debian systems, the full text of the GNU Library General Public
License version 2 can be found in the file
`/usr/share/common-licenses/LGPL-2'.
License: CFORTRAN
THIS PACKAGE, I.E. CFORTRAN.H, THIS DOCUMENT, AND THE CFORTRAN.H EXAMPLE
PROGRAMS ARE PROPERTY OF THE AUTHOR WHO RESERVES ALL RIGHTS. THIS PACKAGE AND
THE CODE IT PRODUCES MAY BE FREELY DISTRIBUTED WITHOUT FEES, SUBJECT
(AT YOUR CHOICE) EITHER TO THE GNU LIBRARY GENERAL PUBLIC LICENSE
AT http://www.gnu.org/licenses/lgpl.html OR TO THE FOLLOWING RESTRICTIONS:
- YOU MUST ACCOMPANY ANY COPIES OR DISTRIBUTION WITH THIS (UNALTERED) NOTICE.
- YOU MAY NOT RECEIVE MONEY FOR THE DISTRIBUTION OR FOR ITS MEDIA
(E.G. TAPE, DISK, COMPUTER, PAPER.)
- YOU MAY NOT PREVENT OTHERS FROM COPYING IT FREELY.
- YOU MAY NOT DISTRIBUTE MODIFIED VERSIONS WITHOUT CLEARLY DOCUMENTING YOUR
CHANGES AND NOTIFYING THE AUTHOR.
- YOU MAY NOT MISREPRESENTED THE ORIGIN OF THIS SOFTWARE, EITHER BY EXPLICIT
CLAIM OR BY OMISSION.
.
THE INTENT OF THE ABOVE TERMS IS TO ENSURE THAT THE CFORTRAN.H PACKAGE NOT BE
USED FOR PROFIT MAKING ACTIVITIES UNLESS SOME ROYALTY ARRANGEMENT IS ENTERED
INTO WITH ITS AUTHOR.
.
THIS SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER
EXPRESSED OR IMPLIED. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
SOFTWARE IS WITH YOU. SHOULD THE SOFTWARE PROVE DEFECTIVE, YOU ASSUME THE COST
OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. THE AUTHOR IS NOT RESPONSIBLE
FOR ANY SUPPORT OR SERVICE OF THE CFORTRAN.H PACKAGE.