Commit 1b21049f authored by Lukas Riedel's avatar Lukas Riedel

Merge branch '68-update-to-dune-v2-6' into 'master'

Resolve "Update to DUNE v2.6"

Closes #68

See merge request !53
parents 2971b6d1 9747a91a
variables:
DUNE_CONTROL_PATH: /opt/dune:$CI_PROJECT_DIR
DUNECONTROL: ./dune-common/bin/dunecontrol
CPUS_MULTICORE: 7
CPUS_MULTICORE: 4
CPUS_DIND: 3
DOCKER_LOGIN:
docker login -u $DOCKER_HUB_USER -p $DOCKER_HUB_PW
DUNE_ENV_IMAGE:
dorie/dune-env:2.5.1
dorie/dune-env:2.6
CMAKE_FLAGS:
-DDUNE_PYTHON_VIRTUALENV_SETUP=True
-DDUNE_PYTHON_ALLOW_GET_PIP=True
......@@ -25,7 +25,7 @@ stages:
- test
- deploy
setup:dune-env:
setup:dune-env: &setup
stage: setup
only:
- web # activate through 'Run pipeline' only.
......@@ -39,25 +39,21 @@ setup:dune-env:
before_script:
- $DOCKER_LOGIN
script:
- docker build --build-arg PROCNUM=$CPUS_DIND -f dockerfiles/dune-env -t $DUNE_ENV_IMAGE .
- docker build -f docker/dune-env.dockerfile
--build-arg DUNE_ENV_IMAGE=$DUNE_ENV_IMAGE --build-arg PROCNUM=$CPUS_DIND
-t $DUNE_ENV_IMAGE .
- docker push $DUNE_ENV_IMAGE
prep:update-dune:
<<: *setup
stage: prep
only:
- master
- tags
tags:
- dind
image: docker:stable
services:
- docker:dind
variables:
DOCKER_DRIVER: overlay2
before_script:
- $DOCKER_LOGIN
script:
- docker build --build-arg PROCNUM=$CPUS_DIND -f dockerfiles/dune-env-update -t $DUNE_ENV_IMAGE .
- docker build -f docker/dune-env-update.dockerfile
--build-arg DUNE_ENV_IMAGE=$DUNE_ENV_IMAGE --build-arg PROCNUM=$CPUS_DIND
-t $DUNE_ENV_IMAGE .
- docker push $DUNE_ENV_IMAGE
build:main:
......@@ -79,19 +75,16 @@ build:main:
build:debug:
stage: build
allow_failure: true
tags:
- multicore
script:
- CMAKE_FLAGS="
$CMAKE_FLAGS
-DCMAKE_BUILD_TYPE=Debug
-DCMAKE_CXX_FLAGS_DEBUG='-Werror'"
MAKE_FLAGS="$MAKE_FLAGS"
$DUNECONTROL --only=dorie all
$DUNECONTROL --only=dorie configure
- MAKE_FLAGS="$MAKE_FLAGS"
$DUNECONTROL --only=dorie make build_tests
$DUNECONTROL --only=dorie make dorie_mass_conservation
test:exec_cmds:
test:exec_cmds: &test
stage: test
dependencies:
- build:main
......@@ -105,60 +98,30 @@ test:exec_cmds:
expire_in: 1 day
test:ode:
stage: test
dependencies:
- build:main
<<: *test
script:
- $DUNECONTROL --only=dorie configure
- $DUNECONTROL --only=dorie make test_run_ode
artifacts:
name: "$CI_JOB_NAME"
paths:
- $CI_PROJECT_DIR/build-cmake/Testing
expire_in: 1 day
test:parallel:
stage: test
dependencies:
- build:main
tags:
- multicore
<<: *test
script:
- $DUNECONTROL --only=dorie configure
- $DUNECONTROL --only=dorie make test_run_parallel
artifacts:
name: "$CI_JOB_NAME"
paths:
- $CI_PROJECT_DIR/build-cmake/Testing
expire_in: 1 day
test:reference:
stage: test
dependencies:
- build:main
<<: *test
script:
- $DUNECONTROL --only=dorie configure
- $DUNECONTROL --only=dorie make test_run_ref
artifacts:
name: "$CI_JOB_NAME"
paths:
- $CI_PROJECT_DIR/build-cmake/Testing
expire_in: 1 day
test:mass_conserve:
stage: test
dependencies:
- build:main
<<: *test
script:
- $DUNECONTROL --only=dorie configure
- $DUNECONTROL --only=dorie make test_mass_conservation
artifacts:
name: "$CI_JOB_NAME"
paths:
- $CI_PROJECT_DIR/build-cmake/Testing
expire_in: 1 day
deploy:dockerhub-devel:
deploy:dockerhub-devel: &deploy
stage: deploy
only:
- master@dorie/dorie
......@@ -172,22 +135,17 @@ deploy:dockerhub-devel:
before_script:
- $DOCKER_LOGIN
script:
- docker build --build-arg PROCNUM=$CPUS_DIND -f dockerfiles/dorie -t dorie/dorie:devel .
- docker build -f docker/dorie.dockerfile
--build-arg DUNE_ENV_IMAGE=$DUNE_ENV_IMAGE --build-arg PROCNUM=$CPUS_DIND
-t dorie/dorie:devel .
- docker push dorie/dorie:devel
deploy:dockerhub-stable:
stage: deploy
<<: *deploy
only:
- tags@dorie/dorie
tags:
- dind
image: docker:stable
services:
- docker:dind
variables:
DOCKER_DRIVER: overlay2
before_script:
- $DOCKER_LOGIN
script:
- docker build --build-arg PROCNUM=$CPUS_DIND -f dockerfiles/dorie -t dorie/dorie:$CI_COMMIT_TAG .
- docker build -f docker/dorie.dockerfile
--build-arg DUNE_ENV_IMAGE=$DUNE_ENV_IMAGE --build-arg PROCNUM=$CPUS_DIND
-t dorie/dorie:$CI_COMMIT_TAG .
- docker push dorie/dorie:$CI_COMMIT_TAG
......@@ -8,6 +8,9 @@
* Automatic update of the DUNE environment Docker Image for `master` builds
### Changed
* Update code base to DUNE v2.6
* Raise software requirements to versions available on Ubuntu 18.04 LTS
(Bionic Beaver)
* Switch VTK output from conforming to non-conforming
### Fixed
......
# Welcome to DORiE!
(__D__UNE-__O__perated __Ri__chards equation solving __E__nvironment)
| Current Release | Current `master` |
| :-------------: | :--------------: |
| N/A | [![pipeline status](https://ts-gitlab.iup.uni-heidelberg.de/dorie/dorie/badges/master/pipeline.svg)](https://ts-gitlab.iup.uni-heidelberg.de/dorie/dorie/commits/master) |
DORiE is a software suite for solving Richard's Equation. The core feature is a C++ PDE-solver powered by [DUNE](https://dune-project.org/) and the [DUNE-PDELab](https://dune-project.org/modules/dune-pdelab/) module. It implements a Discontinous Galerkin (DG) discretization scheme on structured rectangular / cubic and unstructured simplex grids in two and three spatial dimensions, and makes use of advanced features like adaptive grid refinement.
The suite encapsulates a documentation and various tools for program setup, program testing, and output analysis, which are mostly written in Python.
......@@ -25,7 +21,7 @@ This setup is intended for users who simply want to start computations with DORi
Install Docker on your machine. Then, use `git clone` to download the DORiE repository into a suitable directory on your machine. Enter the directory, and call
docker build -t dorie .
docker build -f docker/dorie.dockerfile -t dorie .
Docker will use a prepared image from Dockerhub and install DORiE into it. You can now call DORiE via the Docker deamon from any directory `dir` on your machine:
......@@ -43,29 +39,33 @@ Installing all packages manually can be quite an effort, but useful for develope
Whenever possible, dependencies should be installed using a package manager, like [APT](https://wiki.ubuntuusers.de/APT/) on Ubuntu or [Homebrew](http://brew.sh/) on Mac. Manual installation on a Windows environment is strongly discouraged!
### Dependencies
Depending on your system configuration, there will be more packages necessary to install DORiE on your machine. See the step-by-step manual for further details.
Depending on your system configuration, there will be more packages necessary to
install DORiE on your machine. See the step-by-step manual for further details.
The specified versions are the _supported_ ones, where compatibility is ensured
by CI tests.
| Software | Version/Branch | Comments |
| ---------| -------------- | -------- |
| CMake | >= 2.8.12 |
| GCC | >= 5 | Alternatively: LLVM Clang >=6
| CMake | 3.10.2 |
| GCC | 7.3 | Alternatively: LLVM Clang >=6
| git |
| pkg-config |
| HDF5 | | with MPI support
| FFTW3 | | with MPI support
| Python | 3.x |
| pip | 3.x |
| MPI | | Tested with OpenMPI
| SuperLU | 4.3 or 5.x |
| [dune-common](https://gitlab.dune-project.org/core/dune-common) | releases/2.5
| [dune-geometry](https://gitlab.dune-project.org/core/dune-geometry) | releases/2.5
| [dune-grid](https://gitlab.dune-project.org/core/dune-grid) | releases/2.5
| [dune-uggrid](https://gitlab.dune-project.org/staging/dune-uggrid) | releases/2.5
| [dune-istl](https://gitlab.dune-project.org/core/dune-istl) | releases/2.5
| [dune-localfunctions](https://gitlab.dune-project.org/core/dune-localfunctions) | releases/2.5
| [dune-functions](https://gitlab.dune-project.org/staging/dune-functions) | releases/2.5
| [dune-typetree](https://gitlab.dune-project.org/staging/dune-typetree) | releases/2.5
| [dune-pdelab](https://gitlab.dune-project.org/pdelab/dune-pdelab) | releases/2.5
| HDF5 | 1.10 | with MPI support
| FFTW3 | 3.3.7 | with MPI support
| Python | 3.6 |
| pip | 3.6 |
| MPI | | Tested with OpenMPI 2.1.1
| SuperLU | 5.2 |
| [dune-common](https://gitlab.dune-project.org/core/dune-common) | releases/2.6
| [dune-geometry](https://gitlab.dune-project.org/core/dune-geometry) | releases/2.6
| [dune-grid](https://gitlab.dune-project.org/core/dune-grid) | releases/2.6
| [dune-uggrid](https://gitlab.dune-project.org/staging/dune-uggrid) | releases/2.6
| [dune-istl](https://gitlab.dune-project.org/core/dune-istl) | releases/2.6
| [dune-localfunctions](https://gitlab.dune-project.org/core/dune-localfunctions) | releases/2.6
| [dune-functions](https://gitlab.dune-project.org/staging/dune-functions) | releases/2.6
| [dune-typetree](https://gitlab.dune-project.org/staging/dune-typetree) | releases/2.6
| [dune-pdelab](https://gitlab.dune-project.org/pdelab/dune-pdelab) | releases/2.6
| [dune-randomfield](https://gitlab.dune-project.org/oklein/dune-randomfield) | master
......@@ -73,17 +73,17 @@ Depending on your system configuration, there will be more packages necessary to
| Software | Version/Branch | Comments |
| ---------| -------------- | -------- |
| [dune-testtools](https://gitlab.dune-project.org/quality/dune-testtools) | master | Handles system tests
| [doxygen](http://www.stack.nl/~dimitri/doxygen/) | | Builds documentation
| [doxygen](http://www.stack.nl/~dimitri/doxygen/) | 1.8.13 | Builds documentation
| [METIS](http://glaros.dtc.umn.edu/gkhome/views/metis) | 5 | For parallel runs
| [ParMETIS](http://glaros.dtc.umn.edu/gkhome/views/metis) | 4 | For parallel runs
### Step-by-step Instructions
These instructions are suitable for a clean **Ubuntu** or **Mac OS X** setup. The main difference between the two systems is the package manager. Debian-based systems have the APT manager already built in. On Mac, we recommend installing [Homebrew](http://brew.sh/). If you prefer to use [MacPorts](https://www.macports.org/), you need to check if some of the packages require different installation options than displayed here.
These instructions are suitable for a clean **Ubuntu** or **macOS** setup. The main difference between the two systems is the package manager. Debian-based systems have the APT manager already built in. On Mac, we recommend installing [Homebrew](http://brew.sh/). If you prefer to use [MacPorts](https://www.macports.org/), you need to check if some of the packages require different installation options than displayed here.
If you installed [Anaconda](https://conda.io/docs/user-guide/install/download.html) on your machine, you don't need to install Python or Pip. Simply skip these packages when using the package managers for installing the software. However, notice the warnings when compiling DORiE below!
1. **Mac OS X** users need to start by installing the Apple Command Line Tools by executing
1. **macOS** users need to start by installing the Apple Command Line Tools by executing
xcode-select --install
......@@ -92,12 +92,12 @@ If you installed [Anaconda](https://conda.io/docs/user-guide/install/download.ht
**Ubuntu:**
apt update
apt install cmake doxygen gcc-5 g++-5 gfortran-5 \
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 libxft-dev python3-dev python3-pip
**Mac OS X:**
**macOS:**
brew update
brew install cmake doxygen gcc libpng open-mpi \
......@@ -111,7 +111,7 @@ If you installed [Anaconda](https://conda.io/docs/user-guide/install/download.ht
apt install libmetis-dev libparmetis-dev
**Mac OS X:** _Support is dropped because ParMETIS is currently unavailable from Homebrew._
**macOS:** _Support is dropped because ParMETIS is currently unavailable from Homebrew._
**Parallel runs without these two packages are possible but not supported!**
......@@ -156,14 +156,6 @@ The following software packages are cross-platform, so you should be able to fin
# Usage
## Start an interactive Docker session
In case you built DORiE using `docker build` and want to start an interactive session, e.g. to build the documentation or do some debugging, you can do so by specifying a custom entrypoint for the container:
docker run -i -t --entrypoint=/bin/bash -v <dir>:/sim dorie
This way, an interactive bash session inside the container will be started (instead of directly running DORiE). Note that DUNE and DORiE are located in `/opt/dune`.
## Documentation
The documentation of the current `master` branch can be found [online](http://dorie-docs.gitballoon.com) (password: `richards`).
......@@ -211,6 +203,15 @@ or
dorie <command> --help
## Start an interactive Docker session
In case you built DORiE using `docker build` and want to start an interactive session, e.g. to build the documentation or do some debugging, you can do so by specifying a custom entrypoint for the container:
docker run -i -t --entrypoint=/bin/bash -v <dir>:/sim dorie
This way, an interactive bash session inside the container will be started (instead of directly running DORiE). Note that DUNE and DORiE are located in `/opt/dune`.
## Troubleshooting
CMake heavily caches the results of its configuration process. In case you encounter errors or strange behavior, especially after an update, you should delete the DORiE build folder (called `build-cmake` by default) and re-install DORiE using `dunecontrol`.
......
FROM dorie/dune-env:2.5.1
ARG DUNE_ENV_IMAGE=dorie/dune-env
FROM $DUNE_ENV_IMAGE
LABEL maintainer="lriedel@iup.uni-heidelberg.de"
# number of cores for parallel builds
ARG PROCNUM=1
......
FROM dorie/dune-env:2.5.1
ARG DUNE_ENV_IMAGE=dorie/dune-env
FROM $DUNE_ENV_IMAGE
LABEL maintainer="lriedel@iup.uni-heidelberg.de"
# number of cores for parallel builds
ARG PROCNUM=1
......
......@@ -31,16 +31,16 @@ RUN rm -rf /var/lib/apt/lists/* \
ENV LANG en_US.utf8
WORKDIR /opt/dune
RUN git clone https://gitlab.dune-project.org/staging/dune-uggrid.git -b releases/2.5 \
RUN git clone https://gitlab.dune-project.org/staging/dune-uggrid.git -b releases/2.6 \
&& git clone https://gitlab.dune-project.org/oklein/dune-randomfield.git -b master \
&& git clone https://gitlab.dune-project.org/core/dune-common.git -b releases/2.5 \
&& git clone https://gitlab.dune-project.org/core/dune-geometry.git -b releases/2.5 \
&& git clone https://gitlab.dune-project.org/core/dune-grid.git -b releases/2.5 \
&& git clone https://gitlab.dune-project.org/core/dune-istl.git -b releases/2.5 \
&& git clone https://gitlab.dune-project.org/core/dune-localfunctions.git -b releases/2.5 \
&& git clone https://gitlab.dune-project.org/staging/dune-functions.git -b releases/2.5 \
&& git clone https://gitlab.dune-project.org/pdelab/dune-pdelab.git -b releases/2.5 \
&& git clone https://gitlab.dune-project.org/staging/dune-typetree.git -b releases/2.5 \
&& git clone https://gitlab.dune-project.org/core/dune-common.git -b releases/2.6 \
&& git clone https://gitlab.dune-project.org/core/dune-geometry.git -b releases/2.6 \
&& git clone https://gitlab.dune-project.org/core/dune-grid.git -b releases/2.6 \
&& git clone https://gitlab.dune-project.org/core/dune-istl.git -b releases/2.6 \
&& git clone https://gitlab.dune-project.org/core/dune-localfunctions.git -b releases/2.6 \
&& git clone https://gitlab.dune-project.org/staging/dune-functions.git -b releases/2.6 \
&& git clone https://gitlab.dune-project.org/pdelab/dune-pdelab.git -b releases/2.6 \
&& git clone https://gitlab.dune-project.org/staging/dune-typetree.git -b releases/2.6 \
&& git clone https://gitlab.dune-project.org/quality/dune-testtools.git -b master
WORKDIR /opt/dune
......
......@@ -48,7 +48,7 @@ private:
/// Solution vector type
using U0 = Dune::PDELab::Backend::Vector<AGFS,RF>;
/// Matrix backend type
using MBE = Dune::PDELab::istl::BCRSMatrixBackend<RF>;
using MBE = Dune::PDELab::ISTL::BCRSMatrixBackend<>;
/// Grid operator for Error LOP
using ESTGO = Dune::PDELab::GridOperator<GFS,AGFS,ESTLOP,MBE,RF,RF,RF,NoTrafo,NoTrafo>;
......
......@@ -55,7 +55,7 @@ protected:
// -- DUNE Class Defintions -- //
/// Matrix backend type
using MBE = Dune::PDELab::istl::BCRSMatrixBackend<>;
using MBE = Dune::PDELab::ISTL::BCRSMatrixBackend<>;
/// Grid operator for spatial LOP
using GO0 = Dune::PDELab::GridOperator<GFS,GFS,SLOP,MBE,RF,RF,RF,CC,CC>;
/// Grid operator for temporal LOP
......
......@@ -55,7 +55,7 @@ public:
using CON = Dune::PDELab::P0ParallelConstraints;
/// GFS type
using Type = typename Dune::PDELab::GridFunctionSpace<ES,FEM,CON,
Dune::PDELab::istl::VectorBackend<Dune::PDELab::istl::Blocking::fixed>>;
Dune::PDELab::ISTL::VectorBackend<Dune::PDELab::ISTL::Blocking::fixed, 1>>;
/// GFS Constraints Container type
using CC = typename Type::template ConstraintsContainer<RF>::Type;
......@@ -63,9 +63,7 @@ public:
static Type create (const GridView& gv)
{
ES es(gv);
Dune::GeometryType geo;
geo.makeSimplex(dim);
auto fem = std::make_shared<FEM>(geo);
auto fem = std::make_shared<FEM>(Dune::GeometryTypes::simplex(dim));
auto con = std::make_shared<CON>();
return Type(es,fem,con);
}
......@@ -88,7 +86,7 @@ public:
using CON = Dune::PDELab::P0ParallelConstraints;
/// GFS type
using Type = typename Dune::PDELab::GridFunctionSpace<ES,FEM,CON,
Dune::PDELab::istl::VectorBackend<Dune::PDELab::istl::Blocking::fixed> >;
Dune::PDELab::ISTL::VectorBackend<Dune::PDELab::ISTL::Blocking::fixed, 1>>;
/// GFS Constraints Container type
using CC = typename Type::template ConstraintsContainer<RF>::Type;
......@@ -96,9 +94,7 @@ public:
static Type create (const GridView& gv)
{
ES es(gv);
Dune::GeometryType geo;
geo.makeCube(dim);
auto fem = std::make_shared<FEM>(geo);
auto fem = std::make_shared<FEM>(Dune::GeometryTypes::cube(dim));
auto con = std::make_shared<CON>();
return Type(es,fem,con);
}
......@@ -128,7 +124,12 @@ public:
using CON = Dune::PDELab::P0ParallelConstraints;
/// GFS type
using Type = typename Dune::PDELab::GridFunctionSpace<ES,FEM,CON,
Dune::PDELab::istl::VectorBackend<Dune::PDELab::istl::Blocking::fixed>>;
Dune::PDELab::ISTL::VectorBackend<
Dune::PDELab::ISTL::Blocking::fixed,
Dune::PB::pk_size(order, dim)
>
>;
/// GFS Constraints Container type
using CC = typename Type::template ConstraintsContainer<RF>::Type;
......@@ -159,7 +160,8 @@ public:
using CON = Dune::PDELab::P0ParallelConstraints;
/// GFS type
using Type = typename Dune::PDELab::GridFunctionSpace<ES,FEM,CON,
Dune::PDELab::istl::VectorBackend<Dune::PDELab::istl::Blocking::fixed> >;
Dune::PDELab::ISTL::VectorBackend<Dune::PDELab::ISTL::Blocking::fixed, 1>
>;
/// GFS Constraints Container type
using CC = typename Type::template ConstraintsContainer<RF>::Type;
......
......@@ -3,7 +3,9 @@
#define DUNE_DORIE_RICHARDS_OPERATOR_HH
#include<dune/geometry/referenceelements.hh>
#include<dune/pdelab/common/referenceelements.hh>
#include <dune/grid/common/mcmgmapper.hh>
#include<dune/pdelab/common/quadraturerules.hh>
#include<dune/pdelab/localoperator/pattern.hh>
#include<dune/pdelab/localoperator/flags.hh>
......@@ -137,7 +139,7 @@ protected:
typedef typename FEM::Traits::FiniteElementType::Traits::LocalBasisType LocalBasisType;
typedef Dune::PDELab::LocalBasisCache<LocalBasisType> Cache;
using Mapper = Dune::MultipleCodimMultipleGeomTypeMapper<GridView,Dune::MCMGElementLayout>;
using Mapper = Dune::MultipleCodimMultipleGeomTypeMapper<GridView>;
const Parameter& param; //!< class providing equation parameters
const Boundary& boundary; //!< class providing boundary conditions
......@@ -190,7 +192,8 @@ public:
: Dune::PDELab::NumericalJacobianVolume<RichardsDGSpatialOperator<Traits,Parameter,Boundary,SourceTerm,FEM,adjoint> >(1.e-7),
Dune::PDELab::NumericalJacobianSkeleton<RichardsDGSpatialOperator<Traits,Parameter,Boundary,SourceTerm,FEM,adjoint> >(1.e-7),
Dune::PDELab::NumericalJacobianBoundary<RichardsDGSpatialOperator<Traits,Parameter,Boundary,SourceTerm,FEM,adjoint> >(1.e-7),
param(param_), boundary(boundary_), sourceTerm(sourceTerm_), method(method_), upwinding(upwinding_), weights(weights_), mapper(view_),
param(param_), boundary(boundary_), sourceTerm(sourceTerm_), method(method_), upwinding(upwinding_), weights(weights_),
mapper(view_, Dune::mcmgElementLayout()),
intorderadd(intorderadd_), quadrature_factor(quadrature_factor_),
penalty_factor(config.get<RF>("dg.penaltyFactor")),
time(0.0),
......
......@@ -2,7 +2,7 @@
#define DUNE_DORIE_ERROR_INDICATOR_HH
#include<dune/geometry/referenceelements.hh>
#include<dune/pdelab/common/referenceelements.hh>
#include<dune/pdelab/common/quadraturerules.hh>
#include<dune/pdelab/localoperator/pattern.hh>
#include<dune/pdelab/localoperator/flags.hh>
......
......@@ -4,7 +4,7 @@
#include <algorithm>
#include <dune/geometry/referenceelements.hh>
#include <dune/pdelab/common/referenceelements.hh>
#include <dune/pdelab/common/quadraturerules.hh>
#include <dune/pdelab/localoperator/pattern.hh>
#include <dune/pdelab/localoperator/flags.hh>
......
......@@ -19,7 +19,7 @@ adaptivity.useAdaptivity = false
grid.dimensions = {_dimension}
grid.initialLevel = 0
grid.gridType = rectangular
grid.cells = 40 40, 9 9 9 | expand dim
grid.cells = 40 40, 12 12 12 | expand dim
grid.extensions = 1 1, 1 1 1 | expand dim
boundary.file = "{_asset_path}/bcs/infiltration_2d.dat", "{_asset_path}/bcs/infiltration_3d.dat" | expand dim
......
......@@ -25,7 +25,7 @@ adaptivity.useAdaptivity = false
grid.dimensions = {_dimension}
grid.initialLevel = 0
grid.gridType = rectangular
grid.cells = 40 40, 9 9 9 | expand dim
grid.cells = 40 40, 12 12 12 | expand dim
grid.extensions = 1 1, 1 1 1 | expand dim
boundary.file = "{_asset_path}/bcs/infiltration_2d.dat", "{_asset_path}/bcs/infiltration_3d.dat" | expand dim
......
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