Merge pull request ESMCI#1446 from NCAR/ejh_again

change to trigger CI
rfiorella · May 24, 2019 · abb1339 · abb1339
2 parents 08d0dbc + ad5f1f1
commit abb1339
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,7 +11,7 @@ addons:
     sources:
     - ubuntu-toolchain-r-test
     packages:
-    - pkg-config netcdf-bin libnetcdf-dev openmpi-bin libopenmpi-dev gfortran
+    - pkg-config netcdf-bin libnetcdf-dev openmpi-bin libopenmpi-dev gfortran doxygen graphviz
 
 before_install:
   - test -n $CC && unset CC
@@ -40,12 +40,14 @@ env:
     - LDFLAGS='-L/usr/lib'
 
 script:
+  - ls -l /usr/include
   - autoreconf -i
   - export CFLAGS='-std=c99  -fsanitize=address -fno-omit-frame-pointer'
   - export FFLAGS='-fsanitize=address -fno-omit-frame-pointer'
   - export FCFLAGS='-fsanitize=address -fno-omit-frame-pointer'
   - export DISTCHECK_CONFIGURE_FLAGS='--enable-fortran'
-  - ./configure --enable-fortran
+  - ./configure --enable-fortran --enable-docs
+  - make
   - make -j distcheck
   - rm -rf build
   - mkdir build

diff --git a/configure.ac b/configure.ac
@@ -1,6 +1,7 @@
 ## This is the autoconf file for the PIO library.
 ## Ed Hartnett 8/16/17
 
+
 # Initialize autoconf and automake.
 AC_INIT(pio, 2.4.2-development)
 AC_CONFIG_SRCDIR(src/clib/pio_darray.c)

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
@@ -291,7 +291,7 @@ OPTIMIZE_OUTPUT_VHDL   = NO
 # Note that for custom extensions you also need to set FILE_PATTERNS otherwise
 # the files are not read by doxygen.
 
-EXTENSION_MAPPING      = F90=FortranFree 
+EXTENSION_MAPPING      = f90=Fortran 
 
 # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
 # according to the Markdown format, which allows for more readable

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -9,7 +9,7 @@ if (PIO_ENABLE_FORTRAN)
     ADD_SUBDIRECTORY(f03)
     ADD_SUBDIRECTORY(c)
   else()
-    ADD_SUBDIRECTORY(f03)
+#    ADD_SUBDIRECTORY(f03)
     ADD_SUBDIRECTORY(c)
     #    ADD_SUBDIRECTORY(cxx)
   endif()

diff --git a/src/flib/piolib_mod.F90 b/src/flib/piolib_mod.F90
@@ -504,7 +504,6 @@ end subroutine PIO_initdecomp_bc
 !! @ingroup PIO_initdecomp
 !! @brief A deprecated interface to the PIO_initdecomp method.
 !! @details
-!! @deprecated
 !! @param iosystem : a defined pio system descriptor, see PIO_types
 !! @param basepiotype : the type of variable(s) associated with this iodesc.
 !! @copydoc PIO_kinds
@@ -514,6 +513,7 @@ end subroutine PIO_initdecomp_bc
 !! @param iodofr :
 !! @param iodofw :
 !! @param iodesc @copydoc iodesc_generate
+!! @deprecated
 !<
   subroutine initdecomp_2dof_bin_i4(iosystem,basepiotype,dims,lenblocks,compdof,iodofr,iodofw,iodesc)
     type (iosystem_desc_t), intent(in) :: iosystem
@@ -554,7 +554,6 @@ end subroutine initdecomp_2dof_bin_i8
 !! @ingroup PIO_initdecomp
 !! @brief A deprecated interface to the PIO_initdecomp method.
 !! @details
-!! @deprecated
 !! @param iosystem : a defined pio system descriptor, see PIO_types
 !! @param basepiotype : the type of variable(s) associated with this iodesc.
 !! @copydoc PIO_kinds
@@ -563,6 +562,7 @@ end subroutine initdecomp_2dof_bin_i8
 !! @param compdof : mapping of the storage order of the variable to its memory order
 !! @param iodofr :
 !! @param iodesc @copydoc iodesc_generate
+!! @deprecated
 !<
   subroutine initdecomp_1dof_bin_i8(iosystem,basepiotype,dims,lenblocks,compdof,iodofr,iodesc)
     type (iosystem_desc_t), intent(in) :: iosystem
@@ -604,7 +604,6 @@ end subroutine initdecomp_1dof_bin_i4
 !! @ingroup PIO_initdecomp
 !! @brief A deprecated interface to the PIO_initdecomp method.
 !! @details
-!! @deprecated
 !! @param iosystem : a defined pio system descriptor, see PIO_types
 !! @param basepiotype : the type of variable(s) associated with this iodesc.
 !! @copydoc PIO_kinds
@@ -616,6 +615,7 @@ end subroutine initdecomp_1dof_bin_i4
 !! @param start : used with count to give a block description of the shape of the data
 !! @param count :
 !! @param iodesc @copydoc iodesc_generate
+!! @deprecated
 !<
   subroutine initdecomp_2dof_nf_i4(iosystem,basepiotype,dims,lenblocks,compdof,iodofr,iodofw,start, count, iodesc)
     type (iosystem_desc_t), intent(in) :: iosystem
@@ -664,7 +664,6 @@ end subroutine initdecomp_2dof_nf_i8
 !! @ingroup PIO_initdecomp
 !! @brief A deprecated interface to the PIO_initdecomp method.
 !! @details
-!! @deprecated
 !! @param iosystem : a defined PIO system descriptor, see pio_types
 !! @param basepiotype : The type of variable(s) associated with this iodesc.
 !! @copydoc PIO_kinds
@@ -675,6 +674,7 @@ end subroutine initdecomp_2dof_nf_i8
 !! @param start :
 !! @param count :
 !! @param iodesc @copydoc iodesc_generate
+!! @deprecated
 !<
   subroutine initdecomp_1dof_nf_i4(iosystem,basepiotype,dims,lenblocks,compdof,iodof,start, count, iodesc)
     type (iosystem_desc_t), intent(in) :: iosystem