revert changes to mosaic2 helper module

Author: rem1776

CMakeLists.txt

@@ -593,7 +593,7 @@ list(APPEND TEST_MODS_SRC
   test_fms/fms/test_fms.F90
   test_fms/fms2_io/argparse.F90
   test_fms/fms2_io/setup.F90
-  test_fms/mosaic2/write_files.F90
+#  test_fms/mosaic2/write_files.F90
   test_fms/mpp/compare_data_checksums.F90
   test_fms/mpp/compare_data_checksums_int.F90
   test_fms/mpp/fill_halo.F90

cmake/compiler_flags_IntelLLVM_C.cmake

@@ -4,6 +4,6 @@ set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -traceback")
 
 set( CMAKE_C_FLAGS_RELEASE "-qno-opt-dynamic-align -O2 -debug minimal")
 
-set( CMAKE_C_FLAGS_DEBUGUFS "-O0 -g -ftrapuv")
+set( CMAKE_C_FLAGS_DEBUGUFS "-O0 -g -ftrapv")
 
 set( CMAKE_C_LINK_FLAGS "")

test_fms/mosaic2/Makefile.am

@@ -23,7 +23,7 @@
 # uramirez, Ed Hartnett
 
 # Find the needed mod and include files.
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(MODDIR) -I./INPUT -I$(top_srcdir)/mosaic -I./
+AM_CPPFLAGS = -I$(abs_top_srcdir)/test_fms/mosaic2 -I$(top_srcdir)/include -I$(MODDIR)
 
 # Link to the FMS library.
 LDADD = $(top_builddir)/libFMS/libFMS.la

test_fms/mosaic2/test_grid2.F90

@@ -21,6 +21,8 @@
 !! with C1 tiles where tiles 1-6 are identical.  The tile points are made up with
 !! values that result in simple answers.  See write_files module for grid details.
 
+#include "write_files.inc"
+
 program test_mosaic
 
 use mpp_mod,      only : mpp_init, mpp_error, FATAL, mpp_npes, mpp_pe, mpp_root_pe

test_fms/mosaic2/test_mosaic2.F90

@@ -21,6 +21,8 @@
 !! get_mosaic_grid_sizes, get_mosaic_contact.  The subroutines are tested with
 !! made up C1 grids and exchange grids.  See write_files mod for grid details.
 
+#include "write_files.inc"
+
 program test_mosaic
 
 use mosaic2_mod