From 516a5bda9e9aee196c26b5bed75be79cd47c8190 Mon Sep 17 00:00:00 2001
From: Guillaume Vernieres <guillaume.vernieres@noaa.gov>
Date: Wed, 13 Sep 2023 19:06:52 -0400
Subject: [PATCH] Save the correct field for ssh_u (#622)

* save the correct field for ssh_u ... and stop 0ing it out ...

* fixed typo
---
 parm/soca/berror/saber_blocks.yaml            | 10 ++++++----
 parm/soca/berror/soca_ensweights.yaml         |  2 +-
 scripts/exgdas_global_marine_analysis_vrfy.py |  2 +-
 utils/soca/gdas_ens_handler.h                 |  2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/parm/soca/berror/saber_blocks.yaml b/parm/soca/berror/saber_blocks.yaml
index 2938876f9..9487ddae3 100644
--- a/parm/soca/berror/saber_blocks.yaml
+++ b/parm/soca/berror/saber_blocks.yaml
@@ -32,11 +32,11 @@ components:
         ice_filename: 'ice.bkgerr_stddev.incr.{{ATM_WINDOW_BEGIN}}.nc'
         date: '{{ATM_WINDOW_MIDDLE}}'
         t_min: 0.1
-        t_max: 10.0
+        t_max: 5.0
         s_min: 0.1
-        s_max: 10.0
+        s_max: 1.0
         ssh_min: 0.0 # std ssh=0 => ssh balance applied as
-        ssh_max: 0.0 #              strong constraint
+        ssh_max: 1.0 #              strong constraint
         cicen_min: 0.1
         cicen_max: 0.5
         hicen_min: 0.0
@@ -44,9 +44,11 @@ components:
         standard deviation: true
 
       - linear variable change name: BalanceSOCA
+        ksshts:
+          nlayers: 10
 
   weight:
-    value: 1.0
+    value: 0.25
 - covariance:
     covariance model: ensemble
     members from template:
diff --git a/parm/soca/berror/soca_ensweights.yaml b/parm/soca/berror/soca_ensweights.yaml
index ee25ab73f..c7ea40a98 100644
--- a/parm/soca/berror/soca_ensweights.yaml
+++ b/parm/soca/berror/soca_ensweights.yaml
@@ -18,7 +18,7 @@ background:
 weights:
   # Need to provide weights^2 when reading from file
   ice: 0.0025   #  5% of original variance
-  ocean: 0.01   # 10%      "       "
+  ocean: 0.0625   # 25%      "       "
 
 output:
   datadir: ./
diff --git a/scripts/exgdas_global_marine_analysis_vrfy.py b/scripts/exgdas_global_marine_analysis_vrfy.py
index 013afc8ce..52d657563 100755
--- a/scripts/exgdas_global_marine_analysis_vrfy.py
+++ b/scripts/exgdas_global_marine_analysis_vrfy.py
@@ -48,7 +48,7 @@
 config = plotConfig(grid_file=grid_file,
                     data_file=data_file,
                     variables_horiz={'ave_ssh': [-1, 1]},
-                    colormap='gist_ncar',
+                    colormap='seismic',
                     comout=os.path.join(comout, 'vrfy', 'recentering_error'))
 recErrPlotter = statePlotter(config)
 recErrPlotter.plot()
diff --git a/utils/soca/gdas_ens_handler.h b/utils/soca/gdas_ens_handler.h
index 592094ba7..44e994a0b 100644
--- a/utils/soca/gdas_ens_handler.h
+++ b/utils/soca/gdas_ens_handler.h
@@ -231,7 +231,7 @@ namespace gdasapp {
       oops::Log::info() << "mean non-steric ssh: " << sshMean << std::endl;
       oops::Log::info() << "std non-steric ssh: " << sshNonStericStd << std::endl;
       eckit::LocalConfiguration nonStericSshOutputConfig(fullConfig, "ssh output.unbalanced");
-      sshStd.write(nonStericSshOutputConfig);
+      sshNonStericStd.write(nonStericSshOutputConfig);
 
       // Compute filtered ensemble moments
       ensMean.zero();