Defining PIO2 doesn't work at the moment

philipwjones · Nov 15, 2023 · 1db00b4 · 1db00b4
1 parent b25e4bc
commit 1db00b4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/components/cmake/common_setup.cmake b/components/cmake/common_setup.cmake
@@ -75,7 +75,13 @@ else()
   set(CPPDEFS "${CPPDEFS} -DHAVE_MPI")
 endif()
 
-set(CPPDEFS "${CPPDEFS} -DPIO${PIO_VERSION}")
+if (PIO_VERSION STREQUAL "1")
+  set(CPPDEFS "${CPPDEFS} -DPIO1")
+endif()
+# The code below is what we actually want but it's currently broken.
+# Once fixes are in place, uncomment the line below and remove the 3
+# lines above.
+# set(CPPDEFS "${CPPDEFS} -DPIO${PIO_VERSION}")
 
 # Not clear how to escape commas for libraries with their own configure
 # script, and they don't need this defined anyway, so leave this out of

diff --git a/share/util/shr_pio_mod.F90 b/share/util/shr_pio_mod.F90
@@ -669,7 +669,7 @@ subroutine shr_pio_getiotypefromname(typename, iotype, defaulttype)
        iotype = pio_iotype_netcdf4p
     else if ( typename .eq. 'NETCDF4C') then
        iotype = pio_iotype_netcdf4c
-#ifdef PIO2
+#ifndef PIO1
     else if ( typename .eq. 'ADIOS') then
        iotype = pio_iotype_adios
 #endif