Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update WAM RT compatible with v17 #2283

Merged
merged 22 commits into from
Jun 18, 2024
Merged

update WAM RT compatible with v17 #2283

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
ce6b667
update WAM RT compatible with v17
WChen-NOAA May 9, 2024
2c4747c
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
WChen-NOAA May 15, 2024
56295a6
removed unused commnet lines and did corrections to wam RTs configura…
WChen-NOAA May 22, 2024
7789b86
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
WChen-NOAA May 22, 2024
d076c13
wam RTs input data to FV3_input_data_L149_wam
WChen-NOAA May 22, 2024
f6a61e7
commit test_changes.list
WChen-NOAA Jun 7, 2024
af1da26
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
WChen-NOAA Jun 7, 2024
6c29f3e
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
WChen-NOAA Jun 13, 2024
a5dc824
Update bl_date.conf
jkbk2004 Jun 14, 2024
dcc0831
Update ufs_derecho.intel.lua: SSv1.6
jkbk2004 Jun 14, 2024
0e00545
Update ufs_derecho.gnu.lua: SSv1.6
jkbk2004 Jun 14, 2024
f817915
add hera RT log passed
FernandoAndrade-NOAA Jun 14, 2024
02276e2
add gaea RT log passed
FernandoAndrade-NOAA Jun 14, 2024
524af2b
git commit -m "add hercules RT logs: passed"
zach1221 Jun 14, 2024
3dfdb07
add derecho RT logs: passed
zach1221 Jun 17, 2024
7376653
add control_p8_gnu ORT logs: passed
zach1221 Jun 17, 2024
51f72b6
add regional_control_gnu ORT logs: passed
zach1221 Jun 17, 2024
cfa2f75
add cpld_control_gnu ORT logs: passed
zach1221 Jun 17, 2024
ccbb520
Update for wcoss2 lua, and WCOSS2 RT Log: Passed
BrianCurtis-NOAA Jun 17, 2024
355dedb
Disable dcice test, Acorn RT Log Passed
BrianCurtis-NOAA Jun 18, 2024
3cde66f
add jet RT logs: passed
zach1221 Jun 18, 2024
124382f
Update ufs_jet.intel.lua
FernandoAndrade-NOAA Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 97 additions & 6 deletions tests/fv3_conf/wam_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,101 @@

inputdir=FV3_input_data_L149
mkdir INPUT RESTART
cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT/* ./INPUT
cp @[INPUTDATA_ROOT]/${inputdir}/*grb .
FV3_FIX=@[INPUTDATA_ROOT]/FV3_fix/
#WAM_FIX=@[INPUTDATA_ROOT]/${inputdir}/FV3_input_data_wam
WChen-NOAA marked this conversation as resolved.
Show resolved Hide resolved
if [ $WARM_START = .true. ]; then
mkdir INPUT RESTART
cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT/* ./INPUT
cp @[INPUTDATA_ROOT]/FV3_fix/*grb .
else
mkdir INPUT RESTART
cp -r @[INPUTDATA_ROOT]/${inputdir}/INPUT_C/* ./INPUT/.
# cp ${WAM_FIX}/global*dat ./
# cp ${WAM_FIX}/global_idea_coeff_lte* ./
# cp ${WAM_FIX}/global_idea_ggww* ./
# cp ${WAM_FIX}/global_idea_h2o* ./
# cp ${WAM_FIX}/swio_waminput.nc ./
# cp ${WAM_FIX}/snoe_eof.nc ./
# cp ${WAM_FIX}/tiros_tjr.nc ./
# cp ${WAM_FIX}/iondata_tjr.nc ./
# cp ${WAM_FIX}/wam_rm3_globcomp.nc ./
# cp ${WAM_FIX}/ionprof ./
# cp ${WAM_FIX}/tiros_spectra ./
WChen-NOAA marked this conversation as resolved.
Show resolved Hide resolved
fi
if [ $TILEDFIX = .true. ]; then
if [ $CPLLND == .true. ]; then
cp @[INPUTDATA_ROOT]/FV3_fix_tiled/@[ATMRES]/@[ATMRES]*.nc INPUT/.
else
cp @[INPUTDATA_ROOT]/FV3_fix_tiled/@[ATMRES]/@[ATMRES]*.nc .
fi
cp @[INPUTDATA_ROOT]/FV3_fix/global_glacier.2x2.grb .
cp @[INPUTDATA_ROOT]/FV3_fix/global_maxice.2x2.grb .
cp @[INPUTDATA_ROOT]/FV3_fix/RTGSST.1982.2012.monthly.clim.grb .
cp @[INPUTDATA_ROOT]/FV3_fix/global_snoclim.1.875.grb .
cp @[INPUTDATA_ROOT]/FV3_fix/IMS-NIC.blended.ice.monthly.clim.grb .
cp @[INPUTDATA_ROOT]/${inputdir}/@[FNSMCC] .
cp @[INPUTDATA_ROOT]/${inputdir}/@[FNMSKH_control] .
else
cp @[INPUTDATA_ROOT]/FV3_fix/*grb .
fi

if [ $CPLWAV = .true. ]; then
cp @[INPUTDATA_ROOT_WW3]/mod_def.* .
cp @[INPUTDATA_ROOT_WW3]/rmp_src* .
if [ $WW3_MULTIGRID = 'true' ]; then
cp @[INPUTDATA_ROOT_WW3]/mod_def.pointsatmw mod_def.points
cp @[INPUTDATA_ROOT_WW3]/@[WW3_MODDEF] .
cp @[INPUTDATA_ROOT_WW3]/rmp_src* .
else
cp @[INPUTDATA_ROOT_WW3]/@[WW3_MODDEF] mod_def.ww3
cp @[INPUTDATA_ROOT_WW3]/@[MESH_WAV] .
fi
fi

#inline post
if [[ $POSTAPP = 'global' ]]; then
cp ${PATHRT}/parm/post_itag_gfs itag
cp ${PATHRT}/parm/postxconfig-NT-gfs.txt postxconfig-NT.txt
cp ${PATHRT}/parm/postxconfig-NT-gfs_FH00.txt postxconfig-NT_FH00.txt
cp ${PATHRT}/parm/params_grib2_tbl_new params_grib2_tbl_new
fi

#rrtmgp
if [ $DO_RRTMGP = .true. ]; then
cp @[INPUTDATA_ROOT]/FV3_input_data_RRTMGP/* .
fi

#merra2
if [ $USE_MERRA2 = .true. ]; then
for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m${n}.nc aeroclim.m${n}.nc
done
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat optics_BC.dat
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat optics_OC.dat
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_DU.v15_3.dat optics_DU.dat
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SS.v3_3.dat optics_SS.dat
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SU.v1_3.dat optics_SU.dat
fi

#rad_c_gocart
if [ $IAER = 2011 ]; then
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat optics_BC.dat
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat optics_OC.dat
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_DU.v15_3.dat optics_DU.dat
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SS.v3_3.dat optics_SS.dat
cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_SU.v1_3.dat optics_SU.dat
fi
#ugwpv1
if [ $DO_UGWP_V1 = .true. ]; then
cp @[INPUTDATA_ROOT]/FV3_input_data/ugwp_c384_tau.nc ./ugwp_limb_tau.nc
fi

#Thompson
if [ $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

#prognostic aerosols
if [ $CPLCHM = .true. ]; then
cp ${PATHRT}/parm/gocart/*.rc .
ln -sf @[INPUTDATA_ROOT]/GOCART/p8/ExtData .
fi
29 changes: 19 additions & 10 deletions tests/parm/diag_table/diag_table_wam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,13 @@
"gfs_dyn", "sphum", "spfh", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "temp", "tmp", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "liq_wat", "clwmr", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "o3mr", "o3mr", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "spfo2", "spfo2", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "spfo", "spfo", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "ice_wat", "icmr", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "rainwat", "rwmr", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "snowwat", "snmr", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "graupel", "grle", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "spo3", "o3mr", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "spo2", "spfo2", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "spo", "spfo", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "delp", "dpres", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "delz", "delz", "fv3_history", "all", .false., "none", 2
"gfs_dyn", "w", "dzdt", "fv3_history", "all", .false., "none", 2
Expand Down Expand Up @@ -69,13 +73,6 @@
"gfs_phys", "dusfc", "uflx_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "dvsfc", "vflx_ave", "fv3_history2d", "all", .false., "none", 2

"gfs_phys", "frzr", "frzr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frzrb", "frzrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozr", "frozr", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "frozrb", "frozrb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowp", "tsnowp", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "tsnowpb", "tsnowpb", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "rhonewsn", "rhonewsn", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "psurf", "pressfc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "u10m", "ugrd10m", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "v10m", "vgrd10m", "fv3_history2d", "all", .false., "none", 2
Expand Down Expand Up @@ -181,7 +178,19 @@
"gfs_phys", "nbdsf_ave", "nbdsf_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "nddsf_ave", "nddsf_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "trans_ave", "trans_ave", "fv3_history2d", "all", .false., "none", 2
# Aerosols (CCN, IN) from Thompson microphysics
"gfs_phys", "nwfa", "nwfa", "fv3_history", "all", .false., "none", 2
"gfs_phys", "nifa", "nifa", "fv3_history", "all", .false., "none", 2
"gfs_sfc", "nwfa2d", "nwfa2d", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "nifa2d", "nifa2d", "fv3_history2d", "all", .false., "none", 2
# Cloud effective radii from Thompson and WSM6 microphysics
"gfs_phys", "cleffr", "cleffr", "fv3_history", "all", .false., "none", 2
"gfs_phys", "cieffr", "cieffr", "fv3_history", "all", .false., "none", 2
"gfs_phys", "cseffr", "cseffr", "fv3_history", "all", .false., "none", 2

# "gfs_phys", "cldfra2d", "cldfra2d", "fv3_history2d", "all", .false., "none", 2
# "gfs_phys", "AOD_550", "aod550", "fv3_history2d", "all", .false., "none", 2
#"gfs_phys", "cldfra", "cldfra", "fv3_history", "all", .false., "none", 2
#=============================================================================================
#
#====> This file can be used with diag_manager/v2.0a (or higher) <====
Expand Down
36 changes: 23 additions & 13 deletions tests/parm/field_table/field_table_wam → tests/parm/field_table/field_table_wam_noaer
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,49 +10,59 @@
"longname", "cloud water mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e30" /
# 3 prognostic cloud water mixing ratio
# 3 prognostic rain water mixing ratio
"TRACER", "atmos_mod", "rainwat"
"longname", "rain mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e30" /
# 4 prognostic cloud water mixing ratio
# 4 prognostic ice water mixing ratio
"TRACER", "atmos_mod", "ice_wat"
"longname", "cloud ice mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e30" /
# 5 prognostic cloud water mixing ratio
# 5 prognostic snow water mixing ratio
"TRACER", "atmos_mod", "snowwat"
"longname", "snow mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e30" /
# 6 prognostic cloud water mixing ratio
# 6 prognostic graupel water mixing ratio
"TRACER", "atmos_mod", "graupel"
"longname", "graupel mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e30" /
# 7 prognostic ozone mixing ratio tracer
# 9 prognostic ozone mixing ratio tracer
"TRACER", "atmos_mod", "spo3"
"longname", "ozone mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e15" /
# 8 prognostic ozone mixing ratio tracer
# 10 prognostic ozone mixing ratio tracer
"TRACER", "atmos_mod", "spo"
"longname", "oxygen atom mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e10" /
# 9 prognostic ozone mixing ratio tracer
# 11 prognostic ozone mixing ratio tracer
"TRACER", "atmos_mod", "spo2"
"longname", "oxygen mixing ratio"
"units", "kg/kg"
"profile_type", "fixed", "surface_value=1.e15" /
# 10 prognostic subgrid scale turbulent kinetic energy
# 7 prognostic cloud ice water number concentration
"TRACER", "atmos_mod", "ice_nc"
"longname", "cloud ice water number concentration"
"units", "/kg"
"profile_type", "fixed", "surface_value=0.0" /
# 8 prognostic rain number concentration
"TRACER", "atmos_mod", "rain_nc"
"longname", "rain number concentration"
"units", "/kg"
"profile_type", "fixed", "surface_value=0.0" /
# 12 prognostic subgrid scale turbulent kinetic energy
"TRACER", "atmos_mod", "sgs_tke"
"longname", "subgrid scale turbulent kinetic energy"
"units", "m2/s2"
"profile_type", "fixed", "surface_value=0.0" /
# 11 # non-prognostic cloud amount
"TRACER", "atmos_mod", "cld_amt"
"longname", "cloud amount"
"units", "1"
"profile_type", "fixed", "surface_value=0.0" /
# 13 # non-prognostic cloud amount
# "TRACER", "atmos_mod", "cld_amt"
# "longname", "cloud amount"
# "units", "1"
# "profile_type", "fixed", "surface_value=0.0" /

Loading