Skip to content

Commit

Permalink
Import latest updates (Nek5000#609)
Browse files Browse the repository at this point in the history
* Fix Nek5000#474
* Add cgns2nek
* Add blasLapack as 3rd party
* Add nekconfig
  • Loading branch information
stgeke authored Mar 31, 2019
1 parent c181c74 commit d4b02b8
Show file tree
Hide file tree
Showing 194 changed files with 37,544 additions and 40,458 deletions.
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env:
- TEST_CASE=Eddy_EddyUv::test_PnPn_Serial MPI=0 FC=gfortran CC=gcc

- TEST_CASE=Axi::test_PnPn_Parallel
- TEST_CASE=Axi::test_PnPn2_Parallel
# - TEST_CASE=Axi::test_PnPn2_Parallel

- TEST_CASE=FsHydro::test_PnPn2_Parallel

Expand Down Expand Up @@ -60,13 +60,16 @@ before_install:
- sudo apt-get update -qq
- sudo apt-get install -y libmpich-dev mpich

- sudo apt-get purge cmake

# Set up Python virtualenv
- virtualenv -p python2.7 $ROOT_DIR/python2-env
- source $ROOT_DIR/python2-env/bin/activate
- export PYTHONPATH="$ROOT_DIR/short_tests:$PYTHONPATH"

install:
- pip install --upgrade pip
- pip install --upgrade cmake
- pip install pytest

script:
Expand Down
17 changes: 17 additions & 0 deletions 3rd_party/blasLapack/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
AR = ar
SDIR = ./
ARFLAGS = -cr

.SUFFIXES: .f

SRC = $(wildcard $(SDIR)/*f)
OBJS = $(subst $(SDIR)/,$(SDIR),$(SRC:.f=.o))

.f.o:
$(FC) $(FFLAGS) -c $*.f

lib: $(OBJS)
$(AR) $(ARFLAGS) libblasLapack.a *.o

clean:
@rm -f libblasLapack.a *.o
43 changes: 43 additions & 0 deletions 3rd_party/blasLapack/dasum.f
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
double precision function dasum(n,dx,incx)
c
c takes the sum of the absolute values.
c jack dongarra, linpack, 3/11/78.
c modified 3/93 to return if incx .le. 0.
c modified 12/3/93, array(1) declarations changed to array(*)
c
double precision dx(*),dtemp
integer i,incx,m,mp1,n,nincx
c
dasum = 0.0d0
dtemp = 0.0d0
if( n.le.0 .or. incx.le.0 )return
if(incx.eq.1)go to 20
c
c code for increment not equal to 1
c
nincx = n*incx
do 10 i = 1,nincx,incx
dtemp = dtemp + dabs(dx(i))
10 continue
dasum = dtemp
return
c
c code for increment equal to 1
c
c
c clean-up loop
c
20 m = mod(n,6)
if( m .eq. 0 ) go to 40
do 30 i = 1,m
dtemp = dtemp + dabs(dx(i))
30 continue
if( n .lt. 6 ) go to 60
40 mp1 = m + 1
do 50 i = mp1,n,6
dtemp = dtemp + dabs(dx(i)) + dabs(dx(i + 1)) + dabs(dx(i + 2))
* + dabs(dx(i + 3)) + dabs(dx(i + 4)) + dabs(dx(i + 5))
50 continue
60 dasum = dtemp
return
end
48 changes: 48 additions & 0 deletions 3rd_party/blasLapack/daxpy.f
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
subroutine daxpy(n,da,dx,incx,dy,incy)
c
c constant times a vector plus a vector.
c uses unrolled loops for increments equal to one.
c jack dongarra, linpack, 3/11/78.
c modified 12/3/93, array(1) declarations changed to array(*)
c
double precision dx(*),dy(*),da
integer i,incx,incy,ix,iy,m,mp1,n
c
if(n.le.0)return
if (da .eq. 0.0d0) return
if(incx.eq.1.and.incy.eq.1)go to 20
c
c code for unequal increments or equal increments
c not equal to 1
c
ix = 1
iy = 1
if(incx.lt.0)ix = (-n+1)*incx + 1
if(incy.lt.0)iy = (-n+1)*incy + 1
do 10 i = 1,n
dy(iy) = dy(iy) + da*dx(ix)
ix = ix + incx
iy = iy + incy
10 continue
return
c
c code for both increments equal to 1
c
c
c clean-up loop
c
20 m = mod(n,4)
if( m .eq. 0 ) go to 40
do 30 i = 1,m
dy(i) = dy(i) + da*dx(i)
30 continue
if( n .lt. 4 ) return
40 mp1 = m + 1
do 50 i = mp1,n,4
dy(i) = dy(i) + da*dx(i)
dy(i + 1) = dy(i + 1) + da*dx(i + 1)
dy(i + 2) = dy(i + 2) + da*dx(i + 2)
dy(i + 3) = dy(i + 3) + da*dx(i + 3)
50 continue
return
end
Loading

0 comments on commit d4b02b8

Please sign in to comment.