Resolved merge conflict

Author: Abhinab Bhattacharjee

master

@@ -31,7 +31,7 @@
 % naturetomodel = datools.observation.Linear(numel(nature0), 'H', speye(nvrs));
 naturetomodel = datools.observation.Indexed(numel(nature0), 'Indices', 1:nvrs);
 
-observeindicies = 1;
+observeindicies = 1:3;
 
 nobsvars = numel(observeindicies);
 
@@ -54,7 +54,7 @@
 % No localization
 localization = [];
 
-meth = datools.statistical.ensemble.SIR(model, ...
+meth = datools.statistical.ensemble.LETPF2(model, ...
     'ModelError', modelerror, ...
     'Observation', observation, ...
     'NumEnsemble', ensN, ...

src/+datools/+examples/l63.m

@@ -106,6 +106,7 @@
         %$localization = @(t, y, Hi, k) datools.tapering.gcCTilde(t, y, Hi, r, d, k);
         %localization = @(t, y, Hi, k) datools.tapering.cutoffCTilde(t, y, r, d, Hi, k);
 
+
         enkf = datools.statistical.ensemble.ETKF(model, ...
             'Observation', observation, ...
             'NumEnsemble', ensN, ...

src/+datools/+examples/l96_enkf.m

@@ -42,7 +42,7 @@ function analysis(obj, R, y)
 
             obj.Ensemble = xa;
             obj.Weights = ones(ensN, 1)/ensN;
-            obj.rejuvenate(tau);
+            obj.rejuvenate(tau, xf);
 
             obj.Model.update(0, obj.BestEstimate);
 

src/+datools/+statistical/+ensemble/ETPF.m

@@ -54,8 +54,8 @@ function analysis(obj, R, y)
 
             obj.Ensemble = xa;
             obj.Weights = ones(ensN, 1)/ensN;
-            obj.rejuvenate(tau);
 
+            obj.rejuvenate(tau, xf);
             obj.Model.update(0, obj.BestEstimate);
 
         end

src/+datools/+statistical/+ensemble/ETPF2.m

@@ -153,13 +153,13 @@ function scaleAnomalies(obj, scale)
 
         end
 
-        function rejuvenate(obj, tau)
+        function rejuvenate(obj, tau, Xf)
 
             X = obj.Ensemble;
             [n, ensN] = size(X);
 
             if n > ensN + 2
-                A = (X - mean(X, 2))/sqrt(ensN -1);
+                A = (Xf - mean(Xf, 2))/sqrt(ensN - 1);
                 vs = sqrt(sum(A.^2, 2));
 
                 Xi = sqrt(tau)*vs.*rand(n, ensN);
@@ -168,7 +168,7 @@ function rejuvenate(obj, tau)
                 X = X + Xi;
             else
                 P = sqrt(tau/(ensN - 1))*(eye(ensN) - ones(ensN)/ensN)*randn(ensN)*(eye(ensN) - ones(ensN)/ensN);
-                X = X + X*P;
+                X = X + Xf*P;
             end
 
             obj.Ensemble = X;

src/+datools/+statistical/+ensemble/EnF.m

@@ -165,7 +165,7 @@ function analysis(obj, R, y)
             % rejuvenation of this sort is not performed by default,
             % however it is included in this algorithm purely for
             % completeness
-            obj.rejuvenate(tau);
+            obj.rejuvenate(tau, xf);
 
             obj.Model.update(0, obj.BestEstimate);
 

src/+datools/+statistical/+ensemble/FETPF.m

@@ -51,7 +51,7 @@ function analysis(obj, R, y)
             end
 
             obj.Ensemble = X;
-            obj.rejuvenate(tau);
+            obj.rejuvenate(tau, xf);
 
             obj.Model.update(0, obj.BestEstimate);
 

src/+datools/+statistical/+ensemble/Hybrid.m

@@ -94,7 +94,7 @@ function analysis(obj, R, y)
 
             obj.Ensemble = xa;
             obj.Weights = ones(ensN, 1)/ensN;
-            obj.rejuvenate(tau);
+            obj.rejuvenate(tau, xf);
 
             obj.Model.update(0, obj.BestEstimate);
 

src/+datools/+statistical/+ensemble/LETPF.m

@@ -107,7 +107,7 @@ function analysis(obj, R, y)
 
             obj.Ensemble = xa;
             obj.Weights = ones(ensN, 1)/ensN;
-            obj.rejuvenate(tau);
+            obj.rejuvenate(tau, xf);
 
             obj.Model.update(0, obj.BestEstimate);
 

src/+datools/+statistical/+ensemble/LETPF2.m

@@ -191,7 +191,7 @@ function analysis(obj, R, y)
             % rejuvenation of this sort is not performed by default,
             % however it is included in this algorithm purely for
             % completeness
-            obj.rejuvenate(tau);
+            obj.rejuvenate(tau, xf);
 
             obj.Model.update(0, obj.BestEstimate);
 

src/+datools/+statistical/+ensemble/LFETPF.m

@@ -41,7 +41,7 @@ function analysis(obj, R, y)
 
             obj.Ensemble = xa;
             obj.Weights = w;
-            obj.rejuvenate(tau);
+            obj.rejuvenate(tau, xf);
 
             obj.Model.update(0, obj.BestEstimate);
 

src/+datools/+statistical/+ensemble/SIR.m

@@ -77,7 +77,7 @@ function analysis(obj, R, y)
 
             obj.Ensemble = xa;
             obj.Weights = w;
-            obj.rejuvenate(tau);
+            obj.rejuvenate(tau, xf);
 
             obj.Model.update(0, obj.BestEstimate);