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

Jump to bottom

Add new IcosXISC30E3r7 ocean and sea-ice mesh #85

Closed
wants to merge 9 commits into from
Closed

Add new IcosXISC30E3r7 ocean and sea-ice mesh #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e3a1f1f
Fix some formatting in Registry for generating docs
xylar Feb 29, 2024
271b548
Update namelist definitions
xylar Mar 20, 2024
87e358b
Remove trailing space in description
xylar Mar 22, 2024
cd40745
Merge branch 'xylar/ocn/fix-registry-for-docs' (PR #6293)
jonbob Mar 28, 2024
6dfdcda
Add IcosXISC30E3r7 mesh to MPAS-Ocean and MPAS-Seaice
xylar Mar 15, 2024
19de688
Add IcosXISC30E3r7 mesh to ELM
xylar Mar 15, 2024
8816043
Add domain and mapping files to support IcosXISC30E3r7
jonbob Mar 20, 2024
41df021
Replace domain and mapping files to support IcosXISC30E3r7
jonbob Mar 26, 2024
133640e
Adding PE layouts for Chrysalis
darincomeau Mar 28, 2024
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
61 changes: 61 additions & 0 deletions cime_config/allactive/config_pesall.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1586,6 +1586,67 @@
</pes>
</mach>
</grid>
<grid name="a%ne30np4.pg2_l%r05_oi%IcosXISC30E3r7_r%r05_.+">
<mach name="chrysalis">
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="S">
<comment> --compset WCYCL* --res ne30pg2_r05_IcosXISC30E3r7 on 20 nodes pure-MPI, ~7.25 sypd </comment>
<ntasks>
<ntasks_atm>1024</ntasks_atm>
<ntasks_cpl>1024</ntasks_cpl>
<ntasks_ocn>256</ntasks_ocn>
<ntasks_ice>640</ntasks_ice>
<ntasks_rof>384</ntasks_rof>
<ntasks_lnd>385</ntasks_lnd>
</ntasks>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_cpl>0</rootpe_cpl>
<rootpe_ocn>1024</rootpe_ocn>
<rootpe_ice>0</rootpe_ice>
<rootpe_rof>640</rootpe_rof>
<rootpe_lnd>640</rootpe_lnd>
</rootpe>
</pes>
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="M">
<comment> --compset WCYCL* --res ne30pg2_r05_IcosXISC30E3r7 on 54 nodes pure-MPI, ~17.5 sypd </comment>
<ntasks>
<ntasks_atm>2752</ntasks_atm>
<ntasks_cpl>2752</ntasks_cpl>
<ntasks_ocn>704</ntasks_ocn>
<ntasks_ice>2048</ntasks_ice>
<ntasks_rof>704</ntasks_rof>
<ntasks_lnd>704</ntasks_lnd>
</ntasks>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_cpl>0</rootpe_cpl>
<rootpe_ocn>2752</rootpe_ocn>
<rootpe_ice>0</rootpe_ice>
<rootpe_rof>2048</rootpe_rof>
<rootpe_lnd>2048</rootpe_lnd>
</rootpe>
</pes>
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="L">
<comment> --compset WCYCL* --res ne30pg2_r05_IcosXISC30E3r7 on 105 nodes pure-MPI, ~27.7 sypd </comment>
<ntasks>
<ntasks_atm>5440</ntasks_atm>
<ntasks_cpl>5440</ntasks_cpl>
<ntasks_ocn>1280</ntasks_ocn>
<ntasks_ice>4352</ntasks_ice>
<ntasks_rof>1088</ntasks_rof>
<ntasks_lnd>1088</ntasks_lnd>
</ntasks>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_cpl>0</rootpe_cpl>
<rootpe_ocn>5440</rootpe_ocn>
<rootpe_ice>0</rootpe_ice>
<rootpe_rof>4352</rootpe_rof>
<rootpe_lnd>4352</rootpe_lnd>
</rootpe>
</pes>
</mach>
</grid>
<grid name="a%ne30np4.pg.+_oi%EC30to60E2r2">
<mach name="chrysalis">
<pes compset=".*EAM.+ELM.+MPASSI.+MPASO.+MOSART.+SWAV.+" pesize="XS">
Expand Down
65 changes: 65 additions & 0 deletions cime_config/config_grids.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,6 +569,16 @@
<mask>IcoswISC30E3r5</mask>
</model_grid>

<model_grid alias="TL319_IcosXISC30E3r7" compset="(DATM|XATM|SATM)">
<grid name="atm">TL319</grid>
<grid name="lnd">TL319</grid>
<grid name="ocnice">IcosXISC30E3r7</grid>
<grid name="rof">JRA025</grid>
<grid name="glc">null</grid>
<grid name="wav">null</grid>
<mask>IcosXISC30E3r7</mask>
</model_grid>

<model_grid alias="TL319_oRRS18to6v3" compset="(DATM|XATM|SATM)">
<grid name="atm">TL319</grid>
<grid name="lnd">TL319</grid>
Expand Down Expand Up @@ -2104,6 +2114,16 @@
<mask>IcoswISC30E3r5</mask>
</model_grid>

<model_grid alias="ne30pg2_r05_IcosXISC30E3r7">
<grid name="atm">ne30np4.pg2</grid>
<grid name="lnd">r05</grid>
<grid name="ocnice">IcosXISC30E3r7</grid>
<grid name="rof">r05</grid>
<grid name="glc">null</grid>
<grid name="wav">null</grid>
<mask>IcosXISC30E3r7</mask>
</model_grid>

<model_grid alias="ne30pg2_r05_WC14to60E2r3">
<grid name="atm">ne30np4.pg2</grid>
<grid name="lnd">r05</grid>
Expand Down Expand Up @@ -2466,6 +2486,8 @@
<file grid="ice|ocn" mask="ECwISC30to60E2r1">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_ECwISC30to60E2r1.201007.nc</file>
<file grid="atm|lnd" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_IcoswISC30E3r5.231121.nc</file>
<file grid="ice|ocn" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_IcoswISC30E3r5.231121.nc</file>
<file grid="atm|lnd" mask="IcosXISC30E3r7">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_IcosXISC30E3r7.240326.nc</file>
<file grid="ice|ocn" mask="IcosXISC30E3r7">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_IcosXISC30E3r7.240326.nc</file>
<file grid="atm|lnd" mask="oRRS18to6v3">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_oRRS18to6v3.220124.nc</file>
<file grid="ice|ocn" mask="oRRS18to6v3">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_oRRS18to6v3.220124.nc</file>
<desc>TL319 is JRA lat/lon grid:</desc>
Expand Down Expand Up @@ -2575,6 +2597,8 @@
<file grid="ice|ocn" mask="oRRS18to6v3">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_oRRS18to6v3.211101.nc</file>
<file grid="atm|lnd" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_IcoswISC30E3r5.231121.nc</file>
<file grid="ice|ocn" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_IcoswISC30E3r5.231121.nc</file>
<file grid="atm|lnd" mask="IcosXISC30E3r7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_IcosXISC30E3r7.240326.nc</file>
<file grid="ice|ocn" mask="IcosXISC30E3r7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_IcosXISC30E3r7.240326.nc</file>
<file grid="atm|lnd" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_gx1v6.190806.nc</file>
<file grid="ice|ocn" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_gx1v6.190806.nc</file>
<desc>ne30np4.pg2 is Spectral Elem 1-deg grid w/ 2x2 FV physics grid per element:</desc>
Expand Down Expand Up @@ -2877,6 +2901,13 @@
<desc>IcoswISC30E3r5 is a MPAS ocean grid generated with the jigsaw/compass process using a dual mesh that is a subdivided icosahedron, resulting in a nearly uniform resolution of 30 km. Additionally, it has ocean in ice-shelf cavities:</desc>
</domain>

<domain name="IcosXISC30E3r7">
<nx>463013</nx>
<ny>1</ny>
<file grid="ice|ocn">$DIN_LOC_ROOT/share/domains/domain.ocn.IcosXISC30E3r7.240326.nc</file>
<desc>IcosXISC30E3r7 is a MPAS ocean grid generated with the jigsaw/compass process using a dual mesh that is a subdivided icosahedron, resulting in a nearly uniform resolution of 30 km.:</desc>
</domain>

<!-- ROF (river) grids-->

<domain name="r2">
Expand Down Expand Up @@ -2909,6 +2940,8 @@
<file grid="lnd" mask="WC14to60E2r3">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_WC14to60E2r3.200929.nc</file>
<file grid="atm" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcoswISC30E3r5.231121.nc</file>
<file grid="lnd" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcoswISC30E3r5.231121.nc</file>
<file grid="atm" mask="IcosXISC30E3r7">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcosXISC30E3r7.240326.nc</file>
<file grid="lnd" mask="IcosXISC30E3r7">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_IcosXISC30E3r7.240326.nc</file>
<file grid="lnd" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.lnd.r05_gx1v6.191014.nc</file>
<desc>r05 is 1/2 degree river routing grid:</desc>
</domain>
Expand Down Expand Up @@ -3375,6 +3408,16 @@
<map name="ATM2OCN_FMAPNAME_NONLINEAR">cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcoswISC30E3r5_trfvnp2.20231121.nc</map>
</gridmap>

<gridmap atm_grid="ne30np4.pg2" ocn_grid="IcosXISC30E3r7">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcosXISC30E3r7_traave.20240326.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcosXISC30E3r7_trbilin.20240326.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcosXISC30E3r7_trbilin.20240326.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/IcosXISC30E3r7/map_IcosXISC30E3r7_to_ne30pg2_traave.20240326.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/IcosXISC30E3r7/map_IcosXISC30E3r7_to_ne30pg2_traave.20240326.nc</map>
<map name="ATM2ICE_FMAPNAME_NONLINEAR">cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcosXISC30E3r7_trfvnp2.20240326.nc</map>
<map name="ATM2OCN_FMAPNAME_NONLINEAR">cpl/gridmaps/ne30pg2/map_ne30pg2_to_IcosXISC30E3r7_trfvnp2.20240326.nc</map>
</gridmap>

<gridmap atm_grid="ne30np4.pg3" ocn_grid="oEC60to30v3">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne30pg3/map_ne30pg3_to_oEC60to30v3_mono.200331.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ne30pg3/map_ne30pg3_to_oEC60to30v3_bilin.200331.nc</map>
Expand Down Expand Up @@ -4230,6 +4273,14 @@
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_TL319_traave.20231121.nc</map>
</gridmap>

<gridmap atm_grid="TL319" ocn_grid="IcosXISC30E3r7">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/TL319/map_TL319_to_IcosXISC30E3r7_traave.20240326.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/TL319/map_TL319_to_IcosXISC30E3r7_trbilin.20240326.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/TL319/map_TL319_to_IcosXISC30E3r7_esmfpatch.20240326.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/IcosXISC30E3r7/map_IcosXISC30E3r7_to_TL319_traave.20240326.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/IcosXISC30E3r7/map_IcosXISC30E3r7_to_TL319_traave.20240326.nc</map>
</gridmap>

<gridmap atm_grid="TL319" ocn_grid="oRRS18to6v3">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/TL319/map_TL319_to_oRRS18to6v3_aave.220124.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/TL319/map_TL319_to_oRRS18to6v3_bilin.220124.nc</map>
Expand Down Expand Up @@ -4589,6 +4640,10 @@
<map name="OCN2ROF_SMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_r05_traave.20231121.nc</map>
</gridmap>

<gridmap rof_grid="r05" ocn_grid="IcosXISC30E3r7">
<map name="OCN2ROF_SMAPNAME">cpl/gridmaps/IcosXISC30E3r7/map_IcosXISC30E3r7_to_r05_traave.20240326.nc</map>
</gridmap>

<gridmap rof_grid="r05" ocn_grid="EC30to60E2r2">
<map name="OCN2ROF_SMAPNAME">cpl/cpl6/map_EC30to60E2r2_to_r05_neareststod.220728.nc</map>
</gridmap>
Expand Down Expand Up @@ -4775,6 +4830,11 @@
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_JRA025_to_IcoswISC30E3r5_cstmnn.r150e300.20231121.nc</map>
</gridmap>

<gridmap ocn_grid="IcosXISC30E3r7" rof_grid="JRA025">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_JRA025_to_IcosXISC30E3r7_cstmnn.r150e300.20240326.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_JRA025_to_IcosXISC30E3r7_cstmnn.r150e300.20240326.nc</map>
</gridmap>

<gridmap ocn_grid="oRRS18to6v3" rof_grid="JRA025">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_JRA025_to_oRRS18to6v3_smoothed.r50e100.220124.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_JRA025_to_oRRS18to6v3_smoothed.r50e100.220124.nc</map>
Expand Down Expand Up @@ -4860,6 +4920,11 @@
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r05_to_IcoswISC30E3r5_cstmnn.r150e300.20231121.nc</map>
</gridmap>

<gridmap ocn_grid="IcosXISC30E3r7" rof_grid="r05">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r05_to_IcosXISC30E3r7_cstmnn.r150e300.20240326.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r05_to_IcosXISC30E3r7_cstmnn.r150e300.20240326.nc</map>
</gridmap>

<gridmap ocn_grid="WC14to60E2r3" rof_grid="r0125">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r0125_to_WC14to60E2r3_smoothed.r150e300.200929.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r0125_to_WC14to60E2r3_smoothed.r150e300.200929.nc</map>
Expand Down
2 changes: 1 addition & 1 deletion components/elm/bld/namelist_files/namelist_definition.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1419,7 +1419,7 @@ Representative concentration pathway for future scenarios [radiative forcing at

<entry id="mask" type="char*20" category="default_settings"
group="default_settings"
valid_values="USGS,gx3v7,gx1v6,navy,test,tx0.1v2,tx1v1,T62,TL319,cruncep,oEC60to30v3,oEC60to30v3wLI,ECwISC30to60E1r2,EC30to60E2r2,WC14to60E2r3,WCAtl12to45E2r4,SOwISC12to60E2r4,ECwISC30to60E2r1,oRRS18to6,oRRS18to6v3,oRRS15to5,oARRM60to10,oARRM60to6,ARRM10to60E2r1,oQU480,oQU240,oQU240wLI,oQU120,oRRS30to10v3,oRRS30to10v3wLI,360x720cru,NLDASww3a,NLDAS,tx0.1v2,ICOS10,IcoswISC30E3r5">
valid_values="USGS,gx3v7,gx1v6,navy,test,tx0.1v2,tx1v1,T62,TL319,cruncep,oEC60to30v3,oEC60to30v3wLI,ECwISC30to60E1r2,EC30to60E2r2,WC14to60E2r3,WCAtl12to45E2r4,SOwISC12to60E2r4,ECwISC30to60E2r1,oRRS18to6,oRRS18to6v3,oRRS15to5,oARRM60to10,oARRM60to6,ARRM10to60E2r1,oQU480,oQU240,oQU240wLI,oQU120,oRRS30to10v3,oRRS30to10v3wLI,360x720cru,NLDASww3a,NLDAS,tx0.1v2,ICOS10,IcoswISC30E3r5,IcosXISC30E3r7">
Land mask description
</entry>

Expand Down
Loading
Loading