Enhance: avoid Intel VF compile error

Reformat code to avoid Intel Visual Fortran compile error. 72-column restriction. parameter redefinition...
Merge commit 'cd1c2'
CMake project