bring up to latest main, still debugging

jedwards4b · jedwards4b · commit 9a56514becdc · 2026-01-27T07:32:37.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@
 # This is the CMake build file for the main directory.
 # Jim Edwards
 
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.18)
 project(PIO LANGUAGES C)
 
 # The project version number (modern style)
@@ -141,9 +141,12 @@ endif()
 
 # Set a variable that appears in the config.h.in file.
 if(PIO_USE_GDAL)
-  set(USE_GDAL 1)
+  find_package(GDAL REQUIRED)
+  if(GDAL_FOUND)
+    set(PIO_ENABLE_GDAL 1)
+  endif()
 else()
-  set(USE_GDAL 0)
+  set(PIO_ENABLE_GDAL 0)
 endif()
 
 
diff --git a/cmake_config.h.in b/cmake_config.h.in
@@ -46,6 +46,6 @@
 /* Does PIO support using pnetcdf for I/O? */
 #cmakedefine _PNETCDF
 
-#cmakedefine USE_GDAL
+#cmakedefine PIO_ENABLE_GDAL
 
 #endif /* _PIO_CONFIG_ */
diff --git a/src/clib/CMakeLists.txt b/src/clib/CMakeLists.txt
@@ -29,7 +29,7 @@ if (NETCDF_INTEGRATION)
   set (src ${src} ../ncint/nc_get_vard.c ../ncint/ncintdispatch.c ../ncint/ncint_pio.c ../ncint/nc_put_vard.c)
 endif ()
 # This needs to be in an IF statement. using GDAL_INTEGRATION. But haven't figured that out yet.
-if (USE_GDAL)
+if (PIO_USE_GDAL)
   set (src ${src} pio_gdal.c)
 endif()
 
@@ -193,11 +193,11 @@ endif()
 
 
 #===== GDAL ===== <M.Long>
-if (USE_GDAL)
+if (PIO_USE_GDAL)
   target_include_directories (pioc
-    PUBLIC ${GDAL_INCLUDE_DIR})
+    PUBLIC ${GDAL_INCLUDE_DIRS})
   target_link_libraries (pioc
-    PUBLIC "-L${GDAL_LIBRARY_PATH} -lgdal")
+    PUBLIC ${GDAL_LIBRARIES})
 endif ()
 
 include(CheckTypeSize)
diff --git a/src/clib/pio.h b/src/clib/pio.h
@@ -18,9 +18,9 @@
 
 #include <netcdf.h>
 #include <netcdf_meta.h>
-
+#ifdef PIO_ENABLE_GDAL
 #include <gdal.h>
-
+#endif
 #define NETCDF_VERSION_LE(Maj, Min, Pat) \
     (((NC_VERSION_MAJOR == Maj) && (NC_VERSION_MINOR == Min) && (NC_VERSION_PATCH <= Pat)) || \
      ((NC_VERSION_MAJOR == Maj) && (NC_VERSION_MINOR < Min)) || (NC_VERSION_MAJOR < Maj))
@@ -611,12 +611,13 @@ typedef struct file_desc_t
      * feature. One consequence is that PIO_IOTYPE_NETCDF4C files will
      * not have deflate automatically turned on for each var. */
     int ncint_file;
-
+#ifdef PIO_ENABLE_GDAL
     /** GDAL specific vars - M.Long */
     GDALDatasetH *hDS;
     int dateVarID;     // Index of field with type OFTDate
     int timeVarID;     // Index of field with type OFTTime
     int datetimeVarID; // Index of field with type OFTDatetime
+#endif
 
 } file_desc_t;
 
@@ -640,6 +641,7 @@ enum PIO_IOTYPE
 
     /** GDAL (serial only) */
     PIO_IOTYPE_GDAL = 5
+
 };
 
 /**
@@ -1371,7 +1373,7 @@ extern "C" {
                              const long long *op);
     int nc_put_vard_ulonglong(int ncid, int varid, int decompid, const size_t recnum,
                               const unsigned long long *op);
-
+#ifdef PIO_ENABLE_GDAL
     /* These functions are for the GDAL integration layer. MSL - 9/7/2023 */
     int GDALc_inq_fieldid(int fileid, const char *name, int *varidp);
     int GDALc_inq_timeid(int fileid, int *timeid); // Is there a field of type OFTDate, OFTTime, or OFTDateTime?
@@ -1385,7 +1387,7 @@ extern "C" {
     int pio_read_darray_shp(file_desc_t *file, io_desc_t *iodesc, int vid, void *iobuf);
     int pio_gdal_read_features_par(int fileid, int varid, io_desc_t *ddesc, float *ip);
     int pio_read_darray_shp_par(file_desc_t *file, io_desc_t *iodesc, int vid, void *iobuf);
-
+#endif
 #if defined(__cplusplus)
 }
 #endif
diff --git a/src/clib/pio_darray.c b/src/clib/pio_darray.c
@@ -197,7 +197,7 @@ PIOc_write_darray_multi(int ncid, const int *varids, int ioid, int nvars,
 
     }
 
-    if ((!ios->async || !ios->ioproc) && (file->iotype = PIO_IOTYPE_GDAL))
+    if ((!ios->async || !ios->ioproc) && (file->iotype == PIO_IOTYPE_GDAL))
     {
       // Do we even need to sort out fndims here? (MSL<<>>)
       fndims = 1;
@@ -961,7 +961,7 @@ PIOc_read_darray(int ncid, int varid, int ioid, PIO_Offset arraylen,
         if ((ierr = pio_read_darray_nc(file, iodesc, varid, iobuf)))
             return pio_err(ios, file, ierr, __FILE__, __LINE__);
         break;
-#ifdef USE_GDAL
+#ifdef PIO_ENABLE_GDAL
     case PIO_IOTYPE_GDAL:
         if ((ierr = pio_read_darray_shp_par(file, iodesc, varid, iobuf)))
             return pio_err(ios, file, ierr, __FILE__, __LINE__);
diff --git a/src/clib/pio_darray_int.c b/src/clib/pio_darray_int.c
@@ -996,11 +996,13 @@ recv_and_write_data(file_desc_t *file, const int *varids, const int *frame,
 
                     /* Call the netCDF functions to write the data. */
                     if (needtowrite) {
+#ifdef PIO_ENABLE_GDAL
+			if (file->iotype == PIO_IOTYPE_GDAL)
+			    ierr = GDALc_shp_write_float_field(file->pio_ncid, varids[nv], start, count, bufptr);
+#endif		        
 		      if (file->iotype == PIO_IOTYPE_NETCDF)
                         if ((ierr = nc_put_vara(file->fh, varids[nv], start, count, bufptr)))
                             return check_netcdf2(ios, NULL, ierr, __FILE__, __LINE__);
-		      if (file->iotype == PIO_IOTYPE_GDAL)
-                        ierr = GDALc_shp_write_float_field(file->pio_ncid, varids[nv], start, count, bufptr);
 		      }
 
                 } /* next var */
diff --git a/src/clib/pio_file.c b/src/clib/pio_file.c
@@ -283,12 +283,14 @@ PIOc_closefile(int ncid)
             ierr = ncmpi_close(file->fh);
             break;
 #endif
+#ifdef PIO_ENABLE_GDAL
 	case PIO_IOTYPE_GDAL:
             if (ios->io_rank == 0) {
 	      GDALClose((void*)file->hDS);
 	      printf("GDALClose ierr: %d\n",ierr);
 	    }
 	  break;
+#endif
         default:
             return pio_err(ios, file, PIO_EBADIOTYPE, __FILE__, __LINE__);
         }
@@ -477,8 +479,10 @@ PIOc_sync(int ncid)
                 flush_output_buffer(file, true, 0);
                 break;
 #endif
+#ifdef PIO_ENABLE_GDAL
 	    case PIO_IOTYPE_GDAL:
 	        break;
+#endif
             default:
                 return pio_err(ios, file, PIO_EBADIOTYPE, __FILE__, __LINE__);
             }
diff --git a/src/clib/pio_gdal.c b/src/clib/pio_gdal.c
@@ -1,7 +1,7 @@
 #include <config.h>
 #include <pio.h>
 #include <pio_internal.h>
-#ifdef USE_GDAL
+#ifdef PIO_ENABLE_GDAL
 #include <ogr_api.h>
 
 /**
diff --git a/src/clib/pio_internal.h b/src/clib/pio_internal.h
@@ -91,7 +91,7 @@
 
 #define PIO_DATATYPE_NULL MPI_CHAR
 
-#ifdef USE_GDAL
+#ifdef PIO_ENABLE_GDAL
 int
 pio_read_darray_shp(file_desc_t *file, io_desc_t *iodesc, int vid,
 		    void *iobuf);
diff --git a/src/clib/pioc_support.c b/src/clib/pioc_support.c
@@ -3137,10 +3137,10 @@ iotype_is_valid(int iotype)
     if (iotype == PIO_IOTYPE_PNETCDF)
         ret++;
 #endif /* _PNETCDF */
-
+#ifdef PIO_ENABLE_GDAL
     if (iotype == PIO_IOTYPE_GDAL)
         ret++;
-
+#endif
     return ret;
 }
 
diff --git a/tests/cunit/CMakeLists.txt b/tests/cunit/CMakeLists.txt
@@ -29,7 +29,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0")
 
 
 set(CMAKE_MACOSX_RPATH 1)
-if(USE_GDAL)  
+if(PIO_ENABLE_GDAL)  
   set(CMAKE_BUILD_RPATH ${GDAL_LIBRARY_PATH})
 endif()
 #==============================================================================
@@ -130,8 +130,10 @@ if (NOT PIO_USE_MPISERIAL)
     target_link_libraries (test_simple pioc)
     add_executable (test_async_perf EXCLUDE_FROM_ALL test_async_perf.c test_common.c)
     target_link_libraries(test_async_perf pioc)
-    add_executable (test_gdal EXCLUDE_FROM_ALL test_gdal.c test_common.c)
-    target_link_libraries (test_gdal pioc)
+    if(PIO_ENABLE_GDAL)  
+      add_executable (test_gdal EXCLUDE_FROM_ALL test_gdal.c test_common.c)
+      target_link_libraries (test_gdal pioc)
+    endif()
 endif ()
 add_executable (test_spmd EXCLUDE_FROM_ALL test_spmd.c test_common.c)
 target_link_libraries (test_spmd pioc)
@@ -166,8 +168,9 @@ add_dependencies (tests test_async_manyproc)
 add_dependencies (tests test_async_1d)
 add_dependencies (tests test_simple)
 add_dependencies (tests test_async_perf)
-add_dependencies (tests test_gdal)
-
+if(PIO_ENABLE_GDAL)  
+  add_dependencies (tests test_gdal)
+endif()
 # Test Timeout in seconds.
 if (PIO_VALGRIND_CHECK)
   set (DEFAULT_TEST_TIMEOUT 800)
@@ -354,7 +357,7 @@ else ()
   #   EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/test_async_perf
   #   NUMPROCS ${EXACTLY_FOUR_TASKS}
   #   TIMEOUT ${DEFAULT_TEST_TIMEOUT})
-  if(USE_GDAL)  
+  if(PIO_ENABLE_GDAL)  
     add_custom_target(link_target ALL
                       COMMAND ${CMAKE_COMMAND} -E create_symlink
                       ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_BINARY_DIR}/data)
diff --git a/tests/cunit/test_pioc.c b/tests/cunit/test_pioc.c
@@ -170,17 +170,18 @@ int check_darray_file(int iosysid, int ntasks, int my_rank, char *filename)
     if ((ret = PIOc_read_darray(ncid, 0, ioid, arraylen, &data_in)))
         ERR(ret);
 
+    /* Check data. */
+    printf("my_rank %d data_in %f\n",my_rank, data_in);
+    if (data_in != my_rank * 10)
+        ERR(ERR_WRONG);
+
     /* Try to write, but this will fail because file was opened with
      * NOWRITE. */
     float fillvalue = 0.0;
     float test_data =  my_rank * 10;
     if (PIOc_write_darray(ncid, 0, ioid, arraylen, &test_data, &fillvalue) != PIO_EPERM)
         ERR(ret);
 
-    /* Check data. */
-    if (data_in != my_rank * 10)
-        ERR(ERR_WRONG);
-
     /* Close the file. */
     if ((ret = PIOc_closefile(ncid)))
         ERR(ret);
@@ -209,7 +210,7 @@ int test_darray(int iosysid, int ioid, int num_flavors, int *flavor, int my_rank
     {
         /* Create the filename. */
         sprintf(filename, "%s_flavor_%d_fv_%d.nc", TEST_NAME, flavor[fmt], fv);
-
+	printf("Creating file %s\n",filename);
         /* Create the netCDF output file. */
         if ((ret = PIOc_createfile(iosysid, &ncid, &(flavor[fmt]), filename, PIO_CLOBBER)))
             ERR(ret);
@@ -237,10 +238,17 @@ int test_darray(int iosysid, int ioid, int num_flavors, int *flavor, int my_rank
         float fillvalue = PIO_FILL_FLOAT;
         float *fillvaluep = fv ? &fillvalue : NULL;
         float test_data[arraylen];
-        for (int f = 0; f < arraylen; f++)
+        for (int f = 0; f < arraylen; f++){
             test_data[f] = my_rank * 10 + f;
+	    if (flavor[fmt] == 3)
+		printf("my_rank %d test_data[%d]%f\n",my_rank, f, test_data[f]);
+	}
+	if (flavor[fmt] == 3)
+	    PIOc_set_log_level(3);
         if ((ret = PIOc_write_darray(ncid, varid, ioid, arraylen, test_data, fillvaluep)))
             ERR(ret);
+	if (flavor[fmt] == 3)
+	    PIOc_set_log_level(0);
 
         /* Close the netCDF file. */
         if ((ret = PIOc_closefile(ncid)))
