Skip to content

Commit d7a84ce

Browse files
committed
Merge branch 'darincomeau/grids/add-trigrid-arrm-support' (PR #7442)
Add support for trigrid Arctic RRM Adds grid alias, domain and mapping files for arcticx4v1pg2_r025_ARRM10to60E2r1 resolution. All support files are staged in public inputdata and world readable. Adds new default 80 layer ncdata for arcticx4v1pg2 atmosphere mesh (h/t @whannah1 ). Fixes #7440 [BFB]
2 parents 36f2208 + 37e1448 commit d7a84ce

File tree

2 files changed

+41
-7
lines changed

2 files changed

+41
-7
lines changed

cime_config/config_grids.xml

Lines changed: 40 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2637,6 +2637,16 @@
26372637
<mask>oARRM60to10</mask>
26382638
</model_grid>
26392639

2640+
<model_grid alias="arcticx4v1pg2_r025_ARRM10to60E2r1">
2641+
<grid name="atm">ne0np4_arcticx4v1.pg2</grid>
2642+
<grid name="lnd">r025</grid>
2643+
<grid name="ocnice">ARRM10to60E2r1</grid>
2644+
<grid name="rof">r025</grid>
2645+
<grid name="glc">null</grid>
2646+
<grid name="wav">null</grid>
2647+
<mask>ARRM10to60E2r1</mask>
2648+
</model_grid>
2649+
26402650
<model_grid alias="ne30pg2_r05_EC30to60E2r2">
26412651
<grid name="atm">ne30np4.pg2</grid>
26422652
<grid name="lnd">r05</grid>
@@ -3616,6 +3626,7 @@
36163626
<ny>720</ny>
36173627
<file grid="atm|lnd" mask="IcoswISC30E3r5">$DIN_LOC_ROOT/share/domains/domain.lnd.r025_IcoswISC30E3r5.240129.nc</file>
36183628
<file grid="atm|lnd" mask="RRSwISC6to18E3r5">$DIN_LOC_ROOT/share/domains/domain.lnd.r025_RRSwISC6to18E3r5.250216.nc</file>
3629+
<file grid="atm|lnd" mask="ARRM10to60E2r1">$DIN_LOC_ROOT/share/domains/domain.lnd.r025_ARRM10to60E2r1.250617.nc</file>
36193630
<desc>r025 is 1/4 degree river routing grid:</desc>
36203631
</domain>
36213632

@@ -3790,8 +3801,8 @@
37903801
<ny>1</ny>
37913802
<file grid="atm|lnd" mask="oARRM60to10">$DIN_LOC_ROOT/share/domains/domain.lnd.arcticx4v1pg2_oARRM60to10.210630.nc</file>
37923803
<file grid="ice|ocn" mask="oARRM60to10">$DIN_LOC_ROOT/share/domains/domain.ocn.arcticx4v1pg2_oARRM60to10.210630.nc</file>
3793-
<file grid="atm|lnd" mask="ARRM10to60E2r1">$DIN_LOC_ROOT/share/domains/domain.lnd.arcticx4v1pg2_ARRM10to60E2r1.220802.nc</file>
3794-
<file grid="ice|ocn" mask="ARRM10to60E2r1">$DIN_LOC_ROOT/share/domains/domain.ocn.arcticx4v1pg2_ARRM10to60E2r1.220802.nc</file>
3804+
<file grid="atm|lnd" mask="ARRM10to60E2r1">$DIN_LOC_ROOT/share/domains/domain.lnd.arcticx4v1pg2_ARRM10to60E2r1.240708.nc</file>
3805+
<file grid="ice|ocn" mask="ARRM10to60E2r1">$DIN_LOC_ROOT/share/domains/domain.ocn.arcticx4v1pg2_ARRM10to60E2r1.240708.nc</file>
37953806
<desc>1-deg with 1/4-deg over Arctic (version 1) pg2:</desc>
37963807
</domain>
37973808

@@ -4737,11 +4748,11 @@
47374748
</gridmap>
47384749

47394750
<gridmap atm_grid="ne0np4_arcticx4v1.pg2" ocn_grid="ARRM10to60E2r1">
4740-
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_ARRM10to60E2r1_mono.220802.nc</map>
4741-
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_ARRM10to60E2r1_bilin.220802.nc</map>
4742-
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_ARRM10to60E2r1_bilin.220802.nc</map>
4743-
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/ARRM10to60E2r1/map_ARRM10to60E2r1_to_arcticx4v1pg2_mono.220802.nc</map>
4744-
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/ARRM10to60E2r1/map_ARRM10to60E2r1_to_arcticx4v1pg2_mono.220802.nc</map>
4751+
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_ARRM10to60E2r1_traave.20240820.nc</map>
4752+
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_ARRM10to60E2r1_traave.20240820.nc</map>
4753+
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_ARRM10to60E2r1_traave.20240820.nc</map>
4754+
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/ARRM10to60E2r1/map_ARRM10to60E2r1_to_arcticx4v1pg2_traave.20240820.nc</map>
4755+
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/ARRM10to60E2r1/map_ARRM10to60E2r1_to_arcticx4v1pg2_traave.20240820.nc</map>
47454756
</gridmap>
47464757

47474758
<gridmap atm_grid="ne0np4_arcticx4v1.pg2" lnd_grid="r0125">
@@ -4751,6 +4762,13 @@
47514762
<map name="LND2ATM_SMAPNAME">cpl/gridmaps/r0125/map_r0125_to_arcticx4v1pg2_mono.20210517.nc</map>
47524763
</gridmap>
47534764

4765+
<gridmap atm_grid="ne0np4_arcticx4v1.pg2" lnd_grid="r025">
4766+
<map name="ATM2LND_FMAPNAME">cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_r025_traave.20240820.nc</map>
4767+
<map name="ATM2LND_SMAPNAME">cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_r025_trbilin.20240820.nc</map>
4768+
<map name="LND2ATM_FMAPNAME">cpl/gridmaps/r025/map_r025_to_arcticx4v1pg2_traave.20240820.nc</map>
4769+
<map name="LND2ATM_SMAPNAME">cpl/gridmaps/r025/map_r025_to_arcticx4v1pg2_traave.20240820.nc</map>
4770+
</gridmap>
4771+
47544772
<gridmap atm_grid="ne0np4_arcticx4v1.pg2" lnd_grid="r05">
47554773
<map name="ATM2LND_FMAPNAME">cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_r05_mono.20210706.nc</map>
47564774
<map name="ATM2LND_SMAPNAME">cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_r05_mono.20210706.nc</map>
@@ -4763,6 +4781,11 @@
47634781
<map name="ATM2ROF_SMAPNAME">cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_r0125_mono.20210517.nc</map>
47644782
</gridmap>
47654783

4784+
<gridmap atm_grid="ne0np4_arcticx4v1.pg2" rof_grid="r025">
4785+
<map name="ATM2ROF_FMAPNAME">cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_r025_traave.20240820.nc</map>
4786+
<map name="ATM2ROF_SMAPNAME">cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_r025_traave.20240820.nc</map>
4787+
</gridmap>
4788+
47664789
<gridmap atm_grid="ne0np4_arcticx4v1.pg2" rof_grid="r05">
47674790
<map name="ATM2ROF_FMAPNAME">cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_r05_mono.20210706.nc</map>
47684791
<map name="ATM2ROF_SMAPNAME">cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_r05_mono.20210706.nc</map>
@@ -5479,6 +5502,11 @@
54795502
<map name="ROF2LND_FMAPNAME">cpl/gridmaps/r0125/map_r0125_to_arcticx4v1pg2_mono.20210517.nc</map>
54805503
</gridmap>
54815504

5505+
<gridmap lnd_grid="ne0np4_arcticx4v1.pg2" rof_grid="r025">
5506+
<map name="LND2ROF_FMAPNAME">cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_r025_traave.20240820.nc</map>
5507+
<map name="ROF2LND_FMAPNAME">cpl/gridmaps/r025/map_r025_to_arcticx4v1pg2_traave.20240820.nc</map>
5508+
</gridmap>
5509+
54825510
<gridmap lnd_grid="ne0np4_arcticx4v1.pg2" rof_grid="r05">
54835511
<map name="LND2ROF_FMAPNAME">cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_r05_mono.20210706.nc</map>
54845512
<map name="ROF2LND_FMAPNAME">cpl/gridmaps/r05/map_r05_to_arcticx4v1pg2_mono.20210706.nc</map>
@@ -5956,6 +5984,11 @@
59565984
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r025_to_RRSwISC6to18E3r5_cstmnn.r50e100.20250325.nc</map>
59575985
</gridmap>
59585986

5987+
<gridmap ocn_grid="ARRM10to60E2r1" rof_grid="r025">
5988+
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r025_to_ARRM10to60E2r1_cstmnn.r150e300.20240814.nc</map>
5989+
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r025_to_ARRM10to60E2r1_cstmnn.r150e300.20240814.nc</map>
5990+
</gridmap>
5991+
59595992
<gridmap ocn_grid="WC14to60E2r3" rof_grid="r0125">
59605993
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r0125_to_WC14to60E2r3_smoothed.r150e300.200929.nc</map>
59615994
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r0125_to_WC14to60E2r3_smoothed.r150e300.200929.nc</map>

components/eam/bld/namelist_files/namelist_defaults_eam.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@
120120
<ncdata dyn="se" hgrid="ne0np4_northamericax4v1" nlev="72" >atm/cam/inic/homme/cami_0001-01-01_northamericax4v1_c190709.nc</ncdata>
121121
<ncdata dyn="se" hgrid="ne0np4_antarcticax4v1" nlev="72" >atm/cam/inic/homme/cami_mam3_Linoz_0000-01-antarcticax4v1_L72_topoadj_c20200507.nc</ncdata>
122122
<ncdata dyn="se" hgrid="ne0np4_arcticx4v1" nlev="72" >atm/cam/inic/homme/eam_i_mam4_Linoz_0011-01-arcticx4v1np4_L72_c20220127.nc</ncdata>
123+
<ncdata dyn="se" hgrid="ne0np4_arcticx4v1" nlev="80" >atm/cam/inic/homme/eam_i_mam4_Linoz_0011-01-arcticx4v1np4_L80_c20250617.nc</ncdata>
123124
<ncdata dyn="se" hgrid="ne0np4_svalbard_x8v1_lowcon" nlev="30" >atm/cam/inic/homme/cami-mam3_0000-01-01_svalbardx8v1np4_L30_c141107.nc</ncdata>
124125
<ncdata dyn="se" hgrid="ne0np4_svalbard_x8v1_lowcon" nlev="30" ocn="aquaplanet">atm/cam/inic/homme/cami_0003-01-01_svalbardx8v1np4_L30_ape_c000000.nc</ncdata>
125126
<ncdata dyn="se" hgrid="ne0np4_sooberingoa_x4x8v1_lowcon" nlev="30" >atm/cam/inic/homme/cami-mam3_0000-01-01_sooberingoax4x8v1np4_L30_c141110.nc</ncdata>

0 commit comments

Comments
 (0)