Skip to content

Commit 4c3efea

Browse files
committed
add commented out module loads and PREFIX for local building on workstation for now, also make an attempt at fixing the split_ncvars tests
1 parent b0a36df commit 4c3efea

File tree

8 files changed

+20
-8
lines changed

8 files changed

+20
-8
lines changed

build.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22

33
set -ex
44

5+
## testing locally on ppan/ workstation
6+
#module load gcc
7+
#module load hdf5
8+
#module load mpich
9+
#module load hdf5
10+
#module load netcdf-c
11+
#module load nco
12+
#module load netcdf-fortran/
13+
#module list
14+
15+
516
echo ""
617
which nc-config
718
echo "we have nc-config"
@@ -73,6 +84,7 @@ echo ""
7384
echo 'building FRE-NCtools conda package...'
7485

7586
## this is sufficient
87+
#PREFIX=/home/inl/Working/fre-nctools/FRENCTOOLS
7688
autoreconf -iv
7789
./configure --prefix=$PREFIX --enable-quad-precision --with-mpi || cat config.log
7890
#./configure --with-mpi || cat config.log

tests/split_ncvars/split_ncvars

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ then
2424
command -v split_ncvars.pl --version
2525
fi
2626

27-
. ${srcdir=.}/init.sh; path_prepend_ ../../src
27+
. ${srcdir=.}/init.sh; path_prepend_ ../src
2828

2929
# Need to use the included list_ncvars.sh script. Otherwise,
3030
# split_ncvars will look for list_ncvars.sh in the installed bin
@@ -52,4 +52,4 @@ split_ncvars.pl test_input_*.nc || fail_ split_ncvars.pl multiple input files fa
5252
test -f var1.nc || fail_ var1.nc not created with multiple input files
5353
test -f var2.nc || fail_ var2.nc not created with multiple input files
5454
# Verify there are 60 time steps
55-
ncdump -h var1.nc | grep -q '60 currently' || fail_ var1.nc does not have 60 time steps
55+
ncdump -h var1.nc | grep -q '60 currently' || fail_ var1.nc does not have 60 time steps

tests/split_ncvars/split_ncvars-i

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ then
2424
command -v split_ncvars.pl --version
2525
fi
2626

27-
. ${srcdir=.}/init.sh; path_prepend_ ../../src
27+
. ${srcdir=.}/init.sh; path_prepend_ ../src
2828

2929
# Need to use the included list_ncvars.sh script. Otherwise,
3030
# split_ncvars will look for list_ncvars.sh in the installed bin

tests/split_ncvars/split_ncvars-l

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ then
2424
command -v split_ncvars.pl --version
2525
fi
2626

27-
. ${srcdir=.}/init.sh; path_prepend_ ../../src
27+
. ${srcdir=.}/init.sh; path_prepend_ ../src
2828

2929
# Need to use the included list_ncvars.sh script. Otherwise,
3030
# split_ncvars will look for list_ncvars.sh in the installed bin

tests/split_ncvars/split_ncvars-o

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ then
2424
command -v split_ncvars.pl --version
2525
fi
2626

27-
. ${srcdir=.}/init.sh; path_prepend_ ../../src
27+
. ${srcdir=.}/init.sh; path_prepend_ ../src
2828

2929
# Need to use the included list_ncvars.sh script. Otherwise,
3030
# split_ncvars will look for list_ncvars.sh in the installed bin

tests/split_ncvars/split_ncvars-p

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ then
2424
command -v split_ncvars.pl --version
2525
fi
2626

27-
. ${srcdir=.}/init.sh; path_prepend_ ../../src
27+
. ${srcdir=.}/init.sh; path_prepend_ ../src
2828

2929
# Need to use the included list_ncvars.sh script. Otherwise,
3030
# split_ncvars will look for list_ncvars.sh in the installed bin

tests/split_ncvars/split_ncvars-s

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ then
2424
command -v split_ncvars.pl --version
2525
fi
2626

27-
. ${srcdir=.}/init.sh; path_prepend_ ../../src
27+
. ${srcdir=.}/init.sh; path_prepend_ ../src
2828

2929
# Need to use the included list_ncvars.sh script. Otherwise,
3030
# split_ncvars will look for list_ncvars.sh in the installed bin

tests/split_ncvars/split_ncvars-v

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ then
2424
command -v split_ncvars.pl --version
2525
fi
2626

27-
. ${srcdir=.}/init.sh; path_prepend_ ../../src
27+
. ${srcdir=.}/init.sh; path_prepend_ ../src
2828

2929
# Need to use the included list_ncvars.sh script. Otherwise,
3030
# split_ncvars will look for list_ncvars.sh in the installed bin

0 commit comments

Comments
 (0)