Merge pull request #106 from grantfirl/ufs-dev-PR88

UFS-dev PR88
NCAR · Nov 2, 2023 · e1ce405 · e1ce405
2 parents 18631eb + a67b30d
commit e1ce405
Show file tree

Hide file tree

Showing 6 changed files with 5,237 additions and 7,821 deletions.
diff --git a/FV3 b/FV3
diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1,2 +1,2 @@
-export BL_DATE=20230713
+export BL_DATE=20230720
 
diff --git a/tests/bl_date.ncar.conf b/tests/bl_date.ncar.conf
@@ -1,2 +1,2 @@
-export BL_DATE=20231004
+export BL_DATE=20231031
 
diff --git a/tests/compile.sh b/tests/compile.sh
@@ -40,7 +40,7 @@ fi
 BUILD_NAME=fv3${COMPILE_NR}
 
 PATHTR=${PATHTR:-$( cd ${MYDIR}/.. && pwd )}
-BUILD_DIR=$(pwd)/build_${BUILD_NAME}
+BUILD_DIR=${BUILD_DIR:-$(pwd)/build_${BUILD_NAME}}
 
 # ----------------------------------------------------------------------
 # Make sure we have reasonable number of threads.

diff --git a/tests/detect_machine.sh b/tests/detect_machine.sh
@@ -105,7 +105,7 @@ case $(hostname -f) in
 
 esac
 
-case $(echo $PW_CSP:-nono) in
+case $(echo ${PW_CSP:-nono}) in
 
   aws) MACHINE_ID=aws ;; ### parallelworks aws
   google)  MACHINE_ID=gcp ;; ### parallelworks gcp