Mercurial > repos > public > sbplib
changeset 889:f5e14e5986b5 feature/timesteppers
Remove getState from TimeStepper and derived classes
- Currently no need for that functionality. Remove it.
| author | Vidar Stiernström <vidar.stiernstrom@it.uu.se> |
|---|---|
| date | Thu, 15 Nov 2018 17:29:30 -0800 |
| parents | 8732d6bd9890 |
| children | d1c1615bd1a5 |
| files | +time/Cdiff.m +time/CdiffNonlin.m +time/CdiffTimeDep.m +time/Ode45.m +time/Rk4SecondOrderNonlin.m +time/Rungekutta4.m +time/Rungekutta4SecondOrder.m +time/SBPInTime.m +time/SBPInTimeSecondOrderForm.m +time/SBPInTimeSecondOrderFormImplicit.m +time/Timestepper.m |
| diffstat | 11 files changed, 0 insertions(+), 61 deletions(-) [+] |
line wrap: on
line diff
--- a/+time/Cdiff.m Thu Nov 15 17:10:01 2018 -0800 +++ b/+time/Cdiff.m Thu Nov 15 17:29:30 2018 -0800 @@ -43,10 +43,6 @@ t = obj.t; end - function state = getState(obj) - state = struct('v', obj.v, 'v_prev', obj.v_prev, 't', obj.t, 'k', obj.k); - end - function obj = step(obj) [obj.v, obj.v_prev] = time.cdiff.cdiff(obj.v, obj.v_prev, obj.k, obj.D, obj.E, obj.S); obj.t = obj.t + obj.k;
--- a/+time/CdiffNonlin.m Thu Nov 15 17:10:01 2018 -0800 +++ b/+time/CdiffNonlin.m Thu Nov 15 17:29:30 2018 -0800 @@ -50,12 +50,6 @@ t = obj.t; end - function state = getState(obj) - [v, t] = obj.getV(); - [vt] = obj.getVt(); - state = struct('v', v, 'vt', vt, 't', t, 'k', obj.k); - end - function obj = step(obj) D = obj.D(obj.v); E = obj.E(obj.v);
--- a/+time/CdiffTimeDep.m Thu Nov 15 17:10:01 2018 -0800 +++ b/+time/CdiffTimeDep.m Thu Nov 15 17:29:30 2018 -0800 @@ -42,10 +42,6 @@ t = obj.t; end - function state = getState(obj) - state = struct('v', obj.v, 'v_prev', obj.v_prev, 't', obj.t, 'k', obj.k); - end - function obj = step(obj) [obj.v, obj.v_prev] = time.cdiff.cdiff(obj.v, obj.v_prev, obj.k, obj.D, obj.E(obj.t), obj.S(obj.t)); obj.t = obj.t + obj.k;
--- a/+time/Ode45.m Thu Nov 15 17:10:01 2018 -0800 +++ b/+time/Ode45.m Thu Nov 15 17:29:30 2018 -0800 @@ -48,12 +48,6 @@ t = obj.t; end - function state = getState(obj) - [v, t] = obj.getV(); - [vt] = obj.getVt(); - state = struct('v', v, 'vt', vt, 't', t, 'k', obj.k); - end - function obj = step(obj) [t,w] = ode45(@(t,w)(obj.F(w,t)),[obj.t obj.t+obj.k],obj.w);
--- a/+time/Rk4SecondOrderNonlin.m Thu Nov 15 17:10:01 2018 -0800 +++ b/+time/Rk4SecondOrderNonlin.m Thu Nov 15 17:29:30 2018 -0800 @@ -60,12 +60,6 @@ t = obj.t; end - function state = getState(obj) - [v, t] = obj.getV(); - [vt] = obj.getVt(); - state = struct('v', v, 'vt', vt, 't', t, 'k', obj.k); - end - function obj = step(obj) obj.w = time.rk.rungekutta_4(obj.w, obj.t, obj.k, obj.F); obj.t = obj.t + obj.k;
--- a/+time/Rungekutta4.m Thu Nov 15 17:10:01 2018 -0800 +++ b/+time/Rungekutta4.m Thu Nov 15 17:29:30 2018 -0800 @@ -38,10 +38,6 @@ t = obj.t; end - function state = getState(obj) - state = struct('v', obj.v, 't', obj.t, 'k', obj.k); - end - function obj = step(obj) obj.v = time.rk.rungekutta_4(obj.v, obj.t, obj.k, obj.F); obj.t = obj.t + obj.k;
--- a/+time/Rungekutta4SecondOrder.m Thu Nov 15 17:10:01 2018 -0800 +++ b/+time/Rungekutta4SecondOrder.m Thu Nov 15 17:29:30 2018 -0800 @@ -98,12 +98,6 @@ t = obj.t; end - function state = getState(obj) - [v, t] = obj.getV(); - [vt] = obj.getVt(); - state = struct('v', v, 'vt', vt, 't', t, 'k', obj.k); - end - function obj = step(obj) obj.w = time.rk.rungekutta_4(obj.w, obj.t, obj.k, obj.F); obj.t = obj.t + obj.k;
--- a/+time/SBPInTime.m Thu Nov 15 17:10:01 2018 -0800 +++ b/+time/SBPInTime.m Thu Nov 15 17:29:30 2018 -0800 @@ -94,11 +94,6 @@ t = obj.t; end - function state = getState(obj) - [v, t] = getV(obj); - state = struct('v', v, 't', t, 'k', obj.k); - end - function obj = step(obj) obj.v = time.sbp.sbpintime(obj.v, obj.t, obj.nodes,... obj.penalty, obj.f, obj.blockSize,...
--- a/+time/SBPInTimeSecondOrderForm.m Thu Nov 15 17:10:01 2018 -0800 +++ b/+time/SBPInTimeSecondOrderForm.m Thu Nov 15 17:29:30 2018 -0800 @@ -58,12 +58,6 @@ t = obj.t; end - function state = getState(obj) - [v, t] = obj.getV(); - [vt] = obj.getVt(); - state = struct('v', v, 'vt', vt, 't', t, 'k', obj.k); - end - function obj = step(obj) obj.firstOrderTimeStepper.step(); obj.t = obj.firstOrderTimeStepper.t;
--- a/+time/SBPInTimeSecondOrderFormImplicit.m Thu Nov 15 17:10:01 2018 -0800 +++ b/+time/SBPInTimeSecondOrderFormImplicit.m Thu Nov 15 17:29:30 2018 -0800 @@ -77,12 +77,6 @@ t = obj.t; end - function state = getState(obj) - [v, t] = obj.getV(); - [vt] = obj.getVt(); - state = struct('v', v, 'vt', vt, 't', t, 'k', obj.k); - end - function obj = step(obj) obj.firstOrderTimeStepper.step(); obj.t = obj.firstOrderTimeStepper.t;
--- a/+time/Timestepper.m Thu Nov 15 17:10:01 2018 -0800 +++ b/+time/Timestepper.m Thu Nov 15 17:29:30 2018 -0800 @@ -3,19 +3,11 @@ t k n - % TBD: Decide on accessibility of properties. - % Properties that are not intended to be modified from the outside - % should ideally be made private and the specialized classes should be extended with - % getter functions for their relevant members, e.g v, t, k, etc. end methods (Abstract) % Returns the solution vector v at timestep t. - % TBD: Replace with getters for the separate members if the above suggestion is implemented? [v,t] = getV(obj) - % Returns struct holding relevant state properties for the specialized timestepper. - % E.g [v, t, k]. - state = getState(obj) obj = step(obj) end