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

Fixes ufs-community#1977.

MOM6-interface/mom6_files.cmake

@@ -209,7 +209,7 @@ list(APPEND mom6_src_files
 
   MOM6/src/tracer/MOM_OCMIP2_CFC.F90
   MOM6/src/tracer/MOM_generic_tracer.F90
-  MOM6/src/tracer/MOM_lateral_boundary_diffusion.F90
+  MOM6/src/tracer/MOM_hor_bnd_diffusion.F90
   MOM6/src/tracer/MOM_neutral_diffusion.F90
   MOM6/src/tracer/nw2_tracers.F90
   MOM6/src/tracer/MOM_offline_aux.F90

cmake/Intel.cmake

@@ -25,6 +25,7 @@ else()
     elseif(SIMDMULTIARCH)
         set(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -axSSE4.2,CORE-AVX2")
         set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -axSSE4.2,CORE-AVX2")
+        set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -mcmodel=medium")
     elseif(AVX)
         set(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -march=core-avx-i")
         set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -march=core-avx-i")

tests/bl_date.conf

@@ -1 +1 @@
-export BL_DATE=20231024
+export BL_DATE=20231115

tests/default_vars.sh

@@ -174,6 +174,8 @@ elif [[ $MACHINE_ID = jet ]]; then
   INPES_thrd=3 ; JNPES_thrd=4
   INPES_c384=6 ; JNPES_c384=12 ; THRD_c384=1
   INPES_c768=8 ; JNPES_c768=16 ; THRD_c768=2
+  WRTTASK_PER_GROUP_c384=84
+  WRTTASK_PER_GROUP_c384gdas=88
 
   THRD_cpl_atmw_gdas=2
   INPES_cpl_atmw_gdas=6; JNPES_cpl_atmw_gdas=8; WPG_cpl_atmw_gdas=24
@@ -357,7 +359,7 @@ export INPES=$INPES_dflt
 export JNPES=$JNPES_dflt
 export RESTART_INTERVAL=0
 export QUILTING=.true.
-export QUILTING_RESTART=.false.
+export QUILTING_RESTART=.true.
 export WRITE_GROUP=1
 export WRTTASK_PER_GROUP=6
 export ITASKS=1
@@ -449,6 +451,7 @@ export DO_UGWP=.false.
 export DO_TOFD=.false.
 export GWD_OPT=1
 export DO_UGWP_V0=.false.
+export DO_UGWP_V1_W_GSLDRAG=.false.
 export DO_UGWP_V0_OROG_ONLY=.false.
 export DO_GSL_DRAG_LS_BL=.false.
 export DO_GSL_DRAG_SS=.false.
@@ -457,7 +460,9 @@ export DO_UGWP_V1=.false.
 export DO_UGWP_V1_OROG_ONLY=.false.
 export KNOB_UGWP_DOKDIS=1
 export KNOB_UGWP_NDX4LH=1
-
+export KNOB_UGWP_VERSION=0
+export KNOB_UGWP_PALAUNCH=500.e2
+export KNOB_UGWP_NSLOPE=1
 
 # resolution dependent settings
 export CDMBWD_c48='0.071,2.1,1.0,1.0'
@@ -499,13 +504,17 @@ export RAS=.false.
 export RANDOM_CLDS=.false.
 export CNVCLD=.true.
 export PROGSIGMA=.false.
+export BETASCU=8.0
+export BETAMCU=1.0
+export BETADCU=2.0
 
 # Aerosol convective scavenging
 export FSCAV_AERO='"*:0.3","so2:0.0","msa:0.0","dms:0.0","nh3:0.4","nh4:0.6","bc1:0.6","bc2:0.6","oc1:0.4","oc2:0.4","dust1:0.6","dust2:0.6","dust3:0.6","dust4:0.6","dust5:0.6","seas1:0.5","seas2:0.5","seas3:0.5","seas4:0.5","seas5:0.5"'
 
 # SFC
 export DO_MYJSFC=.false.
 export DO_MYNNSFCLAY=.false.
+export BL_MYNN_TKEADVECT=.false.
 
 # LSM
 export LSM=1
@@ -555,6 +564,11 @@ export FNSMCC_control="'global_soilmgldas.statsgo.t1534.3072.1536.grb'"
 export FNMSKH_control="'global_slmask.t1534.3072.1536.grb'"
 export FNABSC="'global_mxsnoalb.uariz.t126.384.190.rg.grb'"
 
+# Dynamical core
+export FV_CORE_TAU=0.
+export RF_CUTOFF=30.0
+export FAST_TAU_W_SEC=0.0
+
 # Tiled Fix files
 export ATMRES=C96
 export TILEDFIX=.false.
@@ -698,6 +712,8 @@ export JNPES=$JNPES_cpl_dflt
 export THRD=$THRD_cpl_dflt
 export WRTTASK_PER_GROUP=$WPG_cpl_dflt
 
+export QUILTING_RESTART=.false.
+
 OCN_tasks=$OCN_tasks_cpl_dflt
 ICE_tasks=$ICE_tasks_cpl_dflt
 WAV_tasks=$WAV_tasks_cpl_dflt
@@ -1147,7 +1163,6 @@ export RESTART_INTERVAL=0
 export FHROT=0
 export coupling_interval_fast_sec=0
 export QUILTING=.true.
-export QUILTING_RESTART=.false.
 export WRITE_GROUP=1
 export WRTTASK_PER_GROUP=6
 export OUTPUT_HISTORY=.true.
@@ -1208,6 +1223,34 @@ export DOCN_CDEPS=false
 export INPES=$INPES_dflt
 export JNPES=$JNPES_dflt
 export NTILES=1
+export IMFSHALCNV=2
+export IMFDEEPCNV=2
+export HYBEDMF=.false.
+export SATMEDMF=.true.
+export MONINQ_FAC=-1.0
+export HURR_PBL=.true.
+export ISATMEDMF=1
+export IOPT_SFC=1
+export IOPT_DVEG=2
+export IOPT_CRS=1
+export IOPT_RAD=1
+export IOPT_ALB=2
+export IOPT_STC=1
+export LSM=1
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GSL_DRAG_SS=.true.
+export DO_GSL_DRAG_TOFD=.true.
+export IMP_PHYSICS=11
+export IAER=111
+export CNVGWD=.false.
+export LTAEROSOL=.false.
+export CDMBWD=1.0,1.0,1.0,1.0
+export LHEATSTRG=.false.
+export LRADAR=.true.
+
+export FV_CORE_TAU=5.
+export RF_CUTOFF=30.e2
+export RF_CUTOFF_NEST=50.e2
 
 export IS_MOVING_NEST=".false."
 export VORTEX_TRACKER=0
@@ -1348,6 +1391,9 @@ export FHMAX=12
 export FRAC_GRID=.false.
 export FRAC_ICE=.true.
 
+export FV_CORE_TAU=10.
+export RF_CUTOFF=7.5e2
+
 export FV3_RUN=lake_control_run.IN
 export CCPP_SUITE=FV3_HRRR
 export INPUT_NML=rap.nml.IN
@@ -1480,3 +1526,74 @@ export MODEL_CONFIGURE=model_configure_rrfs_conus13km.IN
 export DIAG_TABLE_ADDITIONAL=diag_additional_rrfs_smoke
 export FRAC_ICE=.true.
 }
+export_rap_common()
+{
+export_fv3
+export NPZ=127
+export NPZP=128
+export DT_ATMOS=300
+export SYEAR=2021
+export SMONTH=03
+export SDAY=22
+export SHOUR=06
+export OUTPUT_GRID='gaussian_grid'
+export NSTF_NAME='2,0,0,0,0'
+export WRITE_DOPOST=.true.
+export IAER=5111
+
+export FV_CORE_TAU=10.
+export RF_CUTOFF=7.5e2
+
+export FV3_RUN=control_run.IN
+export INPUT_NML=rap.nml.IN
+export FIELD_TABLE=field_table_thompson_aero_tke
+
+export LHEATSTRG=.false.
+export IMP_PHYSICS=8
+export DNATS=0
+export DO_SAT_ADJ=.false.
+export LRADAR=.true.
+export LTAEROSOL=.true.
+export IALB=2
+export IEMS=2
+export HYBEDMF=.false.
+export DO_MYNNEDMF=.true.
+export DO_MYNNSFCLAY=.true.
+}
+export_rap()
+{
+export_rap_common
+
+export DIAG_TABLE=diag_table_rap
+export CCPP_SUITE=FV3_RAP
+
+export IMFSHALCNV=3
+export IMFDEEPCNV=3
+export LSM=3
+export LSOIL_LSM=9
+export KICE=9
+
+export GWD_OPT=3
+export DO_UGWP_V0=.false.
+export DO_UGWP_V0_OROG_ONLY=.false.
+export DO_GSL_DRAG_LS_BL=.true.
+export DO_GSL_DRAG_SS=.true.
+export DO_GSL_DRAG_TOFD=.true.
+export DO_UGWP_V1=.false.
+export DO_UGWP_V1_OROG_ONLY=.false.
+}
+export_rrfs_v1()
+{
+export_rap_common
+
+export CCPP_SUITE=FV3_RRFS_v1beta
+export DIAG_TABLE=diag_table_rap_noah
+
+export DO_DEEP=.false.
+export SHAL_CNV=.false.
+export IMFSHALCNV=-1
+export IMFDEEPCNV=-1
+export LHEATSTRG=.false.
+export LSM=2
+export LSOIL_LSM=4
+}

tests/fv3_conf/hafs_fv3_run.IN

@@ -25,16 +25,23 @@ elif [ ${CNTL_DIR} = "hafs_regional_1nest_atm" ] || \
      [ ${CNTL_DIR} = "hafs_global_multiple_4nests_atm" ] || \
      [ ${CNTL_DIR} = "hafs_global_storm_following_1nest_atm" ]; then
   cp -r @[INPUTDATA_ROOT]/FV3_hafs_input_data/INPUT_${CNTL_DIR}/* ./INPUT/
+elif [ ${CNTL_DIR} = "gnv1_nested" ]; then
+  cp -r @[INPUTDATA_ROOT]/FV3_hafs_input_data/INPUT_hafs_global_1nest_atm/* ./INPUT/
 else
-  echo "Error: unsupported experiments ${CNTL_DIR}"
+  echo "Error: unsupported experiment ${CNTL_DIR}" 1>&2
+  exit 1
 fi
 
-if [ ${CNTL_DIR} = "hafs_regional_atm_thompson_gfdlsf" ]; then
+if [ ${CNTL_DIR} = "hafs_regional_atm_thompson_gfdlsf" ] || [ $IMP_PHYSICS = 8 ]; then
   cp @[INPUTDATA_ROOT]/FV3_fix/qr_acr_qsV2.dat .
   cp @[INPUTDATA_ROOT]/FV3_fix/qr_acr_qgV2.dat .
   cp @[INPUTDATA_ROOT]/FV3_fix/freezeH2O.dat .
   cp @[INPUTDATA_ROOT]/FV3_fix/CCN_ACTIVATE.BIN .
 fi
+#ugwpv1
+if [[ $DO_UGWP_V1 == .true. && ${CNTL_DIR} == "gnv1_nested" ]]; then
+  cp    @[INPUTDATA_ROOT]/FV3_input_data/ugwp_c384_tau.nc ./ugwp_limb_tau.nc
+fi
 
 if [[ $POSTAPP = 'hafs' ]]; then
     cp ${PATHRT}/parm/post_itag_hafs itag