Test script updates and input tests

.gitignore

@@ -36,7 +36,6 @@ Makefile.in
 /mdate-sh
 /py-compile
 /test-driver
-/tap-driver.sh
 /ylwrap
 *.log
 *.trs

affinity/affinity.c

@@ -19,11 +19,14 @@
  * License along with FMS.  If not, see <http://www.gnu.org/licenses/>.
  **********************************************************************/
 
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdbool.h>
 #include <unistd.h>
 #include <sched.h>
 #include <errno.h>

configure.ac

@@ -74,8 +74,32 @@ AS_IF([test ${enable_setting_flags:-yes} = yes],
   [enable_setting_flags=yes],
   [enable_setting_flags=no])
 
+# user enabled testing with input files
+AC_MSG_CHECKING([whether to enable tests with input files])
+AC_ARG_ENABLE([test-input],
+            [AS_HELP_STRING([--enable-test-input="path/to/input"],
+            [Enable tests using input netcdf files, if present in the given full directory.])])
+AC_MSG_RESULT([$enable_test_input])
+
+# require path to be given
+AS_IF([test "x$enable_test_input" = "xyes"],
+    [AC_MSG_ERROR([Test input enabled, but no directory given with --enable-test-input=/path])],
+    [AS_IF([test "x$enable_test_input" != "xno"],
+        [TEST_INPUT_PATH="$enable_test_input"],[])]
+)
+
+# if set, check directory exists
+AS_IF([test "$TEST_INPUT_PATH" = ""],
+  [],
+  [AS_IF([test -d $TEST_INPUT_PATH],[],
+    [AC_MSG_ERROR([Test input enabled, but directory $TEST_INPUT_PATH not found]) ]
+  )])
+
+# substitute path for input
+AC_SUBST([TEST_INPUT_PATH])
+
 # Does the user want to build documentation?
-AC_MSG_CHECKING([whether documentation should be build (requires doxygen)])
+AC_MSG_CHECKING([whether documentation should be built (requires doxygen)])
 AC_ARG_ENABLE([docs],
               [AS_HELP_STRING([--enable-docs],
                               [enable building of documentation with doxygen.])])
@@ -94,6 +118,7 @@ if test "x$enable_docs" = xyes; then
    AC_CONFIG_FILES([docs/Doxyfile])
 fi
 
+
 # Find the C compiler.
 AC_PROG_CC
 AM_PROG_CC_C_O
@@ -221,9 +246,6 @@ if test $enable_setting_flags = yes; then
   fi
 fi
 
-# Define an AM_CONDITIONAL to determine if you are on a CRAY
-AM_CONDITIONAL([CRAY], [test `env | grep CRAY | wc -l` -gt 0])
-
 # Find which mpi launcher to use
 AC_CHECK_PROGS([MPI_LAUNCHER],[srun aprun mpirun])
 
@@ -337,25 +359,25 @@ AC_CONFIG_FILES([
   random_numbers/Makefile
   libFMS/Makefile
   docs/Makefile
-  test_fms/test_common.sh
+  test_fms/test-lib.sh
   test_fms/Makefile
-  test_fms/diag_manager/Makefile
+  test_fms/affinity/Makefile
+  test_fms/axis_utils/Makefile
   test_fms/data_override/Makefile
-  test_fms/exchange/Makefile
-  test_fms/monin_obukhov/Makefile
+  test_fms/diag_manager/Makefile
   test_fms/drifters/Makefile
-  test_fms/interpolator/Makefile
-  test_fms/fms2_io/Makefile
+  test_fms/exchange/Makefile
+  test_fms/field_manager/Makefile
   test_fms/fms/Makefile
-  test_fms/mpp/Makefile
-  test_fms/mpp_io/Makefile
+  test_fms/fms2_io/Makefile
+  test_fms/horiz_interp/Makefile
+  test_fms/interpolator/Makefile
   test_fms/time_interp/Makefile
   test_fms/time_manager/Makefile
-  test_fms/horiz_interp/Makefile
-  test_fms/field_manager/Makefile
-  test_fms/axis_utils/Makefile
+  test_fms/mpp_io/Makefile
+  test_fms/mpp/Makefile
+  test_fms/monin_obukhov/Makefile
   test_fms/mosaic/Makefile
-  test_fms/affinity/Makefile
   test_fms/coupler/Makefile
   FMS.pc
   ])

libFMS/Makefile.am

@@ -64,5 +64,5 @@ libFMS_la_LIBADD += $(top_builddir)/diag_integral/libdiag_integral.la
 libFMS_la_LIBADD += $(top_builddir)/sat_vapor_pres/libsat_vapor_pres.la
 libFMS_la_LIBADD += $(top_builddir)/libFMS_mod.la
 
-# At least one source file must be included to please Automake.
-libFMS_la_SOURCES = $(top_builddir)/include/file_version.h
+libFMS_la_SOURCES =
+nodist_EXTRA_libFMS_la_SOURCES = dummy.f90

mkmods.mk

@@ -1,9 +1,9 @@
 # Ensure the $(MODDIR) exists
-$(shell test -d $(MODDIR) || mkdir -p $(MODDIR))
 
 SUFFIXES = .$(FC_MODEXT) _mod.$(FC_MODEXT)
 .F90.$(FC_MODEXT) .F90_mod.$(FC_MODEXT) .f90.$(FC_MODEXT) .f90_mod.$(FC_MODEXT):
+	test -d $(MODDIR) || mkdir -p $(MODDIR)
 	$(PPFCCOMPILE) -c $<
-	@cp $(MODDIR)/$@ .
+	@if test -e $(MODDIR)/$@; then cp $(MODDIR)/$@ .; fi
 
 CLEANFILES = *.$(FC_MODEXT) $(BUILT_SOURCES:%=$(MODDIR)/%) *__genmod.$(FC_MODEXT) *__genmod.f90

mosaic/read_mosaic.c

@@ -54,7 +54,7 @@ void handle_netcdf_error(const char *msg, int status )
 void get_file_dir(const char *file, char *dir)
 {
   int len;
-  char *strptr = NULL;
+  const char *strptr = NULL;
 
   /* get the diretory */
 
@@ -259,13 +259,13 @@ void get_var_data(const char *file, const char *name, void *data)
   switch (vartype) {
     case NC_DOUBLE:case NC_FLOAT:
 #ifdef OVERLOAD_R4
-      status = nc_get_var_float(ncid, varid, data);
+      status = nc_get_var_float(ncid, varid, (float *)data);
 #else
-      status = nc_get_var_double(ncid, varid, data);
+      status = nc_get_var_double(ncid, varid, (double *)data);
 #endif
       break;
     case NC_INT:
-      status = nc_get_var_int(ncid, varid, data);
+      status = nc_get_var_int(ncid, varid, (int *)data);
       break;
     default:
       sprintf(msg, "get_var_data: field %s in file %s has an invalid type, "
@@ -319,13 +319,13 @@ void get_var_data_region(const char *file, const char *name, const size_t *start
   switch (vartype) {
     case NC_DOUBLE:case NC_FLOAT:
 #ifdef OVERLOAD_R4
-      status = nc_get_vara_float(ncid, varid, start, nread, data);
+      status = nc_get_vara_float(ncid, varid, start, nread, (float *)data);
 #else
-      status = nc_get_vara_double(ncid, varid, start, nread, data);
+      status = nc_get_vara_double(ncid, varid, start, nread, (double *)data);
 #endif
       break;
     case NC_INT:
-      status = nc_get_vara_int(ncid, varid, start, nread, data);
+      status = nc_get_vara_int(ncid, varid, start, nread, (int *)data);
       break;
     default:
       sprintf(msg, "get_var_data_region: field %s in file %s has an invalid type, "