Skip to content

Commit

Permalink
Merge pull request ufs-community#36 from climbfuji/dtc_hwrf-physics_a…
Browse files Browse the repository at this point in the history 
…dd_rrtmg

dtc/hwrf-physics: HWRF RRTMG (based on ufs-community#30)
  • Loading branch information
@climbfuji
climbfuji authored Apr 9, 2020
2 parents 228dda8 + a8f0363 commit 61b9443
Show file tree
Hide file tree
Showing 8 changed files with 96 additions and 18 deletions.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 7 files
+4 −2 ccpp/config/ccpp_prebuild_config.py
+1 −1 ccpp/physics
+85 −0 ccpp/suites/suite_FV3_HAFS_FA_HWRF_RRTMG.xml
+0 −1 ccpp/suites/suite_FV3_HAFS_ferhires_update_moist.xml
+1 −1 gfsphysics/GFS_layer/GFS_diagnostics.F90
+11 −1 gfsphysics/GFS_layer/GFS_typedefs.F90
+23 −17 gfsphysics/GFS_layer/GFS_typedefs.meta
33 changes: 28 additions & 5 deletions README_HWRF_PHYSICS.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,31 +17,54 @@ PRs pulled into the dtc/hwrf-physics branches
=============================================

The following PRs were pulled into these branches on the given dates
and with the given hashes (further down is later):

and with the given hashes (further down is later). Additional commits
were made by @climbfuji as required for changing the target branch
(from dtc/develop to dtc/hwrf-physics), bug fixes, cleanup, and as
a result of the code review processes.

ccpp-physics
------------

04/06/2020 MONINEDMF https://github.com/NCAR/ccpp-physics/pull/395
04/06/2020 MONINEDMF https://github.com/NCAR/ccpp-physics/pull/395 -> https://github.com/NCAR/ccpp-physics/pull/428
git cherry-pick 942889ab0acace519254712cb4e14b6aaf3e0415
git cherry-pick 500d53a21027f362a9c12c10767f0b4f8cf3361c
git cherry-pick b0f04b210bd588673182023ea36b56ee94642c3e
git cherry-pick e895c62cf49b908927678d72c1ad21ad828e3587

04/08/2020 RRTMG https://github.com/NCAR/ccpp-physics/pull/412 -> https://github.com/NCAR/ccpp-physics/pull/430
git cherry-pick 9e9222a470dd8a644ba4c3d010766c62dc71de59
git cherry-pick 4d9e68fc27bb3974f1a6c5733bf1b8127165581d
git cherry-pick 6f9fec9d183531c81475b3496504dc3225011472
git cherry-pick 57873f2045e1cd2d09c71481c0593f3d7eee24ef
git cherry-pick 7e492ca69cab20d2457af82c5d535d8b64e2ab1e
git cherry-pick 298d1aed7b2f29ccf624a71be7d9f804eaf9e8ab
git cherry-pick 5404462a72fe10477595c25baab0ae28fe667f0f

fv3atm
------

04/06/2020 MONINEDMF https://github.com/NCAR/fv3atm/pull/18
04/06/2020 MONINEDMF https://github.com/NCAR/fv3atm/pull/18 -> https://github.com/NCAR/fv3atm/pull/37
git cherry-pick 80ce8591b6af615c9f85a2b3becf8aadc836d734

04/08/2020 RRTMG https://github.com/NCAR/fv3atm/pull/33 -> https://github.com/NCAR/fv3atm/pull/38
git cherry-pick 1bae50c9fd5a365226088d861b9d80af9b60de7d
git cherry-pick ed8347eb0f001de2f53989054c024ad24394a483
git cherry-pick f1cad8833735ce833bc2ed08a318b77c04e3f536
git cherry-pick d9841c8d353c262c5aa8e0394ab3ed02542ca8f6
git cherry-pick 3c64b5a3eaa7608edef1d7c91066d4265e442b27

ufs-weather-model
-----------------

04/06/2020 MONINEDMF https://github.com/NCAR/ufs-weather-model/pull/15
04/06/2020 MONINEDMF https://github.com/NCAR/ufs-weather-model/pull/15 -> https://github.com/NCAR/ufs-weather-model/pull/35
git cherry-pick e6fe22ffde6425800b7ed2e1cf3748b606806d28
git cherry-pick a99d5e73f94f5ffb3bd9bbb1a3dc04171026b6d7
git cherry-pick 5570528f22a9815437e0ef5b413435a8b9fd5881
git cherry-pick 2bb15be8cc15c69c178b6e443c0ab8c0d75ef318

04/08/2020 RRTMG https://github.com/NCAR/ufs-weather-model/pull/30 -> https://github.com/NCAR/ufs-weather-model/pull/36
git cherry-pick 5ab446fe423d9a7ba0172ec782e6346c47c98116
git cherry-pick 1cbc515c6dff00e729523ff6f922e046179d7dcf
git cherry-pick c6f51f5090411c737a8d79a27bbf08b8d9b00c28
git cherry-pick 2a43ab170916fbe60c3d918ff16a510928964e51
git cherry-pick 73f5dcbc93ae297a6a9880988a8f7a7109f99c2e
5 changes: 4 additions & 1 deletion parm/ccpp_regional_c768_FA.nml.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
blocksize = 32
chksum_debug = .false.
dycore_only = .false.
fdiag = 1
fdiag = 0,1,2,3
ccpp_suite = '@[CCPP_SUITE]'
/

Expand Down Expand Up @@ -129,6 +129,9 @@
pre_rad = .false.
ncld = 5
imp_physics = 15
icloud = @[ICLOUD]
iovr_lw = @[IOVR_LW]
iovr_sw = @[IOVR_SW]
spec_adv = .true.
RHGRD = 0.98
lradar = @[LRADAR]
Expand Down
5 changes: 5 additions & 0 deletions tests/default_vars.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,11 @@ export MAKE_NH=.T.
export MOUNTAIN=.F.
export NA_INIT=1

# Radiation
export ICLOUD=0
export IOVR_LW=1
export IOVR_SW=1

# Microphysics
export IMP_PHYSICS=11
# GFDL MP
Expand Down
10 changes: 8 additions & 2 deletions tests/fv3_conf/ccpp_regional_FA_run.IN
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,14 @@ fi
cp @[RTPWD]/FV3_input_data/DETAMPNEW_DATA* .
cp @[RTPWD]/FV3_input_data/*grb .
cp @[RTPWD]/FV3_input_data/*_table .
cp /scratch1/BMC/gmtb/ufs-weather-model/RT/NEMSfv3gfs/FV3_input_data_temporary_hafs/diag_table_FA diag_table
cp /scratch1/BMC/gmtb/ufs-weather-model/RT/NEMSfv3gfs/FV3_input_data_temporary_hafs/field_table_FA_nwat4 field_table
# Copy diag table for HWRF RRTMG or GFS RRTMG
if [ $IOVR_LW = 4 ] && [ $IOVR_SW = 4 ]; then
cp @[RTPWD]/FV3_input_data_hafs/diag_table_FA_HWRF diag_table
else
cp @[RTPWD]/FV3_input_data_hafs/diag_table_FA diag_table
fi
# Copy field table for Ferrier-Aligo MP
cp @[RTPWD]/FV3_input_data_hafs/field_table_FA_nwat4 field_table

cp ${PATHRT}/../FV3/ccpp/suites/suite_${CCPP_SUITE}.xml suite_${CCPP_SUITE}.xml

Expand Down
6 changes: 4 additions & 2 deletions tests/rt.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -252,10 +252,11 @@ RUN | fv3_ccpp_gfdlmprad_32bit_post
RUN | fv3_ccpp_cpt | standard | | |
RUN | fv3_ccpp_gsd | standard | | fv3 |

COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires_update_moist | standard | hera.intel | fv3 |
COMPILE | REPRO=Y CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires_update_moist,FV3_HAFS_FA_HWRF_RRTMG | standard | hera.intel | fv3 |

RUN | fv3_ccpp_regional_c768_FA_update_moist | standard | hera.intel | fv3 |
RUN | fv3_ccpp_regional_c768_HWRF_PBL | standard | hera.intel | fv3 |
RUN | fv3_ccpp_regional_c768_FA_HWRF_RRTMG | standard | hera.intel | fv3 |

#######################################################################################################################################################################################
# CCPP PROD tests #
Expand Down Expand Up @@ -374,10 +375,11 @@ RUN | fv3_ccpp_gsd
RUN | fv3_ccpp_thompson | standard | | fv3 |
RUN | fv3_ccpp_thompson_no_aero | standard | | fv3 |

COMPILE | CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires_update_moist | standard | hera.intel | fv3 |
COMPILE | CCPP=Y STATIC=Y SUITES=FV3_HAFS_ferhires_update_moist,FV3_HAFS_FA_HWRF_RRTMG | standard | hera.intel | fv3 |

RUN | fv3_ccpp_regional_c768_FA_update_moist | standard | hera.intel | fv3 |
RUN | fv3_ccpp_regional_c768_HWRF_PBL | standard | hera.intel | fv3 |
RUN | fv3_ccpp_regional_c768_FA_HWRF_RRTMG | standard | hera.intel | fv3 |

#######################################################################################################################################################################################
# CCPP PROD tests #
Expand Down
22 changes: 15 additions & 7 deletions tests/rt.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,18 @@ elif [[ $MACHINE_ID = hera.* ]]; then
QUEUE=debug
# ACCNR=fv3-cpu
PARTITION=
dprefix=/scratch1/NCEPDEV
DISKNM=$dprefix/nems/emc.nemspara/RT
STMP=$dprefix/stmp4
PTMP=$dprefix/stmp2
#
# DTC HWRF baseline
dprefix=/scratch1/BMC/gmtb
DISKNM=$dprefix/ufs-weather-model/RT
STMP=$dprefix
PTMP=$dprefix
# EMC baseline
#dprefix=/scratch1/NCEPDEV
#DISKNM=$dprefix/nems/emc.nemspara/RT
#STMP=$dprefix/stmp4
#PTMP=$dprefix/stmp2
#

SCHEDULER=slurm
cp fv3_conf/fv3_slurm.IN_hera fv3_conf/fv3_slurm.IN
Expand Down Expand Up @@ -375,11 +383,11 @@ done

# Fix me - make those definitions and DISKNM consistent
if [[ $MACHINE_ID = hera.* ]]; then
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20200317/${COMPILER^^}}
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/hwrf-physics-20200317/${COMPILER^^}}
elif [[ $MACHINE_ID = cheyenne.* ]]; then
RTPWD=${RTPWD:-$DISKNM/develop-20200317/${COMPILER^^}}
RTPWD=${RTPWD:-$DISKNM/hwrf-physics-20200317/${COMPILER^^}}
else
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-20200317}
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/hwrf-physics-20200317}
fi

shift $((OPTIND-1))
Expand Down
31 changes: 31 additions & 0 deletions tests/tests/fv3_ccpp_regional_c768_FA_HWRF_RRTMG
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
###############################################################################
#
# FV3 CCPP regional c768 test with Ferrier-Aligo MP scheme
#
###############################################################################

export TEST_DESCR="Compare FV3 CCPP regional c768 with Ferrier-Aligo MP scheme results with previous trunk version"

export CNTL_DIR=fv3_regional_c768_FA_HWRF_RRTMG

export LIST_FILES=" atmos_4xdaily.nc \
fv3_history2d.nc \
fv3_history.nc "

export_fv3

export TASKS=480
export WLCLK=30

export ICLOUD=3
export IOVR_LW=4
export IOVR_SW=4

export RUN_SCRIPT=rt_fv3.sh
export FV3_RUN=ccpp_regional_FA_run.IN

export CCPP_SUITE=FV3_HAFS_FA_HWRF_RRTMG
export CCPP_LIB_DIR=ccpp/lib
export INPUT_NML=ccpp_regional_c768_FA.nml.IN
export LRADAR=.T.
export WRITE_DOPOST=.true.

0 comments on commit 61b9443

Please sign in to comment.