Skip to content

Fix Stochastic UI Issues #565

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
cpaulgilman merged 10 commits into from
Apr 1, 2021
Merged

Fix Stochastic UI Issues #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
56ed9da
Enhancements for Stochastic Simulations
cpaulgilman Mar 18, 2021
ada784a
Stochastic show DNI/GHI with weather file label
cpaulgilman Mar 18, 2021
bc3a1cf
Fix more stochastic UI issues #564
cpaulgilman Mar 18, 2021
3444f3f
Try to resolve Travis fail
cpaulgilman Mar 24, 2021
66a2fa4
Fix crash from SAM#22 and include for 2020.11.29 patch 2
sjanzou Mar 30, 2021
8579b4e
Updated Linux results on CentOS7 for pull request #565
sjanzou Mar 31, 2021
4833a7b
Merge branch 'patch' into SAM22_stochastic
cpaulgilman Mar 31, 2021
5dac889
Merge branch 'SAM22_stochastic' of https://github.com/nrel/sam into S…
cpaulgilman Mar 31, 2021
64f69e5
results from patch to test .travis.yml
sjanzou Apr 1, 2021
bc9e7ae
Update .travis.yml on patch branch descendants without lk, wex, ssc b…
sjanzou Apr 1, 2021
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
9 changes: 4 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ before_script:
- export SAMNTDIR=/home/travis/build/$user/SAM
- if [[ "$TRAVIS_PULL_REQUEST_BRANCH" == "" ]]; then export BRANCH_NAME=$TRAVIS_BRANCH; else export BRANCH_NAME=$TRAVIS_PULL_REQUEST_BRANCH; fi
- git clone --depth=1 https://github.com/google/googletest /home/travis/build/$user/googletest
- git clone --depth=1 --branch=$BRANCH_NAME https://github.com/$user/lk $LKDIR; if [[ $? != "0" ]]; then git clone --depth=1 --branch="develop" https://github.com/$user/lk $LKDIR; fi
- git clone --depth=1 --branch=$BRANCH_NAME https://github.com/$user/wex $WEXDIR; if [[ $? != "0" ]]; then git clone --depth=1 --branch="develop" https://github.com/$user/wex $WEXDIR; fi
- git clone --depth=1 --branch=$BRANCH_NAME https://github.com/$user/ssc $SSCDIR; if [[ $? != "0" ]]; then git clone --depth=1 --branch="develop" https://github.com/$user/ssc $SSCDIR; fi
- git clone --depth=1 --branch=$BRANCH_NAME https://github.com/$user/lk $LKDIR; if [[ $? != "0" ]]; then git clone --depth=1 --branch="patch" https://github.com/$user/lk $LKDIR; fi
- git clone --depth=1 --branch=$BRANCH_NAME https://github.com/$user/wex $WEXDIR; if [[ $? != "0" ]]; then git clone --depth=1 --branch="patch" https://github.com/$user/wex $WEXDIR; fi
- git clone --depth=1 --branch=$BRANCH_NAME https://github.com/$user/ssc $SSCDIR; if [[ $? != "0" ]]; then git clone --depth=1 --branch="patch" https://github.com/$user/ssc $SSCDIR; fi

script:
- export PATH=$PATH:$HOME/wx-3.1.1/bin
Expand All @@ -43,7 +43,6 @@ branches:
only:
- master
- develop
- MHK
- patch
- wind_pruf
- SAM22_stochastic
- Command_line_script
16 changes: 8 additions & 8 deletions deploy/runtime/ui/Solar Resource Data.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1814,15 +1814,15 @@ Editable
0
ForeColour
4
128
0
64
29
80
173
255
BackColour
4
255
255
255
222
233
244
255
TabOrder
3
Expand Down Expand Up @@ -2477,7 +2477,7 @@ TextEntry
solar_resource
3
4
Location
Solar resource library current selection
Comment thread
sjanzou marked this conversation as resolved.

Location and Resource
19
Expand All @@ -2494,7 +2494,7 @@ Weather file

Location and Resource
0
12
0
1
4
0
Expand Down
Loading