Merge branch 'main' into patch-cmake-code

.github/workflows/clang-tidy.yaml

@@ -25,6 +25,17 @@ jobs:
         spack external find
         spack install googletest
         spack install trilinos@master~mpi~epetra+basker
+    - name: Cache install yaml-cpp
+      id: cache-yaml-cpp
+      uses: actions/cache@v3
+      with:
+        path: ${{ github.workspace }}/spack
+        key: linux-yaml-cpp
+    - name: Install yaml-cpp
+      if: steps.cache-yaml-cpp.outputs.cache-hit != 'true'
+      run: |
+        source spack/share/spack/setup-env.sh
+        spack install yaml-cpp
     - name: Clone
       uses: actions/checkout@v4
       with:
@@ -35,6 +46,7 @@ jobs:
         source spack/share/spack/setup-env.sh
         spack load trilinos
         spack load googletest
+        spack load yaml-cpp
         cd openturbine
         mkdir build-clangtidy
         cd build-clangtidy

.github/workflows/correctness-linux.yaml

@@ -30,6 +30,17 @@ jobs:
         spack external find
         spack install googletest
         spack install trilinos@master~mpi~epetra+basker
+    - name: Cache install yaml-cpp
+      id: cache-yaml-cpp
+      uses: actions/cache@v3
+      with:
+        path: ${{ github.workspace }}/spack
+        key: linux-yaml-cpp
+    - name: Install yaml-cpp
+      if: steps.cache-yaml-cpp.outputs.cache-hit != 'true'
+      run: |
+        source spack/share/spack/setup-env.sh
+        spack install yaml-cpp
     - name: Clone
       uses: actions/checkout@v4
       with:
@@ -40,14 +51,15 @@ jobs:
         source spack/share/spack/setup-env.sh
         spack load trilinos
         spack load googletest
+        spack load yaml-cpp
         cd openturbine
         mkdir build
         cd build
         cmake .. \
           -DOpenTurbine_ENABLE_SANITIZER_ADDRESS=ON \
           -DOpenTurbine_ENABLE_SANITIZER_LEAK=ON \
           -DOpenTurbine_ENABLE_SANITIZER_UNDEFINED=ON \
-          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} 
+          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
         cmake --build .
         cp src/*.dll tests/unit_tests/
         ctest --output-on-failure

.github/workflows/correctness-macos.yaml

@@ -28,6 +28,17 @@ jobs:
         spack external find
         spack install googletest
         spack install trilinos@master~mpi~epetra+basker
+    - name: Cache install yaml-cpp
+      id: cache-yaml-cpp
+      uses: actions/cache@v3
+      with:
+        path: ${{ github.workspace }}/spack
+        key: macos-yaml-cpp
+    - name: Install yaml-cpp
+      if: steps.cache-yaml-cpp.outputs.cache-hit != 'true'
+      run: |
+        source spack/share/spack/setup-env.sh
+        spack install yaml-cpp
     - name: Clone
       uses: actions/checkout@v4
       with:
@@ -38,13 +49,14 @@ jobs:
         source spack/share/spack/setup-env.sh
         spack load trilinos
         spack load googletest
+        spack load yaml-cpp
         cd openturbine
         mkdir build
         cd build
         cmake .. \
           -DOpenTurbine_ENABLE_SANITIZER_ADDRESS=ON \
           -DOpenTurbine_ENABLE_SANITIZER_UNDEFINED=ON \
-          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} 
+          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
         cmake --build .
         cp src/*.dll tests/unit_tests/
         ctest --output-on-failure

.github/workflows/cppcheck.yaml

@@ -26,6 +26,17 @@ jobs:
         spack external find
         spack install googletest
         spack install trilinos@master~mpi~epetra+basker
+    - name: Cache install yaml-cpp
+      id: cache-yaml-cpp
+      uses: actions/cache@v3
+      with:
+        path: ${{ github.workspace }}/spack
+        key: linux-yaml-cpp
+    - name: Install yaml-cpp
+      if: steps.cache-yaml-cpp.outputs.cache-hit != 'true'
+      run: |
+        source spack/share/spack/setup-env.sh
+        spack install yaml-cpp
     - name: Clone
       uses: actions/checkout@v4
       with:
@@ -36,6 +47,7 @@ jobs:
         source spack/share/spack/setup-env.sh
         spack load trilinos
         spack load googletest
+        spack load yaml-cpp
         sudo apt-get install cppcheck
         cd openturbine
         mkdir build-cppcheck

Dependencies.cmake

@@ -2,6 +2,7 @@ function(openturbine_setup_dependencies)
   # Find and link required packages
   find_package(KokkosKernels REQUIRED)
   find_package(Amesos2 REQUIRED)
+  find_package(yaml-cpp REQUIRED)
 
   # Optionally find and link MKL if available
   if(TARGET Kokkos::MKL)

src/CMakeLists.txt

@@ -19,6 +19,7 @@ target_link_libraries(openturbine_library PRIVATE
 target_link_system_libraries(openturbine_library PRIVATE
   KokkosKernels::kokkoskernels
   Amesos2::amesos2
+  yaml-cpp
   ${FS_LIB}
 )
 

src/utilities/controllers/discon_rotor_test_controller.cpp

@@ -38,9 +38,6 @@ void PITCH_CONTROLLER(
 
     // If this is the first call, output the controller input and output file names
     if (first_call) {
-        std::cout << "controller input file: " << accINFILE << std::endl;
-        std::cout << "controller output file: " << avcOUTNAME << std::endl;
-
         // Set first call to false
         first_call = false;
     }

src/utilities/controllers/turbine_controller.cpp

@@ -60,7 +60,7 @@ void TurbineController::CallController() {
     if (status < 0) {
         throw std::runtime_error("Error raised in controller: " + message);
     } else if (status > 0) {
-        std::cout << "Warning from controller: " << message << std::endl;
+        std::cout << "Warning from controller: " << message << "\n";
     }
 }