Skip to content

Commit a4bf8d8

Browse files
committed
also build cice with smaller blocks (18x15) at 0.1deg
1 parent 4b97ba3 commit a4bf8d8

File tree

4 files changed

+35
-3
lines changed

4 files changed

+35
-3
lines changed

Diff for: hashexe-public.sh

+14
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ fmspath=${ACCESS_OM_DIR}/src/mom/exec/nci/${mom_type}/fms_${mom_type}.x
3232
cice1path=${ACCESS_OM_DIR}/src/cice5/build_auscom_360x300_24p/cice_auscom_360x300_24p.exe
3333
cice025path=${ACCESS_OM_DIR}/src/cice5/build_auscom_1440x1080_480p/cice_auscom_1440x1080_480p.exe
3434
cice010path=${ACCESS_OM_DIR}/src/cice5/build_auscom_3600x2700_722p/cice_auscom_3600x2700_722p.exe
35+
cice010path_18x15=${ACCESS_OM_DIR}/src/cice5/build_auscom_18x15.3600x2700_1682p/cice_auscom_18x15.3600x2700_1682p.exe
3536
mppnccombinepath=${ACCESS_OM_DIR}/src/mom/bin/mppnccombine.nci
3637

3738
config1ryfpath=${ACCESS_OM_DIR}/control/1deg_jra55_ryf/config.yaml
@@ -60,34 +61,47 @@ yatmhashexe="${yatmbn%.*}"_${yatmhash}."${yatmpath##*.}"
6061
echo " cp -n ${yatmpath} ${bindir}/${yatmhashexe}"
6162
cp -n ${yatmpath} ${bindir}/${yatmhashexe}
6263
chmod o+x ${bindir}/${yatmhashexe} || true
64+
chgrp ik11 ${bindir}/${yatmhashexe} || true
6365

6466
fmsbn=$(basename "${fmspath}")
6567
fmshashexe="${fmsbn%.*}"_${fmshash}."${fmspath##*.}"
6668
echo " cp -n ${fmspath} ${bindir}/${fmshashexe}"
6769
cp -n ${fmspath} ${bindir}/${fmshashexe}
6870
chmod o+x ${bindir}/${fmshashexe} || true
71+
chgrp ik11 ${bindir}/${fmshashexe} || true
6972

7073
cice1bn=$(basename "${cice1path}")
7174
cice1hashexe="${cice1bn%.*}"_${cicehash}."${cice1path##*.}"
7275
echo " cp -n ${cice1path} ${bindir}/${cice1hashexe}"
7376
cp -n ${cice1path} ${bindir}/${cice1hashexe}
7477
chmod o+x ${bindir}/${cice1hashexe} || true
78+
chgrp ik11 ${bindir}/${cice1hashexe} || true
7579

7680
cice025bn=$(basename "${cice025path}")
7781
cice025hashexe="${cice025bn%.*}"_${cicehash}."${cice025path##*.}"
7882
echo " cp -n ${cice025path} ${bindir}/${cice025hashexe}"
7983
cp -n ${cice025path} ${bindir}/${cice025hashexe}
8084
chmod o+x ${bindir}/${cice025hashexe} || true
85+
chgrp ik11 ${bindir}/${cice025hashexe} || true
8186

8287
cice010bn=$(basename "${cice010path}")
8388
cice010hashexe="${cice010bn%.*}"_${cicehash}."${cice010path##*.}"
8489
echo " cp -n ${cice010path} ${bindir}/${cice010hashexe}"
8590
cp -n ${cice010path} ${bindir}/${cice010hashexe}
8691
chmod o+x ${bindir}/${cice010hashexe} || true
92+
chgrp ik11 ${bindir}/${cice010hashexe} || true
93+
94+
cice010bn_18x15=$(basename "${cice010path_18x15}")
95+
cice010hashexe_18x15="${cice010bn_18x15%.*}"_${cicehash}."${cice010path_18x15##*.}"
96+
echo " cp -n ${cice010path_18x15} ${bindir}/${cice010hashexe_18x15}"
97+
cp -n ${cice010path_18x15} ${bindir}/${cice010hashexe_18x15}
98+
chmod o+x ${bindir}/${cice010hashexe_18x15} || true
99+
chgrp ik11 ${bindir}/${cice010hashexe_18x15} || true
87100

88101
echo " cp -n ${mppnccombinepath} ${bindir}/mppnccombine"
89102
cp -n ${mppnccombinepath} ${bindir}/mppnccombine # no hash for mppnccombine
90103
chmod o+x ${bindir}/mppnccombine || true # no hash for mppnccombine
104+
chgrp ik11 ${bindir}/mppnccombine || true # no hash for mppnccombine
91105

92106
echo "Fixing exe in "${config1ryfpath}" to match executable names..."
93107
sed "s|exe:.*${yatmbn%.*}_.*|exe: ${bindir}/${yatmhashexe}|g" < ${config1ryfpath} > ${config1ryfpath}-tmp

Diff for: hashexe.sh

+6
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ fmspath=${ACCESS_OM_DIR}/src/mom/exec/nci/${mom_type}/fms_${mom_type}.x
1919
cice1path=${ACCESS_OM_DIR}/src/cice5/build_auscom_360x300_24p/cice_auscom_360x300_24p.exe
2020
cice025path=${ACCESS_OM_DIR}/src/cice5/build_auscom_1440x1080_480p/cice_auscom_1440x1080_480p.exe
2121
cice010path=${ACCESS_OM_DIR}/src/cice5/build_auscom_3600x2700_722p/cice_auscom_3600x2700_722p.exe
22+
cice010path_18x15=${ACCESS_OM_DIR}/src/cice5/build_auscom_18x15.3600x2700_1682p/cice_auscom_18x15.3600x2700_1682p.exe
2223
mppnccombinepath=${ACCESS_OM_DIR}/src/mom/bin/mppnccombine.nci
2324

2425
config1ryfpath=${ACCESS_OM_DIR}/control/1deg_jra55_ryf/config.yaml
@@ -71,6 +72,11 @@ cice010hashexe="${cice010bn%.*}"_${cicehash}."${cice010path##*.}"
7172
echo " cp ${cice010path} ${bindir}/${cice010hashexe}"
7273
cp ${cice010path} ${bindir}/${cice010hashexe}
7374

75+
cice010bn_18x15=$(basename "${cice010path_18x15}")
76+
cice010hashexe_18x15="${cice010bn_18x15%.*}"_${cicehash}."${cice010path_18x15##*.}"
77+
echo " cp ${cice010path_18x15} ${bindir}/${cice010hashexe_18x15}"
78+
cp ${cice010path_18x15} ${bindir}/${cice010hashexe_18x15}
79+
7480
echo " cp ${mppnccombinepath} ${bindir}/mppnccombine"
7581
cp ${mppnccombinepath} ${bindir}/mppnccombine # no hash for mppnccombine
7682

Diff for: install.sh

+13-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if [[ -z "${ACCESS_OM_DIR}" ]]; then
2222
fi
2323
export LIBACCESSOM2_ROOT=$ACCESS_OM_DIR/src/libaccessom2
2424

25-
declare -a exepaths=(${ACCESS_OM_DIR}/src/mom/exec/nci/${mom_type}/fms_${mom_type}.x ${LIBACCESSOM2_ROOT}/build/bin/yatm.exe ${ACCESS_OM_DIR}/src/cice5/build_auscom_360x300_24p/cice_auscom_360x300_24p.exe ${ACCESS_OM_DIR}/src/cice5/build_auscom_1440x1080_480p/cice_auscom_1440x1080_480p.exe ${ACCESS_OM_DIR}/src/cice5/build_auscom_3600x2700_722p/cice_auscom_3600x2700_722p.exe ${ACCESS_OM_DIR}/src/mom/bin/mppnccombine.nci)
25+
declare -a exepaths=(${ACCESS_OM_DIR}/src/mom/exec/nci/${mom_type}/fms_${mom_type}.x ${LIBACCESSOM2_ROOT}/build/bin/yatm.exe ${ACCESS_OM_DIR}/src/cice5/build_auscom_360x300_24p/cice_auscom_360x300_24p.exe ${ACCESS_OM_DIR}/src/cice5/build_auscom_1440x1080_480p/cice_auscom_1440x1080_480p.exe ${ACCESS_OM_DIR}/src/cice5/build_auscom_3600x2700_722p/cice_auscom_3600x2700_722p.exe ${ACCESS_OM_DIR}/src/cice5/build_auscom_18x15.3600x2700_1682p/cice_auscom_18x15.3600x2700_1682p.exe ${ACCESS_OM_DIR}/src/mom/bin/mppnccombine.nci)
2626
# ${ACCESS_OM_DIR}/src/matm/build_nt62/matm_nt62.exe
2727
# ${ACCESS_OM_DIR}/src/matm/build_jra55/matm_jra55.exe
2828

@@ -31,37 +31,49 @@ cd ${ACCESS_OM_DIR}
3131
# echo "Downloading experiment input data and creating directories..."
3232
# ${ACCESS_OM_DIR}/get_input_data.py
3333

34+
echo
3435
echo "Removing previous executables (if any)..."
3536
for p in "${exepaths[@]}"
3637
do
3738
rm ${p} && echo "rm ${p}"
3839
done
3940

41+
echo
4042
echo "Compiling YATM file-based atmosphere and libaccessom2... "
4143
cd ${LIBACCESSOM2_ROOT}
4244
source ./build_on_gadi.sh
4345

46+
echo
4447
echo "Compiling MOM5.1..."
4548
cd ${ACCESS_OM_DIR}/src/mom/exp
4649
./MOM_compile.csh --type $mom_type --platform nci
4750

4851
cd ${ACCESS_OM_DIR}/src/cice5
52+
echo
4953
echo "Compiling CICE5.1 at 1 degree..."
5054
make # 1 degree
55+
echo
5156
echo "Compiling CICE5.1 at 1/4 degree..."
5257
make 025deg
58+
echo
5359
echo "Compiling CICE5.1 at 1/10 degree..."
5460
make 01deg
61+
echo
62+
echo "Compiling CICE5.1 at 1/10 degree with more blocks..."
63+
make 01deg_18x15
5564

65+
echo
5666
echo "Checking all executables have been built..."
5767
for p in "${exepaths[@]}"
5868
do
5969
ls ${p} || { echo "Build failed!"; exit 1; }
6070
done
6171

72+
echo
6273
source ${ACCESS_OM_DIR}/hashexe.sh
6374

6475
cd ${ACCESS_OM_DIR}
76+
echo
6577
echo "Executables were built using these library versions:"
6678
source ${ACCESS_OM_DIR}/libcheck.sh
6779

Diff for: libcheck.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ fi
1616

1717
declare -a libs=(openmpi netcdf)
1818

19-
declare -a paths=(${ACCESS_OM_DIR}/src/mom/bin/environs.nci ${ACCESS_OM_DIR}/src/cice5/bld/config.nci.auscom.360x300 ${ACCESS_OM_DIR}/src/cice5/bld/config.nci.auscom.1440x1080 ${ACCESS_OM_DIR}/src/cice5/bld/config.nci.auscom.3600x2700 ${LIBACCESSOM2_ROOT}/build_on_gadi.sh ${LIBACCESSOM2_ROOT}/oasis3-mct/util/make_dir/config.gadi)
19+
declare -a paths=(${ACCESS_OM_DIR}/src/mom/bin/environs.nci ${ACCESS_OM_DIR}/src/cice5/bld/config.nci.auscom.360x300 ${ACCESS_OM_DIR}/src/cice5/bld/config.nci.auscom.1440x1080 ${ACCESS_OM_DIR}/src/cice5/bld/config.nci.auscom.3600x2700 ${ACCESS_OM_DIR}/src/cice5/bld/config.nci.auscom.18x15.3600x2700 ${LIBACCESSOM2_ROOT}/build_on_gadi.sh ${LIBACCESSOM2_ROOT}/oasis3-mct/util/make_dir/config.gadi)
2020

21-
declare -a exepaths=(${ACCESS_OM_DIR}/src/mom/exec/nci/${mom_type}/fms_${mom_type}.x ${ACCESS_OM_DIR}/src/cice5/build_auscom_360x300_24p/cice_auscom_360x300_24p.exe ${ACCESS_OM_DIR}/src/cice5/build_auscom_1440x1080_480p/cice_auscom_1440x1080_480p.exe ${ACCESS_OM_DIR}/src/cice5/build_auscom_3600x2700_722p/cice_auscom_3600x2700_722p.exe ${LIBACCESSOM2_ROOT}/build/bin/yatm.exe ${ACCESS_OM_DIR}/src/mom/bin/mppnccombine.nci)
21+
declare -a exepaths=(${ACCESS_OM_DIR}/src/mom/exec/nci/${mom_type}/fms_${mom_type}.x ${ACCESS_OM_DIR}/src/cice5/build_auscom_360x300_24p/cice_auscom_360x300_24p.exe ${ACCESS_OM_DIR}/src/cice5/build_auscom_1440x1080_480p/cice_auscom_1440x1080_480p.exe ${ACCESS_OM_DIR}/src/cice5/build_auscom_3600x2700_722p/cice_auscom_3600x2700_722p.exe ${ACCESS_OM_DIR}/src/cice5/build_auscom_18x15.3600x2700_1682p/cice_auscom_18x15.3600x2700_1682p.exe ${LIBACCESSOM2_ROOT}/build/bin/yatm.exe ${ACCESS_OM_DIR}/src/mom/bin/mppnccombine.nci)
2222

2323
for l in "${libs[@]}"
2424
do

0 commit comments

Comments
 (0)