2D Pitching Fixed Wing

amr-wind/wind_energy/actuator/ActSrcLineOp.H

@@ -116,7 +116,17 @@ void ActSrcOp<ActTrait, ActSrcLine>::operator()(
             const auto pos_ip = wt * pos[ip] + (1.0 - wt) * opos[ip];
             const auto dist = cc - pos_ip;
             const auto dist_local = tmat[ip] & dist;
-            const auto gauss_fac = utils::gaussian3d(dist_local, eps[ip]);
+            // If the spanwise eps is zero use the two-dimensional Gaussian
+            // The order of epsilon is (chord, thickness, span)
+            amrex::Real gauss_fac;
+            if (eps[ip].z() < 1e-12) {
+                // vector is only defined for n=3 -> append  zeros
+                vs::Vector eps_2d{eps[ip].x(), eps[ip].y(), 0.0};
+                vs::Vector dist_local_2d{dist_local.x(), dist_local.z(), 0.0};
+                gauss_fac = utils::gaussian2d(dist_local_2d, eps_2d);
+            } else {
+                gauss_fac = utils::gaussian3d(dist_local, eps[ip]);
+            }
             const auto& pforce = force[ip];
 
             src_force[0] += gauss_fac * pforce.x();

amr-wind/wind_energy/actuator/actuator_utils.H

@@ -54,6 +54,33 @@ gaussian3d(const vs::Vector& dist, const vs::Vector& eps)
 
     return 0.0;
 }
+
+/** Return the Gaussian smearing factor in 2D
+ *
+ *  \param dist Distance vector of the cell center from the actuator node in
+ *  local frame of reference.
+ *
+ *  \param eps Two-dimensional Gaussian scaling factor
+ *
+ *  \return Gaussian smearing factor in 2D
+ */
+AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE amrex::Real
+gaussian2d(const vs::Vector& dist, const vs::Vector& eps)
+{
+    const vs::Vector rr{
+        dist.x() / eps.x(), dist.y() / eps.y(), 0.0};
+    const amrex::Real rr_sqr = vs::mag_sqr(rr);
+
+    if (rr_sqr < 16.0) {
+        constexpr amrex::Real fac = 0.31830988618379067;
+        const amrex::Real eps_fac = eps.x() * eps.y();
+        return (fac / eps_fac) *
+               std::exp(-rr.x() * rr.x() - rr.y() * rr.y());
+    }
+
+    return 0.0;
+}
+
 /** Return the Gaussian smearing factor in 1D
  *
  *  \param dist Distance vector of the cell center from the actuator node in

amr-wind/wind_energy/actuator/wing/wing_ops.H

@@ -167,10 +167,11 @@ struct ComputeForceOp<
             const auto vmag = vs::mag(windvector);
 
             // Calculate the aoa based on the pitch actuation table if supplied
-            // (interpolate pitch angle at step n) or the initial pitch angle
+            // (interpolate pitch angle at step n+1/2) or the initial pitch angle
             if (!wdata.pitch_timetable_file.empty()) {
+                const auto time_interp = (time.current_time() + time.new_time()) / 2.0;
                 wdata.pitch = amr_wind::interp::linear(
-                    wdata.time_table, wdata.pitch_table, time.current_time());
+                    wdata.time_table, wdata.pitch_table, time_interp);
                 amrex::Print() << "Wing Ops: Current wing pitch is "
                                << wdata.pitch << " degrees.\n";
             }