Merge branch 'master' into QG-Sylvester

AndreyAPopov · AndreyAPopov · commit 6c5709a145d7 · 2021-05-14T13:16:59.000-04:00
diff --git a/src/+otp/+cusp/fdiffusion.m b/src/+otp/+cusp/fdiffusion.m
@@ -1,4 +1,4 @@
-function du = fdiffusion(~, u, epsilon, L)
+function du = fdiffusion(~, u, ~, L)
 
 n = size(u, 1)/3;
 
diff --git a/src/+otp/+cusp/jacdiffusion.m b/src/+otp/+cusp/jacdiffusion.m
@@ -1,4 +1,4 @@
-function j = jacdiffusion(~, u, epsilon, L)
+function j = jacdiffusion(~, ~, ~, L)
 
 j = blkdiag(L, L, L);
 
diff --git a/src/+otp/+cusp/jacstiff.m b/src/+otp/+cusp/jacstiff.m
@@ -4,7 +4,6 @@
 
 y = u(1:n);
 a = u((n + 1):(2*n));
-b = u((2*n + 1):end);
 
 sparseZeros = sparse(n, n);
 
diff --git a/src/+otp/+lorenz63/Lorenz63Problem.m b/src/+otp/+lorenz63/Lorenz63Problem.m
@@ -26,7 +26,7 @@ function onSettingsChanged(obj)
                 otp.Rhs.FieldNames.Jacobian, @(t, y) otp.lorenz63.jac(t, y, sigma, rho, beta), ...
                 otp.Rhs.FieldNames.JacobianVectorProduct, @(t, y, v) otp.lorenz63.jvp(t, y, v, sigma, rho, beta), ...
                 otp.Rhs.FieldNames.JacobianAdjointVectorProduct, @(t, y, v) otp.lorenz63.javp(t, y, v, sigma, rho, beta), ...
-                otp.Rhs.FieldNames.JacobianParameters, @(t, y) otp.lorenz63.jacparams(t, y, sigma, rho, beta), ...
+                otp.Rhs.FieldNames.PartialDerivativeParameters, @(t, y) otp.lorenz63.pdparams(t, y, sigma, rho, beta), ...
                 otp.Rhs.FieldNames.HessianVectorProduct, @(t, y, u, v) otp.lorenz63.hvp(t, y, u, v, sigma, rho, beta), ...
                 otp.Rhs.FieldNames.HessianAdjointVectorProduct, @(t, y, u, v) otp.lorenz63.havp(t, y, u, v, sigma, rho, beta));
         end
diff --git a/src/+otp/+lorenz63/jacparams.m b/src/+otp/+lorenz63/jacparams.m
diff --git a/src/+otp/+lorenz63/pdparams.m b/src/+otp/+lorenz63/pdparams.m
@@ -0,0 +1,7 @@
+function Jp = pdparams(~, y, ~, ~, ~)
+
+% This will be the jacobian with respect to sigma, rho, and beta
+
+Jp = diag([y(2) - y(1), y(1), -y(3)]);
+
+end
diff --git a/src/+otp/+lorenz96/jact.m b/src/+otp/+lorenz96/jact.m
diff --git a/src/+otp/+qg/QuasiGeostrophicProblem.m b/src/+otp/+qg/QuasiGeostrophicProblem.m
@@ -185,11 +185,7 @@ function onSettingsChanged(obj)
                 otp.qg.jvp(psi, u, L, RdnL, PdnL, Ddx, Ddy, Re, Ro), ...
                 ...
                 otp.Rhs.FieldNames.JacobianAdjointVectorProduct, @(t, psi, u) ...
-                otp.qg.javp(psi, u, L, RdnL, PdnL, Ddx, Ddy, Re, Ro), ...
-                ...
-                otp.Rhs.FieldNames.JacobianTime, @(t, psi) ...
-                otp.qg.jact(psi, L, RdnL, PdnL, Ddx, Ddy, ymat, Re, Ro) ...
-                );
+                otp.qg.javp(psi, u, L, RdnL, PdnL, Ddx, Ddy, Re, Ro));
             
 
             % AD LES
diff --git a/src/+otp/+qg/jact.m b/src/+otp/+qg/jact.m
diff --git a/src/+otp/+quadratic/QuadraticProblem.m b/src/+otp/+quadratic/QuadraticProblem.m
@@ -1,9 +1,5 @@
 classdef QuadraticProblem < otp.Problem
     
-    properties
-        RhsClosure
-    end
-    
     methods
         function obj = QuadraticProblem(timeSpan, y0, parameters)
             obj@otp.Problem('Quadratic Problem', [], timeSpan, y0, parameters);
@@ -18,11 +14,9 @@ function onSettingsChanged(obj)
             
             obj.Rhs = otp.Rhs(@(t, x) otp.quadratic.f(t, x, a, B, C), ...
                 otp.Rhs.FieldNames.Jacobian, @(t, x) otp.quadratic.jac(t, x, a, B, C), ...
-                'JacobianParametera',  @(t, x) otp.quadratic.jacpara(t, x, a, B, C), ...
-                'JacobianParameterB',  @(t, x) otp.quadratic.jacparaB(t, x, a, B, C), ...
-                'JacobianParameterC',  @(t, x) otp.quadratic.jacparC(t, x, a, B, C));
-            
-            obj.RhsClosure = otp.Rhs(@(t, x, Btilde) otp.quadratic.fclosureB(t, x, a, B, C, Btilde));
+                'PartialDerivativea',  @(t, x) otp.quadratic.pda(t, x, a, B, C), ...
+                'PartialDerivativeB',  @(t, x) otp.quadratic.pdb(t, x, a, B, C), ...
+                'PartialDerivativeC',  @(t, x) otp.quadratic.pdc(t, x, a, B, C));
         end
         
         function validateNewState(obj, newTimeSpan, newY0, newParameters)
diff --git a/src/+otp/+quadratic/fclosureB.m b/src/+otp/+quadratic/fclosureB.m
diff --git a/src/+otp/+quadratic/jacpara.m b/src/+otp/+quadratic/jacpara.m
diff --git a/src/+otp/+quadratic/pda.m b/src/+otp/+quadratic/pda.m
@@ -0,0 +1,5 @@
+function ja = pda(~, ~, a, ~, ~)
+
+ja = speye(length(a));
+
+end
diff --git a/src/+otp/+quadratic/pdb.m b/src/+otp/+quadratic/pdb.m
@@ -1,4 +1,4 @@
-function jB = jacparB(~, y, ~, B, ~)
+function jB = pdb(~, y, ~, B, ~)
 
 r = size(B, 1);
 
diff --git a/src/+otp/+quadratic/pdc.m b/src/+otp/+quadratic/pdc.m
@@ -1,4 +1,4 @@
-function jC = jacparC(~, y, ~, ~, C)
+function jC = pdc(~, y, ~, ~, C)
 
 r = size(C, 1);
 
diff --git a/src/+otp/Rhs.m b/src/+otp/Rhs.m
@@ -18,8 +18,8 @@
             ... % other fields
             'JacobianVectorProduct',        'JacobianVectorProduct', ...
             'JacobianAdjointVectorProduct', 'JacobianAdjointVectorProduct', ...
-            'JacobianParameters',           'JacobianParameters', ...
-            'JacobianTime',                 'JacobianTime', ...
+            'PartialDerivativeParameters',  'PartialDerivativeParameters', ...
+            'PartialDerivativeTime',        'PartialDerivativeTime', ...
             'HessianVectorProduct',         'HessianVectorProduct', ...
             'HessianAdjointVectorProduct',  'HessianAdjointVectorProduct', ...
             'OnEvent',                      'OnEvent');

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-function du = fdiffusion(~, u, epsilon, L)`
	`1`	`+function du = fdiffusion(~, u, ~, L)`
`2`	`2`
`3`	`3`	`n = size(u, 1)/3;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-function j = jacdiffusion(~, u, epsilon, L)`
	`1`	`+function j = jacdiffusion(~, ~, ~, L)`
`2`	`2`
`3`	`3`	`j = blkdiag(L, L, L);`
`4`	`4`