Commit ca865a33 authored by Santiago Ospina De Los Ríos's avatar Santiago Ospina De Los Ríos

Merge remote-tracking branch 'origin/master' into...

Merge remote-tracking branch 'origin/master' into 101-couple-the-transportsimulation-with-richardssimulation
parents c709708c 780b3d1f
......@@ -117,14 +117,14 @@ If you installed [Anaconda](https://conda.io/docs/user-guide/install/download.ht
apt update
apt install cmake doxygen gcc g++ gfortran \
git libatlas-base-dev libfftw3-dev libfftw3-mpi-dev \
libfreetype6-dev libhdf5-mpi-dev libopenmpi-dev libpng-dev \
libsuperlu-dev libyaml-cpp-dev libxft-dev \
python3-dev python3-pip
libfreetype6-dev libhdf5-mpi-dev libmuparser-dev \
libopenmpi-dev libpng-dev libsuperlu-dev libyaml-cpp-dev \
libxft-dev python3-dev python3-pip
**macOS:**
brew update
brew install cmake doxygen gcc libpng open-mpi \
brew install cmake doxygen gcc libpng open-mpi muparser \
pkg-config python3 superlu yaml-cpp
brew install hdf5 --with-mpi
brew install fftw --with-mpi
......
......@@ -14,7 +14,7 @@ RUN CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=${CC} -DCMAKE_CXX
./dune-common/bin/dunecontrol --only=dorie configure \
&& ./dune-common/bin/dunecontrol --only=dorie make -j ${PROCNUM} dorie-rfg dorie \
&& ./dune-common/bin/dunecontrol --only=dorie exec \
"rm build-cmake/dune/dorie/model/richards/impl/libdorie-impl.a build-cmake/dune/dorie/model/richards/impl/CMakeFiles/dorie-impl.dir/*.cc.o"
"rm build-cmake/dune/dorie/model/richards/impl/libdorie-richards.a build-cmake/dune/dorie/model/richards/impl/CMakeFiles/dorie-richards.dir/*.cc.o"
# move to working directory
WORKDIR /mnt
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment