diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt index 8ec65ac8..009f9152 100644 --- a/build/CMakeLists.txt +++ b/build/CMakeLists.txt @@ -38,10 +38,10 @@ ecbuild_bundle( PROJECT crtm GIT "https://github.com/JCSDA-internal/crtm.gi option(BUNDLE_SKIP_RTTOV "Don't build rttov" "ON") # Skip rttov build unless user passes -DBUNDLE_SKIP_RTTOV=OFF ecbuild_bundle( PROJECT rttov GIT "https://github.com/JCSDA-internal/rttov.git" TAG 5f8b36b ) -ecbuild_bundle( PROJECT oops GIT "https://github.com/JCSDA-internal/oops.git" TAG e7335ff ) -ecbuild_bundle( PROJECT saber GIT "https://github.com/JCSDA-internal/saber.git" TAG 1203356 ) -ecbuild_bundle( PROJECT ioda GIT "https://github.com/JCSDA-internal/ioda.git" TAG 9a40bd0 ) -ecbuild_bundle( PROJECT ufo GIT "https://github.com/JCSDA-internal/ufo.git" TAG 87d299b ) +ecbuild_bundle( PROJECT oops GIT "https://github.com/JCSDA-internal/oops.git" TAG 27ad59f ) +ecbuild_bundle( PROJECT saber GIT "https://github.com/JCSDA-internal/saber.git" TAG 2555221 ) +ecbuild_bundle( PROJECT ioda GIT "https://github.com/JCSDA-internal/ioda.git" TAG 377974b ) +ecbuild_bundle( PROJECT ufo GIT "https://github.com/JCSDA-internal/ufo.git" TAG 0d335f7 ) # ioda and ufo test data #--------------------------------- @@ -56,7 +56,7 @@ find_branch_name(REPO_DIR_NAME ioda) # When LOCAL_PATH_JEDI_TESTFILES is set to the directory of IODA test files stored # in a local directory, ioda-data repo will not be cloned if( NOT DEFINED ENV{LOCAL_PATH_JEDI_TESTFILES} AND NOT DEFINED ${GIT_TAG_FUNC} ) - ecbuild_bundle( PROJECT ioda-data GIT "https://github.com/JCSDA-internal/ioda-data.git" TAG 3b4c1ba ) + ecbuild_bundle( PROJECT ioda-data GIT "https://github.com/JCSDA-internal/ioda-data.git" TAG 2b9add5 ) endif() # If IODA's current branch is available in ioda-data repo, that branch will be checked out @@ -66,7 +66,7 @@ branch_checkout (REPO_DIR_NAME ioda-data # same procedure for ufo-data find_branch_name(REPO_DIR_NAME ufo) if( NOT DEFINED ENV{LOCAL_PATH_JEDI_TESTFILES} AND NOT DEFINED ${GIT_TAG_FUNC} ) - ecbuild_bundle( PROJECT ufo-data GIT "https://github.com/JCSDA-internal/ufo-data.git" TAG 87702a2 ) + ecbuild_bundle( PROJECT ufo-data GIT "https://github.com/JCSDA-internal/ufo-data.git" TAG 58e5a2d ) endif() # If UFO's current branch is available in ioda-data repo, that branch will be checked out @@ -76,8 +76,10 @@ branch_checkout (REPO_DIR_NAME ufo-data 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-internal/MPAS-Model.git" TAG 2a41bf1 ) -ecbuild_bundle( PROJECT mpas-jedi GIT "https://github.com/JCSDA-internal/mpas-jedi" TAG cb20c34 ) +ecbuild_bundle( PROJECT MPAS GIT "https://github.com/JCSDA-internal/MPAS-Model.git" TAG f9e84dd ) +option(BUNDLE_SKIP_SACA "Don't build saca" "ON") # Skip saca build unless user passes -DBUNDLE_SKIP_SACA=OFF +ecbuild_bundle( PROJECT saca GIT "https://github.com/liujake/SACA.git" TAG 5f62db0 ) +ecbuild_bundle( PROJECT mpas-jedi GIT "https://github.com/JCSDA-internal/mpas-jedi" TAG 12c476c ) # same procedure for mpas-jedi-data find_branch_name(REPO_DIR_NAME mpas-jedi)