Skip to content

ufs-dev PR#34a #86

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

Merged
dustinswales merged 12 commits into from
Mar 2, 2023
Merged

ufs-dev PR#34a #86

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ddaf18b
RRTMGP refactoring (#1571)
Feb 7, 2023
beba9fc
Updated submodule pointer
Mar 1, 2023
67190ab
Update rte-rrtmgp submodule
Mar 2, 2023
40e217a
Fix merge conflicts
Mar 2, 2023
80ecd8d
[AutoRT] cheyenne.gnu Job Completed.
Mar 2, 2023
d067fc1
[AutoRT] hera.gnu Job Completed.
Mar 2, 2023
cba9224
Remove c384 Cheyenne intel RT, was reintroduced by mistake.
Mar 2, 2023
84e05c6
Update baseline date
Mar 2, 2023
97141f1
[AutoRT] hera.intel Job Completed.
Mar 2, 2023
d242000
[AutoRT] cheyenne.intel Job Completed.
Mar 2, 2023
969e5fc
Reverted submodules
Mar 2, 2023
0d20f29
Merge branch 'ufs-dev-PR34a' of https://github.com/dustinswales/ufs-w…
Mar 2, 2023
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
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NCAR/fv3atm
branch = main
url = https://github.com/dustinswales/fv3atm
branch = ufs-dev-PR34a
[submodule "WW3"]
path = WW3
url = https://github.com/NOAA-EMC/WW3
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 9 files
+2 −2 .gitmodules
+3 −37 ccpp/config/ccpp_prebuild_config.py
+28 −163 ccpp/data/CCPP_typedefs.F90
+42 −134 ccpp/data/CCPP_typedefs.meta
+12 −3 ccpp/data/GFS_typedefs.F90
+12 −0 ccpp/data/GFS_typedefs.meta
+1 −1 ccpp/physics
+3 −12 ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml
+0 −97 ccpp/suites/suite_FV3_RAP_RRTMGP.xml
1 change: 1 addition & 0 deletions tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@ export DOGP_CLDOPTICS_LUT=.false.
export DOGP_LWSCAT=.false.
export USE_LW_JACOBIAN=.false.
export DAMP_LW_FLUXADJ=.false.
export RRTMGP_LW_PHYS_BLKSZ=2
export ICLOUD=0
export IAER=111
export ICLIQ_SW=1
Expand Down
1 change: 1 addition & 0 deletions tests/parm/control.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ deflate_level=1
rrtmgp_nGptsLW = 128
rrtmgp_nBandsLW = 16
rrtmgp_nBandsSW = 14
rrtmgp_lw_phys_blksz = 16
doGP_cldoptics_LUT = @[DOGP_CLDOPTICS_LUT]
doGP_lwscat = @[DOGP_LWSCAT]
progsigma = @[PROGSIGMA]
Expand Down
1 change: 1 addition & 0 deletions tests/parm/cpld_control.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ deflate_level=1
rrtmgp_nBandsSW = 14
doGP_cldoptics_LUT = @[DOGP_CLDOPTICS_LUT]
doGP_lwscat = @[DOGP_LWSCAT]
doGP_sgs_cnv = @[DOGP_SGS_CNV]
use_med_flux = @[USE_MED_FLUX]
frac_grid = @[FRAC_GRID]
cplchm = @[CPLCHM]
Expand Down
24 changes: 12 additions & 12 deletions tests/rt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ RUN | cpld_mpi_p8
#RUN | cpld_multigrid_p8 | | |
RUN | cpld_control_ciceC_p8 | | fv3 |

RUN | cpld_control_c192_p8 | - wcoss2.intel jet.intel acorn.intel | fv3 |
RUN | cpld_restart_c192_p8 | - wcoss2.intel jet.intel acorn.intel | | cpld_control_c192_p8
RUN | cpld_control_c192_p8 | - wcoss2.intel jet.intel acorn.intel | fv3 |
RUN | cpld_restart_c192_p8 | - wcoss2.intel jet.intel acorn.intel | | cpld_control_c192_p8

RUN | cpld_bmark_p8 | - jet.intel cheyenne.intel acorn.intel | fv3 |
RUN | cpld_restart_bmark_p8 | - jet.intel cheyenne.intel acorn.intel | | cpld_bmark_p8
RUN | cpld_bmark_p8 | - jet.intel cheyenne.intel acorn.intel | fv3 |
RUN | cpld_restart_bmark_p8 | - jet.intel cheyenne.intel acorn.intel | | cpld_bmark_p8

COMPILE | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8 | | fv3 |
RUN | cpld_control_noaero_p8 | | fv3 |
Expand Down Expand Up @@ -51,7 +51,7 @@ RUN | control_latlon
RUN | control_wrtGauss_netcdf_parallel | | fv3 |
RUN | control_c48 | | fv3 |
RUN | control_c192 | | fv3 |
RUN | control_c384 | - cheyenne.intel | fv3 |
RUN | control_c384 | | fv3 |
RUN | control_c384gdas | | fv3 |
RUN | control_stochy | | fv3 |
RUN | control_stochy_restart | | | control_stochy
Expand All @@ -78,10 +78,9 @@ RUN | regional_netcdf_parallel
RUN | regional_2dwrtdecomp | | |
RUN | regional_wofs | | fv3 |

COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_RRTMGP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON | | fv3 |
COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_HRRR_smoke,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON | | fv3 |

RUN | rap_control | | fv3 |
RUN | rap_rrtmgp | | fv3 |
RUN | regional_spp_sppt_shum_skeb | | fv3 |
RUN | rap_decomp | | |
RUN | rap_2threads | | |
Expand Down Expand Up @@ -125,7 +124,7 @@ RUN | control_wam
# DEBUG ATM tests #
###################################################################################################################################################################################

COMPILE | -DAPP=ATM -DDEBUG=ON -D32BIT=ON | | fv3 |
COMPILE | -DAPP=ATM -DDEBUG=ON -D32BIT=ON -DCCPP_SUITES=FV3_HRRR,FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_ras,FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km,FV3_RAP,FV3_HRRR,FV3_RAP_unified_ugwp,FV3_RAP_cires_ugwp,FV3_RAP_flake,FV3_RAP_noah,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta | | fv3 |

RUN | rrfs_conus13km_hrrr_warm_debug | | fv3 |
RUN | rrfs_conus13km_radar_tten_warm_debug | | fv3 |
Expand All @@ -152,7 +151,6 @@ RUN | rap_lndp_debug
RUN | rap_flake_debug | | fv3 |
RUN | rap_progcld_thompson_debug | | fv3 |
RUN | rap_noah_debug | | fv3 |
RUN | rap_rrtmgp_debug | | fv3 |
RUN | rap_sfcdiff_debug | | fv3 |
RUN | rap_noah_sfcdiff_cires_ugwp_debug | | fv3 |
RUN | rrfs_v1beta_debug | | fv3 |
Expand Down Expand Up @@ -202,9 +200,11 @@ RUN | hafs_global_multiple_4nests_atm
RUN | hafs_regional_specified_moving_1nest_atm | - jet.intel | fv3 |
RUN | hafs_regional_storm_following_1nest_atm | - jet.intel | fv3 |
RUN | hafs_regional_storm_following_1nest_atm_ocn | - jet.intel | fv3 |
RUN | hafs_regional_storm_following_1nest_atm_ocn_wav | - jet.intel | fv3 |
RUN | hafs_global_storm_following_1nest_atm | - jet.intel | fv3 |

COMPILE | -DAPP=HAFSW -DMOVING_NEST=ON -DCCPP_SUITES=FV3_HAFS_v1_thompson_noahmp_nonsst,FV3_HAFS_v1_thompson_noahmp,FV3_HAFS_v1_thompson_nonsst,FV3_HAFS_v1_thompson,FV3_HAFS_v1_gfdlmp_tedmf_nonsst,FV3_HAFS_v1_gfdlmp_tedmf,FV3_HAFS_v1_thompson_tedmf_gfdlsf -D32BIT=ON -DFASTER=ON | | fv3 |
RUN | hafs_regional_storm_following_1nest_atm_ocn_wav | - jet.intel | fv3 |

COMPILE | -DAPP=HAFS-ALL -DCCPP_SUITES=FV3_HAFS_v1_gfdlmp_tedmf,FV3_HAFS_v1_gfdlmp_tedmf_nonsst -D32BIT=ON | - wcoss2.intel | fv3 |
RUN | hafs_regional_docn | - wcoss2.intel | fv3 |
RUN | hafs_regional_docn_oisst | - wcoss2.intel | fv3 |
Expand Down Expand Up @@ -247,7 +247,7 @@ RUN | datm_cdeps_lnd_gswp3_rst
# ATM-LND tests, -D32BIT=ON has issue and NoahMP reuires r8 libraries #
###################################################################################################################################################################################

COMPILE | -DAPP=ATML -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v17_p8_rrtmgp,FV3_GFS_v15_thompson_mynn_lam3km | | fv3 |
COMPILE | -DAPP=ATML -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v15_thompson_mynn,FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km | | fv3 |
RUN | control_p8_atmlnd_sbs | | fv3 |

###################################################################################################################################################################################
Expand All @@ -273,4 +273,4 @@ RUN | atmaero_control_p8_rad_micro
COMPILE | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 | | fv3 |
RUN | regional_atmaq | | fv3 |
COMPILE | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -DDEBUG=ON | | fv3 |
RUN | regional_atmaq_debug | - jet.intel | fv3 |
RUN | regional_atmaq_debug | - jet.intel gaea.intel cheyenne.intel | fv3 |
27 changes: 15 additions & 12 deletions tests/rt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ usage() {
[[ $# -eq 0 ]] && usage

rt_single() {
rm -f $RT_SINGLE_CONF
local compile_line=''
local run_line=''
while read -r line || [ "$line" ]; do
Expand All @@ -50,20 +51,20 @@ rt_single() {
if [[ $line =~ RUN ]]; then
tmp_test=$(echo $line | cut -d'|' -f2 | sed -e 's/^ *//' -e 's/ *$//')
if [[ $SINGLE_NAME == $tmp_test && $compile_line != '' ]]; then
echo $compile_line >$TESTS_FILE
echo $compile_line > $RT_SINGLE_CONF
dep_test=$(echo $line | grep -w $tmp_test | cut -d'|' -f5 | sed -e 's/^ *//' -e 's/ *$//')
if [[ $dep_test != '' ]]; then
dep_line=$(cat rt.conf | grep -w "$dep_test" | grep -v "$tmp_test")
dep_line="${dep_line#"${dep_line%%[![:space:]]*}"}"
echo $dep_line >>$TESTS_FILE
echo $dep_line >> $RT_SINGLE_CONF
fi
echo $line >>$TESTS_FILE
echo $line >> $RT_SINGLE_CONF
break
fi
fi
done <'rt.conf'
done < $TESTS_FILE

if [[ ! -f $TESTS_FILE ]]; then
if [[ ! -f $RT_SINGLE_CONF ]]; then
echo "$SINGLE_NAME does not exist or cannot be run on $MACHINE_ID"
exit 1
fi
Expand Down Expand Up @@ -119,6 +120,8 @@ else
exit 1
fi

readonly RT_SINGLE_CONF='rt_single.conf'

# Default compiler "intel"
export RT_COMPILER=${RT_COMPILER:-intel}

Expand All @@ -136,7 +139,7 @@ if [[ $MACHINE_ID = wcoss2.* ]]; then
#ROCOTOCOMPLETE=$(which rocotocomplete)
#ROCOTO_SCHEDULER=lsf

module load ecflow/5.6.0.6
module load ecflow/5.6.0.13
module load gcc/10.3.0 python/3.8.6
ECFLOW_START=${ECF_ROOT}/scripts/server_check.sh
export ECF_OUTPUTDIR=${PATHRT}/ecf_outputdir
Expand All @@ -159,7 +162,7 @@ if [[ $MACHINE_ID = wcoss2.* ]]; then

elif [[ $MACHINE_ID = acorn.* ]]; then

module load ecflow/5.6.0.6
module load ecflow/5.6.0.13
module load gcc/10.3.0 python/3.8.6
ECFLOW_START=${ECF_ROOT}/scripts/server_check.sh
export ECF_OUTPUTDIR=${PATHRT}/ecf_outputdir
Expand Down Expand Up @@ -400,8 +403,6 @@ while getopts ":cl:mn:dwkreh" opt; do
;;
n)
SINGLE_NAME=$OPTARG
TESTS_FILE='rt.conf.single'
rm -f $TESTS_FILE
;;
d)
export delete_rundir=true
Expand Down Expand Up @@ -437,17 +438,19 @@ done

if [[ $SINGLE_NAME != '' ]]; then
rt_single
TESTS_FILE=$RT_SINGLE_CONF
fi

if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
TEST_35D=true
fi

BL_DATE=20230103

BL_DATE=20230201

RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}

INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20220414}
INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20221101}
INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20220624
INPUTDATA_ROOT_BMIC=${INPUTDATA_ROOT_BMIC:-$DISKNM/NEMSfv3gfs/BM_IC-20220207}

Expand Down Expand Up @@ -822,7 +825,7 @@ else
[[ ${KEEP_RUNDIR} == false ]] && rm -rf ${RUNDIR_ROOT}
[[ ${ROCOTO} == true ]] && rm -f ${ROCOTO_XML} ${ROCOTO_DB} ${ROCOTO_STATE} *_lock.db
[[ ${TEST_35D} == true ]] && rm -f tests/cpld_bmark*_20*
[[ ${SINGLE_NAME} != '' ]] && rm -f rt.conf.single
[[ ${SINGLE_NAME} != '' ]] && rm -f $RT_SINGLE_CONF
fi

date >> ${REGRESSIONTEST_LOG}
Expand Down
40 changes: 0 additions & 40 deletions tests/tests/control_rrtmgp
View file
Open in desktop

This file was deleted.

41 changes: 0 additions & 41 deletions tests/tests/control_rrtmgp_2threads
View file
Open in desktop

This file was deleted.

51 changes: 0 additions & 51 deletions tests/tests/control_rrtmgp_c192
View file
Open in desktop

This file was deleted.

Loading