From f6ec184c7ee8861c699aac3f149b7077028c5e6e Mon Sep 17 00:00:00 2001 From: Benjamin Hillman Date: Mon, 7 Aug 2017 12:47:41 -0600 Subject: [PATCH 1/3] Set RTM grid to null for RRM configurations Set RTM grid to null in grid longname for RRM configurations to turn off the river runoff model. Required input files do not exist for running RTM with the RRM grids, so previously this required manually setting RTM_MODE=NULL for RRM grids. Once PR #1629 are #1693 merged as well, the supported RRM grids (CONUS, TWP, and ENA) should run without further user intervention. For now, the user still needs to set CAM_DYCORE=se, due to issue #1357. --- config/acme/config_grids.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/config/acme/config_grids.xml b/config/acme/config_grids.xml index 8b6478a2d80..22414f497c3 100644 --- a/config/acme/config_grids.xml +++ b/config/acme/config_grids.xml @@ -446,23 +446,23 @@ ne0np4_arm_x8v3_lowcon_ne0np4_arm_x8v3_lowcon - a%ne0np4_arm_x8v3_lowcon_l%ne0np4_arm_x8v3_lowcon_oi%ne0np4_arm_x8v3_lowcon_r%r01_m%gx1v6_g%null_w%null + a%ne0np4_arm_x8v3_lowcon_l%ne0np4_arm_x8v3_lowcon_oi%ne0np4_arm_x8v3_lowcon_r%null_m%gx1v6_g%null_w%null armx8v3_armx8v3 ne0np4_conus_x4v1_lowcon_ne0np4_conus_x4v1_lowcon - a%ne0np4_conus_x4v1_lowcon_l%ne0np4_conus_x4v1_lowcon_oi%ne0np4_conus_x4v1_lowcon_r%r01_m%tx0.1v2_g%null_w%null + a%ne0np4_conus_x4v1_lowcon_l%ne0np4_conus_x4v1_lowcon_oi%ne0np4_conus_x4v1_lowcon_r%null_m%tx0.1v2_g%null_w%null conusx4v1_conusx4v1 ne0np4_svalbard_x8v1_lowcon_ne0np4_svalbard_x8v1_lowcon - a%ne0np4_svalbard_x8v1_lowcon_l%ne0np4_svalbard_x8v1_lowcon_oi%ne0np4_svalbard_x8v1_lowcon_r%r01_m%tx0.1v2_g%null_w%null + a%ne0np4_svalbard_x8v1_lowcon_l%ne0np4_svalbard_x8v1_lowcon_oi%ne0np4_svalbard_x8v1_lowcon_r%null_m%tx0.1v2_g%null_w%null svalbardx8v1_svalbardx8v1 ne0np4_sooberingoa_x4x8v1_lowcon_ne0np4_sooberingoa_x4x8v1_lowcon - a%ne0np4_sooberingoa_x4x8v1_lowcon_l%ne0np4_sooberingoa_x4x8v1_lowcon_oi%ne0np4_sooberingoa_x4x8v1_lowcon_r%r01_m%tx0.1v2_g%null_w%null + a%ne0np4_sooberingoa_x4x8v1_lowcon_l%ne0np4_sooberingoa_x4x8v1_lowcon_oi%ne0np4_sooberingoa_x4x8v1_lowcon_r%null_m%tx0.1v2_g%null_w%null sooberingoax4x8v1_sooberingoax4x8v1 @@ -768,25 +768,25 @@ ne0np4_arm_x8v3_lowcon_ne0np4_arm_x8v3_lowcon - a%ne0np4_arm_x8v3_lowcon_l%ne0np4_arm_x8v3_lowcon_oi%ne0np4_arm_x8v3_lowcon_r%r01_m%gx1v6_g%null_w%null + a%ne0np4_arm_x8v3_lowcon_l%ne0np4_arm_x8v3_lowcon_oi%ne0np4_arm_x8v3_lowcon_r%null_m%gx1v6_g%null_w%null armx8v3_armx8v3 ne0np4_conus_x4v1_lowcon_ne0np4_conus_x4v1_lowcon - a%ne0np4_conus_x4v1_lowcon_l%ne0np4_conus_x4v1_lowcon_oi%ne0np4_conus_x4v1_lowcon_r%r01_m%tx0.1v2_g%null_w%null + a%ne0np4_conus_x4v1_lowcon_l%ne0np4_conus_x4v1_lowcon_oi%ne0np4_conus_x4v1_lowcon_r%null_m%tx0.1v2_g%null_w%null conusx4v1_conusx4v1 ne0np4_svalbard_x8v1_lowcon_ne0np4_svalbard_x8v1_lowcon - a%ne0np4_svalbard_x8v1_lowcon_l%ne0np4_svalbard_x8v1_lowcon_oi%ne0np4_svalbard_x8v1_lowcon_r%r01_m%tx0.1v2_g%null_w%null + a%ne0np4_svalbard_x8v1_lowcon_l%ne0np4_svalbard_x8v1_lowcon_oi%ne0np4_svalbard_x8v1_lowcon_r%null_m%tx0.1v2_g%null_w%null svalbardx8v1_svalbardx8v1 ne0np4_sooberingoa_x4x8v1_lowcon_ne0np4_sooberingoa_x4x8v1_lowcon - a%ne0np4_sooberingoa_x4x8v1_lowcon_l%ne0np4_sooberingoa_x4x8v1_lowcon_oi%ne0np4_sooberingoa_x4x8v1_lowcon_r%r01_m%tx0.1v2_g%null_w%null + a%ne0np4_sooberingoa_x4x8v1_lowcon_l%ne0np4_sooberingoa_x4x8v1_lowcon_oi%ne0np4_sooberingoa_x4x8v1_lowcon_r%null_m%tx0.1v2_g%null_w%null sooberingoax4x8v1_sooberingoax4x8v1 From 05f48b273deee0df77c9e42f8c4e848d51e47ab1 Mon Sep 17 00:00:00 2001 From: Benjamin Hillman Date: Tue, 8 Aug 2017 08:01:26 -0600 Subject: [PATCH 2/3] Remove duplicate RRM grid configurations Remove duplicate RRM grid configurations. --- config/acme/config_grids.xml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/config/acme/config_grids.xml b/config/acme/config_grids.xml index 22414f497c3..2ffd4694837 100644 --- a/config/acme/config_grids.xml +++ b/config/acme/config_grids.xml @@ -766,30 +766,6 @@ ne30_oRRS30wLI - - ne0np4_arm_x8v3_lowcon_ne0np4_arm_x8v3_lowcon - a%ne0np4_arm_x8v3_lowcon_l%ne0np4_arm_x8v3_lowcon_oi%ne0np4_arm_x8v3_lowcon_r%null_m%gx1v6_g%null_w%null - armx8v3_armx8v3 - - - - ne0np4_conus_x4v1_lowcon_ne0np4_conus_x4v1_lowcon - a%ne0np4_conus_x4v1_lowcon_l%ne0np4_conus_x4v1_lowcon_oi%ne0np4_conus_x4v1_lowcon_r%null_m%tx0.1v2_g%null_w%null - conusx4v1_conusx4v1 - - - - ne0np4_svalbard_x8v1_lowcon_ne0np4_svalbard_x8v1_lowcon - a%ne0np4_svalbard_x8v1_lowcon_l%ne0np4_svalbard_x8v1_lowcon_oi%ne0np4_svalbard_x8v1_lowcon_r%null_m%tx0.1v2_g%null_w%null - svalbardx8v1_svalbardx8v1 - - - - ne0np4_sooberingoa_x4x8v1_lowcon_ne0np4_sooberingoa_x4x8v1_lowcon - a%ne0np4_sooberingoa_x4x8v1_lowcon_l%ne0np4_sooberingoa_x4x8v1_lowcon_oi%ne0np4_sooberingoa_x4x8v1_lowcon_r%null_m%tx0.1v2_g%null_w%null - sooberingoax4x8v1_sooberingoax4x8v1 - - T31_gx3v7_gland10 a%T31_l%T31_oi%gx3v7_r%r05_m%gx3v7_g%gland10_w%null From 7b5ea6d94b4d3322097e918b40c8b27a8ccde2a7 Mon Sep 17 00:00:00 2001 From: Benjamin Hillman Date: Wed, 9 Aug 2017 09:29:03 -0600 Subject: [PATCH 3/3] Set RTM grid to null for ENA grid Following rebase onto master with newly added ENA grid configuration, set RTM grid to null in grid longname for default ENA grid. --- config/acme/config_grids.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/acme/config_grids.xml b/config/acme/config_grids.xml index 2ffd4694837..8dce70252ca 100644 --- a/config/acme/config_grids.xml +++ b/config/acme/config_grids.xml @@ -469,14 +469,14 @@ ne0np4_enax4v1_ne0np4_enax4v1 - a%ne0np4_enax4v1_l%ne0np4_enax4v1_oi%ne0np4_enax4v1_r%r01_m%oRRS18to6_g%null_w%null + a%ne0np4_enax4v1_l%ne0np4_enax4v1_oi%ne0np4_enax4v1_r%null_m%oRRS18to6_g%null_w%null enax4v1_enax4v1 ne0np4_enax4v1_ne30np4_ne0np4_enax4v1 - a%ne0np4_enax4v1_l%ne30np4_oi%ne0np4_enax4v1_r%r01_m%oRRS18to6_g%null_w%null + a%ne0np4_enax4v1_l%ne30np4_oi%ne0np4_enax4v1_r%null_m%oRRS18to6_g%null_w%null enax4v1_ne30_enax4v1