diff --git a/.gitignore b/.gitignore index 397d623..38e4e67 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,8 @@ atlas/ eckit/ fckit/ +# GSIBEC +gsibec/ # JEDI core repos jedicmake/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ec7df2..3aa386d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_minimum_required( VERSION 3.14 FATAL_ERROR ) find_package( ecbuild 3.6 REQUIRED HINTS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../ecbuild) -project( jedi-bundle VERSION 7.0.0 LANGUAGES C CXX Fortran ) +project( jedi-bundle VERSION 8.0.0 LANGUAGES C CXX Fortran ) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") @@ -35,36 +35,33 @@ include( $ENV{jedi_cmake_ROOT}/share/jedicmake/Functions/git_functions.cmake ) #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.35.0 ) -ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda/GSW-Fortran.git" BRANCH develop UPDATE ) +#ecbuild_bundle( PROJECT gsibec GIT "https://github.com/geos-esm/GSIbec" TAG 1.2.1 ) -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 gsw GIT "https://github.com/jcsda/GSW-Fortran.git" TAG v3.08 ) -ecbuild_bundle( PROJECT crtm GIT "https://github.com/jcsda/CRTMv3.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 ) +ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 1.10.0 ) +ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 1.7.0 ) +ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 1.10.0 ) -# 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 crtm GIT "https://github.com/jcsda/CRTMv3.git" TAG v3.1.0-skylabv8 ) -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 ioda GIT "https://github.com/jcsda/ioda.git" TAG 2.9.0 ) +ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 1.10.0 ) -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 ) +ecbuild_bundle( PROJECT fv3 GIT "https://github.com/jcsda/GFDL_atmos_cubed_sphere.git" TAG 1.3.0.jcsda ) +ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda/femps.git" TAG 1.3.0 ) +ecbuild_bundle( PROJECT fv3-jedi-lm GIT "https://github.com/jcsda/fv3-jedi-linearmodel.git" TAG 1.5.0 ) +ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 1.9.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.8.0 ) set(MPAS_DOUBLE_PRECISION "ON" CACHE STRING "MPAS-Model: Use double precision 64-bit Floating point.") set(MPAS_CORES init_atmosphere atmosphere CACHE STRING "MPAS-Model: cores to build.") -ecbuild_bundle( PROJECT mpas GIT "https://github.com/jcsda/MPAS-Model.git" BRANCH release-stable UPDATE ) -ecbuild_bundle( PROJECT mpas-jedi GIT "https://github.com/jcsda/mpas-jedi.git" BRANCH develop UPDATE ) +ecbuild_bundle( PROJECT mpas GIT "https://github.com/jcsda/MPAS-Model.git" TAG v7.0.jcsda3 ) +ecbuild_bundle( PROJECT mpas-jedi GIT "https://github.com/jcsda/mpas-jedi.git" TAG 3.1.0.jcsda ) -ecbuild_bundle( PROJECT coupling GIT "https://github.com/jcsda/coupling.git" BRANCH develop UPDATE ) +ecbuild_bundle( PROJECT coupling GIT "https://github.com/jcsda/coupling.git" TAG 1.2.0 ) ecbuild_bundle_finalize()