Skip to content

Commit

Permalink
Manual update of release/skylab-v6 in jedi-bundle public from jedi-bu…
Browse files Browse the repository at this point in the history 
…ndle internal
  • Loading branch information
@climbfuji
climbfuji committed Sep 29, 2023
1 parent bbaa828 commit 337875d
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 35 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ ioda-data/
ufo-data/
saber-data/

# Coupled fv3-jedi + soca
coupling/

solo/
ewok/
r2d2/
Expand Down
61 changes: 26 additions & 35 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cmake_minimum_required( VERSION 3.12 FATAL_ERROR )

find_package( ecbuild 3.6 REQUIRED HINTS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../ecbuild)

project( jedi-bundle VERSION 5.0.0 LANGUAGES C CXX Fortran )
project( jedi-bundle VERSION 6.0.0 LANGUAGES C CXX Fortran )

list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

Expand All @@ -29,40 +29,31 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)

# Use external jedi-cmake or build in bundle
if(DEFINED ENV{jedi_cmake_ROOT})
include( $ENV{jedi_cmake_ROOT}/share/jedicmake/Functions/git_functions.cmake )
else()
ecbuild_bundle( PROJECT jedicmake GIT "https://github.com/jcsda/jedi-cmake.git" BRANCH develop UPDATE RECURSIVE )
include( jedicmake/cmake/Functions/git_functions.cmake )
endif()

#ecbuild_bundle( PROJECT eckit GIT "https://github.com/ecmwf/eckit.git" TAG 1.23.0 )
#ecbuild_bundle( PROJECT fckit GIT "https://github.com/ecmwf/fckit.git" TAG 0.10.1 )
#ecbuild_bundle( PROJECT atlas GIT "https://github.com/ecmwf/atlas.git" TAG 0.33.0 )

ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" BRANCH develop UPDATE )
ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" BRANCH develop UPDATE )
ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" BRANCH develop UPDATE )

ecbuild_bundle( PROJECT crtm GIT "https://github.com/JCSDA/CRTMv3.git" BRANCH develop UPDATE )
ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda/GSW-Fortran.git" BRANCH develop UPDATE )
ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" BRANCH develop UPDATE )
ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" BRANCH develop UPDATE )

# Build IODA converters if requested
option(BUILD_IODA_CONVERTERS "Build IODA Converters" OFF)
if(BUILD_IODA_CONVERTERS)
ecbuild_bundle( PROJECT iodaconv GIT "https://github.com/JCSDA/ioda-converters.git" BRANCH develop UPDATE )
endif()

#ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" BRANCH release-stable UPDATE )
ecbuild_bundle( PROJECT fv3 GIT "https://github.com/jcsda/GFDL_atmos_cubed_sphere.git" BRANCH release-stable UPDATE )
ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" BRANCH develop UPDATE )
ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" BRANCH develop UPDATE )
ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" BRANCH develop UPDATE )

ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda/MOM6.git" BRANCH main-ecbuild UPDATE RECURSIVE )
ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda/soca.git" BRANCH develop UPDATE )
include( $ENV{jedi_cmake_ROOT}/share/jedicmake/Functions/git_functions.cmake )

#ecbuild_bundle( PROJECT eckit GIT "https://github.com/ecmwf/eckit.git" TAG 1.24.4 )
#ecbuild_bundle( PROJECT fckit GIT "https://github.com/ecmwf/fckit.git" TAG 0.11.0 )
#ecbuild_bundle( PROJECT atlas GIT "https://github.com/ecmwf/atlas.git" TAG 0.34.0 )

ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda/GSW-Fortran.git" TAG v3.07 )

ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 1.8.0 )
ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 1.5.0 )
ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 1.8.0 )

ecbuild_bundle( PROJECT crtm GIT "https://github.com/jcsda/CRTMv3.git" TAG v3.0.0-skylabv6 )
ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 2.7.0 )
ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 1.8.0 )

ecbuild_bundle( PROJECT fv3 GIT "https://github.com/jcsda/GFDL_atmos_cubed_sphere.git" TAG 1.2.0.jcsda )
ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG 1.2.0 )
ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG 1.3.0)
ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 1.7.0)

ecbuild_bundle( PROJECT mom6 GIT "https://github.com/jcsda/MOM6.git" TAG 2022.1.0 RECURSIVE )
ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda/soca.git" TAG 1.6.0 )

ecbuild_bundle( PROJECT coupling GIT "https://github.com/jcsda-internal/coupling.git" TAG 1.0.0 )

ecbuild_bundle_finalize()

0 comments on commit 337875d

Please sign in to comment.