Skip to content
Commit d92031f5 authored by Sven K's avatar Sven K
Browse files

Manual Merge branch 'toolkit2' of gitlab.lrz.de:exahype/ExaHyPE-Engine into toolkit2

Conflicted two solutions for #238, took mine.
parents e198ed21 749f18bc
Loading
Loading
Loading
Loading
Loading
  • Contributor

    Two changes I did and you unfortunately undid with your merge (should be easy to fix though):

    • Make sure you are using ValueError instead of JSONDecodeError(ValueError). Otherwise, the code requires python3 version>=3.5.0. This is a typical error message you get:

      controller.py:215(getSpec):ERROR Could not read specification file '../Euler_ADERDG.exahype':   'module' object has no attribute 'JSONDecodeError'
    • Make sure mexa.py is python3.

      I regex-replaced print (".+"\s*(%\s*\(.+\))?)$ with print(\1)

  • Ghost User @ghost

    mentioned in issue #242 (closed)

    ·

    mentioned in issue #242 (closed)

    Toggle commit list
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment