Feature #2611 oneapi met-basev3.1 (#2737)

dtcenter · Nov 15, 2023 · b17ff51 · b17ff51
1 parent 501bdeb
commit b17ff51
Show file tree

Hide file tree

Showing 8 changed files with 224 additions and 99 deletions.
diff --git a/.github/jobs/set_job_controls.sh b/.github/jobs/set_job_controls.sh
@@ -6,7 +6,7 @@ run_unit_tests=false
 run_diff=false
 run_update_truth=false
 met_base_repo=met-base
-met_base_tag=v3.0
+met_base_tag=v3.1
 input_data_version=develop
 truth_data_version=develop
 

diff --git a/.github/workflows/build_docker_and_trigger_metplus.yml b/.github/workflows/build_docker_and_trigger_metplus.yml
@@ -29,7 +29,7 @@ jobs:
         env:
           SOURCE_BRANCH: ${{ steps.get_branch_name.outputs.branch_name }}-lite
           MET_BASE_REPO: met-base
-          MET_BASE_TAG: v3.0
+          MET_BASE_TAG: v3.1
 
       - name: Push Docker Image
         run: .github/jobs/push_docker_image.sh

diff --git a/internal/scripts/docker/Dockerfile b/internal/scripts/docker/Dockerfile
@@ -1,5 +1,5 @@
 ARG MET_BASE_REPO=met-base
-ARG MET_BASE_TAG=v3.0
+ARG MET_BASE_TAG=v3.1
 
 FROM dtcenter/${MET_BASE_REPO}:${MET_BASE_TAG}
 MAINTAINER John Halley Gotway <johnhg@ucar.edu>

diff --git a/internal/scripts/docker/Dockerfile.copy b/internal/scripts/docker/Dockerfile.copy
@@ -1,5 +1,5 @@
 ARG MET_BASE_REPO=met-base-unit-test
-ARG MET_BASE_TAG=v3.0
+ARG MET_BASE_TAG=v3.1
 
 FROM dtcenter/${MET_BASE_REPO}:${MET_BASE_TAG}
 MAINTAINER John Halley Gotway <johnhg@ucar.edu>

diff --git a/internal/scripts/docker/build_met_docker.sh b/internal/scripts/docker/build_met_docker.sh
@@ -10,7 +10,7 @@ LOG_FILE=/met/logs/MET-${MET_GIT_NAME}_configure.log
 echo "Running bootstrap for MET ${MET_GIT_NAME} and writing log file ${LOG_FILE}"
 ./bootstrap > ${LOG_FILE} 2>&1
 echo "Configuring MET ${MET_GIT_NAME} and appending to log file ${LOG_FILE}"
-./configure --enable-grib2 --enable-mode_graphics --enable-modis --enable-lidar2nc --enable-python CPPFLAGS="-I/usr/local/include -I/usr/local/include/freetype2 -I/usr/local/include/cairo" LIBS="-ltirpc" >> ${LOG_FILE} 2>&1
+./configure BUFRLIB_NAME=${BUFRLIB_NAME} GRIB2CLIB_NAME=${GRIB2CLIB_NAME} --enable-grib2 --enable-mode_graphics --enable-modis --enable-lidar2nc --enable-python CPPFLAGS="-I/usr/local/include -I/usr/local/include/freetype2 -I/usr/local/include/cairo" LIBS="-ltirpc" >> ${LOG_FILE} 2>&1
 if [ $? != 0 ]; then
   cat ${LOG_FILE}
   exit 1
@@ -22,7 +22,7 @@ fi
 
 LOG_FILE=/met/logs/MET-${MET_GIT_NAME}_make_install.log
 echo "Compiling MET ${MET_GIT_NAME} and writing log file ${LOG_FILE}"
-make ${MAKE_ARGS} install > ${LOG_FILE}
+make ${MAKE_ARGS} install > ${LOG_FILE} 2>&1
 if [ $? != 0 ]; then
   cat ${LOG_FILE}
   exit 1

diff --git a/internal/scripts/environment/development.docker b/internal/scripts/environment/development.docker
@@ -26,7 +26,7 @@ export MET_FONT_DIR=${MET_TEST_INPUT}/fonts
 export MET_TEST_RSCRIPT=/usr/bin/Rscript
 
 # set make arguments to build using multiple jobs
-export MAKE_ARGS=-j
+export MAKE_ARGS="-j 5"
 
 export TEST_BASE=/met
 export COMPILER=gnu_12.2.0
@@ -36,10 +36,15 @@ export USE_MODULES=FALSE
 
 export MET_INSTALL_DIR=/usr/local
 
+export COMPILE_ECKIT=1
+export COMPILE_ATLAS=1
 export COMPILE_HDF=1
 export COMPILE_HDFEOS=1
 export COMPILE_FREETYPE=1
 export COMPILE_CAIRO=1
 
 export SQLITE_INCLUDE_DIR=/usr/include
 export SQLITE_LIB_DIR=/usr/lib/x86_64-linux-gnu
+
+export BUFRLIB_NAME="-lbufr_4"
+export GRIB2CLIB_NAME="-lg2c"