Skip to content
Snippets Groups Projects
Commit 232b607e authored by Dr. Felix Tobias Schindler's avatar Dr. Felix Tobias Schindler
Browse files

Merge remote-tracking branch 'origin/master' into refactor-operators

parents f122c39f 79a4ea7e
No related branches found
No related tags found
1 merge request!10Draft: consolidate refactoring work
......@@ -4,10 +4,10 @@
import os
import jinja2
from itertools import product
import urllib.request
template_url = 'https://raw.githubusercontent.com/dune-community/dune-xt-ci/master/xt_and_gdt_config_template.txt'
tpl = urllib.request.urlopen(template_url).read().decode('utf-8').replace('DUNE_XT_OR_DUNE_GDT', 'dune-gdt')
template_filename = '../shared/xt_and_gdt_config_template.txt'
with open(template_filename, 'r') as f:
tpl = f.read().replace('DUNE_XT_OR_DUNE_GDT', 'dune-gdt')
tpl = jinja2.Template(tpl)
images = ['debian-unstable_gcc_full', 'debian_gcc_full', 'debian_clang_full']
subdirs = ['gdt']
......
Subproject commit 3033fe7a9270cedbdf72275da69fda1d4ac97427
Subproject commit 99ef8e0c998013b4c1cb4f49c7b137a2d41afa6e
Subproject commit d469337152f3aa2fb253d1dbd86c56d8d71e8d0b
Subproject commit 194577ed77af3d15f11c898f00084c4b1458cd74
......@@ -15,7 +15,11 @@
# set up project
project("dune-gdt" CXX)
cmake_minimum_required(VERSION 3.1)
cmake_minimum_required(VERSION 3.13)
if("${TRAVIS}" EQUAL "1")
add_compile_options(-Werror)
endif()
if(NOT
(dune-common_DIR
......@@ -33,7 +37,6 @@ include(DuneMacros)
find_package(dune-xt REQUIRED)
list(APPEND CMAKE_MODULE_PATH "${dune-xt_MODULE_PATH}")
include(DuneUtils)
find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
add_subdirectory(${dune-xt_MODULE_PATH}/../../pybind11 ${CMAKE_CURRENT_BINARY_DIR}/pybind11)
# start a dune project with information from dune.module
......
......@@ -600,7 +600,7 @@ public:
/// temporaries (which we achieve since *this has the correct type here to select the correct add)
/// \{
LincombOperatorType operator*(const FieldType& alpha)final
LincombOperatorType operator*(const FieldType& alpha) final
{
return OperatorType::make_operator_mul(*this, alpha);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment