diff --git a/.gitignore b/.gitignore index 322611a56..31048c1e2 100644 --- a/.gitignore +++ b/.gitignore @@ -159,7 +159,6 @@ install*/ /fv3-jedi-lm /gsibec /gsw -/icepack /ioda /ioda-data /iodaconv diff --git a/.gitmodules b/.gitmodules index 945b2d291..c8512c1d5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -45,10 +45,6 @@ path = sorc/fv3-jedi url = https://github.com/jcsda/fv3-jedi.git branch = develop -[submodule "sorc/icepack"] - path = sorc/icepack - url = https://github.com/JCSDA-internal/Icepack.git - branch = feature/ecbuild-new [submodule "sorc/soca"] path = sorc/soca url = https://github.com/jcsda-internal/soca.git diff --git a/bundle/CMakeLists.txt b/bundle/CMakeLists.txt index 4f628faff..aeed6cff5 100644 --- a/bundle/CMakeLists.txt +++ b/bundle/CMakeLists.txt @@ -111,11 +111,6 @@ if(BUILD_GDASBUNDLE) ecbuild_bundle( PROJECT fv3-jedi SOURCE "../sorc/fv3-jedi" ) # SOCA associated repositories -# TODO: Move the Icepack fork to EMC github - set(BUILD_ICEPACK "ON" CACHE STRING "Build the icepack library") - if ( BUILD_ICEPACK ) - ecbuild_bundle( PROJECT icepack SOURCE "../sorc/icepack" ) - endif() ecbuild_bundle( PROJECT soca SOURCE "../sorc/soca" ) # Build JEDI/DA or other peripherals diff --git a/sorc/fv3-jedi b/sorc/fv3-jedi index 7f7d76a76..9440a15e9 160000 --- a/sorc/fv3-jedi +++ b/sorc/fv3-jedi @@ -1 +1 @@ -Subproject commit 7f7d76a76d521efa90800dfcc3c6542f70f5dc84 +Subproject commit 9440a15e97eaeb53b46e0b49b6d943c5071803ee diff --git a/sorc/icepack b/sorc/icepack deleted file mode 160000 index 73136ee8d..000000000 --- a/sorc/icepack +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 73136ee8dcdbe378821e540488a5980a03d8abe6 diff --git a/sorc/ioda b/sorc/ioda index a3774b348..9644fa134 160000 --- a/sorc/ioda +++ b/sorc/ioda @@ -1 +1 @@ -Subproject commit a3774b348296e81e5b6f524eee33475cad0ad67e +Subproject commit 9644fa134bd078ad9a674ea581623c49fe3b4b32 diff --git a/sorc/saber b/sorc/saber index 29764edcf..b22a04a5a 160000 --- a/sorc/saber +++ b/sorc/saber @@ -1 +1 @@ -Subproject commit 29764edcf46fadf8e6b70a3d1095149fe79e038c +Subproject commit b22a04a5afc59d1f0a96ac916807bf37c4d3b3e1 diff --git a/sorc/soca b/sorc/soca index f60b0e24d..4d51dcabf 160000 --- a/sorc/soca +++ b/sorc/soca @@ -1 +1 @@ -Subproject commit f60b0e24d517847cc14f51643a40c9cf8982887a +Subproject commit 4d51dcabf877017be61803338ac81185d0af7ac1 diff --git a/sorc/ufo b/sorc/ufo index 2dd764a63..4673e7b1c 160000 --- a/sorc/ufo +++ b/sorc/ufo @@ -1 +1 @@ -Subproject commit 2dd764a63ac6b800aad455cd6307175199f33d7a +Subproject commit 4673e7b1c5a0838c31154dd042556b461a1c1812