Skip to content

Commit e208d8b

Browse files
DusanJovic-NOAADusanJovic-NOAA
committed
Libraries update
- zstd 1.5.5 -> 1.5.7 - jasper 2.0.32 -> 4.2.4 - fms 2024.01 -> 2025.03 - esmf 8.9.0 -> 8.9.1 - bacio 2.4.1 -> 2.6.0 - g2tmpl 1.13.0 -> 1.17.0 - crtm 3.1.2 -> 3.1.3 - expat added 2.8.1 - gftl 1.14.0 -> 1.16.0 - gftl_shared 1.10.0 -> 1.11.0
1 parent 1ee4fa7 commit e208d8b

2 files changed

Lines changed: 51 additions & 25 deletions

File tree

‎libs/CMakeLists.txt‎

Lines changed: 38 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ set(downloads_prefix "${CMAKE_CURRENT_SOURCE_DIR}/downloads")
5858
##
5959
ExternalProject_Add(zstd
6060
URL ${downloads_prefix}/zstd.tar.gz
61-
URL_HASH MD5=63251602329a106220e0a5ad26ba656f
61+
URL_HASH MD5=780fc1896922b1bc52a4e90980cdda48
6262
SOURCE_SUBDIR build/cmake
6363
CMAKE_ARGS -LH
6464
-DCMAKE_POLICY_VERSION_MINIMUM=3.5
@@ -114,7 +114,7 @@ ExternalProject_Add(lz4
114114
##
115115
ExternalProject_Add(jasper
116116
URL ${downloads_prefix}/jasper.tar.gz
117-
URL_HASH MD5=2c6017d275146f8792fa448227a7c373
117+
URL_HASH MD5=aa4df693b90223fe6848b34cf1208624
118118
BUILD_IN_SOURCE OFF
119119
CMAKE_ARGS -DCMAKE_POLICY_VERSION_MINIMUM=3.5
120120
-DCMAKE_INSTALL_PREFIX=${install_prefix}/jasper
@@ -331,16 +331,16 @@ ExternalProject_Add_StepDependencies(pio build netcdf_fortran pnetcdf genf90 cma
331331
##
332332
ExternalProject_Add(fms
333333
URL ${downloads_prefix}/fms.tar.gz
334-
URL_HASH MD5=82a26e62825d4439b58535d9b29da7a4
334+
URL_HASH MD5=ec14342f320e36749c16a2f97e3e817e
335335
BUILD_IN_SOURCE OFF
336336
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${install_prefix}/fms
337337
-DCMAKE_PREFIX_PATH=${install_prefix}/netcdf
338338
-DCMAKE_Fortran_COMPILER=${MPI_Fortran_COMPILER}
339339
-DGFS_PHYS=ON
340340
-DCONSTANTS=GFS
341+
-D32BIT=ON
341342
-D64BIT=ON
342343
-DOPENMP=ON
343-
-DUSE_DEPRECATED_IO=ON
344344
-DENABLE_QUAD_PRECISION=OFF
345345
LOG_DOWNLOAD ON
346346
LOG_CONFIGURE ON
@@ -358,7 +358,7 @@ if(${CMAKE_C_COMPILER_ID} STREQUAL "Intel")
358358
list(APPEND esmf_env ESMF_COMPILER=intel)
359359
elseif(${CMAKE_C_COMPILER_ID} MATCHES "IntelLLVM")
360360
list(APPEND esmf_env ESMF_COMPILER=intel ESMF_C=${MPI_C_COMPILER} ESMF_CXX=${MPI_CXX_COMPILER} ESMF_F90=${MPI_Fortran_COMPILER} ESMF_CXXLINKLIBS=-lstdc++)
361-
elseif(${CMAKE_Fortran_COMPILER_ID} STREQUAL "GNU")
361+
elseif(${CMAKE_C_COMPILER_ID} MATCHES "^(GNU|Clang|AppleClang)$")
362362
list(APPEND esmf_env ESMF_COMPILER=gfortran)
363363
elseif(${CMAKE_Fortran_COMPILER_ID} STREQUAL "LLVMFlang")
364364
list(APPEND esmf_env ESMF_COMPILER=llvm ESMF_C=${MPI_C_COMPILER} ESMF_CXX=${MPI_CXX_COMPILER} ESMF_F90=${MPI_Fortran_COMPILER} ESMF_CXXLINKLIBS=-lstdc++)
@@ -416,7 +416,7 @@ list(APPEND esmf_env ESMF_INSTALL_BINDIR=bin)
416416

417417
ExternalProject_Add(esmf
418418
URL ${downloads_prefix}/esmf.tar.gz
419-
URL_HASH MD5=e4fa27d720c323db600a42b65d4f20f7
419+
URL_HASH MD5=6c2ce6beef832abb3b10a70c3920ac63
420420
BUILD_IN_SOURCE ON
421421
CONFIGURE_COMMAND ""
422422
BUILD_COMMAND env ${esmf_env} make -j 8
@@ -434,6 +434,7 @@ ExternalProject_Add_Step(esmf post_install
434434
)
435435
ExternalProject_Add_StepDependencies(esmf build netcdf_fortran pio)
436436

437+
437438
##
438439
## lapack
439440
##
@@ -450,12 +451,13 @@ ExternalProject_Add(lapack
450451
LOG_INSTALL ON
451452
)
452453

454+
453455
##
454456
## bacio
455457
##
456458
ExternalProject_Add(bacio
457459
URL ${downloads_prefix}/bacio.tar.gz
458-
URL_HASH MD5=95bab417fbaf7c1f6f99316052189bea
460+
URL_HASH MD5=ff3634c531758a8c0a7edc7a88a4a4c2
459461
BUILD_IN_SOURCE OFF
460462
LIST_SEPARATOR ,
461463
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${install_prefix}/bacio
@@ -493,7 +495,7 @@ ExternalProject_Add_StepDependencies(g2 build jasper libpng bacio)
493495
##
494496
ExternalProject_Add(g2tmpl
495497
URL ${downloads_prefix}/g2tmpl.tar.gz
496-
URL_HASH MD5=dd40b6ff5d08f76e71475c24a81ea2a3
498+
URL_HASH MD5=3f7a795f17ed08df9a39c020c127cd77
497499
BUILD_IN_SOURCE OFF
498500
LIST_SEPARATOR ,
499501
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${install_prefix}/g2tmpl
@@ -531,13 +533,12 @@ ExternalProject_Add(ip
531533
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${install_prefix}/ip
532534
-DCMAKE_INSTALL_LIBDIR=lib
533535
-DLAPACK_ROOT=${install_prefix}/lapack
534-
-Dsp_ROOT=${install_prefix}/sp
535536
LOG_DOWNLOAD ON
536537
LOG_CONFIGURE ON
537538
LOG_BUILD ON
538539
LOG_INSTALL ON
539540
)
540-
ExternalProject_Add_StepDependencies(ip build lapack sp)
541+
ExternalProject_Add_StepDependencies(ip build lapack)
541542

542543
##
543544
## w3emc
@@ -551,7 +552,6 @@ ExternalProject_Add(w3emc
551552
-DCMAKE_INSTALL_LIBDIR=lib
552553
-Dbacio_ROOT=${install_prefix}/bacio
553554
-DBUILD_WITH_BUFR=OFF
554-
-DBUILD_TESTING=OFF
555555
LOG_DOWNLOAD ON
556556
LOG_CONFIGURE ON
557557
LOG_BUILD ON
@@ -564,7 +564,7 @@ ExternalProject_Add_StepDependencies(w3emc build bacio)
564564
##
565565
ExternalProject_Add(crtm
566566
URL ${downloads_prefix}/crtm.tar.gz
567-
URL_HASH MD5=bca66a095f903c0aca728d4cdbe76ae5
567+
URL_HASH MD5=b4bbe8e0704d4aea096bdf33b9e908af
568568
BUILD_IN_SOURCE OFF
569569
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${install_prefix}/crtm
570570
-DCMAKE_INSTALL_LIBDIR=lib
@@ -613,7 +613,7 @@ ExternalProject_Add(esma_cmake
613613
##
614614
ExternalProject_Add(gftl
615615
URL ${downloads_prefix}/gftl.tar.gz
616-
URL_HASH MD5=2f29353658bc8a40cdd453b7870c06ab
616+
URL_HASH MD5=c504f3890c407cf9625066492232dc7d
617617
BUILD_IN_SOURCE OFF
618618
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${install_prefix}/gftl
619619
LOG_DOWNLOAD ON
@@ -627,7 +627,7 @@ ExternalProject_Add(gftl
627627
##
628628
ExternalProject_Add(gftl_shared
629629
URL ${downloads_prefix}/gftl_shared.tar.gz
630-
URL_HASH MD5=d3c0a851db23503131d1f05031faea50
630+
URL_HASH MD5=a456ae1f6ea8abf525143a1c92f542e2
631631
BUILD_IN_SOURCE OFF
632632
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${install_prefix}/gftl_shared
633633
-DCMAKE_PREFIX_PATH=${install_prefix}/gftl
@@ -639,6 +639,25 @@ ExternalProject_Add(gftl_shared
639639
ExternalProject_Add_StepDependencies(gftl_shared build gftl)
640640

641641

642+
##
643+
## expat
644+
##
645+
ExternalProject_Add(expat
646+
URL ${downloads_prefix}/expat.tar.gz
647+
URL_HASH MD5=5be251ee1d93f9e60a3cdcf0f740efa9
648+
BUILD_IN_SOURCE OFF
649+
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${install_prefix}/expat
650+
-DCMAKE_INSTALL_LIBDIR=lib
651+
-DBUILD_SHARED_LIBS=OFF
652+
-DEXPAT_BUILD_EXAMPLES=OFF
653+
-DEXPAT_BUILD_TESTS=OFF
654+
-DEXPAT_BUILD_TOOLS=OFF
655+
LOG_DOWNLOAD ON
656+
LOG_CONFIGURE ON
657+
LOG_BUILD ON
658+
LOG_INSTALL ON
659+
)
660+
642661
##
643662
## udunits
644663
##
@@ -648,6 +667,9 @@ ExternalProject_Add(udunits
648667
BUILD_IN_SOURCE ON
649668
PATCH_COMMAND autoreconf -i
650669
CONFIGURE_COMMAND env "CFLAGS=-fPIC"
670+
env "CPPFLAGS=-I${install_prefix}/expat/include"
671+
env "LDFLAGS=-L${install_prefix}/expat/lib"
672+
env "LIBS=-lexpat"
651673
env "MAKEINFO=true"
652674
./configure --prefix=${install_prefix}/udunits
653675
--libdir=${install_prefix}/udunits/lib
@@ -657,6 +679,7 @@ ExternalProject_Add(udunits
657679
LOG_BUILD ON
658680
LOG_INSTALL ON
659681
)
682+
ExternalProject_Add_StepDependencies(udunits build expat)
660683

661684

662685
##
@@ -693,7 +716,7 @@ ExternalProject_Add(mapl
693716
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${install_prefix}/mapl
694717
-DCMAKE_C_COMPILER=${MPI_C_COMPILER}
695718
-DCMAKE_Fortran_COMPILER=${MPI_Fortran_COMPILER}
696-
-DCMAKE_PREFIX_PATH=${install_prefix}/ecbuild,${install_prefix}/udunits
719+
-DCMAKE_PREFIX_PATH=${install_prefix}/ecbuild,${install_prefix}/expat,${install_prefix}/udunits
697720
-DCMAKE_MODULE_PATH=${install_prefix}/esma_cmake,${install_prefix}/ecbuild
698721
-DNetCDF_ROOT=${install_prefix}/netcdf
699722
-DNetCDF_Fortran_EXTRA_LIBRARIES=-L${install_prefix}/netcdf/lib,-lnetcdf,-L${install_prefix}/hdf5/lib,-lhdf5_hl,-lhdf5,-L${install_prefix}/zstd/lib,-lzstd,-L${install_prefix}/lz4/lib,-llz4,-L${install_prefix}/zlib/lib,-lz,-ldl,-lm

‎libs/fetch.sh‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ download_and_check_md5sum() {
4848
mkdir -p downloads
4949
cd downloads || exit
5050

51-
download_and_check_md5sum 63251602329a106220e0a5ad26ba656f https://github.com/facebook/zstd/releases/download/v1.5.5/zstd-1.5.5.tar.gz zstd.tar.gz
51+
download_and_check_md5sum 780fc1896922b1bc52a4e90980cdda48 https://github.com/facebook/zstd/releases/download/v1.5.7/zstd-1.5.7.tar.gz zstd.tar.gz
5252
download_and_check_md5sum 9c7d356c5acaa563555490676ca14d23 https://github.com/madler/zlib/archive/refs/tags/v1.2.13.tar.gz zlib.tar.gz
5353
download_and_check_md5sum dead9f5f1966d9ae56e1e32761e4e675 https://github.com/lz4/lz4/releases/download/v1.10.0/lz4-1.10.0.tar.gz lz4.tar.gz
54-
download_and_check_md5sum 2c6017d275146f8792fa448227a7c373 https://github.com/jasper-software/jasper/archive/refs/tags/version-2.0.32.tar.gz jasper.tar.gz
54+
download_and_check_md5sum aa4df693b90223fe6848b34cf1208624 https://github.com/jasper-software/jasper/archive/refs/tags/version-4.2.4.tar.gz jasper.tar.gz
5555
download_and_check_md5sum 92972b05f1895240139f749ff24afce8 https://github.com/pnggroup/libpng/archive/refs/tags/v1.6.58.tar.gz libpng.tar.gz
5656

5757
download_and_check_md5sum 73b513b9c40a8ca2913fcb38570ecdbd https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5_1.14.6.tar.gz hdf5.tar.gz
@@ -63,25 +63,28 @@ download_and_check_md5sum bb4552a07eadb6c5a54677f96282489d https://parallel-net
6363
download_and_check_md5sum 7f3504dfb5aab846f4a9018dda7bb8ad https://github.com/PARALLELIO/genf90/archive/refs/tags/genf90_200608.tar.gz genf90.tar.gz
6464
download_and_check_md5sum b16e88125fbb7e5bd06e8f392f91ae26 https://github.com/NCAR/ParallelIO/archive/refs/tags/pio2_6_2.tar.gz pio.tar.gz
6565

66-
download_and_check_md5sum 82a26e62825d4439b58535d9b29da7a4 https://github.com/NOAA-GFDL/FMS/archive/refs/tags/2024.01.tar.gz fms.tar.gz
67-
download_and_check_md5sum e4fa27d720c323db600a42b65d4f20f7 https://github.com/esmf-org/esmf/archive/refs/tags/v8.9.0.tar.gz esmf.tar.gz
66+
download_and_check_md5sum ec14342f320e36749c16a2f97e3e817e https://github.com/NOAA-GFDL/FMS/archive/refs/tags/2025.03.tar.gz fms.tar.gz
67+
download_and_check_md5sum 6c2ce6beef832abb3b10a70c3920ac63 https://github.com/esmf-org/esmf/archive/refs/tags/v8.9.1.tar.gz esmf.tar.gz
6868

6969
download_and_check_md5sum 2f069617e16b42f5eddcfee85768f204 https://github.com/Reference-LAPACK/lapack/archive/refs/tags/v3.12.1.tar.gz lapack.tar.gz
7070

71-
download_and_check_md5sum 95bab417fbaf7c1f6f99316052189bea https://github.com/NOAA-EMC/NCEPLIBS-bacio/archive/refs/tags/v2.4.1.tar.gz bacio.tar.gz
71+
72+
download_and_check_md5sum ff3634c531758a8c0a7edc7a88a4a4c2 https://github.com/NOAA-EMC/NCEPLIBS-bacio/archive/refs/tags/v2.6.0.tar.gz bacio.tar.gz
7273
download_and_check_md5sum 9931fb0740e66d3bfc09fb6cb842532b https://github.com/NOAA-EMC/NCEPLIBS-g2/archive/refs/tags/v3.5.1.tar.gz g2.tar.gz
73-
download_and_check_md5sum dd40b6ff5d08f76e71475c24a81ea2a3 https://github.com/NOAA-EMC/NCEPLIBS-g2tmpl/archive/refs/tags/v1.13.0.tar.gz g2tmpl.tar.gz
74+
download_and_check_md5sum 3f7a795f17ed08df9a39c020c127cd77 https://github.com/NOAA-EMC/NCEPLIBS-g2tmpl/archive/refs/tags/v1.17.0.tar.gz g2tmpl.tar.gz
7475
download_and_check_md5sum de2cc3097a96d4f06a467a1ceff2fe26 https://github.com/NOAA-EMC/NCEPLIBS-ip/archive/refs/tags/v5.4.1.tar.gz ip.tar.gz
7576
download_and_check_md5sum fc50806fb552b114a9f18d57ad3747a7 https://github.com/NOAA-EMC/NCEPLIBS-sp/archive/refs/tags/v2.5.0.tar.gz sp.tar.gz
7677
download_and_check_md5sum b67fc5206ba59eecf78ebf2f5de40584 https://github.com/NOAA-EMC/NCEPLIBS-w3emc/archive/refs/tags/v2.13.0.tar.gz w3emc.tar.gz
7778

78-
download_and_check_md5sum bca66a095f903c0aca728d4cdbe76ae5 https://github.com/JCSDA/CRTMv3/archive/refs/tags/v3.1.2.tar.gz crtm.tar.gz
79+
download_and_check_md5sum b4bbe8e0704d4aea096bdf33b9e908af https://github.com/JCSDA/CRTMv3/archive/refs/tags/v3.1.3.tar.gz crtm.tar.gz
80+
81+
download_and_check_md5sum 5be251ee1d93f9e60a3cdcf0f740efa9 https://github.com/libexpat/libexpat/releases/download/R_2_8_1/expat-2.8.1.tar.gz expat.tar.gz
82+
download_and_check_md5sum 58259d94f766c13b5b0cf1aed92ebbe3 https://downloads.unidata.ucar.edu/udunits/2.2.28/udunits-2.2.28.tar.gz udunits.tar.gz
7983

8084
download_and_check_md5sum 7a7b4138e0c7e68abcd64e56002cbfcf https://github.com/ecmwf/ecbuild/archive/refs/tags/3.7.2.tar.gz ecbuild.tar.gz
8185
download_and_check_md5sum 3921ba13701606cc0e55dc046508f66d https://github.com/GEOS-ESM/ESMA_cmake/archive/refs/tags/v3.55.0.tar.gz esma_cmake.tar.gz
82-
download_and_check_md5sum 2f29353658bc8a40cdd453b7870c06ab https://github.com/Goddard-Fortran-Ecosystem/gFTL/archive/refs/tags/v1.14.0.tar.gz gftl.tar.gz
83-
download_and_check_md5sum d3c0a851db23503131d1f05031faea50 https://github.com/Goddard-Fortran-Ecosystem/gFTL-shared/archive/refs/tags/v1.10.0.tar.gz gftl_shared.tar.gz
84-
download_and_check_md5sum 58259d94f766c13b5b0cf1aed92ebbe3 https://downloads.unidata.ucar.edu/udunits/2.2.28/udunits-2.2.28.tar.gz udunits.tar.gz
86+
download_and_check_md5sum c504f3890c407cf9625066492232dc7d https://github.com/Goddard-Fortran-Ecosystem/gFTL/archive/refs/tags/v1.16.0.tar.gz gftl.tar.gz
87+
download_and_check_md5sum a456ae1f6ea8abf525143a1c92f542e2 https://github.com/Goddard-Fortran-Ecosystem/gFTL-shared/archive/refs/tags/v1.11.0.tar.gz gftl_shared.tar.gz
8588
download_and_check_md5sum 2277e5fc3128cda361403c5f202bf9cd https://github.com/GEOS-ESM/MAPL/archive/refs/tags/v2.53.4.tar.gz mapl.tar.gz
8689

8790
download_and_check_md5sum d94a92c7206139d2b9dafab64d9c75bf https://gitlab.inria.fr/scotch/scotch/-/archive/v7.0.7/scotch-v7.0.7.tar.gz scotch.tar.gz

0 commit comments

Comments
 (0)