diff --git a/test/testref/3dhyb.test b/test/testref/3dhyb.test
index 2cb821609..ed031e925 100644
--- a/test/testref/3dhyb.test
+++ b/test/testref/3dhyb.test
@@ -1,17 +1,17 @@
 CostJb   : Nonlinear Jb = 0.0000000000000000e+00
-CostJo   : Nonlinear Jo(ADT) = 2.0458137413924777e+02, nobs = 99, Jo/n = 2.0664785266590684e+00, err = 1.0000000149011613e-01
-CostFunction: Nonlinear J = 2.0458137413924777e+02
-RPCGMinimizer: reduction in residual norm = 2.0804496849039553e-02
+CostJo   : Nonlinear Jo(ADT) = 2.0458137413924788e+02, nobs = 99, Jo/n = 2.0664785266590697e+00, err = 1.0000000149011613e-01
+CostFunction: Nonlinear J = 2.0458137413924788e+02
+RPCGMinimizer: reduction in residual norm = 2.1404205571904238e-02
 CostFunction::addIncrement: Analysis: 
   Valid time: 2018-04-15T00:00:00Z
-  cicen   min=-0.0040593081880349   max=1.0000647950655037   mean=0.1175080423133622
-  hicen   min=-0.1694837858544874   max=4.0326695826027077   mean=0.4670393369306883
+  cicen   min=-0.0040988630419505   max=1.0000630744489174   mean=0.1175050968515152
+  hicen   min=-0.1725638320233036   max=4.0326711168772373   mean=0.4671340927388408
   hsnon   min=0.0000000000000000   max=1.2712833951042413   mean=0.0886865877527975
-   socn   min=10.7210460395083924   max=40.4416591897031168   mean=34.5744047862924830
-   tocn   min=-1.8947940137300057   max=31.7004646995896131   mean=6.0146891626655883
-   uocn   min=-0.8581809322810460   max=0.7001463582118039   mean=-0.0002552185891037
-   vocn   min=-0.7656658341969602   max=1.4377766409421606   mean=0.0021996576877204
-    ssh   min=-2.1622959317614252   max=0.8974154324210799   mean=-0.2938633000727268
+   socn   min=10.7210460395083924   max=40.4416591897031168   mean=34.5753803016227792
+   tocn   min=-1.8973132653785527   max=31.7004647372264117   mean=6.0143150203319413
+   uocn   min=-0.8581810504448349   max=0.7001468341842769   mean=-0.0002551821852330
+   vocn   min=-0.7656654371938378   max=1.4377766424239879   mean=0.0021996485608986
+    ssh   min=-2.1639526837757632   max=0.8962563828063304   mean=-0.2944013250972501
    hocn   min=0.0009999999999977   max=1345.6400000000003274   mean=128.6280642065023017
      sw   min=-225.0977630615234375   max=-0.0000000000000000   mean=-71.7393205198725354
     lhf   min=-38.1373977661132812   max=256.5976562500000000   mean=42.0100402226406899
@@ -23,6 +23,6 @@ layer_depth   min=2.2854716757984130   max=5658.3057467114012979   mean=1200.522
 
 
 
-CostJb   : Nonlinear Jb = 6.2208024967284885
-CostJo   : Nonlinear Jo(ADT) = 114.6405248894628244, nobs = 99, Jo/n = 1.1579850998935639, err = 0.1000000014901161
-CostFunction: Nonlinear J = 120.8613273861913058
+CostJb   : Nonlinear Jb = 6.0654922897128243
+CostJo   : Nonlinear Jo(ADT) = 115.5460048800289599, nobs = 99, Jo/n = 1.1671313624245350, err = 0.1000000014901161
+CostFunction: Nonlinear J = 121.6114971697417815
diff --git a/test/testref/3dhybfgat.test b/test/testref/3dhybfgat.test
index 3ef4a059e..43f8b968f 100644
--- a/test/testref/3dhybfgat.test
+++ b/test/testref/3dhybfgat.test
@@ -1,16 +1,16 @@
 CostJb   : Nonlinear Jb = 0.0000000000000000e+00
-CostJo   : Nonlinear Jo(ADT) = 8.7370280580244113e+01, nobs = 31, Jo/n = 2.8183961477498101e+00, err = 1.0000000149011612e-01
-CostFunction: Nonlinear J = 8.7370280580244113e+01
-RPCGMinimizer: reduction in residual norm = 2.9185061797211485e-03
+CostJo   : Nonlinear Jo(ADT) = 8.7370280580244312e+01, nobs = 31, Jo/n = 2.8183961477498167e+00, err = 1.0000000149011612e-01
+CostFunction: Nonlinear J = 8.7370280580244312e+01
+RPCGMinimizer: reduction in residual norm = 3.0018932255325439e-03
 CostFunction::addIncrement: Analysis: 
   Valid time: 2018-04-15T00:00:00Z
-  cicen   min=-0.0033958872442029   max=1.0000001203835267   mean=0.1174835206793045
-  hicen   min=-0.0900934576976787   max=4.0326673084246947   mean=0.4695574918336070
-   socn   min=10.7210460395083924   max=40.4416591897031168   mean=34.5585138714596098
-   uocn   min=-0.8581693992488438   max=0.7001579347565605   mean=-0.0002537807257102
-   vocn   min=-0.7661101230279923   max=1.4377766409421606   mean=0.0021979176021416
-   tocn   min=-1.8883899372702533   max=31.7004645720658580   mean=6.0145093596929469
-    ssh   min=-1.9241669151494767   max=0.8902346892941313   mean=-0.2877140108914097
+  cicen   min=-0.0040535217089970   max=1.0000000421973050   mean=0.1174810780852600
+  hicen   min=-0.0902428957660459   max=4.0326673084246947   mean=0.4697245454894248
+   socn   min=10.7210460395083924   max=40.4416591897031168   mean=34.5590151339643867
+   uocn   min=-0.8581694001038450   max=0.7001584930307920   mean=-0.0002536521284757
+   vocn   min=-0.7661101225938430   max=1.4377766409421606   mean=0.0021979270760311
+   tocn   min=-1.8883899367449197   max=31.7004645720658580   mean=6.0142205656355632
+    ssh   min=-1.9233869940455874   max=0.8888169925302998   mean=-0.2881240363183634
    hocn   min=0.0009999999999977   max=1345.6400000000003274   mean=128.6280642065023017
      sw   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
     lhf   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
@@ -22,6 +22,6 @@ layer_depth   min=2.2854716757984130   max=5658.3057467114012979   mean=1200.522
 
 
 
-CostJb   : Nonlinear Jb = 2.4428367123211485
-CostJo   : Nonlinear Jo(ADT) = 76.8979710680983288, nobs = 31, Jo/n = 2.4805797118741397, err = 0.1000000014901161
-CostFunction: Nonlinear J = 79.3408077804194818
+CostJb   : Nonlinear Jb = 2.2768042398308497
+CostJo   : Nonlinear Jo(ADT) = 77.2923955680257535, nobs = 31, Jo/n = 2.4933030828395406, err = 0.1000000014901161
+CostFunction: Nonlinear J = 79.5691998078566058
diff --git a/test/testref/3dvar_godas.test b/test/testref/3dvar_godas.test
index e87d7ec9b..9500b14e0 100644
--- a/test/testref/3dvar_godas.test
+++ b/test/testref/3dvar_godas.test
@@ -1,27 +1,27 @@
 CostJb   : Nonlinear Jb = 0.0000000000000000e+00
 CostJo   : Nonlinear Jo(CoolSkin) = 1.6731214283333800e+04, nobs = 200, Jo/n = 8.3656071416669008e+01, err = 3.6419991997020579e-01
-CostJo   : Nonlinear Jo(SeaSurfaceTemp) = 1.6258116856443880e+03, nobs = 174, Jo/n = 9.3437453197953335e+00, err = 3.6280357515271239e-01
-CostJo   : Nonlinear Jo(SeaSurfaceSalinity) = 5.4431675889674569e+00, nobs = 29, Jo/n = 1.8769543410232609e-01, err = 1.0000000000000000e+00
+CostJo   : Nonlinear Jo(SeaSurfaceTemp) = 1.6258116856443858e+03, nobs = 174, Jo/n = 9.3437453197953211e+00, err = 3.6280357515271239e-01
+CostJo   : Nonlinear Jo(SeaSurfaceSalinity) = 5.4431675889674533e+00, nobs = 29, Jo/n = 1.8769543410232598e-01, err = 1.0000000000000000e+00
 CostJo   : Nonlinear Jo(ADT) = 1.0375381454781235e-02, nobs = 95, Jo/n = 1.0921454162927615e-04, err = 2.8169260935368467e+01
-CostJo   : Nonlinear Jo(InsituTemperature) = 3.3944990007872332e+02, nobs = 205, Jo/n = 1.6558531711157234e+00, err = 8.9723213032395277e-01
-CostJo   : Nonlinear Jo(InsituSalinity) = 3.4804589303321234e+02, nobs = 218, Jo/n = 1.5965407937303318e+00, err = 6.0819699545777528e-01
-CostJo   : Nonlinear Jo(SeaIceFraction) = 5.8152359560103446e+02, nobs = 88, Jo/n = 6.6082226772844823e+00, err = 1.0000000149011612e-01
-CostFunction: Nonlinear J = 1.9631498900661580e+04
-RPCGMinimizer: reduction in residual norm = 1.4890894677558011e-01
+CostJo   : Nonlinear Jo(InsituTemperature) = 3.3944990007872309e+02, nobs = 205, Jo/n = 1.6558531711157225e+00, err = 8.9723213032395277e-01
+CostJo   : Nonlinear Jo(InsituSalinity) = 3.4804589303321143e+02, nobs = 218, Jo/n = 1.5965407937303278e+00, err = 6.0819699545777528e-01
+CostJo   : Nonlinear Jo(SeaIceFraction) = 5.8152359560103514e+02, nobs = 88, Jo/n = 6.6082226772844903e+00, err = 1.0000000149011612e-01
+CostFunction: Nonlinear J = 1.9631498900661576e+04
+RPCGMinimizer: reduction in residual norm = 1.4894443549372180e-01
 CostFunction::addIncrement: Analysis: 
   Valid time: 2018-04-15T00:00:00Z
-  cicen   min=-0.0000693201292598   max=1.0003376635630259   mean=0.1175458333852691
+  cicen   min=-0.0000705791654016   max=1.0003375266652641   mean=0.1175473153661432
   hicen   min=0.0000000000000000   max=4.0326673084246947   mean=0.4712515705773916
   hsnon   min=0.0000000000000000   max=1.2712833951042413   mean=0.0886865877527975
-   socn   min=10.7210460395083924   max=40.4416591897031168   mean=34.5443923223520315
-   tocn   min=-1.8883899372702533   max=31.7004645720658580   mean=6.0183437899017829
-    ssh   min=-1.9244215280991723   max=0.9272827086645625   mean=-0.2767863997914393
+   socn   min=10.7210460395083924   max=40.4416591897031168   mean=34.5443924231075883
+   tocn   min=-1.8883899372702533   max=31.7004645720658580   mean=6.0183795322919984
+    ssh   min=-1.9244192301495222   max=0.9272827055996893   mean=-0.2767862045107581
    hocn   min=0.0009999999999977   max=1345.6400000000003274   mean=128.6280642065023017
-     sw   min=-225.0942956823528505   max=0.0000000000000000   mean=-71.7383580540423793
-    lhf   min=-38.1375200582396161   max=256.5954937724312686   mean=42.0097184800355450
-    shf   min=-58.9492910987185894   max=201.3742675934934994   mean=6.0753284134086591
-     lw   min=0.0000000000000000   max=88.0360936611186276   mean=31.3955346168523803
-     us   min=0.0043960514439903   max=0.0196673929715284   mean=0.0086875839294735
+     sw   min=-225.0942669976793979   max=0.0000000000000000   mean=-71.7383324470076786
+    lhf   min=-38.1375347796771678   max=256.5954640444307984   mean=42.0097100744138032
+    shf   min=-58.9492919026552897   max=201.3742668398249975   mean=6.0753281714457694
+     lw   min=0.0000000000000000   max=88.0360937135142620   mean=31.3955347883611964
+     us   min=0.0044037898462049   max=0.0196682633704000   mean=0.0086888474081376
     mld   min=2.2854716757984130   max=4593.1533423819937525   mean=192.4109073940401515
 layer_depth   min=2.2854716757984130   max=5658.3057467114012979   mean=1200.5229536158392420
 
@@ -33,12 +33,12 @@ layer_depth   min=2.2854716757984130   max=5658.3057467114012979   mean=1200.522
 
 
 
-CostJb   : Nonlinear Jb = 0.3856003402344498
-CostJo   : Nonlinear Jo(CoolSkin) = 16186.9643635032589373, nobs = 200, Jo/n = 80.9348218175162941, err = 0.3641999199702058
-CostJo   : Nonlinear Jo(SeaSurfaceTemp) = 1596.7679360181962238, nobs = 174, Jo/n = 9.1768272184953812, err = 0.3628035751527124
-CostJo   : Nonlinear Jo(SeaSurfaceSalinity) = 5.4426904998659715, nobs = 29, Jo/n = 0.1876789827539990, err = 1.0000000000000000
-CostJo   : Nonlinear Jo(ADT) = 0.0103757170152075, nobs = 95, Jo/n = 0.0001092180738443, err = 28.1692609353684666
-CostJo   : Nonlinear Jo(InsituTemperature) = 337.3302597227105935, nobs = 205, Jo/n = 1.6455134620620029, err = 0.8972321303239528
-CostJo   : Nonlinear Jo(InsituSalinity) = 346.7205645110620367, nobs = 218, Jo/n = 1.5904613050966148, err = 0.6081969954577753
-CostJo   : Nonlinear Jo(SeaIceFraction) = 580.7185630030103312, nobs = 88, Jo/n = 6.5990745795796633, err = 0.1000000014901161
-CostFunction: Nonlinear J = 19054.3403533153577882
+CostJb   : Nonlinear Jb = 0.4007666548107769
+CostJo   : Nonlinear Jo(CoolSkin) = 16185.1504786777350091, nobs = 200, Jo/n = 80.9257523933886773, err = 0.3641999199702058
+CostJo   : Nonlinear Jo(SeaSurfaceTemp) = 1596.8312280019915761, nobs = 174, Jo/n = 9.1771909655286876, err = 0.3628035751527124
+CostJo   : Nonlinear Jo(SeaSurfaceSalinity) = 5.4426955885249573, nobs = 29, Jo/n = 0.1876791582249985, err = 1.0000000000000000
+CostJo   : Nonlinear Jo(ADT) = 0.0103757363457079, nobs = 95, Jo/n = 0.0001092182773232, err = 28.1692609353684666
+CostJo   : Nonlinear Jo(InsituTemperature) = 337.3241215605842171, nobs = 205, Jo/n = 1.6454835198077278, err = 0.8972321303239528
+CostJo   : Nonlinear Jo(InsituSalinity) = 346.7332622015444485, nobs = 218, Jo/n = 1.5905195513832313, err = 0.6081969954577753
+CostJo   : Nonlinear Jo(SeaIceFraction) = 580.7063311589832892, nobs = 88, Jo/n = 6.5989355813520829, err = 0.1000000014901161
+CostFunction: Nonlinear J = 19052.5992595805219025
diff --git a/test/testref/3dvar_soca.test b/test/testref/3dvar_soca.test
index 2b8f2e245..54e3816a8 100644
--- a/test/testref/3dvar_soca.test
+++ b/test/testref/3dvar_soca.test
@@ -9,23 +9,23 @@ CostJo   : Nonlinear Jo(SeaSurfaceChlorophyll) = 1.4791913800716829e+03, nobs =
 CostJo   : Nonlinear Jo(SeaSurfaceBiomassP) = 4.1314922104098372e+02, nobs = 112, Jo/n = 3.6888323307230690e+00, err = 1.1692603016453901e-08
 CostJo   : Nonlinear Jo(SeaSurfaceHS) = 1.0896018677668069e+03, nobs = 6, Jo/n = 1.8160031129446782e+02, err = 1.0000000149011612e-01
 CostFunction: Nonlinear J = 1.9336735621526943e+04
-RPCGMinimizer: reduction in residual norm = 1.5196974582598013e-01
+RPCGMinimizer: reduction in residual norm = 1.4943903814260545e-01
 CostFunction::addIncrement: Analysis: 
   Valid time: 2018-04-15T00:00:00Z
-  cicen   min=-0.0001944416218803   max=1.0004544470085890   mean=0.1175562963283338
+  cicen   min=-0.0001983484661628   max=1.0004563903533681   mean=0.1175584987640446
   hicen   min=0.0000000000000000   max=4.0326673084246947   mean=0.4712515705773916
-   socn   min=10.7210460395083924   max=40.4416591897031168   mean=34.5444143017789429
-   tocn   min=-1.8883899372702533   max=31.7004645720658580   mean=6.0192939107033352
-    ssh   min=-1.9246079094092028   max=0.9272950968042213   mean=-0.2767236478726869
+   socn   min=10.7210460395083924   max=40.4416591897031168   mean=34.5444154414926672
+   tocn   min=-1.8883899372702533   max=31.7004645720658580   mean=6.0193560753976145
+    ssh   min=-1.9246079806628480   max=0.9272948016729473   mean=-0.2767213847127198
    hocn   min=0.0009999999999977   max=1345.6400000000003274   mean=128.6280642065023017
-     sw   min=-225.0946377620148837   max=0.0000000000000000   mean=-71.7382510638389448
-    lhf   min=-38.1375353584250192   max=256.5953403388396055   mean=42.0096785986080192
-    shf   min=-58.9492894488311876   max=201.3742572707894283   mean=6.0753270197181477
-     lw   min=0.0000000000000000   max=88.0360958910717102   mean=31.3955352012919775
-     us   min=0.0043961139459376   max=0.0196706712107377   mean=0.0086907044249661
-    chl   min=-0.0000132792405676   max=4.6719899196170607   mean=0.1184788251022223
-   biop   min=0.0000000000000000   max=0.0000001868533390   mean=0.0000000065395142
-    swh   min=0.0000996535891318   max=6.7491955757141104   mean=1.0621528146778920
+     sw   min=-225.0945898286534543   max=0.0000000000000000   mean=-71.7382190891333664
+    lhf   min=-38.1375526767112092   max=256.5953230482455183   mean=42.0096679932438946
+    shf   min=-58.9492904310832628   max=201.3742561297929115   mean=6.0753266889941919
+     lw   min=0.0000000000000000   max=88.0360960036400826   mean=31.3955354121763648
+     us   min=0.0044062523598695   max=0.0196718967384776   mean=0.0086921922934188
+    chl   min=-0.0000132860100953   max=4.6719899196170607   mean=0.1184787259407491
+   biop   min=0.0000000000000000   max=0.0000001868533390   mean=0.0000000065395151
+    swh   min=0.0000996535891318   max=6.7491955757141104   mean=1.0621519653888534
     mld   min=2.2854716757984130   max=4593.1533423819937525   mean=192.4109073940401515
 layer_depth   min=2.2854716757984130   max=5658.3057467114012979   mean=1200.5229536158392420
 
@@ -39,14 +39,14 @@ layer_depth   min=2.2854716757984130   max=5658.3057467114012979   mean=1200.522
 
 
 
-CostJb   : Nonlinear Jb = 3.7670299019236628
-CostJo   : Nonlinear Jo(CoolSkin) = 13658.4011985073175310, nobs = 174, Jo/n = 78.4965586121110164, err = 0.3628035751527124
-CostJo   : Nonlinear Jo(SeaSurfaceTemp) = 769.1790616041305384, nobs = 147, Jo/n = 5.2325106231573502, err = 0.3624651015648513
-CostJo   : Nonlinear Jo(SeaSurfaceSalinity) = 5.4427757940687362, nobs = 29, Jo/n = 0.1876819239334047, err = 1.0000000000000000
-CostJo   : Nonlinear Jo(ADT) = 136.4791250306548704, nobs = 91, Jo/n = 1.4997706047324710, err = 0.1000000014901161
-CostJo   : Nonlinear Jo(InsituTS) = 686.2398026360082213, nobs = 423, Jo/n = 1.6223163182884355, err = 0.7620880985778185
-CostJo   : Nonlinear Jo(SeaIceFraction) = 580.4391688961409272, nobs = 88, Jo/n = 6.5958996465470561, err = 0.1000000014901161
-CostJo   : Nonlinear Jo(SeaSurfaceChlorophyll) = 1459.9873566986807418, nobs = 129, Jo/n = 11.3177314472765946, err = 0.0618650277470013
-CostJo   : Nonlinear Jo(SeaSurfaceBiomassP) = 409.2009282277246029, nobs = 112, Jo/n = 3.6535797163189696, err = 0.0000000116926030
-CostJo   : Nonlinear Jo(SeaSurfaceHS) = 1086.9227398834236737, nobs = 6, Jo/n = 181.1537899805706218, err = 0.1000000014901161
-CostFunction: Nonlinear J = 18796.0591871800716035
+CostJb   : Nonlinear Jb = 3.9507913202249219
+CostJo   : Nonlinear Jo(CoolSkin) = 13655.1163728023566364, nobs = 174, Jo/n = 78.4776803034618240, err = 0.3628035751527124
+CostJo   : Nonlinear Jo(SeaSurfaceTemp) = 769.1250325174885347, nobs = 147, Jo/n = 5.2321430783502620, err = 0.3624651015648513
+CostJo   : Nonlinear Jo(SeaSurfaceSalinity) = 5.4427739531973049, nobs = 29, Jo/n = 0.1876818604550795, err = 1.0000000000000000
+CostJo   : Nonlinear Jo(ADT) = 136.4788599610268420, nobs = 91, Jo/n = 1.4997676918794158, err = 0.1000000014901161
+CostJo   : Nonlinear Jo(InsituTS) = 686.2447930167938921, nobs = 423, Jo/n = 1.6223281158789453, err = 0.7620880985778185
+CostJo   : Nonlinear Jo(SeaIceFraction) = 580.4174851187933655, nobs = 88, Jo/n = 6.5956532399862882, err = 0.1000000014901161
+CostJo   : Nonlinear Jo(SeaSurfaceChlorophyll) = 1460.0295525378164712, nobs = 129, Jo/n = 11.3180585468047781, err = 0.0618650277470013
+CostJo   : Nonlinear Jo(SeaSurfaceBiomassP) = 409.2402710143757645, nobs = 112, Jo/n = 3.6539309911997835, err = 0.0000000116926030
+CostJo   : Nonlinear Jo(SeaSurfaceHS) = 1086.9456348424896532, nobs = 6, Jo/n = 181.1576058070816089, err = 0.1000000014901161
+CostFunction: Nonlinear J = 18792.9915670845621207
diff --git a/test/testref/3dvarbump.test b/test/testref/3dvarbump.test
index 0aadcc327..beb9ce12f 100644
--- a/test/testref/3dvarbump.test
+++ b/test/testref/3dvarbump.test
@@ -1,19 +1,19 @@
 CostJb   : Nonlinear Jb = 0.0000000000000000e+00
-CostJo   : Nonlinear Jo(SeaSurfaceTemp) = 7.2761520714484391e+02, nobs = 123, Jo/n = 5.9155707897954786e+00, err = 3.7062899283957257e-01
+CostJo   : Nonlinear Jo(SeaSurfaceTemp) = 7.2761520714484413e+02, nobs = 123, Jo/n = 5.9155707897954803e+00, err = 3.7062899283957257e-01
 CostJo   : Nonlinear Jo(SeaSurfaceSalinity) = 5.7834714574083208e+01, nobs = 50, Jo/n = 1.1566942914816642e+00, err = 1.0000000000000000e+00
-CostJo   : Nonlinear Jo(ADT) = 1.7801726582342690e+02, nobs = 91, Jo/n = 1.9562336903673285e+00, err = 1.0000000149011612e-01
+CostJo   : Nonlinear Jo(ADT) = 1.7801726582342692e+02, nobs = 91, Jo/n = 1.9562336903673287e+00, err = 1.0000000149011612e-01
 CostJo   : Nonlinear Jo(InsituTemperature) = 3.4603234526181200e+02, nobs = 203, Jo/n = 1.7045928338020295e+00, err = 9.0034813852418905e-01
-CostJo   : Nonlinear Jo(InsituSalinity) = 3.1204797269182581e+02, nobs = 218, Jo/n = 1.4314127187698431e+00, err = 6.0819699545777528e-01
-CostFunction: Nonlinear J = 1.6215475054959918e+03
-RPCGMinimizer: reduction in residual norm = 1.9585627812873155e-01
+CostJo   : Nonlinear Jo(InsituSalinity) = 3.1204797269182507e+02, nobs = 218, Jo/n = 1.4314127187698398e+00, err = 6.0819699545777528e-01
+CostFunction: Nonlinear J = 1.6215475054959916e+03
+RPCGMinimizer: reduction in residual norm = 1.8327341126136407e-01
 CostFunction::addIncrement: Analysis: 
   Valid time: 2018-04-15T00:00:00Z
    hocn   min=0.0009999999999977   max=1345.6400000000003274   mean=132.2975966204909355
-   socn   min=21.6778874359345082   max=39.8774684135234310   mean=34.6292686263590355
-   tocn   min=-1.8883899372702533   max=33.2682523259166132   mean=6.3735018436205531
+   socn   min=21.6778874359345082   max=39.8774684135234310   mean=34.6314659731017684
+   tocn   min=-1.8883899372702533   max=32.9461357419237331   mean=6.3373244093251282
    uocn   min=-0.6975788196638589   max=0.4840625031242498   mean=0.0013055310445162
    vocn   min=-0.7661101215480253   max=0.9402890903466523   mean=0.0028998456865158
-    ssh   min=-2.1084939224168693   max=0.8449085686573465   mean=-0.2602635096607882
+    ssh   min=-2.1747524569396468   max=0.8444302643579830   mean=-0.2719212961752963
     mld   min=2.4370615877370523   max=4593.1523423819935488   mean=193.6208071648662212
 layer_depth   min=2.4370615877370523   max=5587.8978052886013757   mean=1243.8222388394297013
 
@@ -23,10 +23,10 @@ layer_depth   min=2.4370615877370523   max=5587.8978052886013757   mean=1243.822
 
 
 
-CostJb   : Nonlinear Jb = 53.0340911400380790
-CostJo   : Nonlinear Jo(SeaSurfaceTemp) = 446.9544273941489791, nobs = 123, Jo/n = 3.6337758324727560, err = 0.3706289928395726
-CostJo   : Nonlinear Jo(SeaSurfaceSalinity) = 59.9152947100068118, nobs = 50, Jo/n = 1.1983058942001363, err = 1.0000000000000000
-CostJo   : Nonlinear Jo(ADT) = 154.6934489111536095, nobs = 91, Jo/n = 1.6999280100126770, err = 0.1000000014901161
-CostJo   : Nonlinear Jo(InsituTemperature) = 293.3242787162378136, nobs = 203, Jo/n = 1.4449471857942748, err = 0.9003481385241890
-CostJo   : Nonlinear Jo(InsituSalinity) = 149.8578704365598355, nobs = 218, Jo/n = 0.6874214240209167, err = 0.6081969954577753
-CostFunction: Nonlinear J = 1157.7794113081451997
+CostJb   : Nonlinear Jb = 48.1596997487495315
+CostJo   : Nonlinear Jo(SeaSurfaceTemp) = 489.5537720365405221, nobs = 123, Jo/n = 3.9801119677767520, err = 0.3706289928395726
+CostJo   : Nonlinear Jo(SeaSurfaceSalinity) = 60.3729231990664914, nobs = 50, Jo/n = 1.2074584639813297, err = 1.0000000000000000
+CostJo   : Nonlinear Jo(ADT) = 153.7954077362375926, nobs = 91, Jo/n = 1.6900594256729407, err = 0.1000000014901161
+CostJo   : Nonlinear Jo(InsituTemperature) = 297.7986374325980705, nobs = 203, Jo/n = 1.4669883617369364, err = 0.9003481385241890
+CostJo   : Nonlinear Jo(InsituSalinity) = 146.4616360198882035, nobs = 218, Jo/n = 0.6718423670637074, err = 0.6081969954577753
+CostFunction: Nonlinear J = 1196.1420761730803406
diff --git a/test/testref/3dvarfgat.test b/test/testref/3dvarfgat.test
index 72148e834..a4ce5339f 100644
--- a/test/testref/3dvarfgat.test
+++ b/test/testref/3dvarfgat.test
@@ -1,23 +1,23 @@
 CostJb   : Nonlinear Jb = 0.0000000000000000e+00
-CostJo   : Nonlinear Jo(CoolSkin) = 4.9634479411817738e+03, nobs = 47, Jo/n = 1.0560527534429306e+02, err = 3.8763169345842458e-01
-CostJo   : Nonlinear Jo(SeaSurfaceTemp) = 3.1780656884217410e+02, nobs = 43, Jo/n = 7.3908504381900952e+00, err = 3.8581534929661854e-01
+CostJo   : Nonlinear Jo(CoolSkin) = 4.9634479411817701e+03, nobs = 47, Jo/n = 1.0560527534429298e+02, err = 3.8763169345842458e-01
+CostJo   : Nonlinear Jo(SeaSurfaceTemp) = 3.1780656884217342e+02, nobs = 43, Jo/n = 7.3908504381900793e+00, err = 3.8581534929661854e-01
 CostJo   : Nonlinear Jo(SeaSurfaceSalinity) = 2.6167366978835638e+00, nobs = 17, Jo/n = 1.5392568811079788e-01, err = 1.0000000000000000e+00
-CostJo   : Nonlinear Jo(ADT) = 8.7166288646666516e+01, nobs = 29, Jo/n = 3.0057340912643626e+00, err = 1.0000000149011612e-01
-CostJo   : Nonlinear Jo(InsituTemperature) = 3.7309178313712380e+01, nobs = 31, Jo/n = 1.2035218810874961e+00, err = 9.0893991658246809e-01
-CostJo   : Nonlinear Jo(InsituSalinity) = 1.6779590930092283e+01, nobs = 33, Jo/n = 5.0847245242703887e-01, err = 6.1042996833236707e-01
-CostJo   : Nonlinear Jo(SeaIceFraction) = 1.9943705186059600e+02, nobs = 24, Jo/n = 8.3098771608581661e+00, err = 1.0000000149011612e-01
+CostJo   : Nonlinear Jo(ADT) = 8.7166288646666715e+01, nobs = 29, Jo/n = 3.0057340912643693e+00, err = 1.0000000149011612e-01
+CostJo   : Nonlinear Jo(InsituTemperature) = 3.7309178313712394e+01, nobs = 31, Jo/n = 1.2035218810874966e+00, err = 9.0893991658246809e-01
+CostJo   : Nonlinear Jo(InsituSalinity) = 1.6779590930092294e+01, nobs = 33, Jo/n = 5.0847245242703920e-01, err = 6.1042996833236707e-01
+CostJo   : Nonlinear Jo(SeaIceFraction) = 1.9943705186059643e+02, nobs = 24, Jo/n = 8.3098771608581838e+00, err = 1.0000000149011612e-01
 CostJo   : Nonlinear Jo(SurfaceU) = 4.6119926561840613e-01, nobs = 47, Jo/n = 9.8127503323065142e-03, err = 3.8763169345842458e-01
-CostFunction: Nonlinear J = 5.6250245557385160e+03
-RPCGMinimizer: reduction in residual norm = 5.6036154349071332e-01
+CostFunction: Nonlinear J = 5.6250245557385133e+03
+RPCGMinimizer: reduction in residual norm = 5.5851410651771616e-01
 CostFunction::addIncrement: Analysis: 
   Valid time: 2018-04-15T00:00:00Z
-  cicen   min=-0.0023081640292671   max=1.0069589746383956   mean=0.1182667192938162
+  cicen   min=-0.0023105442480374   max=1.0069524378029397   mean=0.1182930596900565
   hicen   min=0.0000000000000000   max=4.0326673084246947   mean=0.4712515705773916
-   socn   min=10.7210460395083924   max=40.4416591897031168   mean=34.5448011509061246
-   tocn   min=-1.8883899372702533   max=34.9467200164778191   mean=6.0306130214233562
-   uocn   min=-0.8581723640018309   max=0.7001199981293115   mean=-0.0002591153419329
+   socn   min=10.7210460395083924   max=40.4416591897031168   mean=34.5448184303884460
+   tocn   min=-1.8883899372702533   max=34.9320179814565819   mean=6.0312404953269336
+   uocn   min=-0.8581725098091276   max=0.7001202371455181   mean=-0.0002591135096507
    vocn   min=-0.7661101215480253   max=1.4377766409421606   mean=0.0021972630399530
-    ssh   min=-1.9233241368623117   max=0.9260032295261909   mean=-0.2767309144919679
+    ssh   min=-1.9232051438633977   max=0.9259823164020826   mean=-0.2767178501193626
    hocn   min=0.0009999999999977   max=1345.6400000000003274   mean=128.6280642065023017
      sw   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
     lhf   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
@@ -36,13 +36,13 @@ layer_depth   min=2.2854716757984130   max=5658.3057467114012979   mean=1200.522
 
 
 
-CostJb   : Nonlinear Jb = 279.9394197974504550
-CostJo   : Nonlinear Jo(CoolSkin) = 3440.4450658851174012, nobs = 47, Jo/n = 73.2009588486195213, err = 0.3876316934584246
-CostJo   : Nonlinear Jo(SeaSurfaceTemp) = 974.5843784850217162, nobs = 43, Jo/n = 22.6647529880237606, err = 0.3858153492966185
-CostJo   : Nonlinear Jo(SeaSurfaceSalinity) = 2.6121336586950621, nobs = 17, Jo/n = 0.1536549210997095, err = 1.0000000000000000
-CostJo   : Nonlinear Jo(ADT) = 87.2766562461966515, nobs = 29, Jo/n = 3.0095398705585050, err = 0.1000000014901161
-CostJo   : Nonlinear Jo(InsituTemperature) = 36.2267410466876498, nobs = 31, Jo/n = 1.1686045498931501, err = 0.9089399165824681
-CostJo   : Nonlinear Jo(InsituSalinity) = 16.5292041808890886, nobs = 33, Jo/n = 0.5008849751784572, err = 0.6104299683323671
-CostJo   : Nonlinear Jo(SeaIceFraction) = 190.6732775782927263, nobs = 24, Jo/n = 7.9447198990955306, err = 0.1000000014901161
-CostJo   : Nonlinear Jo(SurfaceU) = 0.4659840212169950, nobs = 47, Jo/n = 0.0099145536429148, err = 0.3876316934584246
-CostFunction: Nonlinear J = 5028.7528608995671675
+CostJb   : Nonlinear Jb = 290.3526002977622511
+CostJo   : Nonlinear Jo(CoolSkin) = 3431.8171901794485166, nobs = 47, Jo/n = 73.0173870250946493, err = 0.3876316934584246
+CostJo   : Nonlinear Jo(SeaSurfaceTemp) = 979.0351134119955532, nobs = 43, Jo/n = 22.7682584514417563, err = 0.3858153492966185
+CostJo   : Nonlinear Jo(SeaSurfaceSalinity) = 2.6122184426213275, nobs = 17, Jo/n = 0.1536599083894898, err = 1.0000000000000000
+CostJo   : Nonlinear Jo(ADT) = 87.2779826946484150, nobs = 29, Jo/n = 3.0095856101602902, err = 0.1000000014901161
+CostJo   : Nonlinear Jo(InsituTemperature) = 36.2139681372996591, nobs = 31, Jo/n = 1.1681925205580534, err = 0.9089399165824681
+CostJo   : Nonlinear Jo(InsituSalinity) = 16.5334752986434736, nobs = 33, Jo/n = 0.5010144029891962, err = 0.6104299683323671
+CostJo   : Nonlinear Jo(SeaIceFraction) = 190.6815481942616373, nobs = 24, Jo/n = 7.9450645080942346, err = 0.1000000014901161
+CostJo   : Nonlinear Jo(SurfaceU) = 0.4659989433909902, nobs = 47, Jo/n = 0.0099148711359785, err = 0.3876316934584246
+CostFunction: Nonlinear J = 5034.9900956000719816
diff --git a/test/testref/3dvarfgat_pseudo.test b/test/testref/3dvarfgat_pseudo.test
index 6072de6f3..ab0370a95 100644
--- a/test/testref/3dvarfgat_pseudo.test
+++ b/test/testref/3dvarfgat_pseudo.test
@@ -1,16 +1,16 @@
 CostJb   : Nonlinear Jb = 0.0000000000000000e+00
-CostJo   : Nonlinear Jo(SeaSurfaceTemp) = 3.1780648145948271e+02, nobs = 43, Jo/n = 7.3908484060344817e+00, err = 3.8581536591328441e-01
+CostJo   : Nonlinear Jo(SeaSurfaceTemp) = 3.1780656884219644e+02, nobs = 43, Jo/n = 7.3908504381906148e+00, err = 3.8581534929661854e-01
 CostJo   : Nonlinear Jo(SeaSurfaceSalinity) = 2.6167366978836499e+00, nobs = 17, Jo/n = 1.5392568811080293e-01, err = 1.0000000000000000e+00
 CostJo   : Nonlinear Jo(ADT) = 8.7166288554315003e+01, nobs = 29, Jo/n = 3.0057340880798278e+00, err = 1.0000000149011612e-01
-CostJo   : Nonlinear Jo(InsituTemperature) = 3.7309148937513228e+01, nobs = 31, Jo/n = 1.2035209334681687e+00, err = 9.0893990043753048e-01
-CostJo   : Nonlinear Jo(InsituSalinity) = 1.6779698504915352e+01, nobs = 33, Jo/n = 5.0847571227016219e-01, err = 6.1042996877640276e-01
-CostFunction: Nonlinear J = 4.6167835415410991e+02
-RPCGMinimizer: reduction in residual norm = 1.9186911231850326e-01
+CostJo   : Nonlinear Jo(InsituTemperature) = 3.7309178313712394e+01, nobs = 31, Jo/n = 1.2035218810874966e+00, err = 9.0893991658246809e-01
+CostJo   : Nonlinear Jo(InsituSalinity) = 1.6779590930092294e+01, nobs = 33, Jo/n = 5.0847245242703920e-01, err = 6.1042996833236707e-01
+CostFunction: Nonlinear J = 4.6167836333819980e+02
+RPCGMinimizer: reduction in residual norm = 1.9447522439970583e-01
 CostFunction::addIncrement: Analysis: 
   Valid time: 2018-04-15T00:00:00Z
-   socn   min=10.7210460395083924   max=40.4416591897031168   mean=34.5541574810123393
-   tocn   min=-1.8883899372702533   max=31.7004645720658580   mean=6.0075174667606959
-    ssh   min=-2.0865904226925553   max=0.9615468660413907   mean=-0.3503315653442778
+   socn   min=10.7210460395083924   max=40.4416591897031168   mean=34.5543176703830426
+   tocn   min=-1.8883899372702533   max=31.7004645720658580   mean=6.0073919144765169
+    ssh   min=-2.0744165687315084   max=1.5044961159893417   mean=-0.3523433403563111
    hocn   min=0.0009999999999977   max=1345.6400000000003274   mean=128.6280642065023017
    uocn   min=-0.8581693992488438   max=0.7000954286848975   mean=-0.0002591771954069
    vocn   min=-0.7661101215480253   max=1.4377766409421606   mean=0.0021972630399530
@@ -23,10 +23,10 @@ layer_depth   min=2.2854716757984130   max=5658.3057467114012979   mean=1200.522
 
 
 
-CostJb   : Nonlinear Jb = 931.2855866357992909
-CostJo   : Nonlinear Jo(SeaSurfaceTemp) = 311.9961441522754626, nobs = 43, Jo/n = 7.2557242826110571, err = 0.3858153659132844
+CostJb   : Nonlinear Jb = 980.6737664494047522
+CostJo   : Nonlinear Jo(SeaSurfaceTemp) = 312.0010780620916648, nobs = 43, Jo/n = 7.2558390246998066, err = 0.3858153492966185
 CostJo   : Nonlinear Jo(SeaSurfaceSalinity) = 2.6167366978836499, nobs = 17, Jo/n = 0.1539256881108029, err = 1.0000000000000000
-CostJo   : Nonlinear Jo(ADT) = 52.8891580740285505, nobs = 29, Jo/n = 1.8237640715182259, err = 0.1000000014901161
-CostJo   : Nonlinear Jo(InsituTemperature) = 37.3091489375132284, nobs = 31, Jo/n = 1.2035209334681687, err = 0.9089399004375305
-CostJo   : Nonlinear Jo(InsituSalinity) = 16.7796985049153520, nobs = 33, Jo/n = 0.5084757122701622, err = 0.6104299687764028
-CostFunction: Nonlinear J = 1352.8764730024154233
+CostJo   : Nonlinear Jo(ADT) = 54.1946630519478489, nobs = 29, Jo/n = 1.8687814845499258, err = 0.1000000014901161
+CostJo   : Nonlinear Jo(InsituTemperature) = 37.3091783137123940, nobs = 31, Jo/n = 1.2035218810874966, err = 0.9089399165824681
+CostJo   : Nonlinear Jo(InsituSalinity) = 16.7795909300922936, nobs = 33, Jo/n = 0.5084724524270392, err = 0.6104299683323671
+CostFunction: Nonlinear J = 1403.5750135051325742
diff --git a/test/testref/3dvarlowres_soca.test b/test/testref/3dvarlowres_soca.test
index 6f01c506d..789cd7781 100644
--- a/test/testref/3dvarlowres_soca.test
+++ b/test/testref/3dvarlowres_soca.test
@@ -1,16 +1,16 @@
 CostJb   : Nonlinear Jb = 0.0000000000000000e+00
-CostJo   : Nonlinear Jo(SeaSurfaceTemp) = 7.8349275156178805e+02, nobs = 148, Jo/n = 5.2938699429850544e+00, err = 3.6139743385133083e-01
-CostJo   : Nonlinear Jo(SeaSurfaceSalinity) = 4.9679661574589502e+01, nobs = 51, Jo/n = 9.7411101126646082e-01, err = 1.0000000000000000e+00
-CostJo   : Nonlinear Jo(ADT) = 1.2846395537995426e+02, nobs = 87, Jo/n = 1.4765971882753364e+00, err = 1.0000000149011612e-01
-CostJo   : Nonlinear Jo(InsituTemperature) = 3.4357440141216813e+02, nobs = 206, Jo/n = 1.6678369000590685e+00, err = 8.9914415723945484e-01
-CostJo   : Nonlinear Jo(InsituSalinity) = 3.4655673420278879e+02, nobs = 218, Jo/n = 1.5897097899210495e+00, err = 6.0819699545777528e-01
-CostFunction: Nonlinear J = 1.6517675041312887e+03
-RPCGMinimizer: reduction in residual norm = 1.0577708381511183e-01
+CostJo   : Nonlinear Jo(SeaSurfaceTemp) = 7.8349275156178783e+02, nobs = 148, Jo/n = 5.2938699429850526e+00, err = 3.6139743385133083e-01
+CostJo   : Nonlinear Jo(SeaSurfaceSalinity) = 4.9679661574589510e+01, nobs = 51, Jo/n = 9.7411101126646094e-01, err = 1.0000000000000000e+00
+CostJo   : Nonlinear Jo(ADT) = 1.2846395537995437e+02, nobs = 87, Jo/n = 1.4765971882753377e+00, err = 1.0000000149011612e-01
+CostJo   : Nonlinear Jo(InsituTemperature) = 3.4357440141216807e+02, nobs = 206, Jo/n = 1.6678369000590683e+00, err = 8.9914415723945484e-01
+CostJo   : Nonlinear Jo(InsituSalinity) = 3.4655673420278907e+02, nobs = 218, Jo/n = 1.5897097899210508e+00, err = 6.0819699545777528e-01
+CostFunction: Nonlinear J = 1.6517675041312889e+03
+RPCGMinimizer: reduction in residual norm = 1.0284648215789360e-01
 CostFunction::addIncrement: Analysis: 
   Valid time: 2018-04-15T00:00:00Z
-   socn   min=10.7211321702112450   max=40.4416937318713892   mean=34.5452612159349073
-   tocn   min=-1.9924644486895162   max=32.0033142104850512   mean=6.0270311615198819
-    ssh   min=-2.0047075305248567   max=0.9082175452289394   mean=-0.2788411193911333
+   socn   min=10.7211292658529338   max=40.4416939896376419   mean=34.5453526007703289
+   tocn   min=-1.9799978062827919   max=32.0274073197037552   mean=6.0264913585459716
+    ssh   min=-2.0049518171767371   max=0.9048369030503509   mean=-0.2781624673856908
    hocn   min=0.0009999999999977   max=1345.6400000000003274   mean=128.6280642065023017
     mld   min=2.2854716757984130   max=4593.1533423819937525   mean=192.4109073940401515
 layer_depth   min=2.2854716757984130   max=5658.3057467114012979   mean=1200.5229536158392420
@@ -21,10 +21,10 @@ layer_depth   min=2.2854716757984130   max=5658.3057467114012979   mean=1200.522
 
 
 
-CostJb   : Nonlinear Jb = 275.0276207267167479
-CostJo   : Nonlinear Jo(SeaSurfaceTemp) = 299.7316436365123877, nobs = 148, Jo/n = 2.0252138083548132, err = 0.3613974338513308
-CostJo   : Nonlinear Jo(SeaSurfaceSalinity) = 49.7183085773384477, nobs = 51, Jo/n = 0.9748687956340872, err = 1.0000000000000000
-CostJo   : Nonlinear Jo(ADT) = 90.0817750889277420, nobs = 87, Jo/n = 1.0354227021715832, err = 0.1000000014901161
-CostJo   : Nonlinear Jo(InsituTemperature) = 141.6604768580295968, nobs = 206, Jo/n = 0.6876722177574253, err = 0.8991441572394548
-CostJo   : Nonlinear Jo(InsituSalinity) = 291.8347806154215505, nobs = 218, Jo/n = 1.3386916541991813, err = 0.6081969954577753
-CostFunction: Nonlinear J = 1148.0546055029465151
+CostJb   : Nonlinear Jb = 320.8162845472460276
+CostJo   : Nonlinear Jo(SeaSurfaceTemp) = 313.4635753170422277, nobs = 148, Jo/n = 2.1179971305205556, err = 0.3613974338513308
+CostJo   : Nonlinear Jo(SeaSurfaceSalinity) = 49.7200752572230940, nobs = 51, Jo/n = 0.9749034364161391, err = 1.0000000000000000
+CostJo   : Nonlinear Jo(ADT) = 91.2216694263502603, nobs = 87, Jo/n = 1.0485249359350604, err = 0.1000000014901161
+CostJo   : Nonlinear Jo(InsituTemperature) = 138.9177271002498344, nobs = 206, Jo/n = 0.6743578985449021, err = 0.8991441572394548
+CostJo   : Nonlinear Jo(InsituSalinity) = 291.3995035548629176, nobs = 218, Jo/n = 1.3366949704351510, err = 0.6081969954577753
+CostFunction: Nonlinear J = 1205.5388352029744965
diff --git a/test/testref/addincrement.test b/test/testref/addincrement.test
index 0148c8b94..0bc2d83eb 100644
--- a/test/testref/addincrement.test
+++ b/test/testref/addincrement.test
@@ -14,15 +14,15 @@ layer_depth   min=2.2854716757984130   max=5658.3057467114012979   mean=1200.522
 Increment: 
   Valid time: 2018-04-15T00:00:00Z
   hsnon   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
-   socn   min=-0.0001053508048706   max=0.0036695245546320   mean=0.0000025961995222
-   tocn   min=-0.0938132581918806   max=0.0916756132663934   mean=0.0007788315484231
+   socn   min=-0.0001044875304995   max=0.0036310038226467   mean=0.0000026969550798
+   tocn   min=-0.0915142683818291   max=0.0933406499581936   mean=0.0008145739386363
 State plus increment: 
   Valid time: 2018-04-15T00:00:00Z
   cicen   min=0.0000000000000000   max=1.0000000000000000   mean=0.1175125761012928
   hicen   min=0.0000000000000000   max=4.0326673084246947   mean=0.4712515705773916
   hsnon   min=0.0000000000000000   max=1.2712833951042413   mean=0.0886865877527975
-   socn   min=10.7210460395083924   max=40.4416591897031168   mean=34.5443923223520315
-   tocn   min=-1.8883899372702533   max=31.7004645720658580   mean=6.0183437899017829
+   socn   min=10.7210460395083924   max=40.4416591897031168   mean=34.5443924231075883
+   tocn   min=-1.8883899372702533   max=31.7004645720658580   mean=6.0183795322919984
     ssh   min=-1.9244847628277935   max=0.9272826517867588   mean=-0.2767903423591662
    hocn   min=0.0009999999999977   max=1345.6400000000003274   mean=128.6280642065023017
    uocn   min=-0.8581693992488438   max=0.7000954286848975   mean=-0.0002591771954069
diff --git a/test/testref/checkpointmodel.test b/test/testref/checkpointmodel.test
index e699ccff1..73deb3942 100644
--- a/test/testref/checkpointmodel.test
+++ b/test/testref/checkpointmodel.test
@@ -7,12 +7,12 @@ input background:
 analysis: 
 
   Valid time: 2018-04-15T00:00:00Z
-   socn   min=10.7210460395083924   max=40.4416591897031168   mean=34.5443923223520315
-   tocn   min=-1.8883899372702533   max=31.7004645720658580   mean=6.0183437899017829
+   socn   min=10.7210460395083924   max=40.4416591897031168   mean=34.5443924231075883
+   tocn   min=-1.8883899372702533   max=31.7004645720658580   mean=6.0183795322919984
    hocn   min=0.0009999999999977   max=1345.6400000000003274   mean=128.6280642065023017
 output background: 
 
   Valid time: 2018-04-15T00:00:00Z
-   socn   min=10.7210460395083924   max=38.0000000000000000   mean=34.5397727334798290
-   tocn   min=-1.8000000000000000   max=31.7004645720658580   mean=6.0184822134112945
+   socn   min=10.7210460395083924   max=38.0000000000000000   mean=34.5397728342353858
+   tocn   min=-1.8000000000000000   max=31.7004645720658580   mean=6.0185178888673949
    hocn   min=0.0009999999999977   max=1345.6400000000003274   mean=128.6280642065023017
diff --git a/test/testref/convertincrement.test b/test/testref/convertincrement.test
index 6da2a9430..beba15c44 100644
--- a/test/testref/convertincrement.test
+++ b/test/testref/convertincrement.test
@@ -1,8 +1,8 @@
 Input increment: 
   Valid time: 2018-04-15T00:00:00Z
-   tocn   min=-0.0938132581918806   max=0.0916756132663934   mean=0.0007788315484231
-   socn   min=-0.0001053508048706   max=0.0036695245546320   mean=0.0000025961995222
-    ssh   min=-0.0001335113919512   max=0.0005900187800294   mean=0.0000039425677270
+   tocn   min=-0.0915142683818291   max=0.0933406499581936   mean=0.0008145739386363
+   socn   min=-0.0001044875304995   max=0.0036310038226467   mean=0.0000026969550798
+    ssh   min=-0.0001307321269105   max=0.0005881912327456   mean=0.0000041378484079
    hocn   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
 Trajectory state: 
   Valid time: 2018-04-15T00:00:00Z
@@ -14,7 +14,7 @@ layer_depth   min=2.2854716757984130   max=5658.3057467114012979   mean=1200.522
     mld   min=2.2854716757984130   max=4593.1533423819937525   mean=192.4109073940401515
 Output increment: 
   Valid time: 2018-04-15T00:00:00Z
-   tocn   min=-0.0938132581918806   max=0.0916756132663934   mean=0.0007788315484231
-   socn   min=-0.0001053508048706   max=0.0036695245546320   mean=        -nan
-    ssh   min=-0.0005646980045385   max=0.0015930535209445   mean=0.0000282744256740
+   tocn   min=-0.0915142683818291   max=0.0933406499581936   mean=0.0008145739386363
+   socn   min=-0.0001044875304995   max=0.0036310038226467   mean=        -nan
+    ssh   min=-0.0005470853696631   max=0.0015881623198805   mean=0.0000295468588674
    hocn   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
diff --git a/test/testref/dirac_soca_cor_nicas_scales.test b/test/testref/dirac_soca_cor_nicas_scales.test
index 5dc93104a..9b4fbc2f3 100644
--- a/test/testref/dirac_soca_cor_nicas_scales.test
+++ b/test/testref/dirac_soca_cor_nicas_scales.test
@@ -8,9 +8,9 @@ Input Dirac increment:
   hicen   min=0.0000000000000000   max=1.0000000000000000   mean=0.0006086427267194
 Covariance(SABER) * Increment:
   Valid time: 2018-04-15T00:00:00Z
-   socn   min=0.0000000000000000   max=1.0000000000000002   mean=0.0340141737787489
-   tocn   min=0.0000000000000000   max=1.0048129708997011   mean=0.3536185118881098
+   socn   min=0.0000000000000000   max=0.9999999999999998   mean=0.0475378607002945
+   tocn   min=0.0000000000000000   max=1.5290573299466188   mean=0.3842259232179515
     ssh   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
    hocn   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
   cicen   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
-  hicen   min=0.0000000000000000   max=0.9999999999999998   mean=0.2640285296287256
+  hicen   min=0.0000000000000000   max=1.0000000000000002   mean=0.2715365076280349
diff --git a/test/testref/dirac_soca_cov.test b/test/testref/dirac_soca_cov.test
index bc8a36669..4f254ef52 100644
--- a/test/testref/dirac_soca_cov.test
+++ b/test/testref/dirac_soca_cov.test
@@ -12,13 +12,13 @@ Input Dirac increment:
 layer_depth   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
 Covariance(SocaError) * Increment:
   Valid time: 2018-04-15T00:00:00Z
-  cicen   min=-0.0035609555945749   max=0.0000000000000000   mean=-0.0000247866160204
-  hicen   min=0.0000000000000000   max=100.0000000000000000   mean=0.8687764074426576
-   socn   min=-0.0233861103420420   max=0.1032943622422105   mean=0.0003208834542677
-   tocn   min=0.0000000000000000   max=5.2687160390820811   mean=0.0230427116030840
-   uocn   min=0.0000000000000000   max=0.0022948056889126   mean=0.0000004281518965
+  cicen   min=-0.0036089461537001   max=0.0000000000000000   mean=-0.0000275624556497
+  hicen   min=0.0000000000000000   max=100.0000000000000142   mean=0.9283225798949805
+   socn   min=-0.0335232487284927   max=0.1085429089450220   mean=0.0003666358672174
+   tocn   min=0.0000000000000000   max=5.2687160390820855   mean=0.0249020307148332
+   uocn   min=0.0000000000000000   max=0.0023306838654550   mean=0.0000004409841843
    vocn   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
-    ssh   min=-0.0013735744357345   max=0.0505217197847119   mean=0.0008502024507618
+    ssh   min=-0.0014883931115266   max=0.0505217197847120   mean=0.0009123179536632
    hocn   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
     mld   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
 layer_depth   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
diff --git a/test/testref/dirac_soca_mask.test b/test/testref/dirac_soca_mask.test
index aab957e37..0f20135c9 100644
--- a/test/testref/dirac_soca_mask.test
+++ b/test/testref/dirac_soca_mask.test
@@ -13,7 +13,7 @@ Covariance(SocaError) * Increment:
   cicen   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
   hicen   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
    socn   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
-   tocn   min=0.0000000000000000   max=1.0000000000000004   mean=0.0045856545712703
+   tocn   min=0.0000000000000000   max=1.0000000000000009   mean=0.0047334151689189
     ssh   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
    hocn   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
     mld   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
diff --git a/test/testref/dirac_soca_nomask.test b/test/testref/dirac_soca_nomask.test
index 939b29584..b1387cf6c 100644
--- a/test/testref/dirac_soca_nomask.test
+++ b/test/testref/dirac_soca_nomask.test
@@ -13,7 +13,7 @@ Covariance(SocaError) * Increment:
   cicen   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
   hicen   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
    socn   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
-   tocn   min=0.0000000000000000   max=1.0096147233187933   mean=0.0066552713504880
+   tocn   min=0.0000000000000000   max=1.0086683962748459   mean=0.0067775962020394
     ssh   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
    hocn   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
     mld   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
diff --git a/test/testref/dirac_socahyb_cov.test b/test/testref/dirac_socahyb_cov.test
index 327f3ac15..ad765b3b9 100644
--- a/test/testref/dirac_socahyb_cov.test
+++ b/test/testref/dirac_socahyb_cov.test
@@ -12,49 +12,49 @@ Input Dirac increment:
 layer_depth   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
 Covariance(hybrid) * Increment:
   Valid time: 2018-04-15T00:00:00Z
-  cicen   min=-0.0037308136145732   max=0.0033832945797879   mean=-0.0000239489125803
-  hicen   min=-0.0695877305207310   max=50.1073013980972064   mean=0.4362425959632968
-   socn   min=-0.2786405474614049   max=0.4244134146865415   mean=0.0012228353313886
-   tocn   min=-0.1747800608295167   max=3.5877887758283302   mean=0.0165511115136579
-   uocn   min=-0.0019323054461836   max=0.0022913098573106   mean=-0.0000004682690009
-   vocn   min=-0.0009548976692089   max=0.0010971516760553   mean=0.0000002759338063
-    ssh   min=-0.0849196475090573   max=0.0573102079546577   mean=-0.0001552497512365
+  cicen   min=-0.0037816864961005   max=0.0033988462923562   mean=-0.0000256319140461
+  hicen   min=-0.0741129795689144   max=50.1073013980972135   mean=0.4660442760971389
+   socn   min=-0.2824804962843228   max=0.4340045998546955   mean=0.0012619626134192
+   tocn   min=-0.1762875582777306   max=3.5877887758283329   mean=0.0173675319849974
+   uocn   min=-0.0019323054461836   max=0.0022913098573106   mean=-0.0000004686539247
+   vocn   min=-0.0009570793926929   max=0.0011305048458118   mean=0.0000002771043880
+    ssh   min=-0.0905081114790066   max=0.0589716999157324   mean=-0.0001573648879361
    hocn   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
-    mld   min=-60.6461415802428760   max=525.5278285284309732   mean=1.3267794217865554
+    mld   min=-68.9457053290824007   max=531.2265534461570269   mean=1.3585694060809879
 layer_depth   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
 Covariance(hybrid1_SocaError) * Increment:
   Valid time: 2018-04-15T00:00:00Z
-  cicen   min=-0.0035609555945749   max=0.0000000000000000   mean=-0.0000208731031462
-  hicen   min=0.0000000000000000   max=100.0000000000000000   mean=0.8687764074426576
-   socn   min=-0.0233861103420420   max=0.0465023712609259   mean=0.0000022025816480
-   tocn   min=0.0000000000000000   max=5.2687160390820811   mean=0.0208650940486405
-   uocn   min=0.0000000000000000   max=0.0022948056889126   mean=0.0000004281518965
+  cicen   min=-0.0036089461537001   max=0.0000000000000000   mean=-0.0000222575411638
+  hicen   min=0.0000000000000000   max=100.0000000000000142   mean=0.9283225798949805
+   socn   min=-0.0236417547391914   max=0.0472082436947755   mean=0.0000026258255895
+   tocn   min=0.0000000000000000   max=5.2687160390820855   mean=0.0220593638316132
+   uocn   min=0.0000000000000000   max=0.0023306838654550   mean=0.0000004409841843
    vocn   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
-    ssh   min=0.0000000000000000   max=0.0505217197847119   mean=0.0007687680519747
+    ssh   min=0.0000000000000000   max=0.0505217197847120   mean=0.0008077961292637
    hocn   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
     mld   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
 layer_depth   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
 Covariance(hybrid2_ensemble) * Increment:
   Valid time: 2018-04-15T00:00:00Z
-  cicen   min=-0.0047588985877249   max=0.0075467744245189   mean=-0.0000270247220144
-  hicen   min=-0.1391754610414619   max=0.3754297229138135   mean=0.0037087844839362
-   socn   min=-0.5572810949228099   max=0.8488268293730830   mean=0.0024434680811292
-   tocn   min=-0.3495601216590334   max=2.4481918444150668   mean=0.0122371289786754
-   uocn   min=-0.0038646108923672   max=0.0045826197146212   mean=-0.0000013646898984
-   vocn   min=-0.0019097953384178   max=0.0021943033521106   mean=0.0000005518676125
-    ssh   min=-0.1847244457046184   max=0.0930010755515401   mean=-0.0010792675544476
+  cicen   min=-0.0049668146910638   max=0.0075881502357951   mean=-0.0000290062869284
+  hicen   min=-0.1482259591378288   max=0.3806035245579948   mean=0.0037659722992973
+   socn   min=-0.5649609925686456   max=0.8680091997093911   mean=0.0025212994012489
+   tocn   min=-0.3525751165554611   max=2.4747384425302226   mean=0.0126757001383816
+   uocn   min=-0.0038646108923672   max=0.0045826197146212   mean=-0.0000013782920337
+   vocn   min=-0.0019141587853859   max=0.0022610096916236   mean=0.0000005542087760
+    ssh   min=-0.1967369673926479   max=0.0958284039654625   mean=-0.0011225259051359
    hocn   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
-    mld   min=-121.2922831604857521   max=1051.0556570568619463   mean=2.6535588435731108
+    mld   min=-137.8914106581648014   max=1062.4531068923140538   mean=2.7171388121619757
 layer_depth   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
 Localization(hybrid2_ensemble) * Increment:
   Valid time: 2018-04-15T00:00:00Z
-  cicen   min=0.0000000000000000   max=1.0000000000000004   mean=0.0631746532288630
-  hicen   min=0.0000000000000000   max=1.0000000000000004   mean=0.0631746532288630
-   socn   min=0.0000000000000000   max=1.0000000000000004   mean=0.0630672903023646
-   tocn   min=0.0000000000000000   max=1.0000000000000004   mean=0.0630672903023646
-   uocn   min=0.0000000000000000   max=1.0000000000000004   mean=0.0619672590883402
-   vocn   min=0.0000000000000000   max=1.0000000000000004   mean=0.0616052717791618
-    ssh   min=0.0000000000000000   max=1.0000000000000004   mean=0.0631746532288630
-   hocn   min=0.0000000000000000   max=1.0000000000000004   mean=0.0630672903023646
-    mld   min=0.0000000000000000   max=1.0000000000000004   mean=0.0631746532288630
-layer_depth   min=0.0000000000000000   max=1.0000000000000004   mean=0.0630672903023646
+  cicen   min=0.0000000000000000   max=1.0000000000000007   mean=0.0686773581172594
+  hicen   min=0.0000000000000000   max=1.0000000000000007   mean=0.0686773581172594
+   socn   min=0.0000000000000000   max=1.0000000000000007   mean=0.0685604451408007
+   tocn   min=0.0000000000000000   max=1.0000000000000007   mean=0.0685604451408007
+   uocn   min=0.0000000000000000   max=1.0000000000000007   mean=0.0665336927271454
+   vocn   min=0.0000000000000000   max=1.0000000000000007   mean=0.0657786918712790
+    ssh   min=0.0000000000000000   max=1.0000000000000007   mean=0.0686773581172594
+   hocn   min=0.0000000000000000   max=1.0000000000000007   mean=0.0685604451408007
+    mld   min=0.0000000000000000   max=1.0000000000000007   mean=0.0686773581172594
+layer_depth   min=0.0000000000000000   max=1.0000000000000007   mean=0.0685604451408007
diff --git a/test/testref/enspert.test b/test/testref/enspert.test
index 1ec095700..4bfd0c16e 100644
--- a/test/testref/enspert.test
+++ b/test/testref/enspert.test
@@ -20,17 +20,17 @@ Initial state:
 layer_depth   min=2.2854716757984130   max=5658.3057467114012979   mean=1200.5229536158392420
 Member 0 final state: 
   Valid time: 2018-04-15T06:00:00Z
-  cicen   min=-0.0180955754853549   max=1.0154619226063759   mean=0.1166567187237659
-  hicen   min=-1.1890165225084572   max=4.4225078395956468   mean=0.4878445368603064
+  cicen   min=-0.0179477307495680   max=1.0153169498091159   mean=0.1165466655811809
+  hicen   min=-1.2273773517586548   max=4.4384636058585212   mean=0.4836261711443992
   hsnon   min=0.0000000000000000   max=1.2712833951042413   mean=0.0886865877527975
-   socn   min=10.7210460395083924   max=40.4416591783023520   mean=34.5474804194790579
-   tocn   min=-3.0346028010743273   max=31.7041894810928397   mean=6.0892597845774965
-   uocn   min=-0.8618188262973017   max=0.6951975908706787   mean=-0.0003002399277292
-   vocn   min=-0.8095623037177452   max=1.1783094051530068   mean=0.0020621902808385
-    ssh   min=-1.8905821325072507   max=0.9171609472788409   mean=-0.2767818007884086
-   hocn   min=0.0009718942572445   max=1345.9655205644394300   mean=128.6280649079521936
-    chl   min=-0.0346456156552588   max=4.6657951350551032   mean=0.1184774650131123
-   biop   min=-0.0000000010792964   max=0.0000001881576257   mean=0.0000000065411171
+   socn   min=10.7210460395083924   max=40.4416591783000712   mean=34.5473300591765522
+   tocn   min=-2.9515686115790447   max=31.6987104866235683   mean=6.0915201325693875
+   uocn   min=-0.8620325384384893   max=0.6951486388372113   mean=-0.0003028021348463
+   vocn   min=-0.8096150692211626   max=1.1786796751629223   mean=0.0020621985944648
+    ssh   min=-1.8879012403897744   max=0.9170828155466522   mean=-0.2767795213626169
+   hocn   min=0.0009718981829507   max=1345.9655010932206096   mean=128.6280651987123633
+    chl   min=-0.0347096422502859   max=4.6656789272377441   mean=0.1184735933086735
+   biop   min=-0.0000000010670083   max=0.0000001882111536   mean=0.0000000065412874
      sw   min=-225.0977630615234375   max=-0.0000000000000000   mean=-71.7393205198725354
     lhf   min=-38.1373977661132812   max=256.5976562500000000   mean=42.0100402226406899
     shf   min=-58.9492950439453125   max=201.3742980957031250   mean=6.0753344854805622
@@ -40,17 +40,17 @@ Member 0 final state:
 layer_depth   min=2.2854716757984130   max=5658.3057467114012979   mean=1200.5229536158392420
 Member 1 final state: 
   Valid time: 2018-04-15T06:00:00Z
-  cicen   min=-0.0215236267512266   max=1.0125208022390715   mean=0.1167107628551369
-  hicen   min=-1.0658523758283109   max=4.6136403418154135   mean=0.5266782620691725
+  cicen   min=-0.0232472901091385   max=1.0122847550416991   mean=0.1167257882017464
+  hicen   min=-1.0660578510882317   max=4.6241796010597822   mean=0.5312867971814634
   hsnon   min=0.0000000000000000   max=1.2712833951042413   mean=0.0886865877527975
-   socn   min=10.7210460395083924   max=40.4416591799132661   mean=34.5062483129193538
-   tocn   min=-4.3527892363687934   max=32.1716440032313642   mean=5.9996297179408460
-   uocn   min=-0.8612379200915659   max=0.6956460681526615   mean=-0.0001684897472015
-   vocn   min=-0.8096924107049123   max=1.1407984886825635   mean=0.0019624415065930
-    ssh   min=-1.8679621858884223   max=0.9116899301489129   mean=-0.2767153738108127
-   hocn   min=0.0009445732089446   max=1346.2578679840287350   mean=128.6280814476713203
-    chl   min=-0.0289855887820164   max=4.6514396809792586   mean=0.1185532231894127
-   biop   min=-0.0000000013979299   max=0.0000001885820462   mean=0.0000000065387977
+   socn   min=10.7210460395083924   max=40.4416591799142537   mean=34.5053688124024944
+   tocn   min=-4.3506304749330731   max=32.2042084470077796   mean=5.9988769419132568
+   uocn   min=-0.8614391377078680   max=0.6956445384565553   mean=-0.0001691268738891
+   vocn   min=-0.8098303351755853   max=1.1404127828961510   mean=0.0019618738967216
+    ssh   min=-1.8653863960960764   max=0.9116542010324225   mean=-0.2767100679984219
+   hocn   min=0.0009445692826222   max=1346.2515603992962951   mean=128.6280818753411097
+    chl   min=-0.0295705226240191   max=4.6513062708004504   mean=0.1185495592515406
+   biop   min=-0.0000000014227649   max=0.0000001886103202   mean=0.0000000065389500
      sw   min=-225.0977630615234375   max=-0.0000000000000000   mean=-71.7393205198725354
     lhf   min=-38.1373977661132812   max=256.5976562500000000   mean=42.0100402226406899
     shf   min=-58.9492950439453125   max=201.3742980957031250   mean=6.0753344854805622
@@ -60,17 +60,17 @@ Member 1 final state:
 layer_depth   min=2.2854716757984130   max=5658.3057467114012979   mean=1200.5229536158392420
 Member 2 final state: 
   Valid time: 2018-04-15T06:00:00Z
-  cicen   min=-0.0217839784139593   max=1.0135664998925267   mean=0.1170037453526113
-  hicen   min=-1.0702692048053624   max=4.2897631773416807   mean=0.5197523608071601
+  cicen   min=-0.0240114302715288   max=1.0134258249590606   mean=0.1171379107945789
+  hicen   min=-1.0731683257961575   max=4.2637166258387857   mean=0.5242428246457038
   hsnon   min=0.0000000000000000   max=1.2712833951042413   mean=0.0886865877527975
-   socn   min=10.7210460395083924   max=40.4416591813400217   mean=34.5190502846994818
-   tocn   min=-3.6774466807639858   max=31.7294384181555564   mean=6.1017080713155725
-   uocn   min=-0.8527079719957523   max=0.6900307211562242   mean=-0.0002351898776744
-   vocn   min=-0.8081228648634390   max=1.2230267293973940   mean=0.0019664179836585
-    ssh   min=-1.8554279256511403   max=0.9099454891333590   mean=-0.2766017221739970
-   hocn   min=0.0009179243744965   max=1346.5440235208395734   mean=128.6280811165849514
-    chl   min=-0.0242260824668528   max=4.6851634656692536   mean=0.1184642679198311
-   biop   min=-0.0000000008814691   max=0.0000001879042331   mean=0.0000000065376670
+   socn   min=10.7210460395083924   max=40.4416591813473900   mean=34.5180354226551529
+   tocn   min=-3.6550554735710663   max=31.7303623332176805   mean=6.1038746027554263
+   uocn   min=-0.8527354111047408   max=0.6899570050945554   mean=-0.0002331690048723
+   vocn   min=-0.8082836104081030   max=1.2213721318293775   mean=0.0019622229013084
+    ssh   min=-1.8542140554628197   max=0.9099969528834198   mean=-0.2765945892513946
+   hocn   min=0.0009179199629318   max=1346.5391996870687308   mean=128.6280815294010438
+    chl   min=-0.0242344918332649   max=4.6854540006527676   mean=0.1184658524407694
+   biop   min=-0.0000000008753226   max=0.0000001878964701   mean=0.0000000065377026
      sw   min=-225.0977630615234375   max=-0.0000000000000000   mean=-71.7393205198725354
     lhf   min=-38.1373977661132812   max=256.5976562500000000   mean=42.0100402226406899
     shf   min=-58.9492950439453125   max=201.3742980957031250   mean=6.0753344854805622
@@ -80,17 +80,17 @@ Member 2 final state:
 layer_depth   min=2.2854716757984130   max=5658.3057467114012979   mean=1200.5229536158392420
 Member 3 final state: 
   Valid time: 2018-04-15T06:00:00Z
-  cicen   min=-0.0195801063579778   max=1.0147719967288251   mean=0.1172820860076147
-  hicen   min=-1.1341861749030553   max=4.4599301342658908   mean=0.5181641291823246
+  cicen   min=-0.0217194858086926   max=1.0147606235466318   mean=0.1173610111149679
+  hicen   min=-1.2568327839592686   max=4.4544028614335236   mean=0.5230276029529948
   hsnon   min=0.0000000000000000   max=1.2712833951042413   mean=0.0886865877527975
-   socn   min=10.7210460395083924   max=40.4416591824183271   mean=34.5337425245469660
-   tocn   min=-2.9382471201647431   max=31.7406441563765469   mean=6.0345483358398653
-   uocn   min=-0.8567487147577495   max=0.6984678539990958   mean=-0.0001943514805072
-   vocn   min=-0.8030068089098755   max=1.1972014559128583   mean=0.0020539511619779
-    ssh   min=-1.8496740327525270   max=0.9120280276442039   mean=-0.2765355089165666
-   hocn   min=0.0008920106029951   max=1346.8098305246508062   mean=128.6280860382935316
-    chl   min=-0.0339131334494770   max=4.6937598186554741   mean=0.1184950507291665
-   biop   min=-0.0000000007072830   max=0.0000001876715923   mean=0.0000000065402892
+   socn   min=10.7210460395083924   max=40.4416591824269531   mean=34.5335504767250328
+   tocn   min=-2.9603827293906670   max=31.7375756291958311   mean=6.0348520357682034
+   uocn   min=-0.8568785328366374   max=0.6985426327057122   mean=-0.0001952349935024
+   vocn   min=-0.8030924790092691   max=1.1962722596214641   mean=0.0020544226713287
+    ssh   min=-1.8474816242263816   max=0.9121588911692720   mean=-0.2765272002652001
+   hocn   min=0.0008919956143453   max=1346.8077367538628550   mean=128.6280866039477360
+    chl   min=-0.0338003707368620   max=4.6945595955343409   mean=0.1184960636800684
+   biop   min=-0.0000000007022299   max=0.0000001877512722   mean=0.0000000065404235
      sw   min=-225.0977630615234375   max=-0.0000000000000000   mean=-71.7393205198725354
     lhf   min=-38.1373977661132812   max=256.5976562500000000   mean=42.0100402226406899
     shf   min=-58.9492950439453125   max=201.3742980957031250   mean=6.0753344854805622
@@ -100,17 +100,17 @@ Member 3 final state:
 layer_depth   min=2.2854716757984130   max=5658.3057467114012979   mean=1200.5229536158392420
 Member 4 final state: 
   Valid time: 2018-04-15T06:00:00Z
-  cicen   min=-0.0195941332888099   max=1.0093198320940708   mean=0.1172744442785538
-  hicen   min=-1.1019240276229816   max=4.7377629969768993   mean=0.5021357777554611
+  cicen   min=-0.0197718401128143   max=1.0091688136045813   mean=0.1172909046342989
+  hicen   min=-1.1155308717945622   max=4.7092122161910970   mean=0.4994453858606065
   hsnon   min=0.0000000000000000   max=1.2712833951042413   mean=0.0886865877527975
-   socn   min=10.7210460395083924   max=40.4416591834512715   mean=34.5387781877921114
-   tocn   min=-4.7688220842238351   max=31.7683597112020806   mean=5.9949463806419976
-   uocn   min=-0.8553135755927049   max=0.6981189192611161   mean=-0.0002481375767763
-   vocn   min=-0.8098578415481051   max=1.1497701384094767   mean=0.0019866245418100
-    ssh   min=-1.8514675434009882   max=0.9119375302769742   mean=-0.2764841693985222
-   hocn   min=0.0008668131064307   max=1347.1257737543392068   mean=128.6280845260949377
-    chl   min=-0.0343124993979519   max=4.6755082537003148   mean=0.1185660150722009
-   biop   min=-0.0000000008706793   max=0.0000001882726144   mean=0.0000000065375605
+   socn   min=10.7210460395083924   max=40.4416591834597057   mean=34.5385488639554339
+   tocn   min=-4.8171349644026389   max=31.7744438246835017   mean=5.9939225406483150
+   uocn   min=-0.8554285548105096   max=0.6981012723697597   mean=-0.0002457418204399
+   vocn   min=-0.8097634890526260   max=1.1477557612142839   mean=0.0019882066772065
+    ssh   min=-1.8491618596065900   max=0.9121236562517426   mean=-0.2764747662434656
+   hocn   min=0.0008668009166665   max=1347.1244907571915519   mean=128.6280850949645185
+    chl   min=-0.0339841299535465   max=4.6753649255246552   mean=0.1185674718638239
+   biop   min=-0.0000000008837080   max=0.0000001882608358   mean=0.0000000065373823
      sw   min=-225.0977630615234375   max=-0.0000000000000000   mean=-71.7393205198725354
     lhf   min=-38.1373977661132812   max=256.5976562500000000   mean=42.0100402226406899
     shf   min=-58.9492950439453125   max=201.3742980957031250   mean=6.0753344854805622
diff --git a/test/testref/parameters_bump_cor_nicas.test b/test/testref/parameters_bump_cor_nicas.test
index 65f9cb0b9..c81ae420d 100644
--- a/test/testref/parameters_bump_cor_nicas.test
+++ b/test/testref/parameters_bump_cor_nicas.test
@@ -1,2 +1,2 @@
-Norm of BUMP output parameter cor_rh - 1: 1.1484633211382940e+09
-Norm of BUMP output parameter cor_rv - 1: 1.9141055352304898e+04
+Norm of output parameter cor_rh - 1: 1.1484633211382940e+09
+Norm of output parameter cor_rv - 1: 1.9141055352304898e+04
diff --git a/test/testref/parameters_bump_cov.test b/test/testref/parameters_bump_cov.test
index 91710be6c..2b5f36324 100644
--- a/test/testref/parameters_bump_cov.test
+++ b/test/testref/parameters_bump_cov.test
@@ -1,3 +1,3 @@
-Norm of output parameter cor_rh - 1: 3.8103219653899252e+08
-Norm of output parameter cor_rv - 1: 9.1128711918407134e+02
+Norm of output parameter cor_rh - 1: 3.7898603704696083e+08
+Norm of output parameter cor_rv - 1: 9.0619883969753107e+02
 Norm of output parameter stddev - 1: 5.3081714633167209e+01
diff --git a/test/testref/sqrtvertloc.test b/test/testref/sqrtvertloc.test
index 2cb01029d..92caa1e6d 100644
--- a/test/testref/sqrtvertloc.test
+++ b/test/testref/sqrtvertloc.test
@@ -18,52 +18,52 @@ Background:
      us   min=0.0000000000000000   max=0.0000000000000000   mean=0.0000000000000000
     mld   min=2.2854716757984130   max=4593.1533423819937525   mean=192.4109073940401515
 layer_depth   min=2.2854716757984130   max=5658.3057467114012979   mean=1200.5229536158392420
-Variance Explained=0.1095722884945554
-0.1986109674104811
-0.2573592042007319
-0.3107695230030913
-0.3601075805191439
-0.4060398927639458
-0.4490768975279861
-0.4894581680876475
-0.5273973968507524
-0.5630587213523036
-0.5966424448666294
-0.6282216452762419
-0.6579728189097667
-0.6859749507249951
-0.7123308347212612
-0.7370952702038832
-0.7603168555409263
-0.7821305787902608
-0.8025463220344943
-0.8216780361675287
-0.8395667952566088
-0.8562695558486649
-0.8718566481716684
-0.8863678411892866
-0.8998452895820127
-0.9123174374716791
-0.9238167088149134
-0.9343854753848837
-0.9440792712286040
-0.9529261630955466
-0.9609874344601098
-0.9682787831872223
-0.9748495121496636
-0.9806953477270097
-0.9858702442359948
-0.9903924688279335
-0.9942661331040944
-0.9974850871367730
-0.9999999999999999
-0.9999999999999999
+Variance Explained=0.1096171883242914
+0.1986044895485897
+0.2573629939547687
+0.3107532484448482
+0.3600779945201284
+0.4059975533555993
+0.4490255075364599
+0.4894032495447213
+0.5273444758073389
+0.5630156185504506
+0.5965844493455997
+0.6281574726114731
+0.6579214723473769
+0.6859300831907430
+0.7122863544705373
+0.7370565886599456
+0.7602902319347656
+0.7821106380851215
+0.8025341333530773
+0.8216709117844880
+0.8395648385570126
+0.8562730716077007
+0.8718656499471863
+0.8863760812207383
+0.8998514094469292
+0.9123239178583257
+0.9238245402618643
+0.9343962030415417
+0.9440956317535385
+0.9529448187289368
+0.9610054054128291
+0.9682971779435052
+0.9748623001467599
+0.9807032801162059
+0.9858742157225696
+0.9903946217898024
+0.9942664231719054
+0.9974860944257135
+1.0000000000000002
+1.0000000000000002
 Number of retained columns=10
-Retained fraction of the variance=0.5630587213523036
+Retained fraction of the variance=0.5630156185504506
 Variance for truncated correlation matrix
   Valid time: 2018-04-15T00:00:00Z
-    ssh   min=0.0000000000000000   max=0.9956521414877253   mean=0.7859481295984008
-   tocn   min=0.0000000000000000   max=0.9963486197333468   mean=0.5422186134486107
-   socn   min=0.0000000000000000   max=0.9968726530867191   mean=0.5488641651294098
-   uocn   min=0.0379204542449227   max=0.8805075454121231   mean=0.4712705638193914
-   vocn   min=0.0000000000000000   max=0.8431094636696504   mean=0.4718656179177272
+    ssh   min=0.0000000000000000   max=0.9956679957361079   mean=0.7856432884089957
+   tocn   min=0.0000000000000000   max=0.9966481594658687   mean=0.5420608973587538
+   socn   min=0.0000000000000000   max=0.9967239057153128   mean=0.5488927118564396
+   uocn   min=0.0471876299820630   max=0.8507511804330984   mean=0.4712163757674066
+   vocn   min=0.0000000000000000   max=0.8504443347851840   mean=0.4718981519551919