fixes for QG

Author: AndreyAPopov

tests/+problemtests/validateqg.m

@@ -2,7 +2,7 @@
 
 fprintf(' Testing Quasi-Geostrophic Equations\n');
 
-model = otp.quasigeostrophic.presets.PopovMouIliescuSandu('Nx', 16, 'Ny', 32);
+model = otp.quasigeostrophic.presets.PopovMouSanduIliescu('Nx', 16, 'Ny', 32);
 model.TimeSpan = [0, 0.109];
 
 [~] = otp.utils.Solver.Nonstiff(model.RHSADLES.F, model.TimeSpan, model.Y0);

toolbox/+otp/+quasigeostrophic/+presets/Canonical.m

@@ -26,32 +26,7 @@
             %    - ``ADLambda`` – Scaling factor for approximate deconvolution RHS 
             %    - ``ADPasses`` – Number of AD passes
             %
-
-            Re = 450;
-            Ro = 0.0036;
-            
-            p = inputParser;
-            addParameter(p, 'ReynoldsNumber', Re);
-            addParameter(p, 'RossbyNumber', Ro);
-            addParameter(p, 'Size', [255, 511]);
-
-            parse(p, varargin{:});
-            
-            s = p.Results;
-            
-            nx = s.Size(1);
-            ny = s.Size(2);
-            
-            params = otp.quasigeostrophic.QuasiGeostrophicParameters;
-            params.Nx = nx;
-            params.Ny = ny;
-            params.ReynoldsNumber = s.ReynoldsNumber;
-            params.RossbyNumber   = s.RossbyNumber;
-            params.ADLambda = 1;
-            params.ADPasses = 4;
 
-            %% Do the rest
-            tspan = [0, 100];
             params = otp.quasigeostrophic.QuasiGeostrophicParameters( ...
                 'Nx', 255, ...
                 'Ny', 511, ...
@@ -60,6 +35,9 @@
                 'ADLambda', 1, ...
                 'ADPasses', 4, ...
                 varargin{:});
+            
+            %% Do the rest
+            tspan = [0, 100];
             psi0 = zeros(params.Nx * params.Ny, 1);
             obj = [email protected](tspan, psi0, params);
         end