Mercurial > repos > public > sbplib

comparison +rv/ResidualViscosity.m @ 1164:fc2631ba4da5 feature/rv

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove unnecessary variable
author Vidar Stiernström <vidar.stiernstrom@it.uu.se>
date Thu, 27 Jun 2019 17:13:28 +0200
parents 856bd6291d17
children beecb580c5bf
comparison
equal deleted inserted replaced
1163:65a577db5ca0 1164:fc2631ba4da5
41 end 41 end
42 end 42 end
43 end 43 end
44 44
45 function viscosity = evaluateViscosity(obj, v, dvdt) 45 function viscosity = evaluateViscosity(obj, v, dvdt)
46 firstOrderViscosity = obj.Mfirst*abs(obj.waveSpeed(v)); 46 viscosity = min(obj.Mfirst*abs(obj.waveSpeed(v)), obj.fRes(v,dvdt));
47 viscosity = min(firstOrderViscosity, obj.fRes(v,dvdt));
48 end 47 end
49 48
50 function [viscosity, Df, firstOrderViscosity, residualViscosity] = evaluate(obj, v, dvdt) 49 function [viscosity, Df, firstOrderViscosity, residualViscosity] = evaluate(obj, v, dvdt)
51 Df = obj.Df(v); 50 Df = obj.Df(v);
52 firstOrderViscosity = obj.Mfirst*abs(obj.waveSpeed(v)); 51 firstOrderViscosity = obj.Mfirst*abs(obj.waveSpeed(v));