OpenFAST · HaymanConsulting · May 12, 2017 · Jan 12, 2017 · Mar 2, 2017 · Mar 6, 2017
diff --git a/.gitignore b/.gitignore
@@ -31,6 +31,5 @@
 # CMake specific files
 build/**/*
 
-# Visual Studio specific files
 vs-build
-build
+build
diff --git a/glue-codes/fast/src/FAST_Prog.f90 b/glue-codes/fast/src/FAST_Prog.f90
@@ -56,14 +56,27 @@ PROGRAM FAST
 CHARACTER(1024)                       :: CheckpointRoot                          ! Rootname of the checkpoint file
 CHARACTER(20)                         :: FlagArg                                 ! flag argument from command line
 INTEGER(IntKi)                        :: Restart_step                            ! step to start on (for restart) 
-
+INTEGER(IntKi)                        :: UnErrLog                                ! File unit for error log file
 
       !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
       ! determine if this is a restart from checkpoint
       !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
    CALL NWTC_Init() ! open console for writing
    ProgName = 'FAST'
    CheckpointRoot = ""
+
+!++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+! BEGIN: Draft Code for generating parsable error reporting for automated testing
+!
+      ! Open error report log file
+   UnErrLog = -1
+   CALL GetNewUnit( UnErrLog, ErrStat, ErrMsg )
+   CALL OpenFOutfile ( UnErrLog, 'OpenFastErr.log', ErrStat, ErrMsg )
+   WRITE (UnErrLog,'(A)')  ''
+!
+! END  : Draft Code for generating parsable error reporting for automated testing
+!++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
    CALL CheckArgs( CheckpointRoot, ErrStat, Flag=FlagArg )  ! if ErrStat /= ErrID_None, we'll ignore and deal with the problem when we try to read the input file
 
    IF ( TRIM(FlagArg) == 'RESTART' ) THEN ! Restart from checkpoint file
@@ -144,6 +157,7 @@ PROGRAM FAST
 
    END DO ! n_t_global
 
+   IF (UnErrLog > 0) CLOSE(UnErrLog)
 
    !+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
    !  Write simulation times and stop
@@ -171,8 +185,12 @@ SUBROUTINE CheckError(ErrID,Msg,ErrLocMsg)
 
       IF ( ErrID /= ErrID_None ) THEN
          CALL WrScr( NewLine//TRIM(Msg)//NewLine )
+         IF (UnErrLog > 0) THEN
+            WRITE (UnErrLog,'(/,A)')  TRIM(Num2LStr(ErrID))//':  '//Msg
+         END IF
+
          IF ( ErrID >= AbortErrLev ) THEN
-
+            IF (UnErrLog > 0) CLOSE(UnErrLog)
             IF (PRESENT(ErrLocMsg)) THEN
                SimMsg = ErrLocMsg
             ELSE

diff --git a/modules-local/aerodyn/src/AeroDyn.f90 b/modules-local/aerodyn/src/AeroDyn.f90
@@ -1372,6 +1372,8 @@ subroutine SetInputsForBEMT(p, u, m, indx, errStat, errMsg)
       m%AllOuts( BPitch(  k) ) = -theta(3)*R2D ! save this value of pitch for potential output
 #endif
       theta(3) = 0.0_ReKi  
+      m%hub_theta_x_root(k) = theta(1)   ! save this value for FAST.Farm
+
       orientation = EulerConstruct( theta )
       orientation_nopitch = matmul( orientation, u%HubMotion%Orientation(:,:,1) ) ! withoutPitch_theta_Root(k)
 
@@ -2114,7 +2116,7 @@ SUBROUTINE getLocalTowerProps(p, u, BladeNodePosition, theta_tower_trans, W_towe
 
    TwrClrnc = TwoNorm(r_TowerBlade) - 0.5_ReKi*TwrDiam
    if ( TwrClrnc <= 0.0_ReKi ) then
-      call SetErrStat(ErrID_Severe, "Tower strike.", ErrStat, ErrMsg, RoutineName)
+      call SetErrStat(ErrID_Fatal, "Tower strike.", ErrStat, ErrMsg, RoutineName)
    end if
 
 

diff --git a/modules-local/aerodyn/src/AeroDyn_Registry.txt b/modules-local/aerodyn/src/AeroDyn_Registry.txt
@@ -138,6 +138,7 @@ typedef	^	MiscVarType	ReKi	X	{:}{:}	-	-	"normal force per unit length (normal to
 typedef	^	MiscVarType	ReKi	Y	{:}{:}	-	-	"tangential force per unit length (tangential to the plane, not chord) of the jth node in the kth blade"	N/m
 typedef	^	MiscVarType	ReKi	M	{:}{:}	-	-	"pitching moment per unit length of the jth node in the kth blade"	Nm/m
 typedef	^	MiscVarType	ReKi	V_DiskAvg	{3}	-	-	"disk-average relative wind speed"	m/s
+typedef	^	MiscVarType	ReKi	hub_theta_x_root	{3}	-	-	"angles saved for FAST.Farm"	rad
 typedef	^	MiscVarType	ReKi	V_dot_x	-	-	-
 typedef	^	MiscVarType	MeshType	HubLoad	-	-	-	"mesh at hub; used to compute an integral for mapping the output blade loads to a single point (for writing to file only)"	-
 typedef	^	MiscVarType	MeshMapType	B_L_2_H_P	{:}	-	-	"mapping data structure to map each bladeLoad output mesh to the MiscVar%HubLoad mesh"

diff --git a/modules-local/aerodyn14/src/DWM.f90 b/modules-local/aerodyn14/src/DWM.f90
@@ -79,6 +79,7 @@ SUBROUTINE DWM_Init( InitInp, u, p, x, xd, z, OtherState, y, m, Interval, InitOu
    InitInp%IfW%UseInputFile     = .TRUE.
    InitInp%IfW%NumWindPoints    = 1
    InitInp%IfW%lidar%SensorType = SensorType_None      
+   InitInp%IfW%Use4Dext         = .false.
 
    CALL InflowWind_Init( InitInp%IfW, u%IfW, p%IfW, x%IfW, xd%IfW, z%IfW, OtherState%IfW, y%IfW,  m%IfW,  &
                          Interval,  InitOut%IfW,   ErrStat,    ErrMess )

diff --git a/modules-local/beamdyn/src/BeamDyn.f90 b/modules-local/beamdyn/src/BeamDyn.f90
@@ -440,6 +440,9 @@ subroutine InitializeNodalLocations(InputFileData,p,SP_Coef,GLL_nodes,ErrStat, E
    character(ErrMsgLen)                         :: ErrMsg2           ! temporary Error message
    character(*), parameter                      :: RoutineName = 'InitGaussPoints'
 
+   ErrStat = ErrID_None
+   ErrMsg  = ""
+
    !-------------------------------------------------
    ! p%uuN0 contains the initial (physical) positions and orientations of the (output) GLL nodes
    !-------------------------------------------------
@@ -711,7 +714,7 @@ subroutine SetParameters(InitInp, InputFileData, SP_Coef, p, ErrStat, ErrMsg)
        p%ngp = p%node_elem !- 1
    ELSEIF(p%quadrature .EQ. TRAP_QUADRATURE) THEN
        p%refine = InputFileData%refine
-       p%ngp = (InputFileData%kp_member(1) - 1)*p%refine + 1
+       p%ngp = (InputFileData%InpBl%station_total - 1)*p%refine + 1
    ENDIF
 
    ! Degree-of-freedom (DoF) per node

diff --git a/modules-local/beamdyn/src/BeamDyn_Subs.f90 b/modules-local/beamdyn/src/BeamDyn_Subs.f90
@@ -443,7 +443,7 @@ SUBROUTINE BD_TrapezoidalPointWeight(p, InputFileData)
 
 
       ! compute the trapezoidal quadrature weights, p%GLw:
-   id1 = InputFileData%kp_member(1)             !adp: Why is this only checking the first member (size(kp_member) will be number of GL points)????
+   id1 = InputFileData%InpBl%station_total
    temp_id0 = (id0 - 1)*p%refine + 1            ! Starting index in GL --> always going to be 1
    temp_id1 = (id1 - 1)*p%refine + 1            ! ending index in GL --> will be  size(p%GL)
    denom = p%GL(temp_id1) - p%GL(temp_id0)      ! This is the range of GL --> for single member, is always == 2

diff --git a/modules-local/elastodyn/src/ElastoDyn.f90 b/modules-local/elastodyn/src/ElastoDyn.f90
@@ -3510,8 +3510,14 @@ SUBROUTINE SetPrimaryParameters( p, InputFileData, ErrStat, ErrMsg  )
 
    p%CosPreC  = COS( InputFileData%Precone(1:p%NumBl) )
    p%SinPreC  = SIN( InputFileData%Precone(1:p%NumBl) )
-   p%CosDel3  = COS( InputFileData%Delta3 )
-   p%SinDel3  = SIN( InputFileData%Delta3 )
+
+   IF ( p%NumBl == 2 ) THEN
+      p%CosDel3  = COS( InputFileData%Delta3 )
+      p%SinDel3  = SIN( InputFileData%Delta3 )
+   ELSE
+      p%CosDel3  = 1.0_ReKi
+      p%SinDel3  = 0.0_ReKi
+   END IF
 
    !...............................................................................................................................
 
@@ -8706,7 +8712,7 @@ SUBROUTINE ED_AllocOutput( p, m, u, y, ErrStat, ErrMsg )
    !.......................................................
 
    CALL MeshCreate( BlankMesh = y%TowerLn2Mesh           &
-                    , IOS             = COMPONENT_OUTPUT  &
+                    , IOS             = COMPONENT_OUTPUT &
                     , NNodes          = p%TwrNodes + 2   &
                     , TranslationDisp = .TRUE.           &
                     , Orientation     = .TRUE.           &

diff --git a/modules-local/fast-library/src/FAST_Registry.txt b/modules-local/fast-library/src/FAST_Registry.txt
@@ -112,6 +112,7 @@ typedef	^	FAST_ParameterType	CHARACTER(1024)	IceFile	-	-	-	"Name of file contain
 #typedef	^	FAST_ParameterType	DbKi	SttsTime	-	-	-	"Amount of time between screen status messages"	s
 typedef	^	FAST_ParameterType	DbKi	TStart	-	-	-	"Time to begin tabular output"	s
 typedef	^	FAST_ParameterType	DbKi	DT_Out	-	-	-	"Time step for tabular output"	s
+typedef	^	FAST_ParameterType	LOGICAL	WrSttsTime	-	-	-	"Whether we should write the status times to the screen"	-
 typedef	^	FAST_ParameterType	INTEGER	n_SttsTime	-	-	-	"Number of time steps between screen status messages"	-
 typedef	^	FAST_ParameterType	INTEGER	n_ChkptTime	-	-	-	"Number of time steps between writing checkpoint files"	-
 typedef	^	FAST_ParameterType	INTEGER	n_VTKTime	-	-	-	"Number of time steps between writing VTK files"	-
@@ -140,6 +141,7 @@ typedef	^	FAST_ParameterType	IntKi	SizeLin	{NumModules+1}{3}	-	-	"dimension 1 is
 typedef	^	FAST_ParameterType	IntKi	LinStartIndx	{NumModules}{3}	-	-	"dimension 1 is the module ID: dimension 2 is the starting index in combined matrices of (1) the module's inputs, (2) the module's linearized outputs, and (3) the module's continuous states"	-
 typedef	^	FAST_ParameterType	IntKi	Lin_NumMods	-	-	-	"number of modules in the linearization"
 typedef	^	FAST_ParameterType	Integer	Lin_ModOrder	{NumModules}	-	-	"indices that determine which order the modules are in the glue-code linearization matrix"
+typedef	^	FAST_ParameterType	CHARACTER(4)	Tdesc	-	-	-	"description of turbine ID (for FAST.Farm) screen printing"	
 
 # ..... FAST_LinType data .......................................................................................................
 typedef	FAST	FAST_LinType	CHARACTER(LinChanLen)	Names_u	{:}	-	-	"Names of the linearized inputs"
@@ -477,10 +479,15 @@ typedef	^	FAST_MiscVarType	INTEGER	NextLinTimeIndx	-	-	-	"index for next time in
 typedef	^	FAST_ExternInitType	DbKi	Tmax	-	-1	-	"External code specified Tmax"	s
 typedef	^	FAST_ExternInitType	IntKi	SensorType	-	SensorType_None	-	"lidar sensor type, which should not be pulsed at the moment; this input should be replaced with a section in the InflowWind input file"	-
 typedef	^	FAST_ExternInitType	LOGICAL	LidRadialVel	-	-	-	"TRUE => return radial component, FALSE => return 'x' direction estimate"	-
-typedef	^	FAST_ExternInitType	IntKi	TurbineID	-	-	-	"ID number for turbine (used to create output file naming convention)"	-
+typedef	^	FAST_ExternInitType	IntKi	TurbineID	-	0	-	"ID number for turbine (used to create output file naming convention)"	-
 typedef	^	FAST_ExternInitType	ReKi	TurbinePos	{3}	-	-	"Initial position of turbine base (origin used in future for graphics)"	m
 typedef	^	FAST_ExternInitType	IntKi	NumSC2Ctrl	-	-	-	"number of controller inputs [from supercontroller]"	-
 typedef	^	FAST_ExternInitType	IntKi	NumCtrl2SC	-	-	-	"number of controller outputs [to supercontroller]"	-
+typedef	^	FAST_ExternInitType	logical	FarmIntegration	-	.false.	-	"whether this is called from FAST.Farm (or another program that doesn't want FAST to call all of the init stuff first)"	-
+typedef	^	FAST_ExternInitType	IntKi	windGrid_n	4	-	-	"number of grid points in the x, y, z, and t directions for IfW"	-
+typedef	^	FAST_ExternInitType	ReKi	windGrid_delta	4	-	-	"size between 2 consecutive grid points in each grid direction for IfW"	"m,m,m,s"
+typedef	^	FAST_ExternInitType	ReKi	windGrid_pZero	3	-	-	"fixed position of the XYZ grid (i.e., XYZ coordinates of IfW m%V(:,1,1,1,:))"	m
+typedef	^	FAST_ExternInitType	CHARACTER(1024)	RootName	-	-	-	"Root name of FAST output files (overrides normal operation)"	-
 typedef	^	FAST_ExternInitType	IntKi	NumActForcePtsBlade	-	-	-	"number of actuator line force points in blade"	-
 typedef	^	FAST_ExternInitType	IntKi	NumActForcePtsTower	-	-	-	"number of actuator line force points in tower"	-
 

diff --git a/modules-local/fast-library/src/FAST_Solver.f90 b/modules-local/fast-library/src/FAST_Solver.f90
@@ -63,7 +63,7 @@ SUBROUTINE BD_InputSolve( p_FAST, BD, y_AD, u_AD, MeshMapData, ErrStat, ErrMsg )
    TYPE(FAST_ParameterType),       INTENT(IN   )  :: p_FAST                   !< Glue-code simulation parameters
    TYPE(BeamDyn_Data),             INTENT(INOUT)  :: BD                       !< BD Inputs at t
    TYPE(AD_OutputType),            INTENT(IN   )  :: y_AD                     !< AeroDyn outputs
-   TYPE(AD_InputType),             INTENT(INOUT)  :: u_AD                     !< AD inputs (for AD-BD load transfer)
+   TYPE(AD_InputType),             INTENT(IN   )  :: u_AD                     !< AD inputs (for AD-BD load transfer)
 
    TYPE(FAST_ModuleMapType),       INTENT(INOUT)  :: MeshMapData              !< Data for mapping between modules
    INTEGER(IntKi),                 INTENT(  OUT)  :: ErrStat                  !< Error status
@@ -123,7 +123,7 @@ SUBROUTINE ED_InputSolve( p_FAST, u_ED, y_ED, p_AD14, y_AD14, y_AD, y_SrvD, u_AD
    TYPE(AD14_ParameterType),       INTENT(IN   )  :: p_AD14                   !< AeroDyn14 parameters (a hack because the AD14 meshes aren't set up properly)
    TYPE(AD14_OutputType),          INTENT(IN   )  :: y_AD14                   !< AeroDyn14 outputs
    TYPE(AD_OutputType),            INTENT(IN   )  :: y_AD                     !< AeroDyn outputs
-   TYPE(AD_InputType),             INTENT(INOUT)  :: u_AD                     !< AD inputs (for AD-ED load transfer)
+   TYPE(AD_InputType),             INTENT(IN   )  :: u_AD                     !< AD inputs (for AD-ED load transfer)
    TYPE(SrvD_OutputType),          INTENT(IN   )  :: y_SrvD                   !< ServoDyn outputs
    TYPE(SrvD_InputType),           INTENT(IN   )  :: u_SrvD                   !< ServoDyn inputs