more changes so that all fortran files use config.h

ESMCI · Aug 18, 2020 · db93ea5 · db93ea5
1 parent 0a10f86
commit db93ea5
Show file tree

Hide file tree

Showing 21 changed files with 24 additions and 4 deletions.
diff --git a/src/flib/Makefile.am b/src/flib/Makefile.am
@@ -95,15 +95,15 @@ if BUILD_DOCS
 BUILT_SOURCES += piodarray.f90 piolib_mod.f90 pionfatt_mod.f90 pionfget_mod.f90 \
 pionfput_mod.f90 pionfatt_mod_2.f90 pionfget_mod_2.f90
 piodarray.f90: piodarray.F90
-	$(CC) -E $< > $@
+	$(CC) -I../.. $(AM_CPPFLAGS) -E $< > $@
 piolib_mod.f90: piolib_mod.F90
 	$(CC) -I../.. $(AM_CPPFLAGS) -E $< > $@
 pionfatt_mod.f90: pionfatt_mod.F90
-	$(CC) -E $< > $@
+	$(CC) -I../.. $(AM_CPPFLAGS) -E $< > $@
 pionfget_mod.f90: pionfget_mod.F90
-	$(CC) -E $< > $@
+	$(CC) -I../.. $(AM_CPPFLAGS) -E $< > $@
 pionfput_mod.f90: pionfput_mod.F90
-	$(CC) -E $< > $@
+	$(CC) -I../.. $(AM_CPPFLAGS) -E $< > $@
 
 # Unfortunately the genf90.pl script which generates these fortran
 # files has no way of handling doxygen documentation. So use sed to

diff --git a/tests/general/ncdf_fail.F90.in b/tests/general/ncdf_fail.F90.in
@@ -1,3 +1,4 @@
+#include "config.h"
 MODULE ncdf_fail_tgv
   use pio_tutil
   implicit none

diff --git a/tests/general/ncdf_get_put.F90.in b/tests/general/ncdf_get_put.F90.in
@@ -1,3 +1,4 @@
+#include "config.h"
 PIO_TF_TEMPLATE<PIO_TF_PREDEF_TYPENAME PIO_TF_DATA_TYPE, PIO_TF_PREDEF_TYPENAME PIO_TF_FC_DATA_TYPE>
 PIO_TF_AUTO_TEST_SUB_BEGIN test_put_1datt
   Implicit none

diff --git a/tests/general/ncdf_inq.F90.in b/tests/general/ncdf_inq.F90.in
@@ -1,3 +1,4 @@
+#include "config.h"
 MODULE ncdf_inq_tests_tgv
   use pio_tutil
   character(len=PIO_TF_MAX_STR_LEN), parameter :: tgv_fname = "pio_ncdf_inq_test_file.nc"

diff --git a/tests/general/ncdf_simple_tests.F90.in b/tests/general/ncdf_simple_tests.F90.in
@@ -1,3 +1,4 @@
+#include "config.h"
 MODULE ncdf_simple_tests_tgv
   use pio_tutil
   ! tgv in prefix corresponds to module name (ncdf_simple_tests_tgv)

diff --git a/tests/general/pio_decomp_fillval.F90.in b/tests/general/pio_decomp_fillval.F90.in
@@ -1,3 +1,4 @@
+#include "config.h"
 ! nc write 1d array with fillvalues (the holes are explicitly specified)
 PIO_TF_TEMPLATE<PIO_TF_PREDEF_TYPENAME PIO_TF_DATA_TYPE, PIO_TF_PREDEF_TYPENAME PIO_TF_FC_DATA_TYPE>
 PIO_TF_AUTO_TEST_SUB_BEGIN nc_write_1d_explicit_fval

diff --git a/tests/general/pio_decomp_frame_tests.F90.in b/tests/general/pio_decomp_frame_tests.F90.in
@@ -1,3 +1,4 @@
+#include "config.h"
 ! Get a 3D column decomposition
 ! If force_rearrange is FALSE, the decomposition is such that
 ! # All even procs have VEC_HGT_SZ blocks of 

diff --git a/tests/general/pio_decomp_tests.F90.in b/tests/general/pio_decomp_tests.F90.in
@@ -1,3 +1,4 @@
+#include "config.h"
 PIO_TF_AUTO_TEST_SUB_BEGIN init_decomp_1d_get_loc_sz
   implicit none
   integer, parameter :: VEC_LOCAL_SZ = 7

diff --git a/tests/general/pio_decomp_tests_1d.F90.in b/tests/general/pio_decomp_tests_1d.F90.in
@@ -1,3 +1,4 @@
+#include "config.h"
 ! Get a block cyclic decomposition
 ! If force_rearrange is FALSE, the decomposition is such that
 ! # All even procs have VEC_LOCAL_SZ elements

diff --git a/tests/general/pio_decomp_tests_2d.F90.in b/tests/general/pio_decomp_tests_2d.F90.in
@@ -1,3 +1,4 @@
+#include "config.h"
 ! Get a 2D column decomposition
 ! If force_rearrange is FALSE, the decomposition is such that
 ! # All even procs have VEC_COL_SZ rows of VEC_ROW_SZ elements

diff --git a/tests/general/pio_decomp_tests_3d.F90.in b/tests/general/pio_decomp_tests_3d.F90.in
@@ -1,3 +1,4 @@
+#include "config.h"
 ! Get a 3D column decomposition
 ! If force_rearrange is FALSE, the decomposition is such that
 ! # All even procs have VEC_HGT_SZ blocks of 

diff --git a/tests/general/pio_fail.F90.in b/tests/general/pio_fail.F90.in
@@ -1,3 +1,4 @@
+#include "config.h"
 PIO_TF_AUTO_TEST_SUB_BEGIN fail_rank_even
   LOGICAL cond
   ! Even procs fail

diff --git a/tests/general/pio_file_fail.F90.in b/tests/general/pio_file_fail.F90.in
@@ -1,3 +1,4 @@
+#include "config.h"
 PIO_TF_TEST_SUB_BEGIN create_file_always_fail(iotype, filename)
   implicit none
   integer,  intent(in)  :: iotype

diff --git a/tests/general/pio_file_simple_tests.F90.in b/tests/general/pio_file_simple_tests.F90.in
@@ -1,3 +1,4 @@
+#include "config.h"
 PIO_TF_TEST_SUB_BEGIN create_file_no_opts(iotype, filename)
   implicit none
   integer,  intent(in)  :: iotype

diff --git a/tests/general/pio_init_finalize.F90.in b/tests/general/pio_init_finalize.F90.in
@@ -1,3 +1,4 @@
+#include "config.h"
 PIO_TF_AUTO_TEST_SUB_BEGIN init_finalize
   ! The default test driver should initialize and finalize PIO
   PRINT *, "Hello world"

diff --git a/tests/general/pio_iosystem_tests.F90.in b/tests/general/pio_iosystem_tests.F90.in
@@ -1,3 +1,4 @@
+#include "config.h"
 ! Split comm world into two comms (one with even procs and the other
 ! with odd procs
 SUBROUTINE split_world_odd_even(new_comm, new_rank, new_size, is_even)

diff --git a/tests/general/pio_iosystem_tests2.F90.in b/tests/general/pio_iosystem_tests2.F90.in
@@ -1,3 +1,4 @@
+#include "config.h"
 ! Split comm world into two comms (one with even procs and the other
 ! with odd procs
 SUBROUTINE split_world_odd_even(new_comm, new_rank, new_size, is_even)

diff --git a/tests/general/pio_iosystem_tests3.F90.in b/tests/general/pio_iosystem_tests3.F90.in
@@ -1,3 +1,4 @@
+#include "config.h"
 ! Split comm world into two comms (even procs and odd procs) and
 ! rank == overlapped_rank included in both comms
 SUBROUTINE split_world_two_with_overlap(new_comms, new_ranks, new_sizes, overlapped_rank)

diff --git a/tests/general/pio_rearr.F90.in b/tests/general/pio_rearr.F90.in
@@ -1,3 +1,4 @@
+#include "config.h"
 ! Create a file with a global attribute (filename)
 SUBROUTINE create_file(comm, iosys, iotype, fname, attname, dimname, ret)
     use pio_tutil

diff --git a/tests/general/pio_rearr_opts.F90.in b/tests/general/pio_rearr_opts.F90.in
@@ -1,3 +1,4 @@
+#include "config.h"
 MODULE pio_rearr_opts_tgv
   use pio_tutil
   character(len=PIO_TF_MAX_STR_LEN), parameter ::tgv_fname ="pio_rearr_opts_test.nc"

diff --git a/tests/general/pio_rearr_opts2.F90.in b/tests/general/pio_rearr_opts2.F90.in
@@ -1,3 +1,4 @@
+#include "config.h"
 MODULE pio_rearr_opts_tgv
   use pio_tutil
   character(len=PIO_TF_MAX_STR_LEN), parameter ::tgv_fname ="pio_rearr_opts2_test.nc"