Commit 2ffa8b42 authored by Robert Schweppe's avatar Robert Schweppe
Browse files

Merge remote-tracking branch 'remotes/origin/current_hotfix' into new_release

# Conflicts:
#	src_python/pre_proc/create_graphviz_plot.py
#	src_python/pre_proc/graphviz_dot2tex_template.tex
#	src_python/pre_proc/update_tfs_in_fortran_source.py
parents a7f934b7 117a5e11
Pipeline #24283 failed with stages
in 13 minutes and 49 seconds
......@@ -20,6 +20,13 @@ from textwrap import dedent
from src_python.pre_proc.mpr_interface import OPTIONS
import re
DOT2TEX_IS_AVAILABLE = True
try:
import dot2tex as d2t
except ImportError:
d2t = None
DOT2TEX_IS_AVAILABLE = False
DOT2TEX_IS_AVAILABLE = True
try:
import dot2tex as d2t
......@@ -32,6 +39,7 @@ OUTPUT_FILE_BASENAME = 'MPR_graphviz'
DOT2TEX_GUIDE_HTML = 'https://dot2tex.readthedocs.io/en/latest/installation_guide.html'
DEFAULT_PATH_TO_ROOT = '../../'
DEFAULT_CONFIG_FILE = 'predefined_nmls/mpr_mhm_visual.nml'
# DEFAULT_PARAM_FILE = 'mpr_global_parameter.nml' # NOT USED
DEFAULT_OUTPUT_FORMAT = 'pdf'
DEFAULT_ENGINE = 'dot'
# TODO: this is broken?
......
Supports Markdown
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