Well the independent variable is the variable that you are changing so the water and oil could be them
The dependent variable is the one that you are observing so what are you testing? Are you trying to see how long it takes to settle back down?
The control would be the variables you keep the same. So, are they in the same glass, same temperature, same amount?