Skip to content

Commit

Permalink
Consistency in RE and don't require a C or E
Browse files Browse the repository at this point in the history 
Make the Regular Expressions more consistent. Don't allow the use of
CLM51 for all options. Make CPLHIST CAM version depend on which
CLM version is used. Make sure explicit matches for CAM60 are there.
  • Loading branch information
@ekluzek
ekluzek committed Jul 8, 2024
1 parent de689e4 commit f745c21
Showing 1 changed file with 36 additions and 32 deletions.
68 changes: 36 additions & 32 deletions cime_config/config_component.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,11 @@
<value compset="DATM%CRU_CLM45" >clm4_5_CRUv7</value>
<value compset="DATM%GSWP3v1_CLM45">clm4_5_GSWP3v1</value>
<value compset="CAM[^_]+_CLM45" >clm4_5_cam6.0</value>
<value compset="CAM40.*_CLM45" >clm4_5_cam4.0</value>
<value compset="CAM50.*_CLM45" >clm4_5_cam5.0</value>
<value compset="CAM7[^_]+_CLM45" >clm4_5_cam7.0</value>
<value compset="DATM%CPLHIST_CLM45">clm4_5_cam6.0</value>
<value compset="CAM40[^_]*_CLM45" >clm4_5_cam4.0</value>
<value compset="CAM50[^_]*_CLM45" >clm4_5_cam5.0</value>
<value compset="CAM60[^_]*_CLM45" >clm4_5_cam6.0</value>
<value compset="CAM70[^_]*_CLM45" >clm4_5_cam7.0</value>
<value compset="DATM%CPLHIST_CLM45">clm4_5_cam5.0</value>
<value compset="DATM%QIA_CLM45" >clm4_5_QIAN</value>
<value compset="DATM%WISOQIA_CLM45">clm4_5_QIAN</value>
<value compset="DATM%1PT_CLM45" >clm4_5_1PT</value>
Expand All @@ -102,32 +103,35 @@
<value compset="SATM_CLM50" >clm5_0_GSWP3v1</value>
<value compset="DATM%GSWP3v1_CLM50">clm5_0_GSWP3v1</value>
<value compset="CAM[^_]+_CLM50" >clm5_0_cam6.0</value>
<value compset="CAM40.*_CLM50" >clm5_0_cam4.0</value>
<value compset="CAM50.*_CLM50" >clm5_0_cam5.0</value>
<value compset="CAM7[^_]+_CLM50" >clm5_0_cam7.0</value>
<value compset="CAM40[^_]*_CLM50" >clm5_0_cam4.0</value>
<value compset="CAM50[^_]*_CLM50" >clm5_0_cam5.0</value>
<value compset="CAM60[^_]*_CLM50" >clm5_0_cam6.0</value>
<value compset="CAM70[^_]*_CLM50" >clm5_0_cam7.0</value>
<value compset="DATM%CPLHIST_CLM50">clm5_0_cam6.0</value>
<value compset="DATM%QIA_CLM50" >clm5_0_QIAN</value>
<value compset="DATM%WISOQIA_CLM50">clm5_0_QIAN</value>
<value compset="DATM%1PT_CLM50" >clm5_0_1PT</value>
<value compset="DATM%NLDAS2_CLM50" >clm5_0_NLDAS2</value>
<value compset="DATM%ERA5_CLM50" >clm5_0_ERA5</value>
<!-- All the clm5_1 physics options -->
<value compset="SATM_CLM51" >clm5_1_GSWP3v1</value>
<value compset="DATM%GSWP3v1_CLM51">clm5_1_GSWP3v1</value>
<value compset="CAM[^_]+_CLM51" >clm5_1_cam6.0</value>
<value compset="CAM40.*_CLM51" >clm5_1_cam4.0</value>
<value compset="CAM50.*_CLM51" >clm5_1_cam5.0</value>
<value compset="DATM%CPLHIST_CLM51">clm5_1_cam6.0</value>
<value compset="CAM[^_]*_CLM51" >INVALID_USE_CLM60_NOT_CLM51</value>
<value compset="CAM40[^_]*_CLM51" >clm5_1_cam4.0</value>
<value compset="CAM50[^_]*_CLM51" >clm5_1_cam5.0</value>
<value compset="CAM60[^_]*_CLM51" >clm5_1_cam6.0</value>
<value compset="CAM70[^_]*_CLM51" >INVALID_USE_CLM60_NOT_CLM51_FOR_CAM70</value>
<value compset="DATM%CPLHIST_CLM51">INVALID_USE_CLM60_NOT_CLM51_FOR_CPLHIST</value>
<!-- All the clm6_0 physics options -->
<value compset="DATM%CRUv7_CLM60" >clm6_0_CRUv7</value>
<value compset="DATM%CRU_CLM60" >clm6_0_CRUv7</value>
<value compset="SATM_CLM60" >clm6_0_GSWP3v1</value>
<value compset="DATM%GSWP3v1_CLM60">clm6_0_GSWP3v1</value>
<value compset="CAM[^_]+_CLM60" >clm6_0_cam6.0</value>
<value compset="CAM40.*_CLM60" >clm6_0_cam4.0</value>
<value compset="CAM50.*_CLM60" >clm6_0_cam5.0</value>
<value compset="CAM7[^_]+_CLM60" >clm6_0_cam7.0</value>
<value compset="DATM%CPLHIST_CLM60">clm6_0_cam6.0</value>
<value compset="CAM40[^_]*_CLM60" >clm6_0_cam4.0</value>
<value compset="CAM50[^_]*_CLM60" >clm6_0_cam5.0</value>
<value compset="CAM60[^_]*_CLM60" >clm6_0_cam6.0</value>
<value compset="CAM70[^_]*_CLM60" >clm6_0_cam7.0</value>
<value compset="DATM%CPLHIST_CLM60">clm6_0_cam7.0</value>
<value compset="DATM%QIA_CLM60" >clm6_0_QIAN</value>
<value compset="DATM%WISOQIA_CLM60">clm6_0_QIAN</value>
<value compset="DATM%1PT_CLM60" >clm6_0_1PT</value>
Expand Down Expand Up @@ -199,24 +203,24 @@
<default_value>UNSET</default_value>
<values>
<!-- Use SSP5-8.5 for PI to PDAY so will have data up to the current year available (for WACCM compsets that use PDAY) -->
<value compset="^2010[CE]+_" >2010_control</value>
<value compset="^2000[CE]+_" >2000_control</value>
<value compset="^1850[CE]+_" >1850_control</value>
<value compset="^2010[CE]?_" >2010_control</value>
<value compset="^2000[CE]?_" >2000_control</value>
<value compset="^1850[CE]?_" >1850_control</value>
<value compset="^1850_.*_CLM60%[^_]*NOANTHRO" >1850_noanthro_control</value>
<value compset="^1850_.*_CLM50%[^_]*NOANTHRO" >1850_noanthro_control</value>
<value compset="^HIST[CE]+_" >20thC_transient</value>
<value compset="^SSP585[CE]+_" >1850-2100_SSP5-8.5_transient</value>
<value compset="^SSP126[CE]+_" >1850-2100_SSP1-2.6_transient</value>
<value compset="^SSP370[CE]+_" >1850-2100_SSP3-7.0_transient</value>
<value compset="^SSP534[CE]+_" >1850-2100_SSP5-3.4_transient</value>
<value compset="^SSP245[CE]+_" >1850-2100_SSP2-4.5_transient</value>
<value compset="^HIST" grid="ne0np4" >1850-2100_SSP2-4.5_transient</value>
<value compset="^SSP119[CE]+_" >1850-2100_SSP1-1.9_transient</value>
<value compset="^SSP434[CE]+_" >1850-2100_SSP4-3.4_transient</value>
<value compset="^SSP460[CE]+_" >1850-2100_SSP4-6.0_transient</value>
<value compset="^SSP585[CE]+_" >1850-2100_SSP5-8.5_transient</value>
<value compset="^AMIP_" >20thC_transient</value>
<value compset="^PIPD_" >1850-2100_SSP5-8.5_transient</value>
<value compset="^HIST[CE]?_" >20thC_transient</value>
<value compset="^SSP585[CE]?_" >1850-2100_SSP5-8.5_transient</value>
<value compset="^SSP126[CE]?_" >1850-2100_SSP1-2.6_transient</value>
<value compset="^SSP370[CE]?_" >1850-2100_SSP3-7.0_transient</value>
<value compset="^SSP534[CE]?_" >1850-2100_SSP5-3.4_transient</value>
<value compset="^SSP245[CE]?_" >1850-2100_SSP2-4.5_transient</value>
<value compset="^HIST" grid="ne0np4" >1850-2100_SSP2-4.5_transient</value>
<value compset="^SSP119[CE]?_" >1850-2100_SSP1-1.9_transient</value>
<value compset="^SSP434[CE]?_" >1850-2100_SSP4-3.4_transient</value>
<value compset="^SSP460[CE]?_" >1850-2100_SSP4-6.0_transient</value>
<value compset="^SSP585[CE]?_" >1850-2100_SSP5-8.5_transient</value>
<value compset="^AMIP_" >20thC_transient</value>
<value compset="^PIPD_" >1850-2100_SSP5-8.5_transient</value>
</values>
<group>run_component_ctsm</group>
<file>env_run.xml</file>
Expand Down

0 comments on commit f745c21

Please sign in to comment.