From 49bd151c3a1187666911b2842313b97ff29b900e Mon Sep 17 00:00:00 2001
From: Benjamin Hillman <benjaminr.hillman@gmail.com>
Date: Mon, 7 Aug 2017 12:47:41 -0600
Subject: [PATCH] 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.
---
 cime/config/acme/config_grids.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/cime/config/acme/config_grids.xml b/cime/config/acme/config_grids.xml
index 191f88ba69e0..db4569292cad 100644
--- a/cime/config/acme/config_grids.xml
+++ b/cime/config/acme/config_grids.xml
@@ -446,23 +446,23 @@
     </grid>
     <grid compset="(DOCN|XOCN|SOCN|AQUAP)">
       <sname>ne0np4_arm_x8v3_lowcon_ne0np4_arm_x8v3_lowcon</sname>
-      <lname>    a%ne0np4_arm_x8v3_lowcon_l%ne0np4_arm_x8v3_lowcon_oi%ne0np4_arm_x8v3_lowcon_r%r01_m%gx1v6_g%null_w%null</lname>
+      <lname>    a%ne0np4_arm_x8v3_lowcon_l%ne0np4_arm_x8v3_lowcon_oi%ne0np4_arm_x8v3_lowcon_r%null_m%gx1v6_g%null_w%null</lname>
       <alias>armx8v3_armx8v3</alias>
     </grid>
 
     <grid compset="(DOCN|XOCN|SOCN|AQUAP)">
       <sname>ne0np4_conus_x4v1_lowcon_ne0np4_conus_x4v1_lowcon</sname>
-      <lname>    a%ne0np4_conus_x4v1_lowcon_l%ne0np4_conus_x4v1_lowcon_oi%ne0np4_conus_x4v1_lowcon_r%r01_m%tx0.1v2_g%null_w%null</lname>
+      <lname>    a%ne0np4_conus_x4v1_lowcon_l%ne0np4_conus_x4v1_lowcon_oi%ne0np4_conus_x4v1_lowcon_r%null_m%tx0.1v2_g%null_w%null</lname>
       <alias>conusx4v1_conusx4v1</alias>
     </grid>
     <grid compset="(DOCN|XOCN|SOCN|AQUAP)">
       <sname>ne0np4_svalbard_x8v1_lowcon_ne0np4_svalbard_x8v1_lowcon</sname>
-      <lname>    a%ne0np4_svalbard_x8v1_lowcon_l%ne0np4_svalbard_x8v1_lowcon_oi%ne0np4_svalbard_x8v1_lowcon_r%r01_m%tx0.1v2_g%null_w%null</lname>
+      <lname>    a%ne0np4_svalbard_x8v1_lowcon_l%ne0np4_svalbard_x8v1_lowcon_oi%ne0np4_svalbard_x8v1_lowcon_r%null_m%tx0.1v2_g%null_w%null</lname>
       <alias>svalbardx8v1_svalbardx8v1</alias>
     </grid>
     <grid compset="(DOCN|XOCN|SOCN|AQUAP)">
       <sname>ne0np4_sooberingoa_x4x8v1_lowcon_ne0np4_sooberingoa_x4x8v1_lowcon</sname>
-      <lname>    a%ne0np4_sooberingoa_x4x8v1_lowcon_l%ne0np4_sooberingoa_x4x8v1_lowcon_oi%ne0np4_sooberingoa_x4x8v1_lowcon_r%r01_m%tx0.1v2_g%null_w%null</lname>
+      <lname>    a%ne0np4_sooberingoa_x4x8v1_lowcon_l%ne0np4_sooberingoa_x4x8v1_lowcon_oi%ne0np4_sooberingoa_x4x8v1_lowcon_r%null_m%tx0.1v2_g%null_w%null</lname>
       <alias>sooberingoax4x8v1_sooberingoax4x8v1</alias>
     </grid>
 
@@ -754,25 +754,25 @@
 
     <grid compset="(DOCN|XOCN|SOCN|AQUAP)">
       <sname>ne0np4_arm_x8v3_lowcon_ne0np4_arm_x8v3_lowcon</sname>
-      <lname>    a%ne0np4_arm_x8v3_lowcon_l%ne0np4_arm_x8v3_lowcon_oi%ne0np4_arm_x8v3_lowcon_r%r01_m%gx1v6_g%null_w%null</lname>
+      <lname>    a%ne0np4_arm_x8v3_lowcon_l%ne0np4_arm_x8v3_lowcon_oi%ne0np4_arm_x8v3_lowcon_r%null_m%gx1v6_g%null_w%null</lname>
       <alias>armx8v3_armx8v3</alias>
     </grid>
 
     <grid compset="(DOCN|XOCN|SOCN|AQUAP)">
       <sname>ne0np4_conus_x4v1_lowcon_ne0np4_conus_x4v1_lowcon</sname>
-      <lname>    a%ne0np4_conus_x4v1_lowcon_l%ne0np4_conus_x4v1_lowcon_oi%ne0np4_conus_x4v1_lowcon_r%r01_m%tx0.1v2_g%null_w%null</lname>
+      <lname>    a%ne0np4_conus_x4v1_lowcon_l%ne0np4_conus_x4v1_lowcon_oi%ne0np4_conus_x4v1_lowcon_r%null_m%tx0.1v2_g%null_w%null</lname>
       <alias>conusx4v1_conusx4v1</alias>
     </grid>
 
     <grid compset="(DOCN|XOCN|SOCN|AQUAP)">
       <sname>ne0np4_svalbard_x8v1_lowcon_ne0np4_svalbard_x8v1_lowcon</sname>
-      <lname>    a%ne0np4_svalbard_x8v1_lowcon_l%ne0np4_svalbard_x8v1_lowcon_oi%ne0np4_svalbard_x8v1_lowcon_r%r01_m%tx0.1v2_g%null_w%null</lname>
+      <lname>    a%ne0np4_svalbard_x8v1_lowcon_l%ne0np4_svalbard_x8v1_lowcon_oi%ne0np4_svalbard_x8v1_lowcon_r%null_m%tx0.1v2_g%null_w%null</lname>
       <alias>svalbardx8v1_svalbardx8v1</alias>
     </grid>
 
     <grid compset="(DOCN|XOCN|SOCN|AQUAP)">
       <sname>ne0np4_sooberingoa_x4x8v1_lowcon_ne0np4_sooberingoa_x4x8v1_lowcon</sname>
-      <lname>    a%ne0np4_sooberingoa_x4x8v1_lowcon_l%ne0np4_sooberingoa_x4x8v1_lowcon_oi%ne0np4_sooberingoa_x4x8v1_lowcon_r%r01_m%tx0.1v2_g%null_w%null</lname>
+      <lname>    a%ne0np4_sooberingoa_x4x8v1_lowcon_l%ne0np4_sooberingoa_x4x8v1_lowcon_oi%ne0np4_sooberingoa_x4x8v1_lowcon_r%null_m%tx0.1v2_g%null_w%null</lname>
       <alias>sooberingoax4x8v1_sooberingoax4x8v1</alias>
     </grid>