Rename classes, merge fcts etc in Resample, especially in Flux computation

Merge request reports

Loading