From 3bf7609e232e8a6e7883e2f361ebf0036c9b75ba Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Thu, 23 Jun 2022 14:27:59 -0600 Subject: [PATCH 1/2] Add missing SCM_ROOT def that got dropped at some point --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index c81536397..99fc2a25b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -66,4 +66,4 @@ RUN cd /comsoftware/ccpp-scm/scm \ # Set working directory WORKDIR /comsoftware/ccpp-scm/scm/bin ENV SCM_WORK=/comsoftware - +ENV SCM_ROOT=/comsoftware/ccpp-scm/ From 0b693ad2f24396b6016b712aa8b255ba9df9d5ce Mon Sep 17 00:00:00 2001 From: "Michael Kavulich, Jr" Date: Thu, 23 Jun 2022 14:31:30 -0600 Subject: [PATCH 2/2] Make all static data files ".tar.gz" for consistency and smaller file size --- contrib/get_mg_inccn_data.sh | 6 +++--- contrib/get_thompson_tables.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/get_mg_inccn_data.sh b/contrib/get_mg_inccn_data.sh index 4619ea2dc..70881ced1 100755 --- a/contrib/get_mg_inccn_data.sh +++ b/contrib/get_mg_inccn_data.sh @@ -16,8 +16,8 @@ BASEDIR=$MYDIR/.. # Change to directory containing the physics input data, download and extract archive cd $BASEDIR/scm/data/physics_input_data/ -wget https://github.com/NCAR/ccpp-scm/releases/download/v6.0.0/MG_INCCN_data.tar -tar -xvf MG_INCCN_data.tar -rm -f MG_INCCN_data.tar +wget https://github.com/NCAR/ccpp-scm/releases/download/v6.0.0/MG_INCCN_data.tar.gz +tar -xvf MG_INCCN_data.tar.gz +rm -f MG_INCCN_data.tar.gz cd $BASEDIR/ diff --git a/contrib/get_thompson_tables.sh b/contrib/get_thompson_tables.sh index 552ac800a..9657ec902 100755 --- a/contrib/get_thompson_tables.sh +++ b/contrib/get_thompson_tables.sh @@ -15,8 +15,8 @@ BASEDIR=$MYDIR/.. # Change to directory containing the physics input data, download and extract archive cd $BASEDIR/scm/data/physics_input_data/ -wget https://github.com/NCAR/ccpp-scm/releases/download/v6.0.0/thompson_tables.tar -tar -xvf thompson_tables.tar -rm -f thompson_tables.tar +wget https://github.com/NCAR/ccpp-scm/releases/download/v6.0.0/thompson_tables.tar.gz +tar -xvf thompson_tables.tar.gz +rm -f thompson_tables.tar.gz cd $BASEDIR/