exit hashexe* with error if mom_type not set

aekiss · aekiss · commit b80ef22ccc95 · 2022-08-09T15:57:34.000+10:00
diff --git a/control/01deg_jra55_iaf b/control/01deg_jra55_iaf
@@ -1 +1 @@
-Subproject commit 3c01cf5949f7db4b4a10f3168562b498a6d6e26f
+Subproject commit 23989a926f521a26c85cc3d429c3d0bbbfed6b4f
diff --git a/control/01deg_jra55_ryf b/control/01deg_jra55_ryf
@@ -1 +1 @@
-Subproject commit 40134288701705ae059009c3fdbef76f89c684c2
+Subproject commit c76061fe811727a68238ada4be088b4b4eda1045
diff --git a/control/025deg_jra55_iaf b/control/025deg_jra55_iaf
@@ -1 +1 @@
-Subproject commit 5db4f9addddf7cde3ac3b46fb65d2eff9091a982
+Subproject commit a90c0e2cb67995c59407cbf0e2522d225d936482
diff --git a/control/025deg_jra55_ryf b/control/025deg_jra55_ryf
@@ -1 +1 @@
-Subproject commit 2b2be7bb2152229688548fe7d648ef09932f0ae1
+Subproject commit 061f45ae21a0380ef3902b7d6c79be05e232344e
diff --git a/control/1deg_jra55_iaf b/control/1deg_jra55_iaf
@@ -1 +1 @@
-Subproject commit 41138e5f284d254eb120434e1e496c4035619cb8
+Subproject commit a582135ccfe2bbb13bf37ebe0b7da65445ef6312
diff --git a/control/1deg_jra55_ryf b/control/1deg_jra55_ryf
@@ -1 +1 @@
-Subproject commit 878db7c726ebf80218e2a6ae570c5ffef453652b
+Subproject commit 609485dc9146f977a9e037d061f6d646be0886fb
diff --git a/hashexe-public.sh b/hashexe-public.sh
@@ -24,7 +24,13 @@ else
 fi
 
 if [[ -z "${mom_type}" ]]; then
-    export mom_type=ACCESS-OM-BGC
+    echo "FATAL ERROR: mom_type not set. Need to do whichever of these is appropriate"
+    echo "  export mom_type=ACCESS-OM"
+    echo "or"
+    echo "  export mom_type=ACCESS-OM-BGC"
+    echo "taking into account the branches the control dirs are on:"
+    for d in control/*; do cd $d; echo $d; git status | grep "On branch"; cd -; done
+    exit 1
 fi
 
 yatmpath=${ACCESS_OM_DIR}/src/libaccessom2/build/bin/yatm.exe
diff --git a/hashexe.sh b/hashexe.sh
@@ -11,7 +11,13 @@ if [[ -z "${ACCESS_OM_DIR}" ]]; then
 fi
 
 if [[ -z "${mom_type}" ]]; then
-    export mom_type=ACCESS-OM-BGC
+    echo "FATAL ERROR: mom_type not set. Need to do whichever of these is appropriate"
+    echo "  export mom_type=ACCESS-OM"
+    echo "or"
+    echo "  export mom_type=ACCESS-OM-BGC"
+    echo "taking into account the branches the control dirs are on:"
+    for d in control/*; do cd $d; echo $d; git status | grep "On branch"; cd -; done
+    exit 1
 fi
 
 yatmpath=${ACCESS_OM_DIR}/src/libaccessom2/build/bin/yatm.exe
diff --git a/install.sh b/install.sh
@@ -7,8 +7,8 @@ set -e
 
 #Type of MOM installation
 
-#export mom_type=ACCESS-OM
-export mom_type=ACCESS-OM-BGC
+export mom_type=ACCESS-OM
+#export mom_type=ACCESS-OM-BGC
 
 echo "MOM5 build is of type mom_type=${mom_type}"
 sleep 1
diff --git a/src/cice5 b/src/cice5
@@ -1 +1 @@
-Subproject commit 2572851d96dab224415c02f9936fc59e66d6aad7
+Subproject commit 27bcc454cf292710c996c10e87218ec1e4c4bb7e
diff --git a/src/libaccessom2 b/src/libaccessom2
@@ -1 +1 @@
-Subproject commit a227a616fac7a7d4795d2ebcca750292b6004683
+Subproject commit 0ab72954ff751e554fa19e9ffd843320f96b704e
diff --git a/src/mom b/src/mom
@@ -1 +1 @@
-Subproject commit af3a94d40f21a4b7fd925d13b928f8721ad7d4c8
+Subproject commit 730f0bf56f64fad0d9abcfa973b7348a89c175c3
