Skip to content

Commit 9a5f108

Browse files
billsacksbillsacks
authored
Merge pull request #407 from billsacks/bgc_compset_specifier
Change long name specifier for CO2 forcings ### Description of changes We have decided to use the CESM2 scheme for this. See ESCOMP/CMEPS#658 for some relevant discussion. I did this with two regex search & replaces: (1) Concentration-driven: - Search for `<lname>([^_]*)C_(.*)</lname>` - Replace with `<lname>$1_$2_BGC%BDRD</lname>` - Update 2026-06-18: we later decided to remove the `_BGC%BDRD` from these compsets (2) Emissions-driven: - Search for `<lname>([^_]*)E_(.*)</lname>` - Replace with `<lname>$1_$2_BGC%BPRP</lname>` **This should be coordinated with the following component changes:** - **This should come in at the same time as the CAM PR that changes compsets similarly: ESCOMP/CAM#1584 - Ideally, [this CTSM PR](ESCOMP/CTSM#4097) and [this CDEPS PR](ESCOMP/CDEPS#413) would come in at the same time. However, it's safe for either or both of them to come later. (The reason that it's ideal for them to come in at the same time is just to ensure that they are bit-for-bit across a wide range of configurations - so it would be ideal to include them in the bit-for-bit prealpha testing that is planned for this PR.) - For emissions-driven compsets to work correctly, this also needs the changes in [this CAM PR](ESCOMP/CAM#1581); however, emissions-driven compsets currently aren't tested, so it's safe for that CAM PR to come in later ### Specific notes Contributors other than yourself, if any: none Fixes: none User interface changes?: No **Expected answer changes:** Bit-for-bit for concentration-driven compsets (which are the only ones currently tested). (`B1850E*` and `BHISTE*` compsets would change answers, but we currently don't test them.) Testing performed (automated tests and/or manual tests): Ran these tests; they pass and are bit-for-bit: - ERS_Ld5.ne30pg3_t232.B1850C_LTso.derecho_intel.allactive-defaultio - ERS_Ld5.ne30pg3_t232.BHISTC_LTso.derecho_intel.allactive-defaultio - ERS_D_Ld3.ne30pg3_t232.B1850C_LTso.derecho_intel.allactive-defaultio
2 parents c7649e7 + d241756 commit 9a5f108

1 file changed

Lines changed: 21 additions & 21 deletions

File tree

‎cime_config/config_compsets.xml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -40,41 +40,41 @@
4040

4141
<compset>
4242
<alias>B1850C_MTt4s</alias>
43-
<lname>1850C_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
43+
<lname>1850_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
4444
</compset>
4545
<compset>
4646
<alias>B1850CM</alias>
47-
<lname>1850C_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
47+
<lname>1850_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
4848
</compset>
4949

5050
<compset>
5151
<alias>B1850C_MTso</alias>
52-
<lname>1850C_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
52+
<lname>1850_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
5353
</compset>
5454

5555
<compset>
5656
<alias>BHISTC_MTso</alias>
57-
<lname>HISTC_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
57+
<lname>HIST_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
5858
</compset>
5959

6060
<compset>
6161
<alias>BHISTC_MTt4s</alias>
62-
<lname>HISTC_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
62+
<lname>HIST_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
6363
</compset>
6464

6565
<compset>
6666
<alias>BHISTCM</alias>
67-
<lname>HISTC_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
67+
<lname>HIST_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
6868
</compset>
6969

7070
<compset>
7171
<alias>BHISTC_MTso</alias>
72-
<lname>HISTC_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
72+
<lname>HIST_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
7373
</compset>
7474
<!-- Not yet available in cam component
7575
<compset>
7676
<alias>B1850C_WAt4ma</alias>
77-
<lname>1850C_CAM70%HT%CT4MA_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
77+
<lname>1850_CAM70%HT%CT4MA_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
7878
</compset>
7979
8080
<compset>
@@ -84,39 +84,39 @@
8484
-->
8585
<compset>
8686
<alias>B1850C_LTso</alias>
87-
<lname>1850C_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
87+
<lname>1850_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
8888
</compset>
8989

9090
<compset>
9191
<alias>BHISTC_LTso</alias>
92-
<lname>HISTC_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
92+
<lname>HIST_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
9393
</compset>
9494

9595
<!-- BHIST_LTso, except: WW3 can't handle multi-instance (2026-3),
9696
CROP doesn't work in this context. -->
9797
<compset>
9898
<alias>BHISTC_LT_DART</alias>
99-
<lname>HISTC_CAM70%LT_CLM60%BGC_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
99+
<lname>HIST_CAM70%LT_CLM60%BGC_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
100100
</compset>
101101

102102
<!-- Emissions driven compsets for CESM3 -->
103103

104104
<compset>
105105
<alias>B1850E_MTt4s</alias>
106-
<lname>1850E_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
106+
<lname>1850_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BPRP</lname>
107107
</compset>
108108
<compset>
109109
<alias>B1850EM</alias>
110-
<lname>1850E_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
110+
<lname>1850_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BPRP</lname>
111111
</compset>
112112

113113
<compset>
114114
<alias>BHISTE_MTt4s</alias>
115-
<lname>HISTE_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
115+
<lname>HIST_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BPRP</lname>
116116
</compset>
117117
<compset>
118118
<alias>BHISTEM</alias>
119-
<lname>HISTE_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
119+
<lname>HIST_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BPRP</lname>
120120
</compset>
121121

122122
<!-- SOM compsets -->
@@ -134,12 +134,12 @@
134134
<entries>
135135
<entry id="RUN_STARTDATE">
136136
<values>
137-
<value compset="1850[CE]?_" >0001-01-01</value>
138-
<value compset="2000[CE]?_" >0001-01-01</value>
139-
<value compset="HIST[CE]?_" >1850-01-01</value>
140-
<value compset="5505[CE]?_" >1955-01-01</value>
141-
<value compset="RCP[2468][CE]?_">2005-01-01</value>
142-
<value compset="2013[CE]?_" >2013-01-01</value>
137+
<value compset="1850_" >0001-01-01</value>
138+
<value compset="2000_" >0001-01-01</value>
139+
<value compset="HIST_" >1850-01-01</value>
140+
<value compset="5505_" >1955-01-01</value>
141+
<value compset="RCP[2468]_">2005-01-01</value>
142+
<value compset="2013_" >2013-01-01</value>
143143
</values>
144144
</entry>
145145
<entry id="LND_SETS_DUST_EMIS_DRV_FLDS">

0 commit comments

Comments
 (0)