Merge branch 'develop' into feature/phase3_validation

NOAA-EMC · Feb 26, 2025 · 380d2d2 · 380d2d2
2 parents 4c1fa5f + 583e630
commit 380d2d2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 16 deletions.
diff --git a/parm/io/fv3jedi_fieldmetadata_history.yaml b/parm/io/fv3jedi_fieldmetadata_history.yaml
@@ -52,12 +52,6 @@ field metadata:
 - long name: geopotential_height_at_surface
   io name: hgtsfc
 
-- long name: u_component_of_native_D_grid_wind
-  io name: ud
-
-- long name: v_component_of_native_D_grid_wind
-  io name: vd
-
 - long name: slmsk
   io name: land
 

diff --git a/parm/io/fv3jedi_fieldmetadata_restart.yaml b/parm/io/fv3jedi_fieldmetadata_restart.yaml
@@ -1,11 +1,5 @@
 field metadata:
 
-- long name: u_component_of_native_D_grid_wind
-  io name: u
-
-- long name: v_component_of_native_D_grid_wind
-  io name: v
-
 - long name: air_temperature
   io name: T
 

diff --git a/ush/submodules/update_develop.sh b/ush/submodules/update_develop.sh
@@ -21,4 +21,7 @@ for r in $repos; do
   echo "Updating ${gdasdir}/sorc/${r}"
   cd ${gdasdir}/sorc
   git submodule update --remote --merge ${r}
+  cd ${gdasdir}/sorc/${r}
+  git submodule update --init --recursive
 done
+cd ${gdasdir}
diff --git a/utils/soca/gdas_ens_handler.h b/utils/soca/gdas_ens_handler.h
@@ -246,8 +246,7 @@ namespace gdasapp {
 
         // Save total ssh
         oops::Log::info() << "ssh ensemble member "  << i << std::endl;
-        soca::Increment ssh_tmp(geomOut, socaSshVar, postProcIncr.dt_);
-        ssh_tmp = ensMembers[i];
+        soca::Increment ssh_tmp(socaSshVar, ensMembers[i]);
         sshTotal.push_back(ssh_tmp);
 
         // Zero out ssh and other specified fields
@@ -258,8 +257,8 @@ namespace gdasapp {
         // Compute the original steric height perturbation from T and S
         eckit::LocalConfiguration stericConfig(fullConfig, "steric height");
         postProcIncr.applyLinVarChange(incr, stericConfig, ensMeanTraj);
-        ssh_tmp = incr;
-        sshSteric.push_back(ssh_tmp);
+        soca::Increment ssh_tmp2(socaSshVar, incr);
+        sshSteric.push_back(ssh_tmp2);
 
         // Compute unbalanced ssh
         ssh_tmp = sshTotal[i];