Merge branch 'develop' into fix/derecho

Author: natalie-perlin

.cicd/scripts/post_test_results.sh

@@ -46,7 +46,13 @@ function post_test() {
 
 	git add tests/logs/RegressionTests_${machine,,}.log
 	git status
-	git commit -m "[AutoRT] ${machine} Job Completed.\n\n\n on-behalf-of @ufs-community <ecc.platform@noaa.gov>"
+        
+        ##Check regression test logs results 
+        if grep -q "Result: SUCCESS" ${UFS_MODEL_DIR}/tests/logs/RegressionTests_${machine,,}.log && grep -q "status=0" ${UFS_MODEL_DIR}/tests/logs/${machine,,}-status; then
+           git commit -m "[AutoRT] ${machine} Job Completed Successfully.\n\n\n on-behalf-of @ufs-community <ecc.platform@noaa.gov>"
+        else
+           git commit --allow-empty -m "[AutoRT] ${machine} Job Failed! \n\n\n on-behalf-of @ufs-community <ecc.platform@noaa.gov>"
+        fi
 
 	SSH_ORIGIN=$(curl --silent "https://api.github.com/repos/ufs-community/ufs-weather-model/pulls/${CHANGE_ID}" | jq -r '.head.repo.ssh_url')
 	git remote -v | grep -w sshorigin > /dev/null 2>&1 && git remote remove sshorigin > /dev/null 2>&1

.cicd/scripts/wm_test.sh

@@ -134,7 +134,12 @@ if [[ ${WM_REGRESSION_TESTS} = true ]] ; then
 
 	cd ${workspace}
 	find ${workspace}/tests/logs -ls
-	echo "Pipeline Reqression Tests on ${UFS_PLATFORM} complete. status=${status}"
+        ###Fail case check if no test logs were completed move old file back.
+	if [[ ! -f "tests/logs/RegressionTests_${UFS_PLATFORM}.log" && -f "tests/logs/RegressionTests_${UFS_PLATFORM}.log.orig" ]];then 
+           mv tests/logs/RegressionTests_${UFS_PLATFORM}.log.orig tests/logs/RegressionTests_${UFS_PLATFORM}.log
+        fi
+
+	echo "Pipeline Reqression Tests on ${UFS_PLATFORM} complete. status=${status}" | tee ${workspace}/${UFS_PLATFORM}-status
 else
 	echo "Pipeline Regression Tests on ${UFS_PLATFORM} (${machine}) skipped."
 	echo "ExperimentName: null" > ${workspace}/wm_test_results-${UFS_PLATFORM}-${UFS_COMPILER}.txt

AQM

@@ -69,6 +69,7 @@ list(APPEND icepack_files
   CICE/icepack/columnphysics/icepack_itd.F90
   CICE/icepack/columnphysics/icepack_kinds.F90
   CICE/icepack/columnphysics/icepack_mechred.F90
+  CICE/icepack/columnphysics/icepack_meltpond_sealvl.F90
   CICE/icepack/columnphysics/icepack_meltpond_lvl.F90
   CICE/icepack/columnphysics/icepack_meltpond_topo.F90
   CICE/icepack/columnphysics/icepack_mushy_physics.F90

CDEPS-interface/CDEPS

@@ -299,9 +299,6 @@ list(APPEND mom6_src_files
   MOM6/src/ocean_data_assim/MOM_oda_driver.F90
   MOM6/src/ocean_data_assim/MOM_oda_incupd.F90
 
-  MOM6/config_src/external/GFDL_ocean_BGC/FMS_coupler_util.F90
-  MOM6/config_src/external/GFDL_ocean_BGC/generic_tracer.F90
-  MOM6/config_src/external/GFDL_ocean_BGC/generic_tracer_utils.F90
   MOM6/config_src/external/GFDL_ocean_BGC/MOM_generic_tracer.F90
   MOM6/config_src/external/ODA_hooks/kdtree.f90
   MOM6/config_src/external/ODA_hooks/ocean_da_core.F90
@@ -343,9 +340,11 @@ list(APPEND mom6_nuopc_src_files
   MOM6/config_src/drivers/unit_tests/test_MOM_string_functions.F90
   MOM6/config_src/drivers/unit_tests/test_MOM_EOS.F90
   MOM6/config_src/drivers/unit_tests/test_MOM_remapping.F90
+  MOM6/config_src/drivers/unit_tests/test_numerical_testing_type.F90
+  MOM6/config_src/drivers/unit_tests/test_reproducing_sum.F90
   MOM6/config_src/drivers/timing_tests/time_MOM_EOS.F90
   MOM6/config_src/drivers/timing_tests/time_MOM_remapping.F90
-  MOM6/config_src/drivers/unit_tests/test_numerical_testing_type.F90
+  MOM6/config_src/drivers/timing_tests/time_reproducing_sum.F90
 )
 
 list(APPEND mom6_nuopc_src_files