Skip to content
Permalink
Browse files

Merge branch 'walker' into develop

  • Loading branch information...
jbakosi committed Jul 9, 2019
2 parents fc436b2 + 7eac8e6 commit 411eb8815e92618c563881b784e287e2dd916f89
@@ -1,4 +1,4 @@
#rows cols constraints
* 1-2 # no constraint: smallest representable float
* 3-5 abs=0.02 # tolerance for mean velocity components
* 6-$ any rel=0.01 abs=0.03 # tolerance for Reynolds stress components
* 6-$ any rel=0.01 abs=0.04 # tolerance for Reynolds stress components
@@ -21,7 +21,7 @@ FROM alpine:latest

# Install system-wide prerequisites
RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && cat /etc/apk/repositories
RUN apk update && apk add patch libtool autoconf automake gfortran gcc g++ make boost-dev bash m4 file git cmake perl grep zlib-dev libexecinfo-dev ninja graphviz libelf-dev binutils-dev flex bison vim
RUN apk update && apk add patch libtool autoconf automake gfortran gcc g++ make boost-dev bash m4 file git cmake perl grep zlib-dev libexecinfo-dev ninja graphviz binutils-dev flex bison vim

# Install OpenMPI
ADD http://download.open-mpi.org/release/open-mpi/v3.1/openmpi-3.1.1.tar.gz /openmpi/
@@ -46,7 +46,7 @@ ENV EXECUTABLE $EXECUTABLE
RUN grep "^@ref $EXECUTABLE" build.dox -A2 | grep -v $EXECUTABLE | grep -v -e "^$" > submodule_update.sh
RUN cat submodule_update.sh
# Pull in submodules required for the executable
RUN cd quinoa && git submodule init && git submodule update && cd external && sh ../../submodule_update.sh && cd .. && git submodule status --recursive
RUN cd quinoa && git submodule init && git submodule update && cd external && sh ../../submodule_update.sh
# Build TPLs
RUN cd quinoa && mkdir -p external/build && cd external/build && cmake -D${EXECUTABLE^^}_ONLY=true -DCMAKE_BUILD_TYPE=Release .. && make -sj$(grep -c processor /proc/cpuinfo)
# Build code

0 comments on commit 411eb88

Please sign in to comment.
You can’t perform that action at this time.