Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
115fddd
Change MoorDyn warning string for output files to remove too specific…
RyanDavies19 Feb 22, 2026
d254da2
MD: Add ramp time for water kinematics
RyanDavies19 Nov 18, 2025
d60da3e
MD: Add line node acceleration output
RyanDavies19 Apr 8, 2026
cf1b77b
Update logic around allowable current definitions for MHK turbines
hkross Apr 13, 2026
334de00
Update r-test pointer
hkross Apr 13, 2026
e597660
Clarify that Steady Wind option cannot be used in AeroDyn driver for …
hkross Apr 13, 2026
d070a19
MD: runtime improvements for SeaState coupling
RyanDavies19 Apr 14, 2026
528968b
Update r-test pointer
hkross Apr 14, 2026
4ad6e89
Merge remote tracking branch origin/rc-5.0.1 into bug/MHK_Inflow_Calls
hkross Apr 14, 2026
95622bf
Update r-test pointer
hkross Apr 14, 2026
2f1252a
MD: remove forgotten print statements
RyanDavies19 Apr 14, 2026
596ffec
In SeaState, zero out the flow if a point is below the seabed
luwang00 Apr 14, 2026
1822627
Merge luwang00/b/SeaSt_Seabed into bug/MHK_Inflow_Calls
hkross Apr 14, 2026
89fade7
In SeaState, set nodeInWater to 1 for points below the seabed to prev…
luwang00 Apr 14, 2026
b3ad079
Merge luwang00/b/SeaSt_Seabed into bug/MHK_Inflow_Calls
hkross Apr 15, 2026
7830ea8
SubDyn x_e new key cylinders
RBergua Apr 16, 2026
070ceeb
SubDyn JSON output format
RBergua Apr 16, 2026
3d437ae
Update r-test pointer
hkross Apr 20, 2026
495865d
Update r-test pointer
hkross Apr 20, 2026
8651963
Update documentation related to wave-current coupling for MHK turbines
hkross Apr 20, 2026
5448017
Update r-test pointer
hkross Apr 21, 2026
7a3ff44
docs: typo in docs (not building)
andrew-platt Apr 21, 2026
43401ed
Merge pull request #3306 from hkross/bug/MHK_Inflow_Calls
andrew-platt Apr 21, 2026
1630752
Merge pull request #3310 from RBergua/SubDyn_JSON_output_xe_cylinders
andrew-platt Apr 21, 2026
3f50051
Merge remote-tracking branch 'OpenFAST/rc-5.0.1' into MD_improvements
andrew-platt Apr 21, 2026
e4e6e52
Update r-test: RM1 floating tank case
andrew-platt Apr 21, 2026
a0dc268
Merge pull request #3308 from RyanDavies19/MD_improvements
andrew-platt Apr 21, 2026
c349dd5
Fix MoorDyn initial fairlead positions when SubDyn is present
luwang00 Apr 21, 2026
b81d820
Merge pull request #3316 from luwang00/b/MD_SD_Init
andrew-platt Apr 23, 2026
7f0cfef
SubDyn_Registry: add SlDNonLinear to InitInputType and ParameterType …
RBergua Apr 26, 2026
84f9918
FAST_Subs: pass SlDNonLinear flag from SoilDyn to SubDyn based on RED…
RBergua Apr 26, 2026
4333265
SubDyn: store SlDNonLinear flag from InitInput
RBergua Apr 26, 2026
68ef126
SubDyn_Output: set ReactSS to NaN when SoilDyn nonlinear loads are ac…
RBergua Apr 26, 2026
ed1998c
SubDyn: SubDyn_Types.f90 with SlDNonLinear field
RBergua Apr 26, 2026
9cf6687
SoilDyn: Improve console messages for the user
RBergua Apr 27, 2026
a1bb1e8
SubDyn_Output: short-circuit ReactSS computation when SoilDyn nonline…
RBergua Apr 27, 2026
2f7a619
Merge pull request #3321 from andrew-platt/b/SlD-SD_react_loads_backp…
andrew-platt Apr 29, 2026
8c80234
WD: fix minor index logic on wake planes getting dropped
andrew-platt Apr 29, 2026
674bd00
WD: change NumDBuff and NumDFull to reals
andrew-platt Apr 29, 2026
01104dc
FF: change max number of planes calculation
andrew-platt Apr 29, 2026
344cf71
WD: revise logic on wake overtake
andrew-platt Apr 29, 2026
ffb6a98
WD: adjust wake plane overtaking message
andrew-platt Apr 30, 2026
8eb9db1
FF: revert 01104dcd3 to keep original safety factor on max planes
andrew-platt Apr 30, 2026
e84b936
Update OutListParameters.xlsx with the new HydroDyn outputs for gener…
luwang00 Apr 30, 2026
4de653f
HD: Implement the OutAll option for Morison members
luwang00 May 1, 2026
9b42322
HD: Fix segfaults
luwang00 May 1, 2026
81ab6c7
Update HydroDyn user documentation with the new OutAll option
luwang00 May 1, 2026
6878fce
Fix HD user docs structure and link
luwang00 May 1, 2026
7d6edb0
Fix typo in docs
luwang00 May 1, 2026
52b0082
HD: Add outputs of Morison mesh nodal loads when OutAll is true
luwang00 May 4, 2026
57ad6f9
Merge pull request #3325 from luwang00/f/HD_OutAll
andrew-platt May 5, 2026
a6eca46
WD: merge passing wake planes instead of simply dropping
andrew-platt May 5, 2026
e406893
WD: normalize plane vector when merging planes
andrew-platt May 5, 2026
b0e0ad5
WD: fix commit e4068931b
andrew-platt May 5, 2026
6dc4fd8
Merge pull request #3323 from andrew-platt/b/FF_wake_plane_passing
andrew-platt May 5, 2026
1e556bb
Fix HD additional DOF output channels
luwang00 May 18, 2026
13da318
Merge pull request #3343 from luwang00/b/HD_ADOF_out
andrew-platt May 19, 2026
27cf2ed
Merge branch 'rc-5.0.1' into m/rc-5.0.1_to_dev_May2026
andrew-platt May 19, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified docs/OtherSupporting/OutListParameters.xlsx
Binary file not shown.
9 changes: 6 additions & 3 deletions docs/source/user/hydrodyn/input_files.rst
Original file line number Diff line number Diff line change
Expand Up @@ -898,9 +898,12 @@ specified in the HYDRODYN section of the driver input file when running
HydroDyn standalone, or by the OpenFAST program when running a coupled
simulation. See :numref:`hd-summary-file` for summary file details.

For this version, **OutAll** must be set to FALSE. In future versions,
setting **OutAll** = TRUE will cause HydroDyn to auto-generate outputs
for every joint and member in the input file.
If **OutAll** is set to TRUE, HydroDyn will output the total strip-theory
forces and moments on each user-defined member and joint, followed by the
forces and moments on each computational node of the strip-theory mesh.
These additional output channels are inserted as additional columns in the
output file independent of any user-requested outputs. See :ref:`hd-outall-option`
for more information.

If **OutSwtch** is set to 1, outputs are sent to a file with the name
``OutRootname.HD.out``. If **OutSwtch** is set to 2, outputs are
Expand Down
53 changes: 53 additions & 0 deletions docs/source/user/hydrodyn/output_files.rst
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,59 @@ data for a single 6\ **NBody**-by-6\ **NBody** matrix. If **NBodyMod** > 1
(no hydrodynamic coupling), the summary file will contain data for **NBody**
6-by-6 radiation kernal matrices.

.. _hd-outall-option:

**OutAll** Option
~~~~~~~~~~~~~~~~~

If **OutAll** is set to TRUE, HydroDyn will output the total strip-theory
forces and moments on each user-defined member and joint. These are
included as additional columns in the output file independent of any
user-requested outputs. The forces and moments on the members (integrated loads across
all side walls) will be written first. For example, the 6 load components
on the first member in the **MEMBERS** table (the first row of the table)
are given by **M1TotFxi**, **M1TotFyi**, **M1TotFzi**, **M1TotMxi**,
**M1TotMyi**, and **M1TotMzi**. After the member loads, the total lumped
loads on each joint are printed next. For instance, the loads on the first
joint in the **MEMBER JOINTS** table are printed with the column names
**J1TotFxi**, **J1TotFyi**, **J1TotFzi**, **J1TotMxi**, **J1TotMyi**, and
**J1TotMzi**. Note that for these outputs, the members and joints are
simply numbered based on their order of appearance in the respective tables
in the input file, so, as an example, **J2** refers to the joint defined
on the second row of the **MEMBER JOINTS** table. The member and joint
numbering does not follow **MemberID** and **JointID**, nor does it follow
the numbering used with the user-requested member and joint outputs.

The output forces and moments are the total strip-theory loads, including
hydrodynamic, hydrostatic, marine growth, and ballast contributions. If a
member has **PropPot** set to TRUE, the relevant load components will be
omitted for that member and its connecting joints as appropriate. All
force and moment components are resolved in the earth-fixed inertial frame
of reference, and the moments are computed about the instantaneous principal
reference point (PRP), same as the output channels **HydroFxi**,
**HydroFyi**, etc. As a reminder, the PRP is a body-fixed point located at
the earth-fixed origin when the HydroDyn structure is undisplaced. Summing
all member and joint loads gives the total strip-theory loads on the entire
structure.

After the member and joint loads, HydroDyn also outputs the total forces
and moments on each computational node of the HydroDyn strip-theory (Morison)
mesh. This internal mesh is used to map the loads to other structural
modules, such as SubDyn, and contains joint nodes at the user-defined joint
locations followed by member internal nodes created from member discretization.
The force and moment components are again resolved in the earth-fixed inertial
frame of reference. However, the moment on each node is about the node itself,
not about the PRP as with the member and joint load outputs above. Additionally,
the joint mesh nodes can have load contributions from both member side walls
and from the joint/endplates. This is because part of the side-wall loads on
the first and last element of a member can be assignd to the joint nodes. As
a result, the load outputs at the joint nodes do not necessarily match the joint
load outputs above, which do not contain contributions from member side walls.
The nodal load output column names indicate the node number, e.g., **N1TotFxi**,
**N1TotFyi**, **N1TotFzi**, **N1TotMxi**, **N1TotMyi**, and **N1TotMzi** for
the first node. The node numbering follows the **Nodes** table in the HydroDyn
summary file.

Results File
~~~~~~~~~~~~

Expand Down
18 changes: 9 additions & 9 deletions docs/source/user/inflowwind/input.rst
Original file line number Diff line number Diff line change
Expand Up @@ -117,26 +117,26 @@ be performed in a different order than if both angles are specified in the same

.. _inflow_superposition:

Superposition of Wave and Current Inflow
========================================
For MHK turbines, wave and current velocities and accelerations are superimposed (i.e., summed) such that all submerged components are exposed
Superposition/Coupling of Wave and Current Inflow
=================================================
For MHK turbines, wave and current velocities and accelerations are superimposed (i.e., summed) or coupled (see :ref:`sea-waves`) such that all submerged components are exposed
to the same inflow field. Both AeroDyn and HydroDyn can query SeaState for wave field information. SeaState then queries InflowWind for the current
field, sums the velocities and accelerations, and returns the superimposed flow field information. This has several implications for modeling
field, sums or couples the velocities and accelerations, and returns the flow field information. This has several implications for modeling
MHK turbines, which are listed below. Note that dynamic pressure contributions from InflowWind are neglected.

When modeling a rotor or rotor/tower only (i.e., hydrodynamics modeled in AeroDyn only):

- SeaState must be used when defining a flow field with waves
- Current definition in SeaState must always be set to 0
- If SeaState is activated, InflowWind must also be activated, though the current can be set to 0
- InflowWind must be used when defining a flow field with currents
- Current definition in SeaState must always be set to 0
- For combined wave and current flow fields, SeaState will query InflowWind

When modeling a rotor or rotor/tower and support structure (i.e., hydrodynamics modeled in AeroDyn and HydroDyn):

- SeaState must always be used, even when defining a flow field with no waves
- Current definition in SeaState must always be set to 0
- If SeaState is activated, InflowWind must also be activated, though the current can be set to 0
- InflowWind must be used when defining a flow field with currents
- Current definition in SeaState must always be set to 0
- For current only cases, set the SeaState wave field to 0; current information will be passed through SeaState from InflowWind
- For combined wave and current flow fields, SeaState will query InflowWind
- For combined wave and current flow fields, SeaState will query InflowWind

Wave and current coupling is only possible when running the OpenFAST glue code or the AeroDyn driver. This feature is not supported by the HydroDyn or MoorDyn drivers.
5 changes: 4 additions & 1 deletion docs/source/user/seastate/input_files.rst
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ When setting up the wave grid, it is necessary to make sure the wave grid is lar

OpenFAST precomputes and saves the wave-field velocity, acceleration, dynamic pressure, and wave elevation at the start of the simulation. Generating and maintaining the wave grid can be memory intensive for long simulations. Users should set the wave grid to be no larger or finer than necessary to reduce memory use. Reducing **WaveTMax** or increasing **WaveDT** (see WAVES section below) also reduces memory use. For long crested waves (no directional spreading) aligned with the *X*-direction (or *Y*-direction), **NY** (or **NX**) can be reduced to the minimum allowed value of 2 to save memory.

.. _sea-waves:

Waves
-----

Expand Down Expand Up @@ -211,7 +213,8 @@ time-averaged current velocity at the still water level. For applicable **WindTy
InflowWind, users should ensure that the flow-field grid from InflowWind reaches the still
water level. **WvCrntMod** has no effect when **WaveMod** = 0 or 6, or when there is no
current from either SeaState (**CurrMod** = 0) or InflowWind if simulating marine
hydrokinetic turbines.
hydrokinetic turbines. See :ref:`inflow_superposition`
for additional context around wave-current coupling when simulating MHK turbines.

**WaveTMax** sets the length of the incident wave kinematics time
series, but it also determines the frequency step used in the inverse
Expand Down
4 changes: 2 additions & 2 deletions glue-codes/fast-farm/src/FAST_Farm_IO.f90
Original file line number Diff line number Diff line change
Expand Up @@ -775,11 +775,11 @@ SUBROUTINE Farm_ReadPrimaryFile( InputFile, p, WD_InitInp, AWAE_InitInp, OutList

CALL ReadVarWDefault( UnIn, InputFile, WD_InitInp%NumDFull, "NumDFull", &
"Distance of full wake propagation, expressed as a multiple of RotorDiamRef [>0.0] or DEFAULT [DEFAULT=15]", &
15_IntKi, ErrStat2, ErrMsg2, UnEc); if (Failed()) return
15.0_ReKi, ErrStat2, ErrMsg2, UnEc); if (Failed()) return

CALL ReadVarWDefault( UnIn, InputFile, WD_InitInp%NumDBuff, "NumDBuff", &
"Length of wake propagation buffer region, expressed as a multiple of RotorDiamRef [>=0.0] or DEFAULT [DEFAULT=5]", &
5_IntKi, ErrStat2, ErrMsg2, UnEc); if (Failed()) return
5.0_ReKi, ErrStat2, ErrMsg2, UnEc); if (Failed()) return

WD_InitInp%RotorDiamRef = p%RotorDiamRef

Expand Down
2 changes: 1 addition & 1 deletion glue-codes/fast-farm/src/FAST_Farm_Subs.f90
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ SUBROUTINE Farm_Initialize( farm, InputFile, ErrStat, ErrMsg )
call AllocAry( farm%p%MaxNumPlanes, farm%p%NumTurbines, 'farm%p%MaxNumPlanes', ErrStat2, ErrMsg2); CALL SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName); if (Failed()) return
do i=1,farm%p%NumTurbines
! Eventually, we will have different settings for different rotors
farm%p%MaxNumPlanes(i) = ceiling( 15.0 * Real( WD_InitInput%InputFileData%NumDFull + WD_InitInput%InputFileData%NumDBuff , ReKi ) / AWAE_InitInput%InputFileData%C_Meander )
farm%p%MaxNumPlanes(i) = ceiling( 15.0 * ( WD_InitInput%InputFileData%NumDFull + WD_InitInput%InputFileData%NumDBuff ) / AWAE_InitInput%InputFileData%C_Meander )
farm%p%MaxNumPlanes(i) = max( 2, min( farm%p%MaxNumPlanes(i) , farm%p%n_TMax + 2 ) )
end do

Expand Down
8 changes: 4 additions & 4 deletions modules/aerodyn/src/AeroDyn.f90
Original file line number Diff line number Diff line change
Expand Up @@ -1412,7 +1412,7 @@ subroutine Init_RotInflow( p, RotInflow, errStat, ErrMsg )
if (Failed()) return
RotInflow%Blade(k)%InflowVel = 0.0_ReKi

if (p%MHK > 0) then
if (p%MHK /= MHK_None) then
call AllocAry( RotInflow%Blade(k)%InflowAcc, 3_IntKi, p%NumBlNds, 'RotInflow%Blade(k)%InflowAcc', ErrStat2, ErrMsg2 )
if (Failed()) return
RotInflow%Blade(k)%InflowAcc = 0.0_ReKi
Expand All @@ -1422,7 +1422,7 @@ subroutine Init_RotInflow( p, RotInflow, errStat, ErrMsg )
call AllocAry( RotInflow%Tower%InflowVel, 3_IntKi, p%NumTwrNds, 'RotInflow%Tower%InflowVel', ErrStat2, ErrMsg2 ) ! could be size zero
if (Failed()) return

if (p%MHK > 0) then
if (p%MHK /= MHK_None) then
call AllocAry( RotInflow%Tower%InflowAcc, 3_IntKi, p%NumTwrNds, 'RotInflow%Tower%InflowAcc', ErrStat2, ErrMsg2 ) ! could be size zero
if (Failed()) return
end if
Expand Down Expand Up @@ -2031,7 +2031,7 @@ subroutine AD_CalcWind_Rotor(t, u, FlowField, p, p_AD, m, RotInflow, StartNode,
if (.not. associated(FlowField)) return ! use the initial (or input) values for these inputs

! If rotor is MHK, add water depth to z coordinate
if (p%MHK > 0) then
if (p%MHK /= MHK_None) then
PosOffset = [0.0_ReKi, 0.0_ReKi, p%WtrDpth]
else
PosOffset = 0.0_ReKi
Expand Down Expand Up @@ -4541,7 +4541,7 @@ SUBROUTINE ValidateInputData( InitInp, InputFileData, NumBl, calcCrvAngle, ErrSt
! .............................
! check tower mesh data:
! .............................
if (InputFileData%TwrPotent /= TwrPotent_none .or. InputFileData%TwrShadow /= TwrShadow_none .or. InputFileData%TwrAero /= TwrAero_none .or. InitInp%MHK > 0) then
if (InputFileData%TwrPotent /= TwrPotent_none .or. InputFileData%TwrShadow /= TwrShadow_none .or. InputFileData%TwrAero /= TwrAero_none .or. InitInp%MHK /= MHK_None) then
do iR = 1,size(NumBl)
if (InputFileData%rotors(iR)%NumTwrNds <= 0) cycle !bjj: this could be removed since the loops here already take into account the number of tower nodes

Expand Down
2 changes: 1 addition & 1 deletion modules/aerodyn/src/AeroDyn_Driver_Subs.f90
Original file line number Diff line number Diff line change
Expand Up @@ -1411,7 +1411,7 @@ subroutine ValidateInputs(dvr, errStat, errMsg)

if (dvr%MHK /= MHK_None .and. dvr%MHK /= MHK_FixedBottom .and. dvr%MHK /= MHK_Floating) call SetErrStat(ErrID_Fatal, 'MHK switch must be 0, 1, or 2.', ErrStat, ErrMsg, RoutineName)

if (dvr%MHK /= MHK_None .and. dvr%SS_InitInp%CompSeaSt == 1 .and. dvr%IW_InitInp%CompInflow /= 1) call SetErrStat( ErrID_Fatal, 'InflowWind must be activated for MHK turbines when SeaState is used.', ErrStat, ErrMsg, RoutineName )
if (dvr%MHK /= MHK_None .and. dvr%SS_InitInp%CompSeaSt == 1 .and. dvr%IW_InitInp%CompInflow == 0 .and. dvr%IW_InitInp%HWindSpeed > 0) call SetErrStat( ErrID_Fatal, 'Steady Wind option in AeroDyn driver cannot be used for MHK turbines with SeaState.', ErrStat, ErrMsg, RoutineName )

if (dvr%MHK == MHK_None .and. dvr%SS_InitInp%CompSeaSt /= 0) call SetErrStat( ErrID_Fatal, 'SeaState cannot be used with wind turbines.', ErrStat, ErrMsg, RoutineName )

Expand Down
14 changes: 7 additions & 7 deletions modules/hydrodyn/src/HydroDyn.f90
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,9 @@ SUBROUTINE HydroDyn_Init( InitInp, u, p, x, xd, z, OtherState, y, m, Interval, I

! Were visualization meshes requested?
InputFileData%Morison%VisMeshes = p%VisMeshes

! Additional Morison inputs to be initialized just in case
u%Morison%PtfmRefY = 0.0_ReKi
u%Morison%PRP = [0.0_ReKi,0.0_ReKi,0.0_ReKi]
! Initialize the Morison Element Calculations
CALL Morison_Init(InputFileData%Morison, u%Morison, p%Morison, x%Morison, xd%Morison, z%Morison, OtherState%Morison, &
y%Morison, m%Morison, Interval, InitOut%Morison, ErrStat2, ErrMsg2 )
Expand Down Expand Up @@ -1204,14 +1206,11 @@ SUBROUTINE HydroDyn_UpdateStates( t, n, Inputs, InputTimes, p, x, xd, z, OtherSt
DO i=1,nTime
CALL Morison_CopyInput(Inputs(i)%Morison, Inputs_Morison(i), MESH_NEWCOPY, ErrStat2, ErrMsg2)
call SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
! Inputs_Morison(i)%PtfmRefY = Inputs(i)%PtfmRefY
Inputs_Morison(i)%PtfmRefY = xd%PtfmRefY(i)
Inputs_Morison(i)%PRP = Inputs(i)%PRPMesh%Position(:,1) + Inputs(i)%PRPMesh%TranslationDisp(:,1)
END DO
CALL Morison_CopyInput(Inputs(1)%Morison, u_Morison, MESH_NEWCOPY, ErrStat2, ErrMsg2)
call SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )
! u_Morison%PtfmRefY = Inputs(1)%PtfmRefY
u_Morison%PtfmRefY = xd%PtfmRefY(1)

CALL Morison_Input_ExtrapInterp(Inputs_Morison, InputTimes, u_Morison, t, ErrStat2, ErrMsg2) ! get inputs at time t
call SetErrStat( ErrStat2, ErrMsg2, ErrStat, ErrMsg, RoutineName )

Expand Down Expand Up @@ -1762,6 +1761,7 @@ SUBROUTINE HydroDyn_CalcOutput( Time, u, p, x, xd, z, OtherState, y, m, ErrStat,

IF ( u%Morison%Mesh%Committed ) THEN ! Make sure we are using Morison / there is a valid mesh
u%Morison%PtfmRefY = PtfmRefY
u%Morison%PRP = u%PRPMesh%Position(:,1)+u%PRPMesh%TranslationDisp(:,1)
CALL Morison_CalcOutput( Time, u%Morison, p%Morison, x%Morison, xd%Morison, &
z%Morison, OtherState%Morison, y%Morison, m%Morison, &
ErrStat2, ErrMsg2, calcMorisonHstLdsLocal )
Expand All @@ -1777,9 +1777,9 @@ SUBROUTINE HydroDyn_CalcOutput( Time, u, p, x, xd, z, OtherState, y, m, ErrStat,
if (Failed()) return

! Aggregate the sub-module outputs
IF (p%Morison%NumOuts > 0) THEN
IF (p%Morison%NumOuts > 0 .or. p%Morison%OutAll) THEN
J = p%NumOuts + 1
DO I=1, p%Morison%NumOuts
DO I=1, size(p%Morison%OutParam)
y%WriteOutput(J) = y%Morison%WriteOutput(I)
J = J + 1
END DO
Expand Down
1 change: 0 additions & 1 deletion modules/hydrodyn/src/HydroDyn.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ typedef ^ ^ INTEGER
typedef ^ ^ INTEGER NUserOutputs - - - "Number of Hydrodyn-level requested output channels" -
typedef ^ ^ CHARACTER(ChanLen) UserOutputs {:} - - "This should really be dimensioned with MaxOutPts" -
typedef ^ ^ INTEGER OutSwtch - - - "Output requested channels to: [1=Hydrodyn.out 2=GlueCode.out 3=both files]" -
typedef ^ ^ LOGICAL OutAll - - - "Output all user-specified member and joint loads (only at each member end, not interior locations) [T/F]" -
typedef ^ ^ INTEGER NumOuts - - - "The number of outputs for this module as requested in the input file" -
typedef ^ ^ CHARACTER(ChanLen) OutList {:} - - "The user-requested output channel labels for this modules. This should really be dimensioned with MaxOutPts" -
typedef ^ ^ LOGICAL HDSum - - - "Generate a HydroDyn summary file [T/F]" -
Expand Down
11 changes: 1 addition & 10 deletions modules/hydrodyn/src/HydroDyn_Input.f90
Original file line number Diff line number Diff line change
Expand Up @@ -1222,7 +1222,7 @@ SUBROUTINE HydroDyn_ParseInput( InputFileName, OutRootName, FileInfo_In, InputFi
if (Failed()) return;

! OutAll - Whether or not to output information for every member and joint
call ParseVar( FileInfo_In, CurLine, 'OutAll', InputFileData%OutAll, ErrStat2, ErrMsg2, UnEc )
call ParseVar( FileInfo_In, CurLine, 'OutAll', InputFileData%Morison%OutAll, ErrStat2, ErrMsg2, UnEc )
if (Failed()) return;

! OutSwtch - Specify how to write to an output file
Expand Down Expand Up @@ -2804,15 +2804,6 @@ SUBROUTINE HydroDynInput_ProcessInitData( InitInp, Interval, InputFileData, ErrS
! Data section for OUTPUT
!-------------------------------------------------------------------------------------------------


! OutAll - output all member and joint data

IF ( InputFileData%OutAll ) THEN !TODO: Alter this check once OutAll is supported
CALL SetErrStat( ErrID_Fatal,'OutAll must be FALSE. Future versions of HydroDyn will once again support values of either TRUE or FALSE.',ErrStat,ErrMsg,RoutineName)
RETURN
END IF


! OutSwtch - output file switch

IF ( InputFileData%OutSwtch /= 1 .AND. InputFileData%OutSwtch /= 2 .AND. InputFileData%OutSwtch /= 3 ) THEN
Expand Down
Loading
Loading