Solve merge conflicts for OMP implementation

src/cluster/cluster.cpp

src/include/Commons.h

src/include/Configuration.h

src/libnptm/Commons.cpp

src/libnptm/Configuration.cpp

src/libnptm/clu_subs.cpp

src/libnptm/sph_subs.cpp

src/make.inc

src/scripts/pycompare.py