Merged commit [7654] done in ORCHIDEE_3 into the trunk. This concerns cleaning in option OK_SOIL_CARBON_DISCRETIZATION. No change in resultas.