Merge branch 'master' into oscillating_mesh_motion

Exawind · Dec 9, 2024 · cb709cb · cb709cb
2 parents bc0db33 + e0e9f0f
commit cb709cb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/include/overset/TiogaOptions.h b/include/overset/TiogaOptions.h
@@ -72,7 +72,7 @@ class TiogaOptions
 
   //! Set the node and cell resolutions from Nalu-Wind instead of letting TIOGA
   //! compute it for P=1 cells. Default is true
-  bool setResolutions_{true};
+  // bool setResolutions_{true};
 
   //! Option to let TIOGA attempt to reduce fringes.
   bool reduceFringes_{false};

diff --git a/reg_tests/CTestCustom.cmake b/reg_tests/CTestCustom.cmake
@@ -1,4 +1,6 @@
 set(CTEST_CUSTOM_WARNING_EXCEPTION ".*could not create compact unwind.*"
-                                   ".*may conflict with libgfortran.*")
+                                   ".*may conflict with libgfortran.*"
+                                   ".*has no symbols*"
+                                   ".*submake: resetting jobserver mode*")
 set(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE "262144")
-set(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE "51200")
+set(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE "262144")
diff --git a/src/aero/fsi/CalcLoads.C b/src/aero/fsi/CalcLoads.C
@@ -189,12 +189,12 @@ CalcLoads::execute()
 
         // interpolate to bip
         double pBip = 0.0;
-        double rhoBip = 0.0;
+        // double rhoBip = 0.0;
         double muBip = 0.0;
         for (int ic = 0; ic < nodesPerFace; ++ic) {
           const double r = p_face_shape_function(ip, ic);
           pBip += r * p_pressure[ic];
-          rhoBip += r * p_density[ic];
+          // rhoBip += r * p_density[ic];
           muBip += r * p_viscosity[ic];
         }
 

diff --git a/src/aero/fsi/FSIturbine.C b/src/aero/fsi/FSIturbine.C
@@ -1066,10 +1066,6 @@ fsiTurbine::setSampleDisplacement(double curTime)
     << "Setting Sample displacements " << std::endl;
 
   int nBlades = params_.numBlades;
-  ;
-  size_t nTotBldPts = 0;
-  for (int i = 0; i < nBlades; i++)
-    nTotBldPts += params_.nBRfsiPtsBlade[i];
 
   std::vector<double> x_axis = {1.0, 0.0, 0.0};
   std::vector<double> y_axis = {0.0, 1.0, 0.0};