Merge branch 'master' into ejh_ncint_fortran

jedwards4b · Jul 12, 2019 · 70a219c · 70a219c
2 parents b4882a3 + 213084b
commit 70a219c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/flib/CMakeLists.txt b/src/flib/CMakeLists.txt
@@ -38,6 +38,7 @@ endif ()
 
 # Include flib source and binary directories (for Fortran modules)
 target_include_directories (piof
+  PUBLIC ${CMAKE_BINARY_DIR}
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
   PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
 

diff --git a/src/flib/pio.F90 b/src/flib/pio.F90
@@ -22,6 +22,9 @@ module pio
        pio_freedecomp, pio_syncfile, &
        pio_finalize, pio_set_hint, pio_getnumiotasks, pio_file_is_open, &
        PIO_deletefile, PIO_get_numiotasks, PIO_iotype_available, &
+!#ifdef NETCDF_INTEGRATION
+!       nf_init_intracom, &
+!#endif
        pio_set_rearr_opts
 ! #ifdef NETCDF_INTEGRATION
 !        nf_init_intracom, &