Skip to content

Commit

Permalink
update CENTOS_docker_setup.sh to use newer compilers in CCC image; te…
Browse files Browse the repository at this point in the history
…mporary change to Dockerfile to use local CCC-gnu9 image (need to push CCC-gnu9 to Dockerhub)
  • Loading branch information
grantfirl committed Feb 23, 2021
1 parent 09c15c8 commit 76feee9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
5 changes: 3 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM dtcenter/common-community-container:latest
#FROM dtcenter/common-community-container:latest
FROM common-community-container-gnu9
MAINTAINER Michelle Harrold <harrold@ucar.edu> or Grant Firl <grantf@ucar.edu>

#
Expand All @@ -11,7 +12,7 @@ MAINTAINER Michelle Harrold <harrold@ucar.edu> or Grant Firl <grantf@ucar.edu>

# 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/ \
Expand Down
10 changes: 5 additions & 5 deletions scm/etc/CENTOS_docker_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 76feee9

Please sign in to comment.