merged soil model .py files