What were the diplomatic and military options?

In History we learned that the alternatives to dropping the atomic bombs on Japan were military, political, and diplomatic options. The political option was to agree to something less than unconditional surrender, but I don't remember what the other two were. One was to wait until Russia joined the war and scared Japan into surrendering. Which one was that and what was the other one?