Merge branch 'develop' into ip_wne_1

.github/workflows/Linux_options.yml

@@ -33,6 +33,9 @@ jobs:
         - {
             options: "-DUSE_AEC=ON"
           }
+        - { 
+            options: "-DUSE_NETCDF4=ON"
+          }
 
     steps:
 

.github/workflows/developer.yml

@@ -28,7 +28,7 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install libnetcdf-dev libnetcdff-dev netcdf-bin pkg-config
-        sudo apt-get install libpng-dev autotools-dev autoconf gcovr
+        sudo apt-get install libpng-dev autotools-dev libaec-dev autoconf gcovr
 
     - name: cache-jasper
       id: cache-jasper
@@ -90,6 +90,13 @@ jobs:
       with: 
         path: wgrib2
 
+    - name: cache-data
+      id: cache-data
+      uses: actions/cache@v3
+      with:
+        path: ~/data
+        key: data-1
+
     - name: build
       run: |
         cd wgrib2
@@ -98,10 +105,16 @@ jobs:
         export CFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0'        
         export FCFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0'        
         export FFLAGS='-Wall -g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0'        
-        cmake ..
+        cmake .. -DFTP_TEST_FILES=ON  -DTEST_FILE_DIR=/home/runner/data -DUSE_NETCDF4=ON -DUSE_AEC=ON
         make VERBOSE=1
         ctest --verbose --output-on-failure --rerun-failed
         gcovr --root .. -v  --html-details --exclude ../tests --exclude CMakeFiles --print-summary -o test-coverage.html &> /dev/null
+    
+    - name: cache-data
+      if: steps.cache-data.outputs.cache-hit != 'true'
+      run: |
+        mkdir ~/data
+        cp $GITHUB_WORKSPACE/wgrib2/build/tests/data/* ~/data
         
     - name: upload-test-coverage
       uses: actions/upload-artifact@v4

CMakeLists.txt

@@ -30,13 +30,22 @@ option(USE_PNG "Use PNG?" off)
 option(USE_JASPER "Use Jasper?" off)
 option(USE_OPENJPEG "Use OpenJPEG?" off)
 option(USE_AEC "Use AEC?" off)
+option(FTP_TEST_FILES "Fetch and test with files on FTP site." OFF)
+option(FTP_LARGE_TEST_FILES "Fetch and test with very large files on FTP site." OFF)
+option(FTP_EXTRA_TEST_FILES "Fetch even more large files from FTP and test them." OFF)
 # MAKE_FTN_API should only be on when building library
 option(MAKE_FTN_API "add ftn api?" off)
 option(DISABLE_STAT "disable posix feature" off)
 set(BUILD_COMMENTS "stock build")
 option(BUILD_LIB "Build wgrib2 library?" on)
 option(BUILD_SHARED_LIB "Build shared library?" off)
 
+# Developers can use this option to specify a local directory which
+# holds the test files. They will be copied instead of fetching the
+# files via FTP.
+SET(TEST_FILE_DIR "." CACHE STRING "Check this directory for test files before using FTP.")
+message(STATUS "Finding test data files in directory ${TEST_FILE_DIR}.")
+
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 # Set default install path if not provided.
@@ -137,7 +146,7 @@ FILE(WRITE "wgrib2/config.h" "/* config.h generated by cmake */\n")
 FILE(APPEND "wgrib2/config.h" "#ifndef _CONFIG_H\n")
 FILE(APPEND "wgrib2/config.h" "#define _CONFIG_H\n")
 
-FOREACH(var IN ITEMS USE_NETCDF3 USE_NETCDF4 USE_HDF5 USE_REGEX USE_TIGGE USE_MYSQL
+FOREACH(var IN ITEMS USE_NETCDF3 USE_REGEX USE_TIGGE USE_MYSQL
    USE_IPOLATES USE_UDF USE_OPENMP USE_PROJ4 USE_WMO_VALIDATION DISABLE_TIMEZONE
    DISABLE_ALARM USE_NAMES USE_G2CLIB USE_PNG USE_JASPER USE_OPENJPEG MAKE_FTN_API USE_AEC BUILD_COMMENTS)