Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge openfast/dev into openfast/master
- Loading branch information
Showing
227 changed files
with
16,367 additions
and
9,400 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,6 @@ | ||
| [submodule "reg_tests/r-test"] | ||
| path = reg_tests/r-test | ||
| url = https://github.com/openfast/r-test.git | ||
| branch = dev | ||
| [submodule "unit_tests/pfunit"] | ||
| path = unit_tests/pfunit | ||
| url = https://git.code.sf.net/p/pfunit/code | ||
| url = https://github.com/Goddard-Fortran-Ecosystem/pFUnit.git |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| # Travis CI configuration | ||
| # | ||
| # Environment info | ||
| # https://docs.travis-ci.com/user/reference/overview/ | ||
| # https://docs.travis-ci.com/user/reference/osx/ | ||
| # https://docs.travis-ci.com/user/reference/trusty/ | ||
|
|
||
| language: c | ||
|
|
||
| os: | ||
| - linux | ||
| - osx | ||
|
|
||
| # linux configuration; container-based environments (default for linux) require the following setup block | ||
| addons: | ||
| apt: | ||
| packages: | ||
| - gfortran | ||
| - libblas-dev | ||
| - liblapack-dev | ||
|
|
||
| env: | ||
| - FC=/usr/local/bin/gfortran-7; DOUBLE_PRECISION=ON | ||
| - FC=/usr/local/bin/gfortran-7; DOUBLE_PRECISION=OFF | ||
| - FC=/usr/bin/gfortran; DOUBLE_PRECISION=ON | ||
| - FC=/usr/bin/gfortran; DOUBLE_PRECISION=OFF | ||
|
|
||
| # mac configuration | ||
| before_install: | ||
| # first uninstall a conflicting package | ||
| - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew cask uninstall oclint; fi | ||
|
|
||
| # install required packages | ||
| - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi | ||
| - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade python; fi | ||
| - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gcc@7; fi | ||
| # - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install cmake; fi # cmake is already installed in the default mac image | ||
|
|
||
| # common configuration | ||
| - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then pyenv shell 3.6.3; fi | ||
| - pip3 install numpy | ||
|
|
||
| install: | ||
| - mkdir build && cd build | ||
| - cmake .. -DBUILD_TESTING=ON -DDOUBLE_PRECISION=$DOUBLE_PRECISION | ||
| - make -j 8 install | ||
|
|
||
| matrix: | ||
| exclude: | ||
| - os: linux | ||
| env: FC=/usr/local/bin/gfortran-7; DOUBLE_PRECISION=ON | ||
| - os: linux | ||
| env: FC=/usr/local/bin/gfortran-7; DOUBLE_PRECISION=OFF | ||
| - os: osx | ||
| env: FC=/usr/bin/gfortran; DOUBLE_PRECISION=ON | ||
| - os: osx | ||
| env: FC=/usr/bin/gfortran; DOUBLE_PRECISION=OFF | ||
|
|
||
| script: | ||
| # beamdyn unit tests | ||
| - if [[ "$DOUBLE_PRECISION" == "ON" ]]; then ctest -R beamdyn_utest; fi | ||
|
|
||
| # beamdyn regression tests | ||
| - if [[ "$DOUBLE_PRECISION" == "ON" ]]; then ctest -R bd_; fi | ||
|
|
||
| # subset of openfast regression tests | ||
| # do not run | ||
| # - 3, 4, 7, 15, 16, 17 since the free yaw is not well trusted | ||
| # - 20, 21 because theyre too long | ||
| # THIS IS COMMENTED UNTIL TESTS CAN RELIABLY DETERMINE REGRESSION | ||
| # CURRENTLY, TESTS FAIL WITH VERY MINOR DIFFERENCES | ||
| # - ctest -VV -j 18 -I 1,1,1,2,5,6,8,9,10,11,12,13,14,18,19,22,23,24,25,26 | ||
| # - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ctest -j 18 -I 1,1,1,2,5,6,8,9,10,11,12,13,14,18,19,22,23,24,25,26 ; fi | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| # | ||
| # Copyright 2016 National Renewable Energy Laboratory | ||
| # | ||
| # Licensed under the Apache License, Version 2.0 (the "License"); | ||
| # you may not use this file except in compliance with the License. | ||
| # You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
|
|
||
| # find_path(MKL_INCLUDE_DIRS | ||
| # mkl.h | ||
| # HINTS $ENV{MKLROOT} | ||
| # PATH_SUFFIXES include) | ||
|
|
||
| find_library(MKL_IFACE_LIB | ||
| NAMES mkl_intel_lp64 libmkl_intel_lp64.a mkl_intel_lp64_dll.lib | ||
| PATHS $ENV{MKLROOT}/lib $ENV{MKLROOT}/lib/intel64 $ENV{INTEL}/mkl/lib/intel64 $ENV{INTEL}/mkl/lib/intel64_win) | ||
|
|
||
| find_library(MKL_SEQ_LIB | ||
| NAMES mkl_sequential libmkl_sequential.a mkl_sequential.lib | ||
| PATHS $ENV{MKLROOT}/lib $ENV{MKLROOT}/lib/intel64 $ENV{INTEL}/mkl/lib/intel64 $ENV{INTEL}/mkl/lib/intel64_win) | ||
|
|
||
| find_library(MKL_CORE_LIB | ||
| NAMES mkl_core libmkl_core.a mkl_core_dll.lib | ||
| PATHS $ENV{MKLROOT}/lib $ENV{MKLROOT}/lib/intel64 $ENV{INTEL}/mkl/lib/intel64 $ENV{INTEL}/mkl/lib/intel64_win) | ||
|
|
||
| if (MKL_IFACE_LIB AND MKL_SEQ_LIB AND MKL_CORE_LIB) | ||
| set(MKL_LIBRARIES ${MKL_IFACE_LIB} ${MKL_SEQ_LIB} ${MKL_CORE_LIB}) | ||
| else() | ||
| set(MKL_LIBRARIES "") | ||
| set(MKL_INCLUDE_DIRS "") | ||
| endif() | ||
|
|
||
| include(FindPackageHandleStandardArgs) | ||
| find_package_handle_standard_args(MKL DEFAULT_MSG | ||
| MKL_LIBRARIES MKL_IFACE_LIB MKL_SEQ_LIB MKL_CORE_LIB) # MKL_INCLUDE_DIRS) | ||
| mark_as_advanced( | ||
| MKL_INCLUDE_DIRS MKL_LIBRARIES MKL_IFACE_LIB MKL_SEQ_LIB MKL_CORE_LIB) |
Oops, something went wrong.