diff --git a/tests/tests/cpld_bmarkfrac_wave_v16_35d b/tests/tests/cpld_bmarkfrac_wave_v16_35d index f84dccc980..7482dd5e5b 100644 --- a/tests/tests/cpld_bmarkfrac_wave_v16_35d +++ b/tests/tests/cpld_bmarkfrac_wave_v16_35d @@ -31,9 +31,9 @@ export WLCLK=480 #export ice_petlist_bounds=$IPB_cpl_wwav #export wav_petlist_bounds=$WPB_cpl_wwav -export TPN=40 -export THRD=1 -export WRTTASK_PER_GROUP=24 +export TPN=20 +export THRD=2 +export WRTTASK_PER_GROUP=88 # 6x12 setting #export TASKS=866 @@ -55,6 +55,16 @@ export ocn_petlist_bounds="600 839" export ice_petlist_bounds="840 887" export wav_petlist_bounds="888 1009" +# 12x16 setting +export TASKS=1700 +export INPES=12 +export JNPES=16 +export med_petlist_bounds="0 1151" +export atm_petlist_bounds="0 1239" +export ocn_petlist_bounds="1240 1459" +export ice_petlist_bounds="1460 1539" +export wav_petlist_bounds="1540 1699" + # atm/ocn/ice resolution export ATMRES='C384' export NPX=385 @@ -67,7 +77,7 @@ export OCNRES='025' export ICERES='0.25' export NX_GLB=1440 export NY_GLB=1080 -export NPROC_ICE='48' +export NPROC_ICE='80' # resolution dependent setting export CDMBWD=${CDMBWD_c384} diff --git a/tests/tests/cpld_bmarkfrac_wave_v16_noahmp_35d b/tests/tests/cpld_bmarkfrac_wave_v16_noahmp_35d index 4c88e72336..bdb7093fe0 100644 --- a/tests/tests/cpld_bmarkfrac_wave_v16_noahmp_35d +++ b/tests/tests/cpld_bmarkfrac_wave_v16_noahmp_35d @@ -31,9 +31,9 @@ export WLCLK=480 #export ice_petlist_bounds=$IPB_cpl_wwav #export wav_petlist_bounds=$WPB_cpl_wwav -export TPN=40 -export THRD=1 -export WRTTASK_PER_GROUP=24 +export TPN=20 +export THRD=2 +export WRTTASK_PER_GROUP=88 # 6x12 setting #export TASKS=866 @@ -46,14 +46,24 @@ export WRTTASK_PER_GROUP=24 #export wav_petlist_bounds="744 865" # 8x12 setting -export TASKS=1010 -export INPES=8 -export JNPES=12 -export med_petlist_bounds="0 575" -export atm_petlist_bounds="0 599" -export ocn_petlist_bounds="600 839" -export ice_petlist_bounds="840 887" -export wav_petlist_bounds="888 1009" +#export TASKS=1010 +#export INPES=8 +#export JNPES=12 +#export med_petlist_bounds="0 575" +#export atm_petlist_bounds="0 599" +#export ocn_petlist_bounds="600 839" +#export ice_petlist_bounds="840 887" +#export wav_petlist_bounds="888 1009" + +# 12x16 setting + export TASKS=1700 + export INPES=12 + export JNPES=16 + export med_petlist_bounds="0 1151" + export atm_petlist_bounds="0 1239" + export ocn_petlist_bounds="1240 1459" + export ice_petlist_bounds="1460 1539" + export wav_petlist_bounds="1540 1699" # atm/ocn/ice resolution export ATMRES='C384' @@ -67,7 +77,7 @@ export OCNRES='025' export ICERES='0.25' export NX_GLB=1440 export NY_GLB=1080 -export NPROC_ICE='48' +export NPROC_ICE='80' # resolution dependent setting export CDMBWD=${CDMBWD_c384}