Merge branch 'develop' into feature/stable-nightly

NOAA-EMC · Jan 19, 2025 · 6c70804 · 6c70804
2 parents daaea10 + 70ea55b
commit 6c70804
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 12 deletions.
diff --git 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
@@ -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
@@ -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/icepack b/sorc/icepack
diff --git a/sorc/soca b/sorc/soca
+5 −2		.gitmodules
+2 −4		CMakeLists.txt
+0 −5		bundle/CMakeLists.txt
+10 −0		external/README.md
+36 −0		external/icepack/CMakeLists.txt
+1 −0		external/icepack/Icepack
+38 −0		external/icepack/icepack_files.cmake
+8 −5		external/mom6/CMakeLists.txt
+0 −0		external/mom6/MOM6
+0 −0		external/mom6/mom6_files.cmake
+1 −4		src/soca/CMakeLists.txt
+2 −5		src/soca/VariableChange/CMakeLists.txt
+10 −12		test/CMakeLists.txt
+1 −0		test/testinput/convertstate_soca2cice.yml