Skip to content

Commit 65dd1d7

Browse files
author
Roberto Di Remigio
committed
Merge branch 'diagonal_integrators' of repo.ctcc.no:pcmsolver into diagonal_integrators
Conflicts: cmake/testing/TestingMacros.cmake src/bi_operators/CollocationIntegrator.cpp src/bi_operators/NumericalIntegrator.cpp src/bi_operators/PurisimaIntegrator.cpp src/green/MetalNP.hpp src/utils/MathUtils.hpp tests/green/CMakeLists.txt tests/numerical_quadrature/CMakeLists.txt tests/numerical_quadrature/numerical_quadrature.cpp
2 parents eacd5ee + 7dbf388 commit 65dd1d7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+3942
-656
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ add_external(libgetkw "" "${GetkwCMakeArgs}")
139139
if(BUILD_CUSTOM_BOOST)
140140
add_dependencies(libgetkw custom_boost)
141141
endif()
142-
set(INST_LIBDIR ${EXTERNAL_PROJECT_INSTALL_PREFIX}/share/libgetkw)
142+
set(GETKW_PYTHON_DIR ${EXTERNAL_PROJECT_INSTALL_PREFIX}/lib/python2.7/site-packages)
143143

144144
set(TaylorCMakeArgs
145145
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}

doc/Doxyfile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1338,7 +1338,7 @@ PAPER_TYPE = a4wide
13381338
# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
13391339
# packages that should be included in the LaTeX output.
13401340

1341-
EXTRA_PACKAGES =
1341+
EXTRA_PACKAGES = "@CMAKE_SOURCE_DIR@/doc/pcmsolver.sty"
13421342

13431343
# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
13441344
# the generated latex document. The header should contain everything until

doc/pcmsolver.sty

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
\NeedsTeXFormat{LaTeX2e}
2+
\ProvidesPackage{pcmsolver}
3+
\RequirePackage{calc}
4+
\RequirePackage{array}
5+
6+
\RequirePackage[utf8]{inputenc}
7+
\RequirePackage[scaled]{beramono}
8+
\RequirePackage[T1]{fontenc}
9+
\RequirePackage{garamondx}
10+
\RequirePackage[garamondx,cmbraces]{newtxmath}
11+
\linespread{1.05}
12+
\RequirePackage[english]{babel}
13+
\RequirePackage{verbatim}
14+
\RequirePackage{amstext}
15+
\RequirePackage{amssymb}
16+
\RequirePackage{bm}
17+
\RequirePackage{empheq}
18+
\RequirePackage{mathtools}
19+
\RequirePackage{textcomp}
20+
\RequirePackage{pdfcolmk}
21+
\RequirePackage[big]{layaureo}
22+
23+
\newcommand*{\diff}{\mathop{}\!\mathrm{d}}
24+
\newcommand*{\deriv}[3][]{%
25+
\frac{\diff^{#1}#2}{\diff #3^{#1}}}
26+
\newcommand*{\pderiv}[3][]{%
27+
\frac{\partial^{#1}#2}%
28+
{\partial #3^{#1}}}
29+
\newcommand*{\commutator}[3][]{\left[ #2, #3 \right]^{#1}}
30+
\newcommand*{\anticommutator}[2]{%
31+
\left[ #1, #2 \right]_{+}}
32+
33+
\newcommand*{\diel}{\varepsilon}
34+
\newcommand*{\vect}[1]{\bm{#1}}
35+
\newcommand*{\mat}[1]{\bm{\mathcal{#1}}}

0 commit comments

Comments
 (0)