diff --git a/.appveyor.yml b/.appveyor.yml index 0c16dcf7b8..627755ba2a 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -20,6 +20,7 @@ environment: install: - call %CONDA_INSTALL_LOCN%\Scripts\activate.bat + - conda config --set auto_update_conda false - conda config --add channels conda-forge --force - conda install --yes --quiet flang jom - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 diff --git a/TESTING/EIG/cchkee.F b/TESTING/EIG/cchkee.F index f1e224412e..7c6f580870 100644 --- a/TESTING/EIG/cchkee.F +++ b/TESTING/EIG/cchkee.F @@ -1072,7 +1072,8 @@ PROGRAM CCHKEE CHARACTER*80 LINE INTEGER I, I1, IC, INFO, ITMP, K, LENP, MAXTYP, NEWSD, $ NK, NN, NPARMS, NRHS, NTYPES, - $ VERS_MAJOR, VERS_MINOR, VERS_PATCH, N_THREADS + $ VERS_MAJOR, VERS_MINOR, VERS_PATCH + INTEGER*4 N_THREADS, ONE_THREAD REAL EPS, S1, S2, THRESH, THRSHN * .. * .. Local Arrays .. @@ -1869,7 +1870,8 @@ PROGRAM CCHKEE IF( TSTERR ) THEN #if defined(_OPENMP) N_THREADS = OMP_GET_MAX_THREADS() - CALL OMP_SET_NUM_THREADS(1) + ONE_THREAD = 1 + CALL OMP_SET_NUM_THREADS(ONE_THREAD) #endif CALL CERRST( 'CST', NOUT ) #if defined(_OPENMP) @@ -2336,7 +2338,8 @@ PROGRAM CCHKEE IF( TSTERR ) THEN #if defined(_OPENMP) N_THREADS = OMP_GET_MAX_THREADS() - CALL OMP_SET_NUM_THREADS(1) + ONE_THREAD = 1 + CALL OMP_SET_NUM_THREADS(ONE_THREAD) #endif CALL CERRST( 'CHB', NOUT ) #if defined(_OPENMP) diff --git a/TESTING/EIG/dchkee.F b/TESTING/EIG/dchkee.F index ec614dee65..2b8e0b371d 100644 --- a/TESTING/EIG/dchkee.F +++ b/TESTING/EIG/dchkee.F @@ -1078,7 +1078,8 @@ PROGRAM DCHKEE CHARACTER*80 LINE INTEGER I, I1, IC, INFO, ITMP, K, LENP, MAXTYP, NEWSD, $ NK, NN, NPARMS, NRHS, NTYPES, - $ VERS_MAJOR, VERS_MINOR, VERS_PATCH, N_THREADS + $ VERS_MAJOR, VERS_MINOR, VERS_PATCH + INTEGER*4 N_THREADS, ONE_THREAD DOUBLE PRECISION EPS, S1, S2, THRESH, THRSHN * .. * .. Local Arrays .. @@ -1874,7 +1875,8 @@ PROGRAM DCHKEE IF( TSTERR ) THEN #if defined(_OPENMP) N_THREADS = OMP_GET_MAX_THREADS() - CALL OMP_SET_NUM_THREADS(1) + ONE_THREAD = 1 + CALL OMP_SET_NUM_THREADS(ONE_THREAD) #endif CALL DERRST( 'DST', NOUT ) #if defined(_OPENMP) diff --git a/TESTING/EIG/schkee.F b/TESTING/EIG/schkee.F index 43a5ee73f8..bf04b5e5b6 100644 --- a/TESTING/EIG/schkee.F +++ b/TESTING/EIG/schkee.F @@ -1078,7 +1078,8 @@ PROGRAM SCHKEE CHARACTER*80 LINE INTEGER I, I1, IC, INFO, ITMP, K, LENP, MAXTYP, NEWSD, $ NK, NN, NPARMS, NRHS, NTYPES, - $ VERS_MAJOR, VERS_MINOR, VERS_PATCH, N_THREADS + $ VERS_MAJOR, VERS_MINOR, VERS_PATCH + INTEGER*4 N_THREADS, ONE_THREAD REAL EPS, S1, S2, THRESH, THRSHN * .. * .. Local Arrays .. @@ -1875,7 +1876,8 @@ PROGRAM SCHKEE IF( TSTERR ) THEN #if defined(_OPENMP) N_THREADS = OMP_GET_MAX_THREADS() - CALL OMP_SET_NUM_THREADS(1) + ONE_THREAD = 1 + CALL OMP_SET_NUM_THREADS(ONE_THREAD) #endif CALL SERRST( 'SST', NOUT ) #if defined(_OPENMP) diff --git a/TESTING/EIG/zchkee.F b/TESTING/EIG/zchkee.F index 5869e29130..b14127553b 100644 --- a/TESTING/EIG/zchkee.F +++ b/TESTING/EIG/zchkee.F @@ -1072,7 +1072,8 @@ PROGRAM ZCHKEE CHARACTER*80 LINE INTEGER I, I1, IC, INFO, ITMP, K, LENP, MAXTYP, NEWSD, $ NK, NN, NPARMS, NRHS, NTYPES, - $ VERS_MAJOR, VERS_MINOR, VERS_PATCH, N_THREADS + $ VERS_MAJOR, VERS_MINOR, VERS_PATCH + INTEGER*4 N_THREADS, ONE_THREAD DOUBLE PRECISION EPS, S1, S2, THRESH, THRSHN * .. * .. Local Arrays .. @@ -1869,7 +1870,8 @@ PROGRAM ZCHKEE IF( TSTERR ) THEN #if defined(_OPENMP) N_THREADS = OMP_GET_MAX_THREADS() - CALL OMP_SET_NUM_THREADS(1) + ONE_THREAD = 1 + CALL OMP_SET_NUM_THREADS(ONE_THREAD) #endif CALL ZERRST( 'ZST', NOUT ) #if defined(_OPENMP) @@ -2334,7 +2336,8 @@ PROGRAM ZCHKEE IF( TSTERR ) THEN #if defined(_OPENMP) N_THREADS = OMP_GET_MAX_THREADS() - CALL OMP_SET_NUM_THREADS(1) + ONE_THREAD = 1 + CALL OMP_SET_NUM_THREADS(ONE_THREAD) #endif CALL ZERRST( 'ZHB', NOUT ) #if defined(_OPENMP)