Skip to content

Commit

Permalink
Merge branch 'cameronsmith1/atm/AV1C-03-L_compset' (PR #897)
Browse files Browse the repository at this point in the history 
Repoint AV1C-L compsets from AV1C-02 to AV1C-03 (for 1850 & 2000)

The AV1C-L compsets were created to point to the latest version of the
AV1C compsets. With the implementation of the AV1C-03 compsets for both
1850 and 2000 (PR #893 , PR #895), this current PR is to shift AV1C-L
from the -02 compsets to the -03 compsets.

[non-BFB]
[NML]
AG-435

* cameronsmith1/atm/AV1C-03-L_compset:
  Repoint AV1C-L compsets from AV1C-02 to AV1C-03 (for 1850 & 2000).
  • Loading branch information
@singhbalwinder
singhbalwinder committed May 20, 2016
2 parents f18a6e8 + e4c9d5f commit 4842dc6
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions cime/scripts/Tools/config_compsets.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -783,11 +783,11 @@ GEOS => GEOS5 meteorology for "stand-alone" CAM
<CAM_NML_USE_CASE compset="1850_CAM5.*AV1C-01">1850_cam5_av1c-01</CAM_NML_USE_CASE>
<CAM_NML_USE_CASE compset="1850_CAM5.*AV1C-02">1850_cam5_av1c-02</CAM_NML_USE_CASE>
<CAM_NML_USE_CASE compset="1850_CAM5.*AV1C-03">1850_cam5_av1c-03</CAM_NML_USE_CASE>
<CAM_NML_USE_CASE compset="1850_CAM5.*AV1C-L" >1850_cam5_av1c-02</CAM_NML_USE_CASE>
<CAM_NML_USE_CASE compset="1850_CAM5.*AV1C-L" >1850_cam5_av1c-03</CAM_NML_USE_CASE>
<CAM_NML_USE_CASE compset="2000_CAM5.*AV1C-01">2000_cam5_av1c-01</CAM_NML_USE_CASE>
<CAM_NML_USE_CASE compset="2000_CAM5.*AV1C-02">2000_cam5_av1c-02</CAM_NML_USE_CASE>
<CAM_NML_USE_CASE compset="2000_CAM5.*AV1C-03">2000_cam5_av1c-03</CAM_NML_USE_CASE>
<CAM_NML_USE_CASE compset="2000_CAM5.*AV1C-L" >2000_cam5_av1c-02</CAM_NML_USE_CASE>
<CAM_NML_USE_CASE compset="2000_CAM5.*AV1C-L" >2000_cam5_av1c-03</CAM_NML_USE_CASE>
<CAM_NML_USE_CASE compset="2000_CAM5.*AV1F" >2000_cam5_av1f</CAM_NML_USE_CASE>
<CAM_NML_USE_CASE compset="2000_CAM5.*AV1F-00">2000_cam5_av1f-00</CAM_NML_USE_CASE>
<CAM_NML_USE_CASE compset="2000_CAM5.*AV1F-01">2000_cam5_av1f-01</CAM_NML_USE_CASE>
Expand Down Expand Up @@ -855,7 +855,7 @@ GEOS => GEOS5 meteorology for "stand-alone" CAM
<desc compset="_CAM5.*AV1C-01" >CAM with complete set of ACME atmospheric mods for V1 (72 layers model) and ACES4BGC SOAG emissions- v01:</desc>
<desc compset="_CAM5.*AV1C-02" >CAM with complete set of ACME atmospheric mods for V1 (72 layers model) and ACES4BGC SOAG emissions- v02:</desc>
<desc compset="_CAM5.*AV1C-03" >CAM with complete set of ACME atmospheric mods for V1 (72 layers model) and ACES4BGC SOAG emissions- v03:</desc>
<desc compset="_CAM5.*AV1C-L" >CAM with complete set of ACME atmospheric mods for V1 (72 layers model) and ACES4BGC SOAG emissions- v02:</desc>
<desc compset="_CAM5.*AV1C-L" >CAM with complete set of ACME atmospheric mods for V1 (72 layers model) and ACES4BGC SOAG emissions- v03:</desc>
<desc compset="_CAM5.*AV1F" >CAM with familiar set of ACME atmospheric mods for V1 (72 Layers model):</desc>
<desc compset="_CAM5.*AV1F-00" >CAM with familiar set of ACME atmospheric mods for V1 (72 Layers model)- v00:</desc>
<desc compset="_CAM5.*AV1F-01" >CAM with familiar set of ACME atmospheric mods for V1 (72 Layers model) and ACES4BGC SOAG emissions- v01:</desc>
Expand Down Expand Up @@ -1947,7 +1947,8 @@ DOCN%COPY => docn copy mode
<CCSM_CO2_PPMV compset="^AR97" >368.9</CCSM_CO2_PPMV>
<CCSM_CO2_PPMV compset="^2003" >367.0</CCSM_CO2_PPMV>
<CCSM_CO2_PPMV compset="^1850.+AV1C" >284.725</CCSM_CO2_PPMV>
<CCSM_CO2_PPMV compset="^2000.+AV1C-03" >368.865</CCSM_CO2_PPMV>
<CCSM_CO2_PPMV compset="^2000.+AV1C-03" >368.865</CCSM_CO2_PPMV> <!-- note: previous versions of 2000_AV1C used the 367ppm default -->
<CCSM_CO2_PPMV compset="^2000.+AV1C-L" >368.865</CCSM_CO2_PPMV>

<!-- Override values based on CAM (WACCM) chemistry -->
<CCSM_CO2_PPMV compset="CAM[45]%WCMX" >0.000001</CCSM_CO2_PPMV>
Expand Down

0 comments on commit 4842dc6

Please sign in to comment.