Added user manual and minor fixes

Author: jcokemurray

Doc/Users/CACTUS_Manual_V1_1.docx

@@ -367,7 +367,7 @@ PROGRAM CACTUS
                     CALL UpdateBladeVel(iflg) 
                 end if
 
-                !If (Itower.EQ.1) Call UpdateTowerVelocity() !JCM: Matt to add this function...
+                If (Itower.EQ.1) Call UpdateTowerVelocity() !JCM: Matt to add this function...
 
                 ! Regression test
                 if (RegTFlag == 1) then

Doc/Users/CACTUS_Manual_V1_1.pdf

@@ -0,0 +1,27 @@
+SUBROUTINE UpdateTowerVelocity()
+  
+  use tower
+  use configr
+
+  implicit none
+
+  real :: uFSt,vFSt,wFSt,utow,vtow,wtow
+  integer :: i,ygcerr
+
+
+  Do i = 1,tower_Npts
+
+     ! Freestream velocity at tower location
+     Call CalcFreestream(tower_x,tower_y(i),0.0,uFSt,vFSt,wFSt,ygcerr)  
+
+     ! Induced velocity at tower location
+     Call CalcIndVel(NT,ntTerm,NBE,NB,NE,tower_x,tower_y(i),0.0,utow,vtow,wtow)
+
+     tower_Vx(i) = uFSt + utow
+
+  End Do
+
+
+  Return
+
+End SUBROUTINE UpdateTowerVelocity

src/CACTUS.f95

@@ -76,8 +76,6 @@ SUBROUTINE bsload(nElem,IsBE,alpha,alpha5,alpha75,adotnorm,Re,umach,ur,CL,CD,CM2
 
     ur=sqrt(urdn**2+urdc**2)                                          
     alpha=atan2(urdn,urdc) 
-    !         dal=alpha-AOA_Last(nelem1)                                                                                       
-    !         adotnorm=dal/DT*ElemChordR/(2.0*max(ur,0.001))  ! adot*c/(2*U)
     wPNorm=wP*ElemChordR/(2.0*max(ur,0.001))        ! wP*c/(2*U)
 
     Re=ReM*ElemChordR*ur                                                         

src/UpdateTowerVelocity.f95

@@ -41,12 +41,12 @@ SUBROUTINE input(ErrFlag)
 
     ! Namelist input file declaration
 	NAMELIST/ConfigInputs/RegTFlag,DiagOutFlag,GPFlag,FSFlag,nr,convrg,nti,iut,iWall,ivtxcor,VCRFB,VCRFT,VCRFS,ifc,convrgf,nric,ntif,iutf,ixterm,xstop, &
-        Output_ELFlag,Output_DSFlag,WallOutFlag,Incompr,DSFlag,PRFlag&
-        &,k1pos,k1neg,GPGridSF,FSGridSF,TSFilFlag,ntsf,&
+        Output_ELFlag,Output_DSFlag,WallOutFlag,Incompr,DSFlag,PRFlag, &
+        k1pos,k1neg,GPGridSF,FSGridSF,TSFilFlag,ntsf
+	NAMELIST/CaseInputs/jbtitle,GeomFilePath,RPM,Ut,nSect,AFDPath, &
+        hAG,dFS,rho,vis,tempr,hBLRef,slex,Cdpar,CTExcrM, &
+        WakeOutFlag,WLI,Igust,gustamp,gusttime,gustX0, &
         Itower,tower_Npts,tower_x,tower_ybot,tower_ytop,tower_D,tower_CD
-	NAMELIST/CaseInputs/jbtitle,GeomFilePath,RPM,Ut,nSect,AFDPath&
-        &,hAG,dFS,rho,vis,tempr,hBLRef,slex,Cdpar,CTExcrM&
-        &,WakeOutFlag,WLI,Igust,gustamp,gusttime,gustX0
 
     ! Input Defaults
     RegTFlag = 0