diff --git a/reg_tests/CTestList.cmake b/reg_tests/CTestList.cmake index 2149800ad..81f6975df 100644 --- a/reg_tests/CTestList.cmake +++ b/reg_tests/CTestList.cmake @@ -235,7 +235,7 @@ if(NOT ENABLE_CUDA AND NOT ENABLE_ROCM) add_test_r(multiElemCylinder 4) endif() - if(ENABLE_OPENFAST AND ENABLE_TRILINOS_SOLVERS) + if(ENABLE_OPENFAST AND ENABLE_HYPRE) add_test_r(nrel5MWactuatorLine 4) add_test_r(nrel5MWactuatorLineAnisoGauss 4) add_test_r(nrel5MWactuatorLineFllc 4) diff --git a/reg_tests/test_files/nrel5MWactuatorDisk/nrel5MWactuatorDisk.yaml b/reg_tests/test_files/nrel5MWactuatorDisk/nrel5MWactuatorDisk.yaml index 065441118..4b41798a4 100644 --- a/reg_tests/test_files/nrel5MWactuatorDisk/nrel5MWactuatorDisk.yaml +++ b/reg_tests/test_files/nrel5MWactuatorDisk/nrel5MWactuatorDisk.yaml @@ -6,24 +6,22 @@ Simulations: linear_solvers: - name: solve_scalar - type: tpetra - method: gmres - preconditioner: sgs + type: hypre + method: hypre_gmres + preconditioner: boomerAMG tolerance: 1e-5 max_iterations: 50 - kspace: 50 + kspace: 5 output_level: 0 - name: solve_cont - type: tpetra - method: gmres - preconditioner: muelu + type: hypre + method: hypre_gmres + preconditioner: boomerAMG tolerance: 1e-5 max_iterations: 50 - kspace: 50 + kspace: 5 output_level: 0 - muelu_xml_file_name: ../../xml/milestone.xml - summarize_muelu_timer: no realms: diff --git a/reg_tests/test_files/nrel5MWactuatorLine/nrel5MWactuatorLine.yaml b/reg_tests/test_files/nrel5MWactuatorLine/nrel5MWactuatorLine.yaml index 34552fc26..7ff4eba7c 100644 --- a/reg_tests/test_files/nrel5MWactuatorLine/nrel5MWactuatorLine.yaml +++ b/reg_tests/test_files/nrel5MWactuatorLine/nrel5MWactuatorLine.yaml @@ -6,24 +6,22 @@ Simulations: linear_solvers: - name: solve_scalar - type: tpetra - method: gmres - preconditioner: mt_sgs + type: hypre + method: hypre_gmres + preconditioner: boomerAMG tolerance: 1e-12 max_iterations: 200 - kspace: 50 + kspace: 5 output_level: 0 - name: solve_cont - type: tpetra - method: gmres - preconditioner: muelu + type: hypre + method: hypre_gmres + preconditioner: boomerAMG tolerance: 1e-12 max_iterations: 200 - kspace: 50 + kspace: 5 output_level: 0 - muelu_xml_file_name: ../../xml/milestone.xml - summarize_muelu_timer: no realms: diff --git a/reg_tests/test_files/nrel5MWactuatorLineAnisoGauss/nrel5MWactuatorLineAnisoGauss.yaml b/reg_tests/test_files/nrel5MWactuatorLineAnisoGauss/nrel5MWactuatorLineAnisoGauss.yaml index 2fc348e59..e399ccaa6 100644 --- a/reg_tests/test_files/nrel5MWactuatorLineAnisoGauss/nrel5MWactuatorLineAnisoGauss.yaml +++ b/reg_tests/test_files/nrel5MWactuatorLineAnisoGauss/nrel5MWactuatorLineAnisoGauss.yaml @@ -6,24 +6,22 @@ Simulations: linear_solvers: - name: solve_scalar - type: tpetra - method: gmres - preconditioner: sgs + type: hypre + method: hypre_gmres + preconditioner: boomerAMG tolerance: 1e-5 max_iterations: 50 - kspace: 50 + kspace: 5 output_level: 0 - name: solve_cont - type: tpetra - method: gmres - preconditioner: muelu + type: hypre + method: hypre_gmres + preconditioner: boomerAMG tolerance: 1e-5 max_iterations: 50 - kspace: 50 + kspace: 5 output_level: 0 - muelu_xml_file_name: ../../xml/milestone.xml - summarize_muelu_timer: no realms: diff --git a/reg_tests/test_files/nrel5MWactuatorLineFllc/nrel5MWactuatorLineFllc.yaml b/reg_tests/test_files/nrel5MWactuatorLineFllc/nrel5MWactuatorLineFllc.yaml index 553ffe570..a98251908 100644 --- a/reg_tests/test_files/nrel5MWactuatorLineFllc/nrel5MWactuatorLineFllc.yaml +++ b/reg_tests/test_files/nrel5MWactuatorLineFllc/nrel5MWactuatorLineFllc.yaml @@ -6,24 +6,22 @@ Simulations: linear_solvers: - name: solve_scalar - type: tpetra - method: gmres - preconditioner: sgs + type: hypre + method: hypre_gmres + preconditioner: boomerAMG tolerance: 1e-5 max_iterations: 50 - kspace: 50 + kspace: 5 output_level: 0 - name: solve_cont - type: tpetra - method: gmres - preconditioner: muelu + type: hypre + method: hypre_gmres + preconditioner: boomerAMG tolerance: 1e-5 max_iterations: 50 - kspace: 50 + kspace: 5 output_level: 0 - muelu_xml_file_name: ../../xml/milestone.xml - summarize_muelu_timer: no realms: diff --git a/reg_tests/test_files/nrel5MWadvActLine/nrel5MWadvActLine.yaml b/reg_tests/test_files/nrel5MWadvActLine/nrel5MWadvActLine.yaml index d5b6c204a..059560471 100644 --- a/reg_tests/test_files/nrel5MWadvActLine/nrel5MWadvActLine.yaml +++ b/reg_tests/test_files/nrel5MWadvActLine/nrel5MWadvActLine.yaml @@ -6,24 +6,22 @@ Simulations: linear_solvers: - name: solve_scalar - type: tpetra - method: gmres - preconditioner: sgs + type: hypre + method: hypre_gmres + preconditioner: boomerAMG tolerance: 1e-5 max_iterations: 50 - kspace: 50 + kspace: 5 output_level: 0 - name: solve_cont - type: tpetra - method: gmres - preconditioner: muelu + type: hypre + method: hypre_gmres + preconditioner: boomerAMG tolerance: 1e-5 max_iterations: 50 - kspace: 50 + kspace: 5 output_level: 0 - muelu_xml_file_name: ../../xml/milestone.xml - summarize_muelu_timer: no realms: diff --git a/unit_tests/aero/UnitTestFSIturbine.C b/unit_tests/aero/UnitTestFSIturbine.C index c5b8e9e99..05d9d0c45 100644 --- a/unit_tests/aero/UnitTestFSIturbine.C +++ b/unit_tests/aero/UnitTestFSIturbine.C @@ -266,11 +266,11 @@ TEST_F(CylinderMesh, call_fsiTurbine_mapLoads) EXPECT_TRUE(fsiTurb != nullptr); fast::turbineDataType& params = fsiTurb->params_; - EXPECT_EQ(0, params.nBRfsiPtsTwr); - EXPECT_EQ(0, params.numBlades); - const unsigned numNodes = set_tower_ref_pos(*bulk, *fsiTurb); + EXPECT_EQ(21, params.nBRfsiPtsTwr); + EXPECT_EQ(0, params.numBlades); + verify_all_zeros(*bulk, *loadMap_); verify_all_zeros(*bulk, *loadMapInterp_);