Skip to content

Commit 0a24efa

Browse files
Merge pull request #36 from CIROH-UA/docker_update_jan_25
Up to dated with Docker
2 parents 261f895 + e67472f commit 0a24efa

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

singularity/singularity_ngen.def

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ From: rockylinux:9.1
33

44
%environment
55
export TROUTE_REPO="CIROH-UA/t-route"
6-
export TROUTE_BRANCH="datastream"
6+
export TROUTE_BRANCH="ngiab"
77
export NGEN_REPO="CIROH-UA/ngen"
88
export NGEN_BRANCH="ngiab"
99
export PATH="/usr/lib64/openmpi/bin:$PATH"
@@ -13,7 +13,7 @@ From: rockylinux:9.1
1313
%post
1414
# First set the environment variables for use in %post
1515
TROUTE_REPO="CIROH-UA/t-route"
16-
TROUTE_BRANCH="datastream"
16+
TROUTE_BRANCH="ngiab"
1717
NGEN_REPO="CIROH-UA/ngen"
1818
NGEN_BRANCH="ngiab"
1919

@@ -23,7 +23,7 @@ From: rockylinux:9.1
2323
dnf install -y epel-release
2424
dnf config-manager --set-enabled crb
2525
dnf install -y sudo vim gcc gcc-c++ make cmake ninja-build tar git gcc-gfortran libgfortran sqlite sqlite-devel \
26-
python3 python3-devel python3-pip gdal gdal-devel \
26+
python3 python3-devel python3-pip \
2727
bzip2 expat expat-devel flex bison udunits2 udunits2-devel zlib-devel \
2828
wget openmpi openmpi-devel hdf5 hdf5-devel netcdf netcdf-devel \
2929
netcdf-fortran netcdf-fortran-devel netcdf-cxx netcdf-cxx-devel lld
@@ -88,7 +88,7 @@ From: rockylinux:9.1
8888
-DNGEN_WITH_UDUNITS:BOOL=ON \
8989
-DUDUNITS_QUIET:BOOL=ON \
9090
-DNGEN_WITH_TESTS:BOOL=OFF \
91-
-DCMAKE_BUILD_TYPE=Debug \
91+
-DCMAKE_BUILD_TYPE=Release \
9292
-DCMAKE_INSTALL_PREFIX=. \
9393
-DCMAKE_CXX_FLAGS='-fuse-ld=lld'"
9494

0 commit comments

Comments
 (0)