modify conditionals and add consts (#945)

Exawind · Dec 26, 2023 · 672b867 · 672b867
1 parent 2d6acd4
commit 672b867
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/amr-wind/wind_energy/actuator/wing/fixed_wing_ops.H b/amr-wind/wind_energy/actuator/wing/fixed_wing_ops.H
@@ -48,16 +48,15 @@ struct ReadInputsOp<FixedWing, ActSrcLine>
 
         pp.query("motion_type", wdata.motion_type);
         {
-            if (amrex::toLower(wdata.motion_type) == "none") {
-                // do nothing, this is default
-            } else if (amrex::toLower(wdata.motion_type) == "linear") {
+            // do nothing for default, "none"
+            if (amrex::toLower(wdata.motion_type) == "linear") {
                 // get velocity
                 pp.get("velocity", wdata.vel_tr);
             } else if (amrex::toLower(wdata.motion_type) == "sine") {
                 // get parameters
                 pp.get("sine_period", wdata.s_period);
                 pp.get("sine_vector", wdata.s_vector);
-            } else {
+            } else if (amrex::toLower(wdata.motion_type) != "none") {
                 amrex::Abort(
                     "Invalid FixedWingLine motion type. Valid options are "
                     "none, linear, and sine.");

diff --git a/amr-wind/wind_energy/actuator/wing/wing_ops.H b/amr-wind/wind_energy/actuator/wing/wing_ops.H
@@ -39,11 +39,11 @@ void new_wing_position_velocity(
     VecList& points,
     vs::Vector& vtr,
     const int npts,
-    amrex::Real tn,
-    amrex::Real tnp1,
+    const amrex::Real tn,
+    const amrex::Real tnp1,
     const std::string motion,
-    amrex::Real period,
-    vs::Vector svec);
+    const amrex::Real period,
+    const vs::Vector svec);
 
 template <typename T>
 ComponentView make_component_view(typename T::DataType& data)

diff --git a/amr-wind/wind_energy/actuator/wing/wing_ops.cpp b/amr-wind/wind_energy/actuator/wing/wing_ops.cpp
@@ -182,11 +182,11 @@ void new_wing_position_velocity(
     VecList& points,
     vs::Vector& vtr,
     const int npts,
-    amrex::Real tn,
-    amrex::Real tnp1,
+    const amrex::Real tn,
+    const amrex::Real tnp1,
     const std::string motion,
-    amrex::Real period,
-    vs::Vector svec)
+    const amrex::Real period,
+    const vs::Vector svec)
 {
     // Get displacement of points from n to n+1
     // Also, if translation velocity changes, update it