Fix bugs in FLOWUnsteady v1.4.2 integration

byuflowlab · Aug 22, 2020 · 608127c · 608127c
1 parent f5b822d
commit 608127c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/FLOWVLM_rotor.jl b/src/FLOWVLM_rotor.jl
@@ -1157,7 +1157,10 @@ function calc_distributedloads(self::Rotor, Vinf, RPM, rho::FWrap;
                                                         occbinflow, turbine_flag;
                                                         tiploss_correction=tiploss_correction)
       push!(gammas, gamma)
-      ccbouputs = ccb.Outputs(Np, Tp, 0.0, 0.0, uvec, vvec, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0)
+      zeroarr = zeros(size(Np))
+      ccbouputs = ccb.Outputs(Np, Tp, zeroarr, zeroarr, uvec, vvec,
+                                zeroarr, zeroarr, zeroarr, zeroarr,
+                                zeroarr, zeroarr, zeroarr, zeroarr, zeroarr)
     else
       # Calls CCBlade
       # NOTE TO SELF: Forces normal and tangential to the plane of rotation

diff --git a/src/FLOWVLM_wingsystem.jl b/src/FLOWVLM_wingsystem.jl
@@ -38,7 +38,7 @@ Adds a wing to the system with the position and orientation of local reference
 being interpreted in relation to the local reference frame of the system.
 """
 function addwing(self::WingSystem, wing_name::String, wing;
-                  overwrite=false)
+                  overwrite=false, reset=true)
   # Error case
   if wing_name in self.wing_names
     if overwrite
@@ -59,7 +59,9 @@ function addwing(self::WingSystem, wing_name::String, wing;
   new_O, new_Oaxis = _interpret(_get_O(wing), _get_Oaxis(wing), self.O, self.invOaxis)
   setcoordsystem(wing, new_O, new_Oaxis)
 
-  _reset(self)
+  if reset
+      _reset(self)
+  end
 end
 
 """