Skip to content

Commit

Permalink
Merge pull request #1 from JCSDA/feature/update_main_for_release_skyl…
Browse files Browse the repository at this point in the history
…ab_v2

Add README.md and update CMakeLists.txt for Skylab v2
  • Loading branch information
climbfuji authored Oct 10, 2022
2 parents d69fd7d + f365b6b commit 9157abc
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 13 deletions.
26 changes: 13 additions & 13 deletions CMakeLists.txt
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 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")

Expand All @@ -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()

13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -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/

0 comments on commit 9157abc

Please sign in to comment.