Skip to content

Commit

Permalink
Merge branch 'brhillman/atm/fix-rrm-rtm' (PR #1706)
Browse files Browse the repository at this point in the history 
Set RTM grid to NULL for RRM grids

Set RTM grid to NULL (inactive) for all existing RRM grids. These grids
were originally created before RTM was active by default, so the
required input files do not exist to run these grids with RTM active.
While this will be fixed by #1705 (which sets RTM to NULL for all F
compsets), it is worth redefining the grid longnames for the RRM grids
so these configurations will not be broken in the future if the
default for F compsets changes, or if these grids are setup in the
future to run other compsets.

Fixes #1694

[BFB]

* brhillman/atm/fix-rrm-rtm:
  Set RTM grid to null for ENA grid
  Remove duplicate RRM grid configurations
  Set RTM grid to null for RRM configurations

Conflicts:
	cime/config/acme/config_grids.xml
  • Loading branch information
@singhbalwinder
singhbalwinder committed Sep 6, 2017
2 parents 607286c + 7b5ea6d commit 7b37665
Showing 1 changed file with 6 additions and 31 deletions.
37 changes: 6 additions & 31 deletions config/acme/config_grids.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,37 +446,37 @@
</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>

<!-- ENA RRM grid (all components) -->
<grid compset="(DOCN|XOCN|SOCN|AQUAP)">
<sname>ne0np4_enax4v1_ne0np4_enax4v1</sname>
<lname>a%ne0np4_enax4v1_l%ne0np4_enax4v1_oi%ne0np4_enax4v1_r%r01_m%oRRS18to6_g%null_w%null</lname>
<lname>a%ne0np4_enax4v1_l%ne0np4_enax4v1_oi%ne0np4_enax4v1_r%null_m%oRRS18to6_g%null_w%null</lname>
<alias>enax4v1_enax4v1</alias>
</grid>

<!-- ENA RRM grid (land on ne30) -->
<grid compset="(DOCN|XOCN|SOCN|AQUAP)">
<sname>ne0np4_enax4v1_ne30np4_ne0np4_enax4v1</sname>
<lname>a%ne0np4_enax4v1_l%ne30np4_oi%ne0np4_enax4v1_r%r01_m%oRRS18to6_g%null_w%null</lname>
<lname>a%ne0np4_enax4v1_l%ne30np4_oi%ne0np4_enax4v1_r%null_m%oRRS18to6_g%null_w%null</lname>
<alias>enax4v1_ne30_enax4v1</alias>
</grid>

Expand Down Expand Up @@ -765,31 +765,6 @@
<lname>a%ne30np4_l%ne30np4_oi%oRRS30to10wLI_r%r05_m%oRRS30to10wLI_g%null_w%null</lname>
<alias>ne30_oRRS30wLI</alias>
</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>
<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>
<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>
<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>
<alias>sooberingoax4x8v1_sooberingoax4x8v1</alias>
</grid>

<grid compset="(DOCN|XOCN|SOCN|AQUAP)">
<sname>ne0np4_twpx4v1_ne0np4_twpx4v1</sname>
<lname>a%ne0np4_twpx4v1_l%ne0np4_twpx4v1_oi%ne0np4_twpx4v1_r%null_m%oRRS18to6v3_g%null_w%null</lname>
Expand Down

0 comments on commit 7b37665

Please sign in to comment.