Move PhysicalConstants to utils

Author: Steven-Roberts

src/+otp/+bouncingball/+presets/Canonical.m

@@ -1,4 +1,4 @@
-classdef Canonical < csl.odetestproblems.bouncingball.presets.Simple
+classdef Canonical < otp.bouncingball.presets.Simple
     % [Name]
     %  Canonical
     %

src/+otp/+bouncingball/+presets/Parabola.m

@@ -15,7 +15,7 @@
     %
     methods
         function obj = Parabola
-            params.g = 9.80665;
+            params.g = otp.utils.PhysicalConstants.EarthGravity;
             params.groundFunction  = @(x) x^2;
             params.dgroundFunction = @(x) 2*x;
 

src/+otp/+bouncingball/+presets/RandomTerrain.m

@@ -11,14 +11,14 @@
     %
     methods
         function obj = RandomTerrain
-            params.g = 9.80665;
+            params.g = otp.utils.PhysicalConstants.EarthGravity;
 
             n = 1000;
 
             rng(6);
 
-            genf  = @(x) cos(x);
-            dgenf = @(x) sin(x);
+            genf  = @cos;
+            dgenf = @sin;
 
             magnitudes = 1/32*randn(n, 1);
             periods    = 0.9*randn(n, 1);

src/+otp/+bouncingball/+presets/Simple.m

@@ -14,7 +14,7 @@
     %
     methods
         function obj = Simple
-            params.g = 9.80665;
+            params.g = otp.utils.PhysicalConstants.EarthGravity;
             params.groundFunction  = @(x) 0;
             params.dgroundFunction = @(x) 0;
 

src/+otp/+nbody/+presets/SunEarth.m

@@ -1,7 +1,7 @@
 classdef SunEarth < otp.nbody.NBodyProblem
     methods
         function obj = SunEarth()
-            import otp.nbody.presets.PhysicalConstants
+            import otp.utils.PhysicalConstants
 
             params.spacialDim = 2;
             params.masses = [PhysicalConstants.SunMass; PhysicalConstants.EarthMass] / 1e24;
@@ -17,4 +17,4 @@
             obj = obj@otp.nbody.NBodyProblem(tspan, y0, params);
         end
     end
-end
+end

src/+otp/+nbody/+presets/SunEarthMoon.m

@@ -1,7 +1,7 @@
 classdef SunEarthMoon < otp.nbody.NBodyProblem
     methods
         function obj = SunEarthMoon()
-            import otp.nbody.presets.PhysicalConstants
+            import otp.utils.PhysicalConstants
 
             params.spacialDim = 2;
             params.masses = [PhysicalConstants.SunMass; PhysicalConstants.EarthMass; PhysicalConstants.MoonMass] / 1e24;
@@ -25,4 +25,4 @@
             obj = obj@otp.nbody.NBodyProblem(tspan, y0, params);
         end
     end
-end
+end

src/+otp/+nbody/NBodyProblem.m

@@ -26,7 +26,7 @@ function validateNewState(obj, newTimeSpan, newY0, newParameters)
         end
 
         function sol = internalSolve(obj, varargin)
-            sol = internalSolve@otp.Problem(obj, 'Method', @ode23t, varargin{:});
+            sol = internalSolve@otp.Problem(obj, 'Method', @ode45, varargin{:});
         end
 
         function mov = internalMovie(obj, t, y, varargin)

…+otp/+nbody/+presets/PhysicalConstants.m src/+otp/+utils/PhysicalConstants.msrc/+otp/+nbody/+presets/PhysicalConstants.m renamed to src/+otp/+utils/PhysicalConstants.m src/+otp/+nbody/+presets/PhysicalConstants.m renamed to src/+otp/+utils/PhysicalConstants.m

@@ -15,6 +15,8 @@
 
         SecondsPerDay = 86400; % s
         DaysPerYear = 365.25; % d
+        
+        EarthGravity = 9.80665;
     end
 
 end