add solvent in setup_s2_environment