From 76feee95dfc0813c86d3c101d508f7a9f7617d54 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 23 Feb 2021 13:48:33 -0700 Subject: [PATCH] update CENTOS_docker_setup.sh to use newer compilers in CCC image; temporary change to Dockerfile to use local CCC-gnu9 image (need to push CCC-gnu9 to Dockerhub) --- docker/Dockerfile | 5 +++-- scm/etc/CENTOS_docker_setup.sh | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 21ed4bb14..332457833 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,5 @@ -FROM dtcenter/common-community-container:latest +#FROM dtcenter/common-community-container:latest +FROM common-community-container-gnu9 MAINTAINER Michelle Harrold or Grant Firl # @@ -11,7 +12,7 @@ MAINTAINER Michelle Harrold or Grant Firl # Obtain CCPP SCM source code RUN cd /comsoftware \ - && git clone --recursive -b v5.0.0-alpha https://github.com/NCAR/ccpp-scm + && git clone --recursive -b release/public-v5 https://github.com/NCAR/ccpp-scm # Obtain the pre-computed look-up tables for running with Thompson microphysics RUN cd /comsoftware/ccpp-scm/ \ diff --git a/scm/etc/CENTOS_docker_setup.sh b/scm/etc/CENTOS_docker_setup.sh index 854178cf8..27e821d28 100755 --- a/scm/etc/CENTOS_docker_setup.sh +++ b/scm/etc/CENTOS_docker_setup.sh @@ -2,11 +2,11 @@ echo "Setting environment variables for SCM-CCPP on CENTOS with gcc/gfortran" -export CC=/opt/rh/devtoolset-8/root/usr/bin/gcc -export CXX=/opt/rh/devtoolset-8/root/usr/bin/g++ -export F77=/opt/rh/devtoolset-8/root/usr/bin/gfortran -export F90=/opt/rh/devtoolset-8/root/usr/bin/gfortran -export FC=/opt/rh/devtoolset-8/root/usr/bin/gfortran +export CC=/opt/rh/devtoolset-9/root/usr/bin/gcc +export CXX=/opt/rh/devtoolset-9/root/usr/bin/g++ +export F77=/opt/rh/devtoolset-9/root/usr/bin/gfortran +export F90=/opt/rh/devtoolset-9/root/usr/bin/gfortran +export FC=/opt/rh/devtoolset-9/root/usr/bin/gfortran export NETCDF=/comsoftware/libs/netcdf