Further changes to the core for compatibility with gfortran - Darcy compiles but does not run yet - the other scenarios are not tested yet