Skip to content

Updates for P8a #538

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
WalterKolczynski-NOAA merged 14 commits into from
Jan 6, 2022
Merged

Updates for P8a #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9e13af5
update ufs-weather-model hash
JessicaMeixner-NOAA Dec 13, 2021
9c57368
Merge remote-tracking branch 'EMC/develop' into feature/p8a
JessicaMeixner-NOAA Dec 17, 2021
9bbd658
updates for p8a
JessicaMeixner-NOAA Dec 18, 2021
3eebcc3
set iopt_sfc="3" for coupled
JessicaMeixner-NOAA Dec 20, 2021
6aec055
update post version to match ufs-weather-model which is needed to
JessicaMeixner-NOAA Dec 20, 2021
ba000f8
update minimum sea-ice to be 1e-6 (larger than CICE puny value)
JessicaMeixner-NOAA Dec 20, 2021
abf37c8
add extra land output parameters
JessicaMeixner-NOAA Dec 20, 2021
5dced31
move iopt_sfc to appropriate config section
JessicaMeixner-NOAA Dec 22, 2021
9aa63e1
update ufs-weather-model to 12/23 commit
JessicaMeixner-NOAA Dec 23, 2021
6f8af9a
update to point to new ICs for p8a
JessicaMeixner-NOAA Dec 23, 2021
a569606
Merge remote-tracking branch 'EMC/develop' into feature/p8a
JessicaMeixner-NOAA Jan 4, 2022
c24c029
use existing RESTILE variable
JessicaMeixner-NOAA Jan 4, 2022
2f055b8
revert unintentional change
JessicaMeixner-NOAA Jan 4, 2022
452737f
Replace UFS hash with P8a tag
WalterKolczynski-NOAA Jan 6, 2022
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
2 changes: 1 addition & 1 deletion parm/config/config.coupled_ic
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ elif [[ "$machine" == "ORION" ]]; then
export BASE_CPLIC="/work/noaa/global/wkolczyn/noscrub/global-workflow/IC"
fi

export CPL_ATMIC=GEFSwithNOAHMP-GLDASdatm-ERAsnow-aerosols
export CPL_ATMIC=GEFS-NoahMP-aerosols-p8a
export CPL_ICEIC=CPC
export CPL_OCNIC=CPC3Dvar
export CPL_WAVIC=GEFSwave20210528v2
Expand Down
10 changes: 6 additions & 4 deletions parm/config/config.defaults.s2sw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,16 @@ FHOUT_HF_GFS=-1
IALB=2
IEMS=2
DO_CA="YES"
min_seaice="1e-11"
min_seaice="1e-6"
use_cice_alb=".true."
export iopt_sfc="3"
Comment thread
WalterKolczynski-NOAA marked this conversation as resolved.

# config.fv3
DELTIM=300
layout_x_gfs=12
layout_y_gfs=16
layout_x_gfs=8
layout_y_gfs=12
WRITE_GROUP_GFS=1
WRTTASK_PER_GROUP_GFS=88
WRTTASK_PER_GROUP_GFS=80
WRTIOBUF="32M"

# config.wave
Expand Down
1 change: 1 addition & 0 deletions parm/config/config.fcst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ export psm_bc="1"

export min_lakeice="0.15"
export min_seaice=${min_seaice:-"0.15"}
export use_cice_alb=${use_cice_alb:-".false."}

export FSICL="99999"

Expand Down
8 changes: 8 additions & 0 deletions parm/parm_fv3diag/diag_table_cpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,14 @@
"gfs_phys", "u10m", "ugrd10m", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "v10m", "vgrd10m", "fv3_history2d", "all", .false., "none", 2

"gfs_phys", "pahi", "pahi", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "pah_ave", "pah_ave", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "ecan_acc", "ecan_acc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "etran_acc", "etran_acc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "edir_acc", "edir_acc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "wa_acc", "wa_acc", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "lfrac", "lfrac", "fv3_history2d", "all", .false., "none", 2

"gfs_sfc", "crain", "crain", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "tprcp", "tprcp", "fv3_history2d", "all", .false., "none", 2
"gfs_phys", "rainc", "cnvprcp", "fv3_history2d", "all", .false., "none", 2
Expand Down
2 changes: 1 addition & 1 deletion sorc/build_ufs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ while getopts "ac" option; do
;;
c)
APP="S2SW"
CCPP_SUITES="FV3_GFS_v16_coupled,FV3_GFS_v16_couplednsst,FV3_GFS_v16_coupled_nsstNoahmpUGWPv1"
CCPP_SUITES="FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v16_coupled_p7_rrtmgp"
shift
;;
*)
Expand Down
4 changes: 2 additions & 2 deletions sorc/checkout.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ echo ufs-weather-model checkout ...
if [[ ! -d ufs_model.fd ]] ; then
git clone https://github.com/ufs-community/ufs-weather-model ufs_model.fd >> ${logdir}/checkout-ufs_model.log 2>&1
cd ufs_model.fd
git checkout ${ufs_model_hash:-c1d6d19}
git checkout ${ufs_model_hash:-release/P8a}
git submodule update --init --recursive
cd ${topdir}
else
Expand Down Expand Up @@ -77,7 +77,7 @@ if [[ ! -d gfs_post.fd ]] ; then
rm -f ${topdir}/checkout-gfs_post.log
git clone https://github.com/NOAA-EMC/UPP.git gfs_post.fd >> ${logdir}/checkout-gfs_post.log 2>&1
cd gfs_post.fd
git checkout upp_v10.0.8
git checkout c939eae
git submodule update --init CMakeModules
################################################################################
# checkout_gtg
Expand Down
5 changes: 4 additions & 1 deletion ush/nems.configure.cpld.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ runSeq::
# CMEPS variables

DRIVER_attributes::
mediator_read_restart = @[use_coldstart]
::
MED_attributes::
ATM_model = @[atm_model]
Expand All @@ -86,6 +85,7 @@ MED_attributes::
history_option = nhours
history_ymd = -999
coupling_mode = @[CPLMODE]
history_tile_atm = @[ATMTILESIZE]
::
ALLCOMP_attributes::
ScalarFieldCount = 2
Expand All @@ -102,4 +102,7 @@ ALLCOMP_attributes::
use_coldstart = @[use_coldstart]
use_mommesh = @[use_mommesh]
eps_imesh = @[eps_imesh]
stop_n = @[FHMAX]
stop_option = nhours
stop_ymd = -999
::
5 changes: 4 additions & 1 deletion ush/nems.configure.cpld_wave.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ runSeq::
# CMEPS variables

DRIVER_attributes::
mediator_read_restart = @[use_coldstart]
::
MED_attributes::
ATM_model = @[atm_model]
Expand All @@ -100,6 +99,7 @@ MED_attributes::
history_option = nhours
history_ymd = -999
coupling_mode = @[CPLMODE]
history_tile_atm = @[ATMTILESIZE]
::
ALLCOMP_attributes::
ScalarFieldCount = 2
Expand All @@ -116,4 +116,7 @@ ALLCOMP_attributes::
use_coldstart = @[use_coldstart]
use_mommesh = @[use_mommesh]
eps_imesh = @[eps_imesh]
stop_n = @[FHMAX]
stop_option = nhours
stop_ymd = -999
::
1 change: 1 addition & 0 deletions ush/nems_configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ if [ $cplflx = .true. ]; then
sed -i -e "s;@\[RESTART_N\];$restart_interval_nems;g" tmp1
sed -i -e "s;@\[use_mommesh\];$USE_MOMMESH;g" tmp1
sed -i -e "s;@\[eps_imesh\];$EPS_IMESH;g" tmp1
sed -i -e "s;@\[ATMTILESIZE\];$RESTILE;g" tmp1
fi
if [ $cplwav = .true. ]; then
sed -i -e "s;@\[wav_model\];ww3;g" tmp1
Expand Down
2 changes: 1 addition & 1 deletion ush/parsing_model_configure_FV3.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fi

rm -f model_configure
cat >> model_configure <<EOF
print_esmf: ${print_esmf:-.true.}
print_esmf: ${print_esmf:-.true.}
start_year: ${tPDY:0:4}
start_month: ${tPDY:4:2}
start_day: ${tPDY:6:2}
Expand Down
3 changes: 2 additions & 1 deletion ush/parsing_namelists_CICE.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ cat > ice_in <<eof
mu_rdg = 3
Cf = 17.
Ktens = 0.
e_ratio = 2.
e_yieldcurve = 2.
e_plasticpot = 2.
coriolis = 'latitude'
kridge = 1
ktransport = 1
Expand Down
18 changes: 10 additions & 8 deletions ush/parsing_namelists_FV3.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,7 @@ EOF
bl_mynn_edmf_mom=${bl_mynn_edmf_mom:-"1"}
min_lakeice = ${min_lakeice:-"0.15"}
min_seaice = ${min_seaice:-"0.15"}
use_cice_alb = ${use_cice_alb:-".false."}
EOF
;;
FV3_GFS_v16_coupled*)
Expand Down Expand Up @@ -327,8 +328,9 @@ EOF
if [ $cpl = .true. ]; then
cat >> input.nml << EOF
frac_grid = ${FRAC_GRID:-".true."}
cplchm = ${cplchem:-".false."}
cplchm = ${cplchem:-".false."}
cplflx = $cplflx
cplice = ${cplice}
Comment thread
WalterKolczynski-NOAA marked this conversation as resolved.
cplwav2atm = ${cplwav2atm}
EOF
fi
Expand All @@ -345,16 +347,16 @@ fi

if [ ${DO_CA:-"NO"} = "YES" ]; then
cat >> input.nml << EOF
do_ca = .True.
ca_global = ${ca_global:-".False."}
ca_sgs = ${ca_sgs:-".True."}
do_ca = .true.
ca_global = ${ca_global:-".false."}
ca_sgs = ${ca_sgs:-".true."}
nca = ${nca:-"1"}
scells = ${scells:-"2600"}
tlives = ${tlives:-"1800"}
ncells = ${ncells:-"5"}
nlives = ${nlives:-"12"}
nseed = ${nseed:-"1"}
nfracseed = ${nfracseed:-"0.5"}
rcell = ${rcell:-"0.72"}
ca_trigger = ${ca_trigger:-".True."}
nthresh = ${nthresh:-"18"}
ca_trigger = ${ca_trigger:-".true."}
nspinup = ${nspinup:-"1"}
iseed_ca = ${ISEED_CA:-"12345"}
EOF
Expand Down