Read New NHF Schema (NGWPC-9422)

.github/workflows/ngwpc-cicd.yml

@@ -23,6 +23,14 @@ on:
         description: 'NGEN_FORCING_IMAGE_TAG'
         required: false
         type: string
+      EWTS_ORG:
+        description: 'EWTS_ORG'
+        required: false
+        type: string
+      EWTS_REF:
+        description: 'EWTS_REF'
+        required: false
+        type: string
 
 permissions:
   contents: read
@@ -149,7 +157,7 @@ jobs:
 
           BOOST_VER=1.86.0
           BOOST_UNDERSCORE=1_86_0
-          PREFIX=/opt/boost-${BOOST_VER}
+          PREFIX=/usr/local
 
           curl -fL --retry 10 --retry-delay 2 --max-time 600 \
             -o /tmp/boost.tar.bz2 \
@@ -161,7 +169,7 @@ jobs:
           ./bootstrap.sh --prefix="${PREFIX}"
 
           # Build Boost libraries
-          ./b2 -j"$(nproc)" install \
+          sudo ./b2 -j"$(nproc)" install \
             --with-system \
             --with-filesystem \
             --with-program_options \
@@ -170,14 +178,35 @@ jobs:
             --with-date_time \
             --with-serialization
           echo "BOOST_ROOT=${PREFIX}" >> "$GITHUB_ENV"
-          echo "CMAKE_PREFIX_PATH=${PREFIX}:${CMAKE_PREFIX_PATH:-}" >> "$GITHUB_ENV"
+
+      - name: Build and install EWTS
+        run: |
+          set -euo pipefail
+          EWTS_ORG="${{ inputs.EWTS_ORG || 'NGWPC' }}"
+          EWTS_REF="${{ inputs.EWTS_REF || 'development' }}"
+          EWTS_PREFIX=/opt/ewts
+
+          git clone --depth 1 -b "${EWTS_REF}" \
+            "https://github.com/${EWTS_ORG}/nwm-ewts.git" /tmp/nwm-ewts \
+          || (git clone "https://github.com/${EWTS_ORG}/nwm-ewts.git" /tmp/nwm-ewts && \
+              cd /tmp/nwm-ewts && git checkout "${EWTS_REF}")
+
+          cd /tmp/nwm-ewts
+          cmake -S . -B cmake_build \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DEWTS_WITH_NGEN=ON \
+            -DEWTS_BUILD_SHARED=ON
+          cmake --build cmake_build -j "$(nproc)"
+          sudo cmake --install cmake_build --prefix "${EWTS_PREFIX}"
+
+          echo "EWTS_PREFIX=${EWTS_PREFIX}" >> "$GITHUB_ENV"
 
       - name: Build C++ code
         env:
           PYTHONPATH: ${{ env.PYTHONPATH }}
         run: |
           cmake -B cmake_build -S . \
-            -DCMAKE_PREFIX_PATH="${BOOST_ROOT}" \
+            -DCMAKE_PREFIX_PATH="${EWTS_PREFIX};${BOOST_ROOT}" \
             -DBoost_NO_SYSTEM_PATHS=ON \
             -DBOOST_ROOT="${BOOST_ROOT}" \
             -DPYTHON_EXECUTABLE=$(which python3) \
@@ -241,6 +270,8 @@ jobs:
           build-args: |
             ORG=${{ needs.setup.outputs.org }}
             NGEN_FORCING_IMAGE_TAG=${{ inputs.NGEN_FORCING_IMAGE_TAG || 'latest' }}
+            EWTS_ORG=${{ inputs.EWTS_ORG || 'NGWPC' }}
+            EWTS_REF=${{ inputs.EWTS_REF || 'development' }}
             IMAGE_SOURCE=https://github.com/${{ github.repository }}
             IMAGE_VENDOR=${{ github.repository_owner }}
             IMAGE_VERSION=${{ needs.setup.outputs.clean_ref }}
@@ -286,10 +317,10 @@ jobs:
       - build
     steps:
       - name: Install Trivy
-        uses: aquasecurity/setup-trivy@v0.2.2
+        uses: aquasecurity/setup-trivy@v0.2.6
         with:
           cache: true
-          version: v0.68.2
+          version: v0.69.3
 
       - name: Trivy scan
         env:

CMakeLists.txt

@@ -1,3 +1,7 @@
+#
+# ngen/CMakeLists.txt
+#
+
 # Ensure CMake policies have defaults depending on the CMake version used
 # between the two versions specified. e.g. if 3.18 is used, then 3.18 defaults
 # will be used instead of 3.17 defaults.
@@ -118,6 +122,30 @@ project(ngen VERSION 0.3.0)
 
 add_executable(ngen "${NGEN_SRC_DIR}/NGen.cpp")
 
+# --- EWTS (installed from nwm-ewts) ---
+find_package(ewts CONFIG REQUIRED)
+
+if(DEFINED ewts_VERSION AND NOT "${ewts_VERSION}" STREQUAL "")
+    set(NGEN_EWTS_VERSION "${ewts_VERSION}")
+else()
+    set(NGEN_EWTS_VERSION "<unknown>")
+endif()
+
+if(DEFINED EWTS_NGWPC_VERSION AND NOT "${EWTS_NGWPC_VERSION}" STREQUAL "")
+    set(NGEN_EWTS_NGWPC_VERSION "${EWTS_NGWPC_VERSION}")
+else()
+    set(NGEN_EWTS_NGWPC_VERSION "<unknown>")
+endif()
+
+get_filename_component(EWTS_PREFIX "${ewts_DIR}" DIRECTORY)
+get_filename_component(EWTS_PREFIX "${EWTS_PREFIX}" DIRECTORY)
+get_filename_component(EWTS_PREFIX "${EWTS_PREFIX}" DIRECTORY)
+
+message(STATUS "Found EWTS: ${EWTS_PREFIX} (found version ${ewts_VERSION})")
+
+# NGen itself uses the NGen-specific EWTS logger/bridge
+target_link_libraries(ngen PRIVATE ewts::ewts_ngen_bridge)
+
 # Dependencies ================================================================
 
 # -----------------------------------------------------------------------------
@@ -165,7 +193,12 @@ add_compile_definitions(NGEN_SHARED_LIB_EXTENSION)
 set(Boost_USE_STATIC_LIBS OFF)
 set(Boost_USE_MULTITHREADED ON)
 set(Boost_USE_STATIC_RUNTIME OFF)
-find_package(Boost 1.86.0 REQUIRED)
+if(CMAKE_CXX_STANDARD LESS 17)
+    # requires non-header filesystem for state saving if C++ 11 or lower
+    find_package(Boost 1.86.0 REQUIRED COMPONENTS system filesystem)
+else()
+    find_package(Boost 1.86.0 REQUIRED)
+endif()
 
 # -----------------------------------------------------------------------------
 if(NGEN_WITH_SQLITE)
@@ -281,7 +314,6 @@ if(UDUNITS_QUIET)
     add_compile_definitions(UDUNITS_QUIET)
 endif()
 
-
 # -----------------------------------------------------------------------------
 # Project Targets
 # -----------------------------------------------------------------------------
@@ -318,6 +350,7 @@ add_subdirectory("src/geojson")
 add_subdirectory("src/bmi")
 add_subdirectory("src/realizations/catchment")
 add_subdirectory("src/forcing")
+add_subdirectory("src/state_save_restore")
 add_subdirectory("src/utilities")
 add_subdirectory("src/utilities/mdarray")
 add_subdirectory("src/utilities/mdframe")
@@ -337,7 +370,9 @@ target_link_libraries(ngen
         NGen::core_mediator
         NGen::logging
         NGen::parallel
+        NGen::state_save_restore
         NGen::bmi_protocols
+        NGen::state_save_restore
 )
 
 if(NGEN_WITH_SQLITE)
@@ -351,6 +386,7 @@ if(NGEN_WITH_ROUTING)
 endif()
 
 add_executable(partitionGenerator src/partitionGenerator.cpp)
+target_link_libraries(partitionGenerator PRIVATE ewts::ewts_ngen_bridge)
 target_link_libraries(partitionGenerator PUBLIC NGen::logging)
 target_include_directories(partitionGenerator PUBLIC "${PROJECT_BINARY_DIR}/include")
 if(NGEN_WITH_SQLITE)
@@ -441,7 +477,10 @@ ngen_multiline_message(
 "  Boost:"
 "    Version: ${Boost_VERSION}"
 "    Include: ${Boost_INCLUDE_DIRS}"
-"    Library: ${Boost_LIBRARY_DIRS}")
+"    Library: ${Boost_LIBRARY_DIRS}"
+"  EWTS:"
+"    Package Version: ${NGEN_EWTS_VERSION}"
+"    NGWPC Version: ${NGEN_EWTS_NGWPC_VERSION}")
 ngen_dependent_multiline_message(INTEL_DPCPP
 "  Intel DPC++:"
 "    Version: ${SYCL_LANGUAGE_VERSION}"