Skip to content
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

update the solution before the convergence criteria control flow #32

Merged
merged 1 commit into from
Jul 11, 2017
Merged

update the solution before the convergence criteria control flow #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions modules-local/beamdyn/src/BeamDyn.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3697,15 +3697,15 @@ SUBROUTINE BD_DynamicSolutionGA2( x, OtherState, u, p, m, ErrStat, ErrMsg)
! Check for convergence
Enorm = SQRT(abs(DOT_PRODUCT(m%LP_RHS_LU, m%LP_RHS(7:p%dof_total))))

CALL BD_UpdateDynamicGA2(p,m,x,OtherState)

IF(i==1) THEN
Eref = Enorm*p%tol
IF(Enorm .LE. 1.0_DbKi) RETURN !FIXME: Do we want a hardcoded limit like this?
ELSE
IF(Enorm .LE. Eref) RETURN
ENDIF

CALL BD_UpdateDynamicGA2(p,m,x,OtherState)

ENDDO

CALL setErrStat( ErrID_Fatal, "Solution does not converge after the maximum number of iterations", ErrStat, ErrMsg, RoutineName)
Expand Down