Update chgres_cube for fractional grids (ufs-community#873)

Update chgres_cube for fractional (partial land/non-land) grids. Outputs a new surface coldstart file (called version 2). Update the sfc_climo_gen program to always map surface data to points with at least some land. Prevously, that only was done for grids with lakes. Fixes ufs-community#123.
LarissaReames-NOAA · Feb 12, 2024 · 7addff5 · 7addff5
1 parent 57bd832
commit 7addff5
Show file tree

Hide file tree

Showing 32 changed files with 855 additions and 471 deletions.
diff --git a/reg_tests/chgres_cube/13km.conus.nam.grib2.sh b/reg_tests/chgres_cube/13km.conus.nam.grib2.sh
@@ -12,18 +12,18 @@ set -x
 export DATA=$OUTDIR/13km_conus_nam_grib2
 rm -fr $DATA
 
-export CRES=775
+export CRES=778
 export KMRES=13km
 export FIXfv3=${HOMEreg}/fix/RRFS_CONUS_${KMRES}
-export FIXsfc=${FIXfv3}/fix_sfc
+
 export COMIN=${HOMEreg}/input_data/nam.grib2
 
 export GRIB2_FILE_INPUT=nam_218_20200801_0000_000.grb2
 export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l64.txt
 export VARMAP_FILE=${HOMEufs}/parm/varmap_tables/GFSphys_var_map.txt
 export INPUT_TYPE='grib2'
 export CONVERT_NST=".false."
-export OROG_FILES_TARGET_GRID="C775_oro_data.tile7.halo4.nc"
+export OROG_FILES_TARGET_GRID="C778_oro_data.tile7.nc"
 export REGIONAL=1
 export HALO_BLEND=0
 export HALO_BNDY=4 

diff --git a/reg_tests/chgres_cube/13km.conus.rap.grib2.sh b/reg_tests/chgres_cube/13km.conus.rap.grib2.sh
@@ -12,18 +12,18 @@ set -x
 export DATA=$OUTDIR/13km_conus_rap_grib2
 rm -fr $DATA
 
-export CRES=775
+export CRES=778
 export KMRES=13km
 export FIXfv3=${HOMEreg}/fix/RRFS_CONUS_${KMRES}
-export FIXsfc=${FIXfv3}/fix_sfc
+
 export COMIN=${HOMEreg}/input_data/rap.grib2
 
 export GRIB2_FILE_INPUT=1921221000900
 export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l64.txt
 export VARMAP_FILE=${HOMEufs}/parm/varmap_tables/GSDphys_var_map.txt
 export INPUT_TYPE='grib2'
 export CONVERT_NST=".false."
-export OROG_FILES_TARGET_GRID="C775_oro_data.tile7.nc"
+export OROG_FILES_TARGET_GRID="C778_oro_data.tile7.nc"
 export REGIONAL=1
 export HALO_BLEND=0
 export HALO_BNDY=4 

diff --git a/reg_tests/chgres_cube/13km.na.gfs.ncei.grib2.sh b/reg_tests/chgres_cube/13km.na.gfs.ncei.grib2.sh
@@ -12,18 +12,17 @@ set -x
 export DATA=$OUTDIR/13km_na_gfs_ncei_grib2
 rm -fr $DATA
 
-export CRES=819
+export CRES=818
 export KMRES=13km
 export FIXfv3=${HOMEreg}/fix/RRFS_NA_${KMRES}
-export FIXsfc=${FIXfv3}/fix_sfc
 export COMIN=${HOMEreg}/input_data/gfs.ncei.grib2
 
 export GRIB2_FILE_INPUT=gfs_4_20190801_0000_000.grb2
 export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l64.txt
 export VARMAP_FILE=${HOMEufs}/parm/varmap_tables/GFSphys_var_map.txt
 export INPUT_TYPE='grib2'
 export CONVERT_NST=".false."
-export OROG_FILES_TARGET_GRID="C819_oro_data.tile7.halo4.nc"
+export OROG_FILES_TARGET_GRID="C818_oro_data.tile7.nc"
 export REGIONAL=1
 export HALO_BLEND=0
 export HALO_BNDY=4 

diff --git a/reg_tests/chgres_cube/25km.conus.gfs.grib2.sh b/reg_tests/chgres_cube/25km.conus.gfs.grib2.sh
@@ -12,10 +12,10 @@ set -x
 export DATA=$OUTDIR/25km_conus_gfs_grib2
 rm -fr $DATA
 
-export CRES=403
+export CRES=405
 export KMRES=25km
 export FIXfv3=${HOMEreg}/fix/RRFS_CONUS_${KMRES}
-export FIXsfc=${FIXfv3}/fix_sfc
+
 export COMIN=${HOMEreg}/input_data/gfs.grib2
 
 export GRIB2_FILE_INPUT=gfs.t00z.pgrb2.0p50.f000
@@ -24,7 +24,7 @@ export VARMAP_FILE=${HOMEufs}/parm/varmap_tables/GSDphys_noaero_var_map.txt
 export INPUT_TYPE='grib2'
 export CONVERT_NST=".false."
 export THOMPSON_AEROSOL_FILE=${HOMEufs}/fix/am/Thompson_MP_MONTHLY_CLIMO.nc
-export OROG_FILES_TARGET_GRID="C403_oro_data.tile7.halo4.nc"
+export OROG_FILES_TARGET_GRID="C405_oro_data.tile7.nc"
 export REGIONAL=1
 export HALO_BLEND=0
 export HALO_BNDY=4 

diff --git a/reg_tests/chgres_cube/25km.conus.gfs.pbgrib2.sh b/reg_tests/chgres_cube/25km.conus.gfs.pbgrib2.sh
@@ -12,18 +12,18 @@ set -x
 export DATA=$OUTDIR/25km_conus_gfs_pbgrib2
 rm -fr $DATA
 
-export CRES=403
+export CRES=405
 export KMRES=25km
 export FIXfv3=${HOMEreg}/fix/RRFS_CONUS_${KMRES}
-export FIXsfc=${FIXfv3}/fix_sfc
+
 export COMIN=${HOMEreg}/input_data/gfs.pbgrib2
 
 export GRIB2_FILE_INPUT=gfs.t18z.pgrb2.0p25.f006
 export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l64.txt
 export VARMAP_FILE=${HOMEufs}/parm/varmap_tables/GFSphys_var_map.txt
 export INPUT_TYPE='grib2'
 export CONVERT_NST=".false."
-export OROG_FILES_TARGET_GRID="C403_oro_data.tile7.halo4.nc"
+export OROG_FILES_TARGET_GRID="C405_oro_data.tile7.nc"
 export REGIONAL=1
 export HALO_BLEND=0
 export HALO_BNDY=4 

diff --git a/reg_tests/chgres_cube/3km.conus.hrrr.gfssdf.grib2.sh b/reg_tests/chgres_cube/3km.conus.hrrr.gfssdf.grib2.sh
@@ -15,7 +15,7 @@ rm -fr $DATA
 export CRES=3357
 export KMRES=3km
 export FIXfv3=${HOMEreg}/fix/RRFS_CONUS_${KMRES}
-export FIXsfc=${FIXfv3}/fix_sfc
+
 export COMIN=${HOMEreg}/input_data/hrrr.grib2
 
 export GRIB2_FILE_INPUT=1918200000000

diff --git a/reg_tests/chgres_cube/3km.conus.hrrr.newsfc.grib2.sh b/reg_tests/chgres_cube/3km.conus.hrrr.newsfc.grib2.sh
@@ -15,7 +15,7 @@ rm -fr $DATA
 export CRES=3357
 export KMRES=3km
 export FIXfv3=${HOMEreg}/fix/RRFS_CONUS_${KMRES}
-export FIXsfc=${FIXfv3}/fix_sfc
+
 export COMIN=${HOMEreg}/input_data/hrrr.grib2
 
 export GRIB2_FILE_INPUT=1921300000000

diff --git a/reg_tests/chgres_cube/c192.fv3.history.sh b/reg_tests/chgres_cube/c192.fv3.history.sh
@@ -13,17 +13,18 @@ export DATA=$OUTDIR/c192_fv3_history
 rm -fr $DATA
 
 export CRES=192
-export FIXfv3=${HOMEreg}/fix/C192
-export FIXsfc=${FIXfv3}/fix_sfc
+export ocn=100
+export FIXfv3=${HOMEreg}/fix/C${CRES}
+
 export COMIN=${HOMEreg}/input_data/fv3.history
 
 # Pay attention to the quotes.  Dont start/end with double quote.
 export ATM_FILES_INPUT='dynf000.tile1.nc","dynf000.tile2.nc","dynf000.tile3.nc","dynf000.tile4.nc","dynf000.tile5.nc","dynf000.tile6.nc'
 export SFC_FILES_INPUT='phyf000.tile1.nc","phyf000.tile2.nc","phyf000.tile3.nc","phyf000.tile4.nc","phyf000.tile5.nc","phyf000.tile6.nc'
 export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l64.txt
 export INPUT_TYPE='history'
-export MOSAIC_FILE_INPUT_GRID="${HOMEreg}/fix/C96/C96_mosaic.nc"
-export OROG_DIR_INPUT_GRID=${HOMEreg}/fix/C96
+export MOSAIC_FILE_INPUT_GRID="${HOMEreg}/fix/C96.history.file/C96_mosaic.nc"
+export OROG_DIR_INPUT_GRID=${HOMEreg}/fix/C96.history.file
 export OROG_FILES_INPUT_GRID='C96_oro_data.tile1.nc","C96_oro_data.tile2.nc","C96_oro_data.tile3.nc","C96_oro_data.tile4.nc","C96_oro_data.tile5.nc","C96_oro_data.tile6.nc'
 export TRACERS_TARGET='"sphum","liq_wat","o3mr"'
 export TRACERS_INPUT='"spfh","clwmr","o3mr"'

diff --git a/reg_tests/chgres_cube/c192.gfs.grib2.sh b/reg_tests/chgres_cube/c192.gfs.grib2.sh
@@ -13,8 +13,9 @@ export DATA=$OUTDIR/c192_gfs_grib2
 rm -fr $DATA
 
 export CRES=192
-export FIXfv3=${HOMEreg}/fix/C192
-export FIXsfc=${FIXfv3}/fix_sfc
+export ocn=100
+export FIXfv3=${HOMEreg}/fix/C${CRES}
+
 export COMIN=${HOMEreg}/input_data/gfs.grib2
 
 export GRIB2_FILE_INPUT=gfs.t00z.pgrb2.0p50.f000

diff --git a/reg_tests/chgres_cube/c96.fv3.nemsio.sh b/reg_tests/chgres_cube/c96.fv3.nemsio.sh
@@ -12,8 +12,10 @@ set -x
 export DATA=$OUTDIR/c96_fv3_nemsio
 rm -fr $DATA
 
-export FIXfv3=${HOMEreg}/fix/C96
-export FIXsfc=${FIXfv3}/fix_sfc
+export CRES=96
+export ocn=100
+export FIXfv3=${HOMEreg}/fix/C${CRES}
+
 export COMIN=${HOMEreg}/input_data/fv3.nemsio
 export ATM_FILES_INPUT=gfs.t12z.atmf000.nemsio
 export SFC_FILES_INPUT=gfs.t12z.sfcf000.nemsio

diff --git a/reg_tests/chgres_cube/c96.fv3.netcdf.sh b/reg_tests/chgres_cube/c96.fv3.netcdf.sh
@@ -12,8 +12,10 @@ set -x
 export DATA=$OUTDIR/c96_fv3_netcdf
 rm -fr $DATA
 
-export FIXfv3=${HOMEreg}/fix/C96
-export FIXsfc=${FIXfv3}/fix_sfc
+export CRES=96
+export ocn=100
+export FIXfv3=${HOMEreg}/fix/C${CRES}
+
 export COMIN=${HOMEreg}/input_data/fv3.netcdf
 export ATM_FILES_INPUT=gfs.t00z.atmf000.nc
 export SFC_FILES_INPUT=gfs.t00z.sfcf000.nc

diff --git a/reg_tests/chgres_cube/c96.fv3.netcdf2wam.sh b/reg_tests/chgres_cube/c96.fv3.netcdf2wam.sh
@@ -12,7 +12,10 @@ set -x
 export DATA=$OUTDIR/c96_fv3_netcdf2wam
 rm -fr $DATA
 
-export FIXfv3=${HOMEreg}/fix/C96
+export CRES=96
+export ocn=100
+export FIXfv3=${HOMEreg}/fix/C${CRES}
+
 export COMIN=${HOMEreg}/input_data/fv3.netcdf
 export ATM_FILES_INPUT=gfs.t00z.atmf000.nc
 export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l64.txt

diff --git a/reg_tests/chgres_cube/c96.fv3.restart.sh b/reg_tests/chgres_cube/c96.fv3.restart.sh
@@ -12,8 +12,9 @@ set -x
 export DATA=$OUTDIR/c96_fv3_restart
 rm -fr $DATA
 
-export FIXfv3=${HOMEreg}/fix/C96
-export FIXsfc=${FIXfv3}/fix_sfc
+export CRES=96
+export ocn=100
+export FIXfv3=${HOMEreg}/fix/C${CRES}
 export COMIN=${HOMEreg}/input_data/fv3.restart
 export VCOORD_FILE=${HOMEufs}/fix/am/global_hyblev.l64.txt
 export INPUT_TYPE='restart'

diff --git a/reg_tests/chgres_cube/c96.gefs.grib2.sh b/reg_tests/chgres_cube/c96.gefs.grib2.sh
@@ -13,8 +13,9 @@ export DATA=$OUTDIR/c96_gefs_grib2
 rm -fr $DATA
 
 export CRES=96
-export FIXfv3=${HOMEreg}/fix/C96
-export FIXsfc=${FIXfv3}/fix_sfc
+export ocn=100
+export FIXfv3=${HOMEreg}/fix/C${CRES}
+
 export COMIN=${HOMEreg}/input_data/gefs.grib2
 
 export GRIB2_FILE_INPUT=gec00.t06z.pgrb2abf00

diff --git a/reg_tests/chgres_cube/c96.gfs.nemsio.sh b/reg_tests/chgres_cube/c96.gfs.nemsio.sh
@@ -12,8 +12,10 @@ set -x
 export DATA=$OUTDIR/c96_gfs_nemsio
 rm -fr $DATA
 
-export FIXfv3=${HOMEreg}/fix/C96
-export FIXsfc=${FIXfv3}/fix_sfc
+export CRES=96
+export ocn=100
+export FIXfv3=${HOMEreg}/fix/C${CRES}
+
 export COMIN=${HOMEreg}/input_data/gfs.nemsio
 export ATM_FILES_INPUT=gfnanl.gdas.2017071700
 export SFC_FILES_INPUT=sfnanl.gdas.2017071700

diff --git a/reg_tests/chgres_cube/c96.gfs.sigio.sh b/reg_tests/chgres_cube/c96.gfs.sigio.sh
@@ -18,8 +18,10 @@ fi
 export DATA=$OUTDIR/c96_gfs_sigio
 rm -fr $DATA
 
-export FIXfv3=${HOMEreg}/fix/C96
-export FIXsfc=${FIXfv3}/fix_sfc
+export CRES=96
+export ocn=100
+export FIXfv3=${HOMEreg}/fix/C${CRES}
+
 export COMIN=${HOMEreg}/input_data/gfs.sigio
 export ATM_FILES_INPUT=gdas.t00z.sanl
 export SFC_FILES_INPUT=gdas.t00z.sfcanl

diff --git a/reg_tests/chgres_cube/c96.regional.sh b/reg_tests/chgres_cube/c96.regional.sh