From 077ff1982390a53a00f0ffa1438e4e692f9d3905 Mon Sep 17 00:00:00 2001 From: Rafael M Mudafort Date: Thu, 8 Nov 2018 14:38:00 -0700 Subject: [PATCH 1/3] Check for tower nodes before allocating data --- modules-local/aerodyn/src/AeroDyn.f90 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules-local/aerodyn/src/AeroDyn.f90 b/modules-local/aerodyn/src/AeroDyn.f90 index b0ad148aee..4acc09a50f 100644 --- a/modules-local/aerodyn/src/AeroDyn.f90 +++ b/modules-local/aerodyn/src/AeroDyn.f90 @@ -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) From 969d9574f860d297b79986b4fb8c7ef069f02158 Mon Sep 17 00:00:00 2001 From: Rafael M Mudafort Date: Thu, 8 Nov 2018 14:59:30 -0700 Subject: [PATCH 2/3] Bug fix in the travis ci macos configuration --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1d2817a78d..2f3ec79e98 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 From 606b9661300b73560afe6a66fc08e7ded3c5cb6e Mon Sep 17 00:00:00 2001 From: Rafael M Mudafort Date: Tue, 13 Nov 2018 14:40:30 -0700 Subject: [PATCH 3/3] Resolve a merge conflict --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2f3ec79e98..cf0493af32 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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