Skip to content

Commit

Permalink
Updates for WaveWatch
Browse files Browse the repository at this point in the history
  • Loading branch information
@fischer-ncar
fischer-ncar committed Jul 1, 2016
1 parent c4a9548 commit 49b2b47
Show file tree
Hide file tree
Showing 4 changed files with 510 additions and 28 deletions.
47 changes: 36 additions & 11 deletions cime_config/cesm/allactive/config_compsets.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,37 +46,42 @@
</compset>

<compset>
<alias>B1850RG</alias>
<alias>B1850RGWs</alias>
<lname>1850_CAM55_CLM50%BGC_CICE_POP2%ECO_RTM_CISM1%NOEVOLVE_SWAV_BGC%BDRD</lname>
</compset>

<compset>
<alias>B1850RW</alias>
<alias>B1850RWd</alias>
<lname>1850_CAM55_CLM50%BGC_CICE_POP2%ECO_RTM_SGLC_DWAV_BGC%BDRD</lname>
</compset>

<compset>
<alias>B1850GW</alias>
<alias>B1850GWd</alias>
<lname>1850_CAM55_CLM50%BGC_CICE_POP2%ECO_MOSART_CISM1%NOEVOLVE_DWAV_BGC%BDRD</lname>
</compset>

<compset>
<alias>B1850W</alias>
<alias>B1850Wd</alias>
<lname>1850_CAM55_CLM50%BGC_CICE_POP2%ECO_MOSART_SGLC_DWAV_BGC%BDRD</lname>
</compset>

<compset>
<alias>B1850</alias>
<alias>B1850Ws</alias>
<lname>1850_CAM55_CLM50%BGC_CICE_POP2%ECO_MOSART_CISM1%NOEVOLVE_SWAV_BGC%BDRD</lname>
</compset>

<compset>
<alias>B1850R</alias>
<alias>B1850</alias>
<lname>1850_CAM55_CLM50%BGC_CICE_POP2%ECO_MOSART_CISM1%NOEVOLVE_WW3_BGC%BDRD</lname>
</compset>

<compset>
<alias>B1850RWs</alias>
<lname>1850_CAM55_CLM50%BGC_CICE_POP2%ECO_RTM_SGLC_SWAV_BGC%BDRD</lname>
</compset>

<compset>
<alias>B1850Cw</alias>
<alias>B1850CwWs</alias>
<lname>1850_CAM55%WTSM_CLM50%BGC_CICE_POP2%ECO_MOSART_SGLC_SWAV</lname>
</compset>

Expand Down Expand Up @@ -173,25 +178,45 @@
</compset>

<compset>
<alias>BHISTC5L40CNR</alias>
<alias>BHISTC5L40CNRWs</alias>
<lname>HIST_CAM5_CLM40%CN_CICE_POP2_RTM_SGLC_SWAV</lname>
</compset>

<compset>
<alias>BHISTC5L45BGCR</alias>
<alias>BHISTC5L40CNR</alias>
<lname>HIST_CAM5_CLM40%CN_CICE_POP2_RTM_SGLC_WW3</lname>
</compset>

<compset>
<alias>BHISTC5L45BGCRWs</alias>
<lname>HIST_CAM5_CLM45%BGC_CICE_POP2_RTM_SGLC_SWAV</lname>
</compset>

<compset>
<alias>BHISTC5L45BGC</alias>
<alias>BHISTC5L45BGCR</alias>
<lname>HIST_CAM5_CLM45%BGC_CICE_POP2_RTM_SGLC_WW3</lname>
</compset>

<compset>
<alias>BHISTC5L45BGCWs</alias>
<lname>HIST_CAM5_CLM45%BGC_CICE_POP2_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>BHISTC4FCHML40CNR</alias>
<alias>BHISTC5L45BGC</alias>
<lname>HIST_CAM5_CLM45%BGC_CICE_POP2_MOSART_SGLC_WW3</lname>
</compset>

<compset>
<alias>BHISTC4FCHML40CNRWs</alias>
<lname>HIST_CAM4%FCHM_CLM40%CN_CICE_POP2_RTM_SGLC_SWAV</lname>
</compset>

<compset>
<alias>BHISTC4FCHML40CNR</alias>
<lname>HIST_CAM4%FCHM_CLM40%CN_CICE_POP2_RTM_SGLC_WW3</lname>
</compset>

<compset>
<alias>BRCP26C4L40CNR</alias>
<lname>RCP2_CAM4_CLM40%CN_CICE_POP2_RTM_SGLC_SWAV</lname>
Expand Down
39 changes: 38 additions & 1 deletion cime_config/cesm/allactive/config_pes.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -897,7 +897,7 @@
<ntasks_ice>-7</ntasks_ice>
<ntasks_ocn>-8</ntasks_ocn>
<ntasks_glc>-1</ntasks_glc>
<ntasks_wav>-12</ntasks_wav>
<ntasks_wav>-8</ntasks_wav>
<ntasks_cpl>-12</ntasks_cpl>
</ntasks>
<nthrds>
Expand Down Expand Up @@ -1331,6 +1331,43 @@
</pes>
</mach>
</grid>
<grid name="a%0.9x1.25.+l%0.9x1.25.+oi%gx1" >
<mach name="yellowstone">
<pes pesize="any" compset="CAM5.+CLM.+CICE.+POP.+WW3.+">
<comment>none</comment>
<ntasks>
<ntasks_atm>-40</ntasks_atm>
<ntasks_lnd>-24</ntasks_lnd>
<ntasks_rof>-24</ntasks_rof>
<ntasks_ice>-16</ntasks_ice>
<ntasks_ocn>-6</ntasks_ocn>
<ntasks_glc>-40</ntasks_glc>
<ntasks_wav>-8</ntasks_wav>
<ntasks_cpl>-40</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>2</nthrds_atm>
<nthrds_lnd>2</nthrds_lnd>
<nthrds_rof>2</nthrds_rof>
<nthrds_ice>2</nthrds_ice>
<nthrds_ocn>2</nthrds_ocn>
<nthrds_glc>2</nthrds_glc>
<nthrds_wav>2</nthrds_wav>
<nthrds_cpl>2</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_rof>0</rootpe_rof>
<rootpe_ice>-24</rootpe_ice>
<rootpe_ocn>-40</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="a%0.9x1.25.+l%0.9x1.25.+oi%gx1" >
<mach name="yellowstone">
<pes pesize="any" compset="CAM5.+CLM.+CICE.+POP.+">
Expand Down
20 changes: 10 additions & 10 deletions cime_config/cesm/allactive/testlist_allactive.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,28 +73,28 @@
</test>
</grid>
</compset>
<compset name="B1850C4L45BGCRBPRP">
<compset name="B1850C4L45BGCRBPRPWs">
<grid name="f19_g16">
<test name="ERS">
<machine compiler="pgi" testtype="prebeta" testmods="allactive/defaultio">bluewaters</machine>
</test>
</grid>
</compset>
<compset name="B1850C4RCO2L40CNR">
<compset name="B1850C4RCO2L40CNRWs">
<grid name="f19_g16">
<test name="ERS_Ld7">
<machine compiler="pgi" testtype="prebeta" testmods="allactive/defaultio">bluewaters</machine>
</test>
</grid>
</compset>
<compset name="B1850C5L40SPR">
<compset name="B1850C5L40SPRWs">
<grid name="f19_g16">
<test name="PET_PT">
<machine compiler="pgi" testtype="prebeta" testmods="allactive/defaultio">bluewaters</machine>
</test>
</grid>
</compset>
<compset name="B1850C5L45BGCR">
<compset name="B1850C5L45BGCRWs">
<grid name="T31_g37">
<test name="ERS_Ld5">
<machine compiler="intel" testtype="prealpha" testmods="allactive/cism/test_coupling">yellowstone</machine>
Expand All @@ -106,22 +106,22 @@
</test>
</grid>
</compset>
<compset name="B1850C5L45BGCRG2">
<compset name="B1850C5L45BGCRG2Ws">
<grid name="T31_g37_gl20">
<test name="SMS_Ld5">
<machine compiler="intel" testtype="prealpha" testmods="allactive/cism/test_coupling">yellowstone</machine>
<machine compiler="intel" testtype="prebeta" testmods="allactive/cism/test_coupling">yellowstone</machine>
</test>
</grid>
</compset>
<compset name="B1850C5WCCML45CNR">
<compset name="B1850C5WCCML45CNRWs">
<grid name="f19_g16">
<test name="ERS_Ld7">
<machine compiler="intel" testtype="prebeta" testmods="allactive/defaultio">yellowstone</machine>
</test>
</grid>
</compset>
<compset name="B1850W">
<compset name="B1850Ws">
<grid name="f09_g16">
<test name="ERS">
<machine compiler="pgi" testtype="prealpha" testmods="allactive/defaultio">bluewaters</machine>
Expand Down Expand Up @@ -149,7 +149,7 @@
</test>
</grid>
</compset>
<compset name="B1850Cw">
<compset name="B1850CwWs">
<grid name="f19_g16">
<test name="ERS_Ld3">
<machine compiler="gnu" testtype="prebeta" testmods="allactive/defaultio">yellowstone</machine>
Expand Down Expand Up @@ -177,7 +177,7 @@
</test>
</grid>
</compset>
<compset name="BHISTC5L40CNR">
<compset name="BHISTC5L40CNRWs">
<grid name="f19_g16">
<test name="ERS_N3_Ld7">
<machine compiler="intel" testtype="prebeta" testmods="allactive/defaultio">edison</machine>
Expand All @@ -186,7 +186,7 @@
</test>
</grid>
</compset>
<compset name="BHISTC5L45BGCR">
<compset name="BHISTC5L45BGCRWs">
<grid name="f09_g16">
<test name="ERS_Ld7">
<machine compiler="pgi" testtype="prebeta" testmods="allactive/defaultio">bluewaters</machine>
Expand Down
Loading

0 comments on commit 49b2b47

Please sign in to comment.