Skip to content

Fix for previous NumCorrections "fix" #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HaymanConsulting merged 2 commits into from
Jun 5, 2017
Merged

Fix for previous NumCorrections "fix" #30

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
928fb43
Merge remote-tracking branch 'OpenFAST-upstream/dev' into dev
bjonkman Jun 3, 2017
8fe111d
Fixed NumCorrection issue from previous "fix"
bjonkman Jun 3, 2017
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
12 changes: 6 additions & 6 deletions modules-local/fast-library/src/FAST_Subs.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4256,18 +4256,18 @@ SUBROUTINE FAST_Solution(t_initial, n_t_global, p_FAST, y_FAST, m_FAST, ED, BD,

END IF

NumCorrections = max(p_FAST%NumCrctn,1)

IF ( p_FAST%CompElast == Module_BD ) THEN
if (n_t_global > 2) then ! this should probably be related to p_FAST%InterpOrder
! set number of corrections to be used for this time step:
IF ( p_FAST%CompElast == Module_BD ) THEN ! BD accelerations have fewer spikes with these corrections on the first several time steps
if (n_t_global > 2) then ! this 2 should probably be related to p_FAST%InterpOrder
NumCorrections = p_FAST%NumCrctn
elseif (n_t_global == 0) then
NumCorrections = max(p_FAST%NumCrctn,16)
else
NumCorrections = max(p_FAST%NumCrctn,1)
end if
END IF

ELSE
NumCorrections = p_FAST%NumCrctn
END IF

! the ServoDyn inputs from Simulink are for t, not t+dt, so we're going to overwrite the inputs from
! the previous step before we extrapolate these inputs:
Expand Down