From 9e13af543b35fc41b38bad3767ae0451da807268 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Mon, 13 Dec 2021 14:54:54 +0000 Subject: [PATCH 01/12] update ufs-weather-model hash --- sorc/checkout.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/checkout.sh b/sorc/checkout.sh index 57503a03f5e..cda3d385831 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -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:-56f3483dacf9bb11597dde731a726cf643049b6d} git submodule update --init --recursive cd ${topdir} else From 9bbd6583e32315428878526a1a70971e355fded6 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Sat, 18 Dec 2021 16:35:18 +0000 Subject: [PATCH 02/12] updates for p8a * update ufs-weather-model * Turn on ice-albedo * Updates to CA namelists --- parm/config/config.defaults.s2sw | 7 ++++--- parm/config/config.fcst | 1 + sorc/build_ufs.sh | 2 +- sorc/checkout.sh | 2 +- ush/nems.configure.cpld.IN | 5 ++++- ush/nems.configure.cpld_wave.IN | 5 ++++- ush/nems_configure.sh | 3 +++ ush/parsing_model_configure_FV3.sh | 2 +- ush/parsing_namelists_CICE.sh | 3 ++- ush/parsing_namelists_FV3.sh | 18 ++++++++++-------- 10 files changed, 31 insertions(+), 17 deletions(-) diff --git a/parm/config/config.defaults.s2sw b/parm/config/config.defaults.s2sw index dca77a8d624..ae5c39fa52c 100644 --- a/parm/config/config.defaults.s2sw +++ b/parm/config/config.defaults.s2sw @@ -16,13 +16,14 @@ IALB=2 IEMS=2 DO_CA="YES" min_seaice="1e-11" +use_cice_alb=".true." # 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 diff --git a/parm/config/config.fcst b/parm/config/config.fcst index 55a47906c40..30796ee77cc 100755 --- a/parm/config/config.fcst +++ b/parm/config/config.fcst @@ -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" diff --git a/sorc/build_ufs.sh b/sorc/build_ufs.sh index 8202981e2ad..1f714f2e55e 100755 --- a/sorc/build_ufs.sh +++ b/sorc/build_ufs.sh @@ -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 ;; *) diff --git a/sorc/checkout.sh b/sorc/checkout.sh index cda3d385831..80380cc63f5 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -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:-56f3483dacf9bb11597dde731a726cf643049b6d} + git checkout ${ufs_model_hash:-c9b399c1163147833dc5caf045151fbc1026a27b} git submodule update --init --recursive cd ${topdir} else diff --git a/ush/nems.configure.cpld.IN b/ush/nems.configure.cpld.IN index 8a070787f51..57e7085cad1 100644 --- a/ush/nems.configure.cpld.IN +++ b/ush/nems.configure.cpld.IN @@ -76,7 +76,6 @@ runSeq:: # CMEPS variables DRIVER_attributes:: - mediator_read_restart = @[use_coldstart] :: MED_attributes:: ATM_model = @[atm_model] @@ -86,6 +85,7 @@ MED_attributes:: history_option = nhours history_ymd = -999 coupling_mode = @[CPLMODE] + history_tile_atm = @[ATMTILESIZE] :: ALLCOMP_attributes:: ScalarFieldCount = 2 @@ -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 :: diff --git a/ush/nems.configure.cpld_wave.IN b/ush/nems.configure.cpld_wave.IN index 2b8a49e56b6..949e3c81998 100644 --- a/ush/nems.configure.cpld_wave.IN +++ b/ush/nems.configure.cpld_wave.IN @@ -90,7 +90,6 @@ runSeq:: # CMEPS variables DRIVER_attributes:: - mediator_read_restart = @[use_coldstart] :: MED_attributes:: ATM_model = @[atm_model] @@ -100,6 +99,7 @@ MED_attributes:: history_option = nhours history_ymd = -999 coupling_mode = @[CPLMODE] + history_tile_atm = @[ATMTILESIZE] :: ALLCOMP_attributes:: ScalarFieldCount = 2 @@ -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 :: diff --git a/ush/nems_configure.sh b/ush/nems_configure.sh index ce8b766e92a..b3024c9b177 100755 --- a/ush/nems_configure.sh +++ b/ush/nems_configure.sh @@ -48,6 +48,8 @@ else EPS_IMESH='1.0e-1' fi +ATMTILESIZE=$(echo $CASE | cut -c2-) + rm -f $DATA/nems.configure med_petlist_bounds=${med_petlist_bounds:-"0 $(( $MEDPETS-1 ))"} @@ -86,6 +88,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\];$ATMTILESIZE;g" tmp1 fi if [ $cplwav = .true. ]; then sed -i -e "s;@\[wav_model\];ww3;g" tmp1 diff --git a/ush/parsing_model_configure_FV3.sh b/ush/parsing_model_configure_FV3.sh index 7ba18dacde8..da8376d0019 100755 --- a/ush/parsing_model_configure_FV3.sh +++ b/ush/parsing_model_configure_FV3.sh @@ -19,7 +19,7 @@ fi rm -f model_configure cat >> model_configure < ice_in <> input.nml << EOF frac_grid = ${FRAC_GRID:-".true."} - cplchm = ${cplchem:-".false."} + cplchm = ${cplchem:-".false."} cplflx = $cplflx + cplice = ${cplice} cplwav2atm = ${cplwav2atm} EOF fi @@ -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 From 3eebcc3762b156aa1aafa3bee8beda47bcded078 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Mon, 20 Dec 2021 14:28:07 +0000 Subject: [PATCH 03/12] set iopt_sfc="3" for coupled --- parm/config/config.defaults.s2sw | 1 + 1 file changed, 1 insertion(+) diff --git a/parm/config/config.defaults.s2sw b/parm/config/config.defaults.s2sw index ae5c39fa52c..2b84418686d 100644 --- a/parm/config/config.defaults.s2sw +++ b/parm/config/config.defaults.s2sw @@ -25,6 +25,7 @@ layout_y_gfs=12 WRITE_GROUP_GFS=1 WRTTASK_PER_GROUP_GFS=80 WRTIOBUF="32M" +export iopt_sfc="3" # config.wave waveGRD='gwes_30m' From 6aec05539b43a3c786ee0fd44876350665e64117 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Mon, 20 Dec 2021 15:59:16 +0000 Subject: [PATCH 04/12] update post version to match ufs-weather-model which is needed to add extra land output --- sorc/checkout.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/checkout.sh b/sorc/checkout.sh index 80380cc63f5..e9a864e0671 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -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 From ba000f802a84c5880e925c39c6ca99f30e37a7e4 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Mon, 20 Dec 2021 20:30:11 +0000 Subject: [PATCH 05/12] update minimum sea-ice to be 1e-6 (larger than CICE puny value) --- parm/config/config.defaults.s2sw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parm/config/config.defaults.s2sw b/parm/config/config.defaults.s2sw index 2b84418686d..cc3cad8eae8 100644 --- a/parm/config/config.defaults.s2sw +++ b/parm/config/config.defaults.s2sw @@ -15,7 +15,7 @@ FHOUT_HF_GFS=-1 IALB=2 IEMS=2 DO_CA="YES" -min_seaice="1e-11" +min_seaice="1e-6" use_cice_alb=".true." # config.fv3 From abf37c8276c703f68bfb69cf1735ef702652069c Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Mon, 20 Dec 2021 20:30:49 +0000 Subject: [PATCH 06/12] add extra land output parameters --- parm/parm_fv3diag/diag_table_cpl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/parm/parm_fv3diag/diag_table_cpl b/parm/parm_fv3diag/diag_table_cpl index 06ad741978e..37b96d43783 100644 --- a/parm/parm_fv3diag/diag_table_cpl +++ b/parm/parm_fv3diag/diag_table_cpl @@ -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 From 5dced31a631a06d5b4674da1bba6fa4669ad23f3 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Wed, 22 Dec 2021 19:13:08 +0000 Subject: [PATCH 07/12] move iopt_sfc to appropriate config section --- parm/config/config.defaults.s2sw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parm/config/config.defaults.s2sw b/parm/config/config.defaults.s2sw index cc3cad8eae8..559782c7c5a 100644 --- a/parm/config/config.defaults.s2sw +++ b/parm/config/config.defaults.s2sw @@ -17,6 +17,7 @@ IEMS=2 DO_CA="YES" min_seaice="1e-6" use_cice_alb=".true." +export iopt_sfc="3" # config.fv3 DELTIM=300 @@ -25,7 +26,6 @@ layout_y_gfs=12 WRITE_GROUP_GFS=1 WRTTASK_PER_GROUP_GFS=80 WRTIOBUF="32M" -export iopt_sfc="3" # config.wave waveGRD='gwes_30m' From 9aa63e1be4fc22744d31868aea498b8738f5d70c Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Thu, 23 Dec 2021 20:36:53 +0000 Subject: [PATCH 08/12] update ufs-weather-model to 12/23 commit --- sorc/checkout.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/checkout.sh b/sorc/checkout.sh index e9a864e0671..e4a3b4d582e 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -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:-c9b399c1163147833dc5caf045151fbc1026a27b} + git checkout ${ufs_model_hash:-803e03adcf14f2b108b013fd1b54055ec2124caa} git submodule update --init --recursive cd ${topdir} else From 6f8af9a5fbd34fe4b53d8e56fc3bb4313b728ce1 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Thu, 23 Dec 2021 20:38:53 +0000 Subject: [PATCH 09/12] update to point to new ICs for p8a --- parm/config/config.coupled_ic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parm/config/config.coupled_ic b/parm/config/config.coupled_ic index 758fc7ad8d7..b642cb1c7a2 100755 --- a/parm/config/config.coupled_ic +++ b/parm/config/config.coupled_ic @@ -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 From c24c02965a1da77e029c490d9604e34348d8e4b5 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Tue, 4 Jan 2022 15:17:27 +0000 Subject: [PATCH 10/12] use existing RESTILE variable --- ush/nems_configure.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ush/nems_configure.sh b/ush/nems_configure.sh index b3024c9b177..e0b3bab05f5 100755 --- a/ush/nems_configure.sh +++ b/ush/nems_configure.sh @@ -48,8 +48,6 @@ else EPS_IMESH='1.0e-1' fi -ATMTILESIZE=$(echo $CASE | cut -c2-) - rm -f $DATA/nems.configure med_petlist_bounds=${med_petlist_bounds:-"0 $(( $MEDPETS-1 ))"} @@ -88,7 +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\];$ATMTILESIZE;g" tmp1 + sed -i -e "s;@\[ATMTILESIZE\];$RESTILE;g" tmp1 fi if [ $cplwav = .true. ]; then sed -i -e "s;@\[wav_model\];ww3;g" tmp1 From 2f055b83fae31673a7a89253d05ba57bdaaabb58 Mon Sep 17 00:00:00 2001 From: Jessica Meixner Date: Tue, 4 Jan 2022 15:21:22 +0000 Subject: [PATCH 11/12] revert unintentional change --- ush/parsing_model_configure_FV3.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ush/parsing_model_configure_FV3.sh b/ush/parsing_model_configure_FV3.sh index da8376d0019..71a5f2394d1 100755 --- a/ush/parsing_model_configure_FV3.sh +++ b/ush/parsing_model_configure_FV3.sh @@ -19,7 +19,7 @@ fi rm -f model_configure cat >> model_configure < Date: Thu, 6 Jan 2022 05:07:22 +0000 Subject: [PATCH 12/12] Replace UFS hash with P8a tag Refs: #525 --- sorc/checkout.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/checkout.sh b/sorc/checkout.sh index 4b40a9f5f0b..1109a574b8a 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -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:-803e03adcf14f2b108b013fd1b54055ec2124caa} + git checkout ${ufs_model_hash:-release/P8a} git submodule update --init --recursive cd ${topdir} else