fix ctest failure

ufs-community · Nov 26, 2024 · e493e8d · e493e8d
1 parent a09847b
commit e493e8d
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 22 deletions.
diff --git a/modulefiles/build_hera_intel.lua b/modulefiles/build_hera_intel.lua
@@ -46,5 +46,5 @@ setenv("CXX", "mpiicpc")
 setenv("FC", "mpiifort")
 setenv("CMAKE_Platform", "hera.intel")
 
-setenv("EPICHOME", "/scratch2/NAGAPE/epic/UFS_Land-DA_Dev")
-setenv("JEDI_PATH", "/scratch2/NAGAPE/epic/UFS_Land-DA_Dev/jedi_v7")
+setenv("EPICHOME", "/scratch2/NAGAPE/epic/UFS_Land-DA_v2.1")
+setenv("JEDI_PATH", "/scratch2/NAGAPE/epic/UFS_Land-DA_v2.1/jedi_v7_ic")
diff --git a/modulefiles/build_orion_intel.lua b/modulefiles/build_orion_intel.lua
@@ -49,5 +49,5 @@ setenv("CXX", "mpiicpc")
 setenv("FC", "mpiifort")
 setenv("CMAKE_Platform", "orion.intel")
 
-setenv("EPICHOME", "/work/noaa/epic/UFS_Land-DA_Dev")
-setenv("JEDI_PATH", "/work/noaa/epic/UFS_Land-DA_Dev/jedi_v7_stack1.6")
+setenv("EPICHOME", "/work/noaa/epic/UFS_Land-DA_v2.1")
+setenv("JEDI_PATH", "/work/noaa/epic/UFS_Land-DA_v2.1/jedi_v7_ic_orion")
diff --git a/scripts/exlandda_prep_obs.sh b/scripts/exlandda_prep_obs.sh
@@ -26,19 +26,24 @@ if [ "${OBS_GHCN}" = "YES" ]; then
   out_fn="GHCN_${YYYY}${MM}${DD}${HH}.nc"
 
   # check obs is available
-  if [ -e $obs_fp ]; then
-    echo "GHCN observation file: $obs_fp"
-    cp -p $obs_fp ${COMOUTobs}/${out_fn}
+  if [ -f "${obs_fp}" ]; then
+    echo "GHCN observation file: ${obs_fp}"
+    cp -p "${obs_fp}" "${COMOUTobs}/${out_fn}"
   else
     input_ghcn_file="${DATA_GHCN_RAW}/${YYYP}.csv"
+    if [ ! -f "${input_ghcn_file}" ]; then
+      echo "GHCN raw data path: ${DATA_GHCN_RAW}"
+      echo "GHCN raw data file: ${YYYP}.csv"
+      err_exit "GHCN raw data file does not exist in designated path !!!"
+    fi
     output_ioda_file="${obs_fn}"
     ghcn_station_file="${DATA_GHCN_RAW}/ghcnd-stations.txt"
 
     ${USHlandda}/ghcn_snod2ioda.py -i ${input_ghcn_file} -o ${output_ioda_file} -f ${ghcn_station_file} -d ${YYYP}${MP}${DP}${HP} -m maskout
     if [ $? -ne 0 ]; then
       err_exit "Generation of GHCN obs file failed !!!"
     fi
-    cp -p ${output_ioda_file} ${COMOUTobs}/${out_fn}
+    cp -p "${output_ioda_file}" "${COMOUTobs}/${out_fn}"
 
   fi
 fi
diff --git a/sorc/test/parm/diag_table b/sorc/test/parm/diag_table
@@ -1,5 +1,5 @@
-20000104.00Z.1760x880.64bit.non-mono
-2000 01 04 00 0 0
+20000105.00Z.1760x880.64bit.non-mono
+2000 01 05 00 0 0
 
 "fv3_history",    0,  "hours",  1,  "hours",  "time"
 "fv3_history2d",  0,  "hours",  1,  "hours",  "time"
@@ -281,4 +281,4 @@
 #packing  = 1  double precision
 #         = 2  float
 #         = 4  packed 16-bit integers
-#         = 8  packed 1-byte (not tested?)
+#         = 8  packed 1-byte (not tested?)
diff --git a/sorc/test/parm/model_configure b/sorc/test/parm/model_configure
@@ -1,9 +1,9 @@
 start_year:              2000
 start_month:             01
-start_day:               04
+start_day:               05
 start_hour:              00
 start_minute:            0
 start_second:            0
 nhours_fcst:             24
 dt_atmos:                900
-fhrot:                   0
+fhrot:                   0
diff --git a/sorc/test/parm/rpointer.cpl b/sorc/test/parm/rpointer.cpl
@@ -1 +1 @@
-./RESTART/ufs.cpld.cpl.r.2000-01-04-00000.nc
+./RESTART/ufs.cpld.cpl.r.2000-01-05-00000.nc
diff --git a/sorc/test/run_ufs_datm_lnd.sh b/sorc/test/run_ufs_datm_lnd.sh
@@ -41,9 +41,12 @@ cp -p ${project_source_dir}/test/parm/rpointer.cpl .
 
 # Set RESTART directory
 mkdir -p RESTART
-ln -nsf ${FIXlandda}/restarts/gswp3/ufs.cpld.cpl.r.2000-01-04-00000.nc RESTART/.
-ln -nsf ${FIXlandda}/restarts/gswp3/ufs.cpld.datm.r.2000-01-04-00000.nc .
-ln -nsf ${FIXlandda}/restarts/gswp3/ufs.cpld.lnd.out.* RESTART/.
+ln -nsf ${FIXlandda}/DATA_RESTART/ufs.cpld.cpl.r.2000-01-05-00000.nc RESTART/.
+ln -nsf ${FIXlandda}/DATA_RESTART/ufs.cpld.datm.r.2000-01-05-00000.nc .
+for itile in {1..6}
+do
+  ln -nsf ${FIXlandda}/DATA_RESTART/ufs_land_restart.2000-01-05_00-00-00.tile${itile}.nc RESTART/ufs.cpld.lnd.out.2000-01-05-00000.tile${itile}.nc
+done
 
 # Set INPUT directory
 mkdir -p INPUT
@@ -80,9 +83,9 @@ ${MPIRUN} -n ${NPROCS_FORECAST} ./ufs_model
 
 #
 echo "Now check model output with ufs-wm baseline!"
-path_fbase="${FIXlandda}/test_base/we2e_com/landda.20000104"
-fn_out="ufs.cpld.lnd.out.2000-01-05-00000.tile"
-fn_res="ufs_land_restart.2000-01-05_00-00-00.tile"
+path_fbase="${FIXlandda}/test_base/we2e_com/landda.20000105"
+fn_out="ufs.cpld.lnd.out.2000-01-06-00000.tile"
+fn_res="ufs_land_restart.2000-01-06_00-00-00.tile"
 
 # restart files
 for itile in {1..6}

diff --git a/sorc/test/runtime_vars.sh b/sorc/test/runtime_vars.sh
@@ -7,7 +7,7 @@ project_source_dir=$2
 
 # Prepare runtime environement
 # set date
-export CYMDH=2000010400
+export CYMDH=2000010500
 export YY=`echo $CYMDH | cut -c1-4`
 export MM=`echo $CYMDH | cut -c5-6`
 export DD=`echo $CYMDH | cut -c7-8`

diff --git a/sorc/test/test_letkfoi_snowda.sh b/sorc/test/test_letkfoi_snowda.sh
@@ -38,7 +38,7 @@ do
   # GHCN are time-stamped at 18. If assimilating at 00, need to use previous day's obs, so that
   # obs are within DA window.
   [[ -e ${OBS_TYPES[$ii]}_${YY}${MP}${DP}${HP}.nc ]] && rm ${OBS_TYPES[$ii]}_${YY}${MP}${DP}${HP}.nc
-  obs_file=${OBSDIR}/snow_depth/${OBS_TYPES[$ii]}/data_proc/v3/${YY}/${OBS_TYPES[$ii],,}_snwd_ioda_${YY}${MP}${DP}.nc
+  obs_file=${OBSDIR}/${OBS_TYPES[$ii]}/${YY}/${OBS_TYPES[$ii],,}_snwd_ioda_${YY}${MP}${DP}${HP}.nc
   if [[ -e $obs_file ]]; then
     echo "${OBS_TYPES[$ii]} observations found: $obs_file"
   else
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		./RESTART/ufs.cpld.cpl.r.2000-01-04-00000.nc
		./RESTART/ufs.cpld.cpl.r.2000-01-05-00000.nc