Skip to content

Commit

Permalink
Add esmf post_install step. Update libaries
Browse files Browse the repository at this point in the history
 - g2     3.4.5  to 3.5.1
 - g2tmpl 1.10.2 to 1.13.0
 - mapl   2.46.0 to 2.46.3
  • Loading branch information
DusanJovic-NOAA committed Aug 18, 2024
1 parent b7ee6c3 commit 6134ffc
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/build_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ jobs:
sudo apt-get update
sudo apt-get install libmpich-dev
- name: Install cmake
run: |
cd ${{ github.workspace }}
curl -f -s -S -R -L https://github.com/Kitware/CMake/releases/download/v3.29.2/cmake-3.29.2-Linux-x86_64.tar.gz | tar -zx
echo "${{ github.workspace }}/cmake-3.29.2-linux-x86_64/bin" >> $GITHUB_PATH
- name: Fetch dependencies
run: |
./get.sh
Expand Down
1 change: 1 addition & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ export NetCDF_ROOT=${ufslibs_install_prefix}/netcdf
export PIO_ROOT=${ufslibs_install_prefix}/pio

export ESMFMKFILE=${ufslibs_install_prefix}/esmf/lib/esmf.mk
export ESMF_ROOT=${ufslibs_install_prefix}/esmf
export FMS_ROOT=${ufslibs_install_prefix}/fms

export bacio_ROOT=${ufslibs_install_prefix}/bacio
Expand Down
15 changes: 11 additions & 4 deletions libs/ufslibs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -302,14 +302,20 @@ ExternalProject_Add(esmf
LOG_BUILD ON
LOG_INSTALL ON
)
ExternalProject_Add_Step(esmf post_install
COMMAND ${CMAKE_COMMAND} -E copy_directory <SOURCE_DIR>/cmake ${install_prefix}/esmf/cmake
DEPENDEES install
WORKING_DIRECTORY <INSTALL_DIR>
LOG ON
)
ExternalProject_Add_StepDependencies(esmf build netcdf_fortran pio)

##
## NCEPLIBS
##
set(bacio_tag 2.4.1)
set(g2_tag 3.4.5)
set(g2tmpl_tag 1.10.2)
set(g2_tag 3.5.1)
set(g2tmpl_tag 1.13.0)
set(ip_tag 4.3.0)
set(sp_tag 2.5.0)
set(w3emc_tag 2.10.0)
Expand All @@ -334,6 +340,7 @@ foreach(lib_name bacio g2 g2tmpl ip sp w3emc)
-Dsp_ROOT=${install_prefix}/sp
-Dw3emc_ROOT=${install_prefix}/w3emc
-DBUILD_WITH_BUFR=OFF
-DBUILD_WITH_W3EMC=OFF
LOG_DOWNLOAD ON
LOG_CONFIGURE ON
LOG_BUILD ON
Expand Down Expand Up @@ -438,8 +445,8 @@ endif()
message(STATUS "Set MAPL MPI_STACK to ${MPITYPE}")

ExternalProject_Add(mapl
URL https://github.com/GEOS-ESM/MAPL/archive/refs/tags/v2.46.0.tar.gz
URL_HASH MD5=7be5f4dc91597db772086691d80bfbfc
URL https://github.com/GEOS-ESM/MAPL/archive/refs/tags/v2.46.3.tar.gz
URL_HASH MD5=8ddf81796cb51a5d48c6989fdb639b9d
BUILD_IN_SOURCE OFF
LIST_SEPARATOR ,
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${install_prefix}/mapl
Expand Down

0 comments on commit 6134ffc

Please sign in to comment.