redo fluid lab

I need to make a good version of these two files of the same experiment within 12 hours ... don't need much 

and sample calc as well 

all what it needs rewritting and calc