* upstream-NLohmannJson:
  NLohmannJson 2017-02-25 (9ff0cc0f)

JSON For Modern C++ Upstream authored 8 years ago and Atkins, Charles Vernon committed 7 years ago

Code extracted from:

    https://github.com/nlohmann/json.git

at commit 9ff0cc0f0212cb1e85b83ce5d2907ba9531b6cae (v2.1.1).

Hdf5 updates

to read hdf directly

in Variable.h and VariableBase.h

Use the HDF5_C_INCLUDE_DIRS instead of HDF5_INCLUDE_DIRS

Allow json.hpp to be used with gcc 4.8.5

There are a few issues with this that prevent it from being accepted upstream but it's fine for how we use it.

Add asserts to disabled tests.

This will ensure that even if they are run they will fail

Add read validation to engine tests

Fixed a bug in CacheMan for cleaning variables after a time step is finished