From 74fc380e90938b7e5c257c0c1be0095f86ac4007 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 7 Oct 2022 14:58:44 -0600 Subject: [PATCH 1/2] Add README.md and update CMakeLists.txt for Skylab v2 --- CMakeLists.txt | 26 +++++++++++++------------- README.md | 13 +++++++++++++ 2 files changed, 26 insertions(+), 13 deletions(-) create mode 100644 README.md diff --git a/CMakeLists.txt b/CMakeLists.txt index 59f5818..3b49215 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 1.0.0 LANGUAGES C CXX Fortran ) +project( jedi-bundle VERSION 2.0.0 LANGUAGES C CXX Fortran ) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") @@ -25,31 +25,31 @@ ecbuild_bundle_initialize() 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" TAG 1.3.0 ) + ecbuild_bundle( PROJECT jedicmake GIT "https://github.com/jcsda/jedi-cmake.git" TAG 1.4.0 RECURSIVE ) include( jedicmake/cmake/Functions/git_functions.cmake ) endif() #ecbuild_bundle( PROJECT eckit GIT "https://github.com/ecmwf/eckit.git" TAG 1.19.0 ) #ecbuild_bundle( PROJECT fckit GIT "https://github.com/ecmwf/fckit.git" TAG 0.9.5 ) -#ecbuild_bundle( PROJECT atlas GIT "https://github.com/ecmwf/atlas.git" TAG 0.29.0 ) +#ecbuild_bundle( PROJECT atlas GIT "https://github.com/ecmwf/atlas.git" TAG 0.30.0 ) -ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 1.3.0 ) -ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 1.0.0 ) -ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 1.3.0 ) +ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" TAG 1.4.0 ) +ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 1.1.0 ) +ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 1.4.0 ) -ecbuild_bundle( PROJECT crtm GIT "https://github.com/jcsda/crtm.git" TAG v2.3-jedi.1 ) -ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda/GSW-Fortran.git" TAG v3.06 ) -ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 2.2.0 ) -ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 1.3.0 ) +ecbuild_bundle( PROJECT crtm GIT "https://github.com/jcsda/crtm.git" TAG v2.4-jedi ) +ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda/GSW-Fortran.git" TAG v3.07 ) +ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 2.3.0 ) +ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 1.4.0 ) -ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1.2.0.jcsda ) +#ecbuild_bundle( PROJECT fms GIT "https://github.com/jcsda/FMS.git" TAG 1.2.0.jcsda ) 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.2.0 ) -ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 1.2.0 ) +ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda/fv3-jedi.git" TAG 1.3.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.1.0 ) +ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda/soca.git" TAG 1.2.0 ) ecbuild_bundle_finalize() diff --git a/README.md b/README.md new file mode 100644 index 0000000..04bdf31 --- /dev/null +++ b/README.md @@ -0,0 +1,13 @@ +### License: + +(C) Copyright 2017-2022 UCAR + +[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) + +### Description: + +Bundle containing all the repositories that are needed to compile JEDI for use in Skylab. + +### Installation: + +For details about JEDI, including installation instructions see: http://jedi-docs.jcsda.org/ From f365b6be4d8cb840aace43cc2d9b10bcb46950f7 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Fri, 7 Oct 2022 19:26:20 -0600 Subject: [PATCH 2/2] Comment out crtm --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b49215..65473b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ ecbuild_bundle( PROJECT oops GIT "https://github.com/jcsda/oops.git" ecbuild_bundle( PROJECT vader GIT "https://github.com/jcsda/vader.git" TAG 1.1.0 ) ecbuild_bundle( PROJECT saber GIT "https://github.com/jcsda/saber.git" TAG 1.4.0 ) -ecbuild_bundle( PROJECT crtm GIT "https://github.com/jcsda/crtm.git" TAG v2.4-jedi ) +#ecbuild_bundle( PROJECT crtm GIT "https://github.com/jcsda/crtm.git" TAG v2.4-jedi ) ecbuild_bundle( PROJECT gsw GIT "https://github.com/jcsda/GSW-Fortran.git" TAG v3.07 ) ecbuild_bundle( PROJECT ioda GIT "https://github.com/jcsda/ioda.git" TAG 2.3.0 ) ecbuild_bundle( PROJECT ufo GIT "https://github.com/jcsda/ufo.git" TAG 1.4.0 )