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

Jump to bottom

Bug fix in allocating tower elevation array #201

Merged
merged 3 commits into from
Nov 13, 2018
Merged

Bug fix in allocating tower elevation array #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
077ff19
Check for tower nodes before allocating data
rafmudaf Nov 8, 2018
969d957
Bug fix in the travis ci macos configuration
rafmudaf Nov 8, 2018
606b966
Resolve a merge conflict
rafmudaf Nov 13, 2018
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ env:
# mac configuration
before_install:
# first uninstall a conflicting package
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew cask uninstall oclint; fi
# - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew cask uninstall oclint; fi

# install required packages
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
Expand Down
14 changes: 7 additions & 7 deletions modules-local/aerodyn/src/AeroDyn.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,14 +231,14 @@ subroutine AD_SetInitOut(p, InputFileData, InitOut, errStat, errMsg)
end do

!Tower data
ALLOCATE(InitOut%TwrElev(p%NumTwrNds), STAT = ErrStat2)
IF (ErrStat2 /= 0) THEN
CALL SetErrStat(ErrID_Fatal,"Error allocating memory for TwrElev.", ErrStat, ErrMsg, RoutineName)
RETURN
END IF
InitOut%TwrElev(:) = InputFileData%TwrElev(:)

IF ( p%NumTwrNds > 0 ) THEN
ALLOCATE(InitOut%TwrElev(p%NumTwrNds), STAT = ErrStat2)
IF (ErrStat2 /= 0) THEN
CALL SetErrStat(ErrID_Fatal,"Error allocating memory for TwrElev.", ErrStat, ErrMsg, RoutineName)
RETURN
END IF
InitOut%TwrElev(:) = InputFileData%TwrElev(:)

ALLOCATE(InitOut%TwrDiam(p%NumTwrNds), STAT = ErrStat2)
IF (ErrStat2 /= 0) THEN
CALL SetErrStat(ErrID_Fatal,"Error allocating memory for TwrDiam.", ErrStat, ErrMsg, RoutineName)
Expand Down