Merge branch 'ufs-community:develop' into text/us-414

gspetro-NOAA · Nov 19, 2024 · 99fbe58 · 99fbe58
2 parents 1d91c15 + c0367fd
commit 99fbe58
Show file tree

Hide file tree

Showing 64 changed files with 2,558 additions and 1,857 deletions.
diff --git a/FV3 b/FV3
diff --git a/NOAHMP-interface/CMakeLists.txt b/NOAHMP-interface/CMakeLists.txt
@@ -13,6 +13,7 @@ list(APPEND _noahmp_cap_files noahmp/drivers/nuopc/lnd_comp_kind.F90
 
 # CCPP interface
 list(APPEND _noahmp_ccpp_files noahmp/drivers/ccpp/noahmpdrv.F90
+                               noahmp/drivers/ccpp/lnd_iau_mod.F90
                                noahmp/drivers/ccpp/sfc_diff.f
                                noahmp/drivers/ccpp/machine.F
                                noahmp/drivers/ccpp/noahmp_tables.f90

diff --git a/NOAHMP-interface/noahmp b/NOAHMP-interface/noahmp
diff --git a/WW3 b/WW3
diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1 +1 @@
-export BL_DATE=20241031
+export BL_DATE=20241112
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -742,7 +742,7 @@ export CDMBWD_c768='4.0,0.15,1.0,1.0'
 # set default
 export CDMBWD=${CDMBWD_c96}
 
-if [[ ${default_dt_atmos} = 1 ]]; then 
+if [[ ${default_dt_atmos} = 1 ]]; then
   export DT_INNER=${DT_INNER_c96}
 else
   export DT_INNER=${DT_ATMOS}
@@ -1013,7 +1013,7 @@ export WW3_IC5='F'
 export WW3_MULTIGRID=true
 export WW3_MODDEF=mod_def.glo_1deg
 export MESH_WAV=mesh.glo_1deg.nc
-
+export WW3_RSTFLDS=" "
 # ATMA
 export AOD_FRQ=060000
 
@@ -1081,7 +1081,7 @@ export_ugwpv1() {
   export LDIAG_UGWP=.false.
   export KNOB_UGWP_DOKDIS=2
   export KNOB_UGWP_NDX4LH=4
-  
+
   # Add updated damping and timestep variables
   case "${ATMRES}" in
     "C48")
@@ -1173,13 +1173,14 @@ export_ugwpv1() {
       exit 1
       ;;
   esac
-  
+
   if [[ ${DO_GSL_DRAG_SS} = .true. ]]; then export CDMBGWD=${CDMBGWD_GSL}; fi
   if [[ ${SEDI_SEMI} = .true. ]]; then export DT_ATMOS=$((DT_ATMOS/2)); fi
   export DT_INNER=${DT_ATMOS}
   export default_dt_atmos=0
 }
-
+
+
 # Defaults for the CICE6 model namelist, mx100
 export_cice6() {
   SECS=$((SHOUR*3600))
@@ -1305,7 +1306,18 @@ export_ww3() {
   export WW3_ICE='C'
   export WW3_IC1='F'
   export WW3_IC5='F'
-  export WW3_user_sets_restname="true"
+  export WW3_user_histname='false'
+  export WW3_historync='false'
+  export WW3_restartnc='true'
+  export WW3_restart_from_binary='false'
+  # For default ufs_configure (fast loop), no added fields reqd
+  export WW3_RSTFLDS=" "
+  # For either history_nc or restart_nc true
+  export WW3_PIO_FORMAT='pnetcdf'
+  export WW3_PIO_STRIDE=4
+  export WW3_PIO_IOTASKS=-99
+  export WW3_PIO_REARR='box'
+  export WW3_PIO_ROOT=-99
 }
 
 export_fire_behavior() {
@@ -1412,7 +1424,7 @@ export NY_GLB=320
 export NPZ=127
 export NPZP=128
 
-# Use updated omega calculations if 
+# Use updated omega calculations if
 #   hydrostatic is set to false
 if [[ "${HYDROSTATIC}" == .false. ]]; then
   export UPDATE_FULL_OMEGA=.true.
@@ -1730,6 +1742,17 @@ export_hafs_regional ()
   export WW3_MODDEF=mod_def.${WW3_DOMAIN}
   export WW3_ICE='F'
   export WW3_OUTPARS="WND HS T01 T02 DIR FP DP PHS PTP PDIR UST CHA USP"
+  export WW3_RSTFLDS=" "
+  export WW3_user_histname='false'
+  export WW3_historync='false'
+  export WW3_restartnc='true'
+  export WW3_restart_from_binary='false'
+  # For either history_nc or restart_nc true
+  export WW3_PIO_FORMAT='pnetcdf'
+  export WW3_PIO_STRIDE=4
+  export WW3_PIO_IOTASKS=-99
+  export WW3_PIO_REARR='box'
+  export WW3_PIO_ROOT=-99
 
   # Set CMEPS component defaults
   export_cmeps

diff --git a/tests/fv3_conf/control_run.IN b/tests/fv3_conf/control_run.IN
@@ -40,7 +40,7 @@ else
       cp  ../${DEP_RUN}${SUFFIX}/RESTART/${RFILE} .
       ls -1 ${RFILE}>rpointer.cpl
     fi
-    RFILE=ufs.atmw.ww3.r.${RESTART_FILE_SUFFIX_SECS}
+    RFILE=ufs.atmw.ww3.r.${RESTART_FILE_SUFFIX_SECS}.nc
     cp ../${DEP_RUN}${SUFFIX}/${RFILE} .
   fi
 

diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
@@ -149,7 +149,7 @@ else
 
      # WAVE restart file
      if [[ $CPLWAV == .true. ]]; then
-       RFILE=ufs.cpld.ww3.r.${RESTART_FILE_SUFFIX_SECS}
+       RFILE=ufs.cpld.ww3.r.${RESTART_FILE_SUFFIX_SECS}.nc
        cp ../${DEP_RUN}${SUFFIX}/${RFILE} .
      fi
 

diff --git a/tests/logs/RegressionTests_gaea.log b/tests/logs/RegressionTests_gaea.log
+7 −0		ccpp/config/ccpp_prebuild_config.py
+69 −2		ccpp/data/GFS_typedefs.F90
+19 −1		ccpp/data/GFS_typedefs.meta
+16 −0		ccpp/driver/CCPP_driver.F90
+1 −1		ccpp/physics
+1 −0		CMakeLists.txt
+788 −0		drivers/ccpp/lnd_iau_mod.F90
+58 −0		drivers/ccpp/lnd_iau_mod.meta
+295 −2		drivers/ccpp/noahmpdrv.F90
+227 −0		drivers/ccpp/noahmpdrv.meta
+4 −5		model/src/CMakeLists.txt
+3 −2		model/src/cmake/src_list.cmake
+3 −3		model/src/w3gridmd.F90
+103 −62		model/src/w3initmd.F90
+9 −34		model/src/w3iogomd.F90
+0 −538		model/src/w3iogoncdmd.F90
+14 −66		model/src/w3iorsmd.F90
+30 −18		model/src/w3odatmd.F90
+62 −23		model/src/w3triamd.F90
+169 −183		model/src/w3wavemd.F90
+231 −157		model/src/wav_comp_nuopc.F90
+0 −295		model/src/wav_grdout.F90
+914 −0		model/src/wav_history_mod.F90
+420 −0		model/src/wav_pio_mod.F90
+538 −0		model/src/wav_restart_mod.F90
+31 −18		model/src/wav_shel_inp.F90
+23 −0		model/src/wav_shr_mod.F90
+1 −1		model/src/wmwavemd.F90