diff --git a/parm/io/fv3jedi_fieldmetadata_history.yaml b/parm/io/fv3jedi_fieldmetadata_history.yaml index 076373e82..2b031f434 100644 --- 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 index ccba447dc..a6059230a 100644 --- 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/sorc/fv3-jedi b/sorc/fv3-jedi index 9440a15e9..9ca9320b3 160000 --- a/sorc/fv3-jedi +++ b/sorc/fv3-jedi @@ -1 +1 @@ -Subproject commit 9440a15e97eaeb53b46e0b49b6d943c5071803ee +Subproject commit 9ca9320b39bce012afe8d1fff8cd39e06047bc3c diff --git a/sorc/fv3-jedi-lm b/sorc/fv3-jedi-lm index a6e97d76e..5994c385a 160000 --- a/sorc/fv3-jedi-lm +++ b/sorc/fv3-jedi-lm @@ -1 +1 @@ -Subproject commit a6e97d76ed7c0b2a27cf97512893a93d7e2b44bc +Subproject commit 5994c385a01236bb9def57dd37b73bec8b5df487 diff --git a/sorc/ioda b/sorc/ioda index 9644fa134..2fdce106b 160000 --- a/sorc/ioda +++ b/sorc/ioda @@ -1 +1 @@ -Subproject commit 9644fa134bd078ad9a674ea581623c49fe3b4b32 +Subproject commit 2fdce106ba36cdd82fd664385c9156e1b422ad55 diff --git a/sorc/iodaconv b/sorc/iodaconv index a2f538327..cdab77230 160000 --- a/sorc/iodaconv +++ b/sorc/iodaconv @@ -1 +1 @@ -Subproject commit a2f538327ed37be6f98a21ee6a5acf3ef4dd96b8 +Subproject commit cdab77230032f72165ec738e5fcaa29a1b3d7dfa diff --git a/sorc/oops b/sorc/oops index 3591b63a7..ab181457b 160000 --- a/sorc/oops +++ b/sorc/oops @@ -1 +1 @@ -Subproject commit 3591b63a772d07beaccdc980cc2da87ffa704f14 +Subproject commit ab181457bbca1d4ecb0e57acdaca3137be24906d diff --git a/sorc/saber b/sorc/saber index 160bbf84e..f044a541d 160000 --- a/sorc/saber +++ b/sorc/saber @@ -1 +1 @@ -Subproject commit 160bbf84e90c6e590f5f0fba11123b80aa11b579 +Subproject commit f044a541ddad0a94ea195c8e92272e9552ec00d1 diff --git a/sorc/soca b/sorc/soca index 697e42645..7675ed14a 160000 --- a/sorc/soca +++ b/sorc/soca @@ -1 +1 @@ -Subproject commit 697e42645211854b79e5db2c86f71c58a3de0092 +Subproject commit 7675ed14a2976b13efb311107dab3eca9e32b568 diff --git a/sorc/ufo b/sorc/ufo index e51ced6a4..75be623bd 160000 --- a/sorc/ufo +++ b/sorc/ufo @@ -1 +1 @@ -Subproject commit e51ced6a4e7db01bf99096bb7a603ba5817cd101 +Subproject commit 75be623bdf2f7bb8013afc81eaae24548006b281 diff --git a/sorc/vader b/sorc/vader index 0792f6931..585c86e06 160000 --- a/sorc/vader +++ b/sorc/vader @@ -1 +1 @@ -Subproject commit 0792f693148c3d09a166021e6b8c2758cb8a1251 +Subproject commit 585c86e067dd8549c012b6412a6009bbca08758f diff --git a/ush/submodules/update_develop.sh b/ush/submodules/update_develop.sh index a6e9210bb..470f02873 100755 --- 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 index 4674c392d..b967c5be6 100644 --- 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];