Merge branch 'develop' into feature/prep_emis_rework

Author: bbakernoaa

sorc/build_upp.sh

@@ -26,12 +26,6 @@ shift $((OPTIND-1))
 
 source "${HOMEgfs_}/ush/detect_machine.sh"
 
-if [[ "${MACHINE_ID}" == "gaeac6" ]]; then
-  # The UPP does not recognise gaeac6 as a valid machine, so we need to set it to "gaea"
-  #    TODO: remove this stop-gap fix when UPP#1308 is addressed and that hash is brought into the GW.
-  export MACHINE_ID="gaea"
-fi
-
 cd "${HOMEgfs_}/sorc/ufs_model.fd/UFSATM/upp/tests"
 # shellcheck disable=SC2086
 BUILD_JOBS=${BUILD_JOBS:-8} bash -x "${HOMEgfs_}/sorc/ufs_model.fd/UFSATM/upp/tests/compile_upp.sh" ${_opts}

sorc/gdas.cd

@@ -55,6 +55,7 @@ local IMO=${LONB_IMO}
 local JMO=${LATB_JMO}
 local OUTPUT_FH=${FV3_OUTPUT_FH_NML}
 local IAU_OFFSET=${IAU_OFFSET:-0}
+local USE_FV3_ROUTEHANDLES=.false.
 
 #set FV3 output directory:
 local FV3ATM_OUTPUT_DIR="./FV3ATM_OUTPUT"

sorc/ufs_model.fd

@@ -476,8 +476,9 @@ local LSOIL_INCR=${LSOIL_INCR:-2}
 local LAND_IAU_FILTER_INC=".false."
 local LAND_IAU_UPD_STC=".true."
 local LAND_IAU_UPD_SLC=".true."
-local LAND_IAU_DP_STCSMC_ADJ=".true."
+local LAND_IAU_DO_STCSMC_ADJ=".true."
 local LAND_IAU_MIN_T_INC=0.0001
+local LAND_IAU_MIN_SLC_INC=0.000001
 
 # Check will need to be modified in the future
 # once GW is ready to add in land IAU

ush/parsing_model_configure_FV3.sh

@@ -59,6 +59,7 @@ if [[ "${DO_OCN_PERT_EPBL}" == "YES" ]]; then
 else
   local PERT_EPBL="False"
 fi
+local MOM6_HFREEZE=20.0
 # Ensure the template exists
 local template=${MOM6_INPUT_TEMPLATE:-"${PARMgfs}/ufs/MOM_input_${OCNRES}.IN"}
 if [[ ! -f "${template}" ]]; then