Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add ACME fully-coupled compsets #481

Merged
merged 2 commits into from
Nov 19, 2015
Merged

Add ACME fully-coupled compsets #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80a6229
Tell CAM build about mpas-o
rljacob Nov 17, 2015
54bbda4
Define ACME B and BG compsets and grids
rljacob Nov 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion cime/scripts/Tools/config_compsets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,9 @@ value of RUN_STARTDATE will be date2.

<COMPSET sname="B_2013_WACCM_BC_CN" alias="B2013WBCCN" >2013_CAM4%WCBC_CLM40%CN_CICE_POP2_RTM_SGLC_SWAV</COMPSET>

<!-- ACME B compsets -->
<COMPSET sname="ACMEB_1850" alias="A_B1850" >1850_CAM5_CLM45%CN_MPASCICE%SSMI_MPASO_RTM_SGLC_SWAV</COMPSET>

<!-- BG compsets -->

<COMPSET sname="B_2000_CN_GLC_CISM1" alias="BGCN" >2000_CAM4_CLM40%CN_CICE_POP2_RTM_CISM1_SWAV</COMPSET>
Expand All @@ -164,19 +167,25 @@ value of RUN_STARTDATE will be date2.
<COMPSET sname="B_RCP6.0_CN_GLC_CISM1" alias="BGRCP60CN" grid="gland">RCP6_CAM4_CLM40%CN_CICE_POP2_RTM_CISM1_SWAV</COMPSET>
<COMPSET sname="B_RCP8.5_CN_GLC_CISM1" alias="BGRCP85CN" grid="gland">RCP8_CAM4_CLM40%CN_CICE_POP2_RTM_CISM1_SWAV</COMPSET>

<!-- ACME BG compsets -->
<COMPSET sname="ACMEB_1850_CN_GLC_MPASLI" alias="A_BG1850CN" >1850_CAM5_CLM45%CN_MPASCICE%SSMI_MPASO_RTM_MPASLI_SWAV</COMPSET>

<!-- C compsets -->

<COMPSET sname="C_NORMAL_YEAR" alias="C" >2000_DATM%NYF_SLND_DICE%SSMI_POP2_DROF%NYF_SGLC_SWAV</COMPSET>
<COMPSET sname="C_INTERANNUAL" alias="CIAF" >2000_DATM%IAF_SLND_DICE%SIAF_POP2_DROF%IAF_SGLC_SWAV</COMPSET>
<COMPSET sname="C_NORMAL_YEAR_ECOSYS" alias="CECO" >1850_DATM%NYF_SLND_DICE%SSMI_POP2%ECO_DROF%NYF_SGLC_SWAV</COMPSET>

<!-- ACME C compsets -->
<COMPSET sname="C_MPAS_NORMAL_YEAR" alias="CMPASO-NYF" support_level="Experimental, under development" >2000_DATM%NYF_SLND_DICE%SSMI_MPASO_DROF%NYF_SGLC_SWAV</COMPSET>
<COMPSET sname="C_MPAS_INTERANNUAL" alias="CMPASO-IAF" support_level="Experimental, under development" >2000_DATM%IAF_SLND_DICE%SIAF_MPASO_DROF%IAF_SGLC_SWAV</COMPSET>

<!-- D compsets -->
<COMPSET sname="D_NORMAL_YEAR" alias="D" support_level="Requires additional user-supplied datasets" >2000_DATM%NYF_SLND_CICE_DOCN%SOM_DROF%NYF_SGLC_SWAV</COMPSET>
<COMPSET sname="D_INTERANNUAL" alias="DIAF" support_level="Requires additional user-supplied datasets" >2000_DATM%IAF_SLND_CICE_DOCN%SOM_DROF%IAF_SGLC_SWAV</COMPSET>
<COMPSET sname="D_TEST" alias="DTEST">2000_DATM%NYF_SLND_CICE_DOCN%SOM_DROF%NYF_SGLC_SWAV_TEST </COMPSET>

<!-- ACME D compsets -->
<COMPSET sname="D_TEST_MPAS" alias="DTESTM">2000_DATM%NYF_SLND_MPASCICE_DOCN%SOM_DROF%NYF_SGLC_SWAV_TEST </COMPSET>

<!-- E compsets -->
Expand Down Expand Up @@ -1658,7 +1667,7 @@ DOCN%COPY => docn copy mode
<GLC_NCPL compset="_SLND.*SOCN.*_MPASLI">1</GLC_NCPL>
<ROF_NCPL compset="_SLND.*SOCN.*_MPASLI">1</ROF_NCPL>

<!-- coupler intervals for MPASLI-ONLY compset -->
<!-- coupler intervals for MPASLI and MPASO compset -->
<NCPL_BASE_PERIOD compset="_DATM.*_SLND.*MPASO.*_MPASLI">day </NCPL_BASE_PERIOD>
<ATM_NCPL compset="_DATM.*_SLND.*MPASO.*_MPASLI">24</ATM_NCPL>
<LND_NCPL compset="_DATM.*_SLND.*MPASO.*_MPASLI">24</LND_NCPL>
Expand All @@ -1667,6 +1676,15 @@ DOCN%COPY => docn copy mode
<GLC_NCPL compset="_DATM.*_SLND.*MPASO.*_MPASLI">1</GLC_NCPL>
<ROF_NCPL compset="_DATM.*_SLND.*MPASO.*_MPASLI">24</ROF_NCPL>

<!-- coupler intervals for CAM, CLM, and MPASO compset -->
<NCPL_BASE_PERIOD compset="_CAM.*_CLM.*MPASO">day </NCPL_BASE_PERIOD>
<ATM_NCPL compset="_CAM.*_CLM.*MPASO">48</ATM_NCPL>
<LND_NCPL compset="_CAM.*_CLM.*MPASO">48</LND_NCPL>
<ICE_NCPL compset="_CAM.*_CLM.*MPASO">48</ICE_NCPL>
<OCN_NCPL compset="_CAM.*_CLM.*MPASO">24</OCN_NCPL>
<GLC_NCPL compset="_CAM.*_CLM.*MPASO">1</GLC_NCPL>
<ROF_NCPL compset="_CAM.*_CLM.*MPASO">8</ROF_NCPL>


<!-- ======================================= -->
<!-- USER_DEFINED section -->
Expand Down
36 changes: 36 additions & 0 deletions cime/scripts/Tools/config_grid.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ Each grid is associated with five names
<GRID sname="0.47x0.63_gx1v6" alias="f05_g16">a%0.47x0.63_l%0.47x0.63_oi%gx1v6_r%r05_m%gx1v6_g%null_w%null</GRID>
<GRID sname="0.47x0.63_tx0.1v2" alias="f05_t12">a%0.47x0.63_l%0.47x0.63_oi%tx0.1v2_r%r05_m%tx0.1v2_g%null_w%null</GRID>
<GRID sname="0.9x1.25_gx1v6" alias="f09_g16">a%0.9x1.25_l%0.9x1.25_oi%gx1v6_r%r05_m%gx1v6_g%null_w%null</GRID>
<GRID sname="0.9x1.25_mpas120" alias="f09_m120">a%0.9x1.25_l%0.9x1.25_oi%mpas120_r%r05_m%mpas120_g%null_w%null</GRID>
<GRID sname="1.9x2.5_gx1v6" alias="f19_g16">a%1.9x2.5_l%1.9x2.5_oi%gx1v6_r%r05_m%gx1v6_g%null_w%null</GRID>
<GRID sname="4x5_gx3v7" alias="f45_g37">a%4x5_l%4x5_oi%gx3v7_r%r05_m%gx3v7_g%null_w%null</GRID>
<GRID sname="1.9x2.5_gx1v6_r01" alias="f19_g16_r01" support_level="Non-standard grid, for testing high resolution RTM grid" >a%1.9x2.5_l%1.9x2.5_oi%gx1v6_r%r01_m%gx1v6_g%null_w%null</GRID>
Expand All @@ -75,6 +76,8 @@ Each grid is associated with five names

<GRID sname="ne16np4_gx3v7" alias="ne16_g37" >a%ne16np4_l%ne16np4_oi%gx3v7_r%r05_m%gx3v7_g%null_w%null</GRID>
<GRID sname="ne30np4_gx1v6" alias="ne30_g16" >a%ne30np4_l%ne30np4_oi%gx1v6_r%r05_m%gx1v6_g%null_w%null</GRID>
<GRID sname="ne30np4_mpas120" alias="ne30_m120" >a%ne30np4_l%ne30np4_oi%mpas120_r%r05_m%mpas120_g%null_w%null</GRID>
<GRID sname="ne30np4_mpas120_gis20" alias="ne30_m120_g" >a%ne30np4_l%ne30np4_oi%mpas120_r%r05_m%mpas120_g%mpas.gis20km_w%null</GRID>
<GRID sname="ne30np4_1.9x2.5_gx1v6" alias="ne30_f19_g16" support_level="For testing tri-grid" >a%ne30np4_l%1.9x2.5_oi%gx1v6_r%r05_m%gx1v6_g%null_w%null</GRID>
<GRID sname="ne30np4_0.9x1.25_gx1v6" alias="ne30_f09_g16" support_level="For testing tri-grid" >a%ne30np4_l%0.9x1.25_oi%gx1v6_r%r05_m%gx1v6_g%null_w%null</GRID>
<GRID sname="ne60np4_gx1v6" alias="ne60_g16" >a%ne60np4_l%ne60np4_oi%gx1v6_r%r05_m%gx1v6_g%null_w%null</GRID>
Expand Down Expand Up @@ -801,6 +804,13 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<LND_DOMAIN_FILE>domain.lnd.fv0.9x1.25_mp120v1.111018.nc</LND_DOMAIN_FILE>
</griddom>

<griddom grid="0.9x1.25" mask="mpas120">
<ATM_DOMAIN_FILE>domain.lnd.0.9x1.25_mpas120.151109.nc</ATM_DOMAIN_FILE>
<LND_DOMAIN_FILE>domain.lnd.0.9x1.25_mpas120.151109.nc</LND_DOMAIN_FILE>
<ICE_DOMAIN_FILE>domain.ocn.0.9x1.25_mpas120.151109.nc</ICE_DOMAIN_FILE>
<OCN_DOMAIN_FILE>domain.ocn.0.9x1.25_mpas120.151109.nc</OCN_DOMAIN_FILE>
</griddom>

<griddom grid="0.9x1.25" mask="tx0.1v2">
<ATM_DOMAIN_FILE>domain.lnd.fv0.9x1.25_tx0.1v2_070928.nc</ATM_DOMAIN_FILE>
<LND_DOMAIN_FILE>domain.lnd.fv0.9x1.25_tx0.1v2_070928.nc</LND_DOMAIN_FILE>
Expand All @@ -814,6 +824,14 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<OCN2ATM_SMAPNAME>cpl/gridmaps/gx1v6/map_gx1v6_TO_fv0.9x1.25_aave.130322.nc </OCN2ATM_SMAPNAME>
</gridmap>

<gridmap atm_grid="0.9x1.25" ocn_grid="mpas120">
<ATM2OCN_FMAPNAME>cpl/gridmaps/fv0.9x1.25/map_0.9x1.25_TO_mpas120_aave.151109.nc</ATM2OCN_FMAPNAME>
<ATM2OCN_SMAPNAME>cpl/gridmaps/fv0.9x1.25/map_0.9x1.25_TO_mpas120_bilin.151109.nc</ATM2OCN_SMAPNAME>
<ATM2OCN_VMAPNAME>cpl/gridmaps/fv0.9x1.25/map_0.9x1.25_TO_mpas120_patc.151109.nc</ATM2OCN_VMAPNAME>
<OCN2ATM_FMAPNAME>cpl/gridmaps/mpas120/map_mpas120_TO_0.9x1.25_aave.151109.nc</OCN2ATM_FMAPNAME>
<OCN2ATM_SMAPNAME>cpl/gridmaps/mpas120/map_mpas120_TO_0.9x1.25_aave.151109.nc</OCN2ATM_SMAPNAME>
</gridmap>

<gridmap atm_grid="0.9x1.25" ocn_grid="mp120v1">
<ATM2OCN_FMAPNAME>cpl/cpl6/map_fv0.9x1.25_to_mp120v1_aave_da_111004.nc</ATM2OCN_FMAPNAME>
<ATM2OCN_SMAPNAME>cpl/cpl6/map_fv0.9x1.25_to_mp120v1_aave_da_111004.nc</ATM2OCN_SMAPNAME>
Expand Down Expand Up @@ -929,6 +947,13 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<OCN_DOMAIN_FILE>domain.ocn.ne30np4_gx1v6_110217.nc</OCN_DOMAIN_FILE>
</griddom>

<griddom grid="ne30np4" mask="mpas120">
<ATM_DOMAIN_FILE>domain.lnd.ne30np4_mpas120.151113.nc</ATM_DOMAIN_FILE>
<LND_DOMAIN_FILE>domain.lnd.ne30np4_mpas120.151113.nc</LND_DOMAIN_FILE>
<ICE_DOMAIN_FILE>domain.ocn.ne30np4_mpas120.151113.nc</ICE_DOMAIN_FILE>
<OCN_DOMAIN_FILE>domain.ocn.ne30np4_mpas120.151113.nc</OCN_DOMAIN_FILE>
</griddom>

<gridmap atm_grid="ne30np4" ocn_grid="gx1v6">
<ATM2OCN_FMAPNAME>cpl/cpl6/map_ne30np4_to_gx1v6_aave_110121.nc</ATM2OCN_FMAPNAME>
<ATM2OCN_SMAPNAME>cpl/cpl6/map_ne30np4_to_gx1v6_native_110328.nc</ATM2OCN_SMAPNAME>
Expand All @@ -937,6 +962,14 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<OCN2ATM_SMAPNAME>cpl/cpl6/map_gx1v6_to_ne30np4_aave_110121.nc</OCN2ATM_SMAPNAME>
</gridmap>

<gridmap atm_grid="ne30np4" ocn_grid="mpas120">
<ATM2OCN_FMAPNAME>cpl/cpl6/map_ne30np4_TO_MPASO_QU120km_aave.151110.nc</ATM2OCN_FMAPNAME>
<ATM2OCN_SMAPNAME>cpl/cpl6/map_ne30np4_TO_MPASO_QU120km_bilin.151110.nc</ATM2OCN_SMAPNAME>
<ATM2OCN_VMAPNAME>cpl/cpl6/map_ne30np4_TO_MPASO_QU120km_bilin.151110.nc</ATM2OCN_VMAPNAME>
<OCN2ATM_FMAPNAME>cpl/cpl6/map_MPASO_QU120km_TO_ne30np4_aave.151110.nc</OCN2ATM_FMAPNAME>
<OCN2ATM_SMAPNAME>cpl/cpl6/map_MPASO_QU120km_TO_ne30np4_aave.151110.nc</OCN2ATM_SMAPNAME>
</gridmap>

<gridmap atm_grid="ne30np4" lnd_grid="0.9x1.25">
<ATM2LND_FMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_TO_fv0.9x1.25_aave.120712.nc</ATM2LND_FMAPNAME>
<ATM2LND_SMAPNAME>cpl/gridmaps/ne30np4/map_ne30np4_TO_fv0.9x1.25_aave.120712.nc</ATM2LND_SMAPNAME>
Expand Down Expand Up @@ -1431,6 +1464,9 @@ do not use scientific experiments; use the T62_g16 resolution instead:
<gridmap rof_grid="r05" ocn_grid="gx1v6" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_r05_to_gx1v6_e1000r300_090226.nc</ROF2OCN_RMAPNAME>
</gridmap>
<gridmap rof_grid="r05" ocn_grid="mpas120" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_r05_to_QU120km_nn_151110.nc</ROF2OCN_RMAPNAME>
</gridmap>
<gridmap rof_grid="r05" ocn_grid="tx1v1" >
<ROF2OCN_RMAPNAME >cpl/cpl6/map_r05_to_tx1v1_e1000r500_080505.nc</ROF2OCN_RMAPNAME>
</gridmap>
Expand Down
2 changes: 1 addition & 1 deletion components/cam/bld/config_files/definition.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Use clm, stub land or no lnd model in cam build: clm, slnd, none
<entry id="rof" valid_values="rtm,srof,none" value="rtm">
Use rtm, stub runoff or no runoff model in cam build: rtm, srof, none
</entry>
<entry id="ocn" valid_values="docn,dom,socn,aquaplanet,pop" value="docn">
<entry id="ocn" valid_values="docn,dom,socn,aquaplanet,pop,mpas-o" value="docn">
Use data ocean model (docn or dom), stub ocean (socn), or aqua planet ocean
(aquaplanet) in cam build. When built from the CESM scripts the value of
ocn may be set to pop, but this doesn't impact how CAM is built.
Expand Down
2 changes: 1 addition & 1 deletion components/cam/bld/configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ OPTIONS
Options for surface components used in standalone CAM mode:

-ice <name> Build CAM with sea ice model [cice | sice | none ]. Default: cice.
-ocn <name> Build CAM with ocean model [docn | dom | socn | aquaplanet | pop]. Default: docn.
-ocn <name> Build CAM with ocean model [docn | dom | socn | aquaplanet | pop | mpas-o]. Default: docn.
-lnd <name> Build CAM with land model [clm | slnd | none]. Default: clm.
-rof <name> Build CAM with runoff model [rtm | srof | none]. Default: rtm.

Expand Down