Merge branch 'origin/jayeshkrishna/homme/port_to_scorpio_1.6.2' into …

…next (PR #6429) Fixes standalone HOMME build issues with SCORPIO 1.6.3 [BFB]
E3SM-Project · May 30, 2024 · cd89388 · cd89388
2 parents 68f2e5b + b06c4a3
commit cd89388
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/components/homme/CMakeLists.txt b/components/homme/CMakeLists.txt
@@ -396,11 +396,14 @@ if (HOMME_BUILD_SCORPIO)
     SET(GENF90_PATH ${CMAKE_CURRENT_SOURCE_DIR}/utils/utils/externals/scorpio/src/genf90)
     SET(PIO_ENABLE_TOOLS OFF CACHE BOOL "Disabling Scorpio tool build")
     ADD_SUBDIRECTORY(utils/externals/scorpio)
+    SET(PIO_INCLUDE_DIRS "${CMAKE_CURRENT_BINARY_DIR}/utils/externals/scorpio/src/flib")
   else ()
     # The default I/O library used in "Scorpio classic"
     ADD_SUBDIRECTORY(utils/externals/scorpio_classic)
     SET(GENF90_PATH ${CMAKE_CURRENT_SOURCE_DIR}/utils/cime/CIME/non_py/externals/genf90)
+    SET(PIO_INCLUDE_DIRS "${CMAKE_CURRENT_BINARY_DIR}/utils/externals/scorpio/pio")
   endif ()
+  INCLUDE_DIRECTORIES(${PIO_INCLUDE_DIRS})
 endif ()
 
 

diff --git a/components/homme/src/prim_movie_mod.F90 b/components/homme/src/prim_movie_mod.F90
@@ -462,7 +462,7 @@ integer function nextoutputstep(tl)
  end function nextoutputstep
 
   subroutine prim_movie_output(elem, tl, hvcoord, par)
-    use piolib_mod, only : Pio_SetDebugLevel !_EXTERNAL
+    use pio, only : Pio_SetDebugLevel !_EXTERNAL
     use pio, only : pio_syncfile !_EXTERNAL
     use perf_mod, only : t_startf, t_stopf !_EXTERNAL
     use viscosity_mod, only : compute_zeta_C0