Skip to content

Commit

Permalink
Merge branch 'feature/update-develop-fms' of https://github.com/noaa-…
Browse files Browse the repository at this point in the history
…emc/gdasapp into feature/update-develop-fms
  • Loading branch information
cory martin committed Jul 12, 2024
2 parents b7af61e + db0364a commit 70e912c
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 13 deletions.
8 changes: 0 additions & 8 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@
path = sorc/icepack
url = https://github.com/JCSDA-internal/Icepack.git
branch = feature/ecbuild-new
[submodule "sorc/mom6"]
path = sorc/mom6
url = https://github.com/jcsda-internal/MOM6.git
branch = main-ecbuild
[submodule "sorc/soca"]
path = sorc/soca
url = https://github.com/jcsda-internal/soca.git
Expand All @@ -73,10 +69,6 @@
path = sorc/crtm
url = https://github.com/jcsda/crtm.git
branch = release/crtm_jedi_v2.4.1
[submodule "sorc/fms"]
path = sorc/fms
url = https://github.com/jcsda/fms.git
branch = release-stable
[submodule "sorc/jcb"]
path = sorc/jcb
url = https://github.com/noaa-emc/jcb.git
Expand Down
4 changes: 1 addition & 3 deletions bundle/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,7 @@ if(BUILD_GDASBUNDLE)
option(ENABLE_UFO_DATA "Obtain ufo test data from ufo-data repository (vs tarball)" ON)
ecbuild_bundle( PROJECT ufo SOURCE "../sorc/ufo" )

# FMS and FV3 dynamical core
#ecbuild_bundle( PROJECT fms SOURCE "../sorc/fms" )
# FV3 dynamical core
include(fv3-interface.cmake)
ecbuild_bundle( PROJECT fv3 SOURCE "../sorc/fv3" )

Expand All @@ -114,7 +113,6 @@ if(BUILD_GDASBUNDLE)
if ( BUILD_ICEPACK )
ecbuild_bundle( PROJECT icepack SOURCE "../sorc/icepack" )
endif()
#ecbuild_bundle( PROJECT mom6 SOURCE "../sorc/mom6" )
ecbuild_bundle( PROJECT soca SOURCE "../sorc/soca" )

# Build JEDI/DA or other peripherals
Expand Down
1 change: 0 additions & 1 deletion sorc/fms
Submodule fms deleted from 1f7391
1 change: 0 additions & 1 deletion sorc/mom6
Submodule mom6 deleted from 51ec48

0 comments on commit 70e912c

Please sign in to comment.