actual fix

Exawind · Sep 26, 2024 · 3cd2e6c · 3cd2e6c
1 parent 9a23832
commit 3cd2e6c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/include/aero/actuator/ActuatorBulkFAST.h b/include/aero/actuator/ActuatorBulkFAST.h
@@ -16,11 +16,13 @@
 namespace sierra {
 namespace nalu {
 
-struct ActuatorMetaFAST : public ActuatorMeta
+struct
+ActuatorMetaFAST : public ActuatorMeta
 {
   ActuatorMetaFAST(const ActuatorMeta& actMeta);
 
   // HOST ONLY
+  void set_dt_driver(const double dt){fastInputs_.dtDriver=dt;}
   fast::fastInputs fastInputs_;
   std::vector<std::string> turbineNames_;
   std::vector<std::string> turbineOutputFileNames_;
@@ -42,7 +44,7 @@ struct ActuatorMetaFAST : public ActuatorMeta
 
 struct ActuatorBulkFAST : public ActuatorBulk
 {
-  ActuatorBulkFAST(const ActuatorMetaFAST& actMeta, double naluTimeStep);
+  ActuatorBulkFAST(ActuatorMetaFAST& actMeta, double naluTimeStep);
 
   Kokkos::RangePolicy<Kokkos::DefaultHostExecutionSpace> local_range_policy();
 

diff --git a/src/aero/actuator/ActuatorBulkDiskFAST.C b/src/aero/actuator/ActuatorBulkDiskFAST.C
@@ -26,6 +26,7 @@ ActuatorBulkDiskFAST::ActuatorBulkDiskFAST(
 {
 
   STK_ThrowErrorIf(!actMeta.is_disk());
+  actMeta.set_dt_driver(naluTimeStep);
   compute_swept_point_count(actMeta);
   resize_arrays(actMeta);
   Kokkos::parallel_for(

diff --git a/src/aero/actuator/ActuatorBulkFAST.C b/src/aero/actuator/ActuatorBulkFAST.C
@@ -44,7 +44,7 @@ ActuatorMetaFAST::is_disk()
 }
 
 ActuatorBulkFAST::ActuatorBulkFAST(
-  const ActuatorMetaFAST& actMeta, double naluTimeStep)
+  ActuatorMetaFAST& actMeta, double naluTimeStep)
   : ActuatorBulk(actMeta),
     turbineThrust_("turbineThrust", actMeta.numberOfActuators_),
     turbineTorque_("turbineTorque", actMeta.numberOfActuators_),
@@ -55,6 +55,7 @@ ActuatorBulkFAST::ActuatorBulkFAST(
       actMeta.isotropicGaussian_ ? 0 : actMeta.numPointsTotal_),
     tStepRatio_(std::round(naluTimeStep / actMeta.fastInputs_.dtFAST))
 {
+  actMeta.set_dt_driver(naluTimeStep);
   init_openfast(actMeta, naluTimeStep);
   init_epsilon(actMeta);
   RunActFastUpdatePoints(*this);

diff --git a/src/aero/actuator/ActuatorParsingFAST.C b/src/aero/actuator/ActuatorParsingFAST.C
@@ -174,9 +174,6 @@ actuator_FAST_parse(const YAML::Node& y_node, const ActuatorMeta& actMeta)
     get_required(y_actuator, "n_every_checkpoint", *restartFreq);
     get_required(y_actuator, "dt_fast", fi.dtFAST);
 
-    // FIXME this needs to be defined. No idea how
-    fi.dtDriver = 0.0625;
-
     get_required(y_actuator, "t_max", fi.tMax);
 
     if (y_actuator["super_controller"]) {