Merge pull request #3114 from luwang00/b/EDInput

ED blade input check, bug fix, and docs update

Author: andrew-platt

docs/source/user/api_change.rst

@@ -97,6 +97,12 @@ Removed in OpenFAST `dev`
 Module                                        Line     Flag Name            Example Value
 ============================================= ======== ==================== ========================================================================================================================================================================================================
 AeroDyn                                       11       Buoyancy             False         Buoyancy           - Include buoyancy effects? (flag)
+BeamDyn                                       \*                            ---------------------- PITCH ACTUATOR PARAMETERS -------------------------------
+BeamDyn                                       \*       UsePitchAct          False         UsePitchAct - Whether a pitch actuator should be used (flag)
+BeamDyn                                       \*       PitchJ               200           PitchJ      - Pitch actuator inertia (kg-m^2) [used only when UsePitchAct is true]
+BeamDyn                                       \*       PitchK               20000000      PitchK      - Pitch actuator stiffness (kg-m^2/s^2) [used only when UsePitchAct is true]
+BeamDyn                                       \*       PitchC               500000        PitchC      - Pitch actuator damping (kg-m^2/s) [used only when UsePitchAct is true]
+ElastoDyn Blade Input File                    \*                            The PitchAxis column has been removed from the DISTRIBUTED BLADE PROPERTIES table. The table should now only have 5 columns: BlFract, StrcTwst, BMassDen, FlpStff, and EdgStff
 ============================================= ======== ==================== ========================================================================================================================================================================================================
 
 

docs/source/user/beamdyn/input_files.rst

@@ -401,20 +401,6 @@ Material Parameter
 ``BldFile`` is the file name of the blade input file. This name should
 be in quotations and can contain an absolute path or a relative path.
 
-Pitch Actuator Parameter
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-In this release, the pitch actuator implemented in BeamDyn is not
-available. The ``UsePitchAct`` should be set to “FALSE” in this
-version, whereby the input blade-pitch angle prescribed by the driver
-code is used to orient the blade directly. ``PitchJ``, ``PitchK``,
-and ``PitchC`` specify the pitch actuator inertial, stiffness, and
-damping coefficient, respectively. In future releases, specifying
-``UsePitchAct`` :math:`=` TRUE will enable a second-order pitch
-actuator, whereby the pitch angular orientation, velocity, and
-acceleration are determined by the actuator based on the input
-blade-pitch angle prescribed by the driver code.
-
 .. _BD-Outputs:
 
 Outputs

modules/elastodyn/src/ElastoDyn.f90

@@ -10076,7 +10076,7 @@ SUBROUTINE ED_PrintSum( p, OtherState, ErrStat, ErrMsg )
       WRITE (UnSu,'(A)')  ' (-)      (-)      (m)      (m)     (deg)    (kg/m)     (Nm^2)     (Nm^2)'
 
       DO I=1,p%BldNodes
-         WRITE(UnSu,'(I4,3F9.3,3F10.3,2ES11.3)')  I, p%RNodesNorm(I), p%RNodes(I) + p%HubRad, p%DRNodes(I), &
+         WRITE(UnSu,'(I4,3F9.3,2F10.3,2ES11.3)')  I, p%RNodesNorm(I), p%RNodes(I) + p%HubRad, p%DRNodes(I), &
                                                       p%ThetaS(K,I)*R2D, p%MassB(K,I), &
                                                       p%StiffBF(K,I), p%StiffBE(K,I)
       ENDDO ! I

modules/elastodyn/src/ElastoDyn_IO.f90

@@ -1789,6 +1789,14 @@ SUBROUTINE ReadBladeFile ( BldFile, BladeKInputFileData, UnEc, ErrStat, ErrMsg )
    call ParseCom( InFileInfo, CurLine, TmpComment, ErrStat2, ErrMsg2, UnEc ); if (Failed()) return;   ! Separator
    call ParseCom( InFileInfo, CurLine, TmpComment, ErrStat2, ErrMsg2, UnEc ); if (Failed()) return;   ! Col Names
    call ParseCom( InFileInfo, CurLine, TmpComment, ErrStat2, ErrMsg2, UnEc ); if (Failed()) return;   ! Col Units
+
+   call ParseAry( InFileInfo, CurLine, 'Blade input station table', TmpRAry, 6_IntKi, ErrStat2, ErrMsg2, UnEc=0_IntKi );
+   if (ErrStat2 < AbortErrLev) then  ! CurLine won't be incremented if ErrStat2>=AbortErrLev
+      call SetErrStat( ErrID_Fatal,  " The ElastoDyn Blade file, "//trim(InFileInfo%FileList(1))//   &
+                 ", DISTRIBUTED BLADE PROPERTIES table contains the PitchAxis column.  This column is no longer supported and must be removed. ", ErrStat, ErrMsg, RoutineName )
+      return
+   endif
+
    call ParseTable5Col(ErrStat2, ErrMsg2); if (Failed()) return;
 
    !  -------------- BLADE MODE SHAPES --------------------------------------------