Merge remote-tracking branch 'upstream/develop' into feature/hash_update

.cicd/scripts/srw_ftest.sh

@@ -46,7 +46,6 @@ fi
 # Test directories
 we2e_experiment_base_dir="${workspace}/expt_dirs"
 we2e_test_dir="${workspace}/tests/WE2E"
-nco_dir="${workspace}/nco_dirs"
 
 pwd
 

.cicd/scripts/srw_test.sh

@@ -28,7 +28,6 @@ fi
 # Test directories
 we2e_experiment_base_dir="${workspace}/expt_dirs"
 we2e_test_dir="${workspace}/tests/WE2E"
-nco_dir="${workspace}/nco_dirs"
 
 # Run the end-to-end tests.
 if "${SRW_WE2E_COMPREHENSIVE_TESTS}"; then
@@ -41,8 +40,7 @@ cd ${we2e_test_dir}
 # Progress file
 progress_file="${workspace}/we2e_test_results-${platform}-${SRW_COMPILER}.txt"
 ./setup_WE2E_tests.sh ${platform} ${SRW_PROJECT} ${SRW_COMPILER} ${test_type} \
-    --expt_basedir=${we2e_experiment_base_dir} \
-    --opsroot=${nco_dir} | tee ${progress_file}
+    --expt_basedir=${we2e_experiment_base_dir} | tee ${progress_file}
 
 # Set exit code to number of failures
 set +e

.gitignore

@@ -5,13 +5,18 @@ build/
 fix/
 include/
 lib/
+parm/aqm_utils_parm/
+parm/nexus_config/
+parm/ufs_utils_parm/
 share/
 sorc/*/
 tests/WE2E/WE2E_tests_*.yaml
 tests/WE2E/*.txt
 tests/WE2E/*.log
 tests/WE2E/log.*
 ush/__pycache__/
+ush/aqm_utils_python/
+ush/nexus_utils/
 ush/config.yaml
 ush/python_utils/__pycache__/
 ush/python_utils/workflow-tools/

Externals.cfg

@@ -30,7 +30,7 @@ protocol = git
 repo_url = https://github.com/noaa-oar-arl/NEXUS
 # Specify either a branch name or a hash but not both.
 #branch = develop
-hash = 6a7a994
+hash = 40346b6
 local_path = sorc/arl_nexus
 required = True
 
@@ -39,7 +39,7 @@ protocol = git
 repo_url = https://github.com/NOAA-EMC/AQM-utils
 # Specify either a branch name or a hash but not both.
 #branch = develop
-hash = 694a139
+hash = d953bd1
 local_path = sorc/AQM-utils
 required = True
 

devbuild.sh

@@ -502,4 +502,38 @@ else
     fi
 fi
 
+# Copy config/python directories from component to main directory (EE2 compliance)
+if [ "${BUILD_UFS_UTILS}" = "on" ]; then
+  if [ -d "${SRW_DIR}/parm/ufs_utils_parm" ]; then
+    rm -rf ${SRW_DIR}/parm/ufs_utils_parm
+  fi
+  cp -rp ${SRW_DIR}/sorc/UFS_UTILS/parm ${SRW_DIR}/parm/ufs_utils_parm
+fi
+if [ "${BUILD_UPP}" = "on" ]; then
+  if [ -d "${SRW_DIR}/parm/upp_parm" ]; then
+    rm -rf ${SRW_DIR}/parm/upp_parm
+  fi
+  cp -rp ${SRW_DIR}/sorc/UPP/parm ${SRW_DIR}/parm/upp_parm
+fi
+if [ "${BUILD_NEXUS}" = "on" ]; then
+  if [ -d "${SRW_DIR}/parm/nexus_config" ]; then
+    rm -rf ${SRW_DIR}/parm/nexus_config
+  fi
+  cp -rp ${SRW_DIR}/sorc/arl_nexus/config ${SRW_DIR}/parm/nexus_config
+  if [ -d "${SRW_DIR}/ush/nexus_utils" ]; then
+    rm -rf ${SRW_DIR}/ush/nexus_utils
+  fi
+  cp -rp ${SRW_DIR}/sorc/arl_nexus/utils ${SRW_DIR}/ush/nexus_utils
+fi
+if [ "${BUILD_AQM_UTILS}" = "on" ]; then
+  if [ -d "${SRW_DIR}/parm/aqm_utils_parm" ]; then
+    rm -rf ${SRW_DIR}/parm/aqm_utils_parm
+  fi
+  cp -rp ${SRW_DIR}/sorc/AQM-utils/parm ${SRW_DIR}/parm/aqm_utils_parm
+  if [ -d "${SRW_DIR}/ush/aqm_utils_python" ]; then
+    rm -rf ${SRW_DIR}/ush/aqm_utils_python
+  fi
+  cp -rp ${SRW_DIR}/sorc/AQM-utils/python_utils ${SRW_DIR}/ush/aqm_utils_python
+fi
+
 exit 0

jobs/JREGIONAL_MAKE_ICS

@@ -56,9 +56,9 @@ for the FV3 (in NetCDF format).
 #-----------------------------------------------------------------------
 #
 if [ $RUN_ENVIR = "nco" ]; then
-    export INPUT_DATA="${COMIN}"
+  export INPUT_DATA="${COMIN}"
 else
-    export INPUT_DATA="${COMIN}${SLASH_ENSMEM_SUBDIR}/INPUT"
+  export INPUT_DATA="${COMIN}${SLASH_ENSMEM_SUBDIR}/INPUT"
 fi
 mkdir_vrfy -p "${INPUT_DATA}"
 #

jobs/JREGIONAL_MAKE_LBCS

@@ -56,9 +56,9 @@ hour zero).
 #-----------------------------------------------------------------------
 #
 if [ $RUN_ENVIR = "nco" ]; then
-    export INPUT_DATA="${COMIN}"
+  export INPUT_DATA="${COMIN}"
 else
-    export INPUT_DATA="${COMIN}${SLASH_ENSMEM_SUBDIR}/INPUT"
+  export INPUT_DATA="${COMIN}${SLASH_ENSMEM_SUBDIR}/INPUT"
 fi
 mkdir_vrfy -p "${INPUT_DATA}"
 #