Reimplementation of the non dimensional coefficients in parallel
Fixing conflicts