Cleaned up some of the READ_FAT_MATRIX/READ_LONG_MATRIX definitions
Merge remote-tracking branch 'origin/ks_additive_schwarz' into ks_additive_schwarz