Clean up logic in config_pes.xml

[mnlevy1981]

Description of the issue:

We typically define pe layouts in cime_config/config_pes.xml to match the regex POP2[^%] for non-ecosystem compsets and POP2%ECO for compsets with the ecosystem enabled. If we introduce a compset to use POP2%ABIO-DIC or POP2%ABIO-DIC%ECO, neither of the two compset attributes will match.

Version:

• CESM: latest
• POP2: latest

Machine/Environment Description:

cheyenne and hobart are currently the only machines specified in config_pes.xml

Any xml/namelist changes or SourceMods:

no

[mnlevy1981]

If config_pes.xml can make use of the match=last construct, we can use POP2 instead of POP2[^%]; I'm sure we can add something in to the POP2%ECO to also allow for POP2%...%ECO provided there isn't a _ in the ... but my regex knowledge isn't strong enough to be willing to put something in a comment without checking it first