Merge branch '3.0' into developer

This commit is contained in:
Dhanya Maliakal 2017-08-21 09:21:41 +02:00
commit 4dd7cafe32

View File

@ -98,7 +98,7 @@ New Features
------- -------
1. One can compile using cmake or the ./cmk.sh script(also uses cmake) 1. One can compile using cmake or the ./cmk.sh script(also uses cmake)
Run ./cmk.sh -help to get more info. This method does not touch the Run ./cmk.sh -help to get more info. This method does not touch the
source files. source files. Please start off with ./cmk.sh -bj9, where (9 is #cores+1)
2. One can compile the normal way using Makefile (editing Makefile.include 2. One can compile the normal way using Makefile (editing Makefile.include
for the hdf5 options), but this will modify other gitInfo files. for the hdf5 options), but this will modify other gitInfo files.