Skip to content

Commit 4655d17

Browse files
committed
Merge tag 'noresm3_0_043_cam6_4_121' into feature/new_co2_mapalgo
Summary: Patch for bad ozone forcing file and NFHIST start date adjustment Contributors: @gold2718, @mvertens Reviewers: @mvertens Purpose of changes: ESCOMP#298 Github PR URL: NorESMhub#299 Changes made to build system: None Changes made to the namelist: None Changes to the defaults for the boundary datasets: None Substantial timing or memory changes: None Details: - Change start date for NFHIST compsets to match NHIST (1850) - Add correct start dates for NF1850, NF2000, and NFAMIP compsets - Use a (temporary?) patched prescribed ozone file for HIST compsets
2 parents 6c1f31f + abcd841 commit 4655d17

2 files changed

Lines changed: 15 additions & 31 deletions

File tree

bld/namelist_files/use_cases/hist_camnor_lt_osloaero.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616

1717
<!-- ozone data -->
1818
<prescribed_ozone_datapath> 'atm/cam/ozone_strataero' </prescribed_ozone_datapath>
19+
<!-- starts at 6. January instead of 1. January
1920
<prescribed_ozone_file > 'ozone_strataero_b.e30_alpha08o.BHISTC_MTt4s.ne30_t232_wgx3.330_branch_1850_1850_2021_transient_zm_5day_c20260625.nc' </prescribed_ozone_file>
21+
-->
22+
<prescribed_ozone_file > 'ozone_strataero_b.e30_alpha08o.BHISTC_MTt4s.ne30_t232_wgx3.330_branch_1850_1850_2021_transient_zm_5day_c20260722.nc' </prescribed_ozone_file>
2023
<prescribed_ozone_name > 'O3' </prescribed_ozone_name>
2124
<prescribed_ozone_type > SERIAL </prescribed_ozone_type>
2225

cime_config/config_compsets.xml

Lines changed: 12 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929
ALL data models must have a %phys option that corresponds to the data model mode
3030

3131
Each compset node is associated with the following elements
32-
- lname
33-
- alias
34-
- support (optional description of the support level for this compset)
32+
- lname
33+
- alias
34+
- support (optional description of the support level for this compset)
3535
Each compset node can also have the following attributes
36-
- grid (optional regular expression match for grid to work with the compset)
36+
- grid (optional regular expression match for grid to work with the compset)
3737
</help>
3838

3939
<!-- NOTE: the NorESM physics does not work with cam60 - so must use
@@ -189,7 +189,7 @@
189189
</compset>
190190

191191
<compset>
192-
<alias>FSCAMCGILSS12</alias>
192+
<alias>FSCAMCGILSS12</alias>
193193
<lname>2000_CAM60%SCAMCGILSS12_CLM50%SP_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV</lname>
194194
</compset>
195195

@@ -384,30 +384,11 @@
384384
<entries>
385385
<entry id="RUN_STARTDATE">
386386
<values match="last">
387-
<value compset="HIST(C_|E_|_)CAM">1979-01-01</value>
388-
<value compset="HIST_CAM60%WCTS_CLM50%BGC-CROP">1950-01-01</value>
389-
<value compset="HIST_CAM40%WX">2000-01-01</value>
390-
<value compset="HIST_CAM60%WCMD">2005-01-01</value>
391-
<value compset="HIST_CAM60%WCMD%SDYN" grid="a%1.9x2.5">1980-01-01</value>
392-
<value compset="HIST_CAM60%WCSC">1850-01-01</value>
393-
<value compset="HIST_CAM60%CT[12]S">2010-01-01</value>
394-
<value compset="HIST_CAM60%GEOSCHEM">2015-01-01</value>
395-
<value compset="HIST_CAM60%CT[12]S" grid="a%ne0np4CONUS">2013-01-01</value>
396-
<value compset="HIST_CAM60%CVBSX">1995-01-01</value>
397-
<value compset="HIST_CAM60%CFIRE">1995-01-01</value>
398-
<value compset="RCP[2468]_CAM\d+">2005-01-01</value>
399-
<value compset="_CAM.*%NUDG" >2010-01-01</value>
400-
<value compset="CAM60%CARMA.*%NUDG" >1990-01-01</value>
401-
<value compset="_CAM.*%SDYN" >2005-01-01</value>
402-
<value compset="_CAM.*%SDYN" grid="a%0.47x0.63">2010-01-01</value>
403-
<value compset="_CAM60%(CARMA|WCCM|WCTS|WXIE).*%SDYN">1980-01-01</value>
404-
<value compset="_CAM60%(WCCM|WCTS|WXIE).*%SDYN">1980-01-01</value>
405-
<value compset="_CAM40%WX.*%SDYN">2000-01-01</value>
406-
<value compset="2000_CAM60%GEOSCHEM">2000-01-01</value>
407-
<value compset="2010_CAM60%GEOSCHEM">2010-01-01</value>
408-
409-
<value compset="C2R4_CAM">2004-01-01</value>
410-
<value compset="C2R[68]_CAM">1950-01-01</value>
387+
<value compset="HIST_CAM">1850-01-01</value>
388+
<value compset="AMIP_CAM">1979-01-01</value>
389+
<value compset="1850_CAM">0001-01-01</value>
390+
<value compset="2000_CAM">0001-01-01</value>
391+
411392
<value compset="CAM.*%SCAMARM95">1995-07-18</value>
412393
<value compset="CAM.*%SCAMARM97">1997-06-18</value>
413394
<value compset="CAM.*%SCAMATEX">1969-02-15</value>
@@ -481,10 +462,10 @@
481462
<value compset="%SDYN">GREGORIAN</value>
482463
<value compset="%NUDG">GREGORIAN</value>
483464
<value compset="HIST_CAM\d0%WX">GREGORIAN</value>
484-
</values>
465+
</values>
485466
</entry>
486467

487-
<!-- single column compset must have pts_mode set to true -->
468+
<!-- single column compset must have pts_mode set to true -->
488469

489470
<entry id="PTS_MODE">
490471
<values match="first">

0 commit comments

Comments
 (0)