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 script support for ARRM10to60E2r1 ocn/ice grid #5178

Merged
merged 12 commits into from
Oct 4, 2022
Merged

Add script support for ARRM10to60E2r1 ocn/ice grid #5178

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8a6c28b
Adding support for ARRM10to60E2r1 ocn/ice mesh to config_grids
darincomeau Aug 2, 2022
33baa35
Adding ARRM10to60E2r1 ocn/ice mesh to list of valid meshes for ELM
darincomeau Aug 2, 2022
fa1cabf
Adding ARRM10to60E2r1 ocn/ice mesh to E3SM namelist/streams generation
darincomeau Aug 3, 2022
761b1d3
Setting default namelist options for ARRM10to60E2r1 ocn/ice mesh
darincomeau Aug 3, 2022
29a1207
Updating spunup ICs for ARRM10to60E2r1 ocn/ice mesh
darincomeau Aug 3, 2022
41f7b1d
Updating sea ice graph partition files to v2
darincomeau Aug 5, 2022
b480ae8
Changing default Redi min layers to 15
darincomeau Aug 22, 2022
2e4100b
Changing default coupling frequencies for G-cases so uses 15min sea i…
darincomeau Aug 30, 2022
c0c860a
Revert "Changing default coupling frequencies for G-cases so uses 15m…
darincomeau Sep 8, 2022
debc6b0
Making change to Redi_min_layers_diag_terms 15 for this mesh only, le…
darincomeau Sep 13, 2022
d81b754
Changing name of analysis_mask_file to intended ARRM10to60E2r1_mocBas…
darincomeau Sep 13, 2022
b87a2bf
Adding land initial condition for WCYCL1950 compset with ne30pg2 atm
darincomeau Sep 20, 2022
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
106 changes: 106 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 @@ -340,6 +340,16 @@
<mask>oARRM60to6</mask>
</model_grid>

<model_grid alias="T62_ARRM10to60E2r1" compset="(DATM|XATM|SATM)">
<grid name="atm">T62</grid>
<grid name="lnd">T62</grid>
<grid name="ocnice">ARRM10to60E2r1</grid>
<grid name="rof">rx1</grid>
<grid name="glc">null</grid>
<grid name="wav">null</grid>
<mask>ARRM10to60E2r1</mask>
</model_grid>

<model_grid alias="T62_EC30to60E2r2" compset="(DATM|XATM|SATM)">
<grid name="atm">T62</grid>
<grid name="lnd">T62</grid>
Expand Down Expand Up @@ -440,6 +450,16 @@
<mask>oARRM60to6</mask>
</model_grid>

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

<model_grid alias="TL319_EC30to60E2r2" compset="(DATM|XATM|SATM)">
<grid name="atm">TL319</grid>
<grid name="lnd">TL319</grid>
Expand Down Expand Up @@ -1014,6 +1034,16 @@
<mask>oARRM60to10</mask>
</model_grid>

<model_grid alias="arcticx4v1pg2_ARRM10to60E2r1">
<grid name="atm">ne0np4_arcticx4v1.pg2</grid>
<grid name="lnd">ne0np4_arcticx4v1.pg2</grid>
<grid name="ocnice">ARRM10to60E2r1</grid>
<grid name="rof">r0125</grid>
<grid name="glc">null</grid>
<grid name="wav">null</grid>
<mask>ARRM10to60E2r1</mask>
</model_grid>

<model_grid alias="svalbardx8v1_svalbardx8v1" compset="(DOCN|XOCN|SOCN|AQP1)">
<grid name="atm">ne0np4_svalbard_x8v1_lowcon</grid>
<grid name="lnd">ne0np4_svalbard_x8v1_lowcon</grid>
Expand Down Expand Up @@ -1843,6 +1873,16 @@
<mask>oARRM60to10</mask>
</model_grid>

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

<model_grid alias="ne30pg2_EC30to60E2r2">
<grid name="atm">ne30np4.pg2</grid>
<grid name="lnd">ne30np4.pg2</grid>
Expand Down Expand Up @@ -2223,6 +2263,7 @@
<file grid="atm|lnd" mask="oRRS15to5">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_oRRS15to5.150722.nc</file>
<file grid="atm|lnd" mask="oARRM60to10">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_oARRM60to10.180716.nc</file>
<file grid="atm|lnd" mask="oARRM60to6">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_oARRM60to6.180803.nc</file>
<file grid="atm|lnd" mask="ARRM10to60E2r1">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_ARRM10to60E2r1.220802.nc</file>
<file grid="atm|lnd" mask="EC30to60E2r2">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_EC30to60E2r2.201005.nc</file>
<file grid="atm|lnd" mask="WC14to60E2r3">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_WC14to60E2r3.200929.nc</file>
<file grid="atm|lnd" mask="WCAtl12to45E2r4">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_WCAtl12to45E2r4.210318.nc</file>
Expand Down Expand Up @@ -2258,6 +2299,8 @@
<file grid="ice|ocn" mask="oARRM60to10">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_oARRM60to10.180905.nc</file>
<file grid="atm|lnd" mask="oARRM60to6">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_oARRM60to6.180905.nc</file>
<file grid="ice|ocn" mask="oARRM60to6">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_oARRM60to6.180905.nc</file>
<file grid="atm|lnd" mask="ARRM10to60E2r1">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_ARRM10to60E2r1.220802.nc</file>
<file grid="ice|ocn" mask="ARRM10to60E2r1">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_ARRM10to60E2r1.220802.nc</file>
<file grid="atm|lnd" mask="EC30to60E2r2">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_EC30to60E2r2.201005.nc</file>
<file grid="ice|ocn" mask="EC30to60E2r2">$DIN_LOC_ROOT/share/domains/domain.ocn.TL319_EC30to60E2r2.201005.nc</file>
<file grid="atm|lnd" mask="WC14to60E2r3">$DIN_LOC_ROOT/share/domains/domain.lnd.TL319_WC14to60E2r3.200929.nc</file>
Expand Down Expand Up @@ -2359,6 +2402,8 @@
<file grid="ice|ocn" mask="oEC60to30v3">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_oEC60to30v3.200220.nc</file>
<file grid="atm|lnd" mask="oARRM60to10">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_ARRM60to10.200527.nc</file>
<file grid="ice|ocn" mask="oARRM60to10">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_ARRM60to10.200527.nc</file>
<file grid="atm|lnd" mask="ARRM10to60E2r1">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_ARRM10to60E2r1.220802.nc</file>
<file grid="ice|ocn" mask="ARRM10to60E2r1">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_ARRM10to60E2r1.220802.nc</file>
<file grid="atm|lnd" mask="EC30to60E2r2">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_EC30to60E2r2.201005.nc</file>
<file grid="ice|ocn" mask="EC30to60E2r2">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30pg2_EC30to60E2r2.201005.nc</file>
<file grid="atm|lnd" mask="WC14to60E2r3">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30pg2_WC14to60E2r3.200929.nc</file>
Expand Down Expand Up @@ -2569,6 +2614,13 @@
<desc>oARRM60to6 is an Arctic-Region-Refined MPAS ocean grid with 30 km gridcells at -90 deg latitude, 60 km gridcells at -40 deg latitude, 30 km gridcells at the equator, and 6 km gridcells at 90 deg latitude; North Atlantic and North Pacific have different resolution between 0 and 60 deg latitudes:</desc>
</domain>

<domain name="ARRM10to60E2r1">
<nx>594836</nx>
<ny>1</ny>
<file grid="ice|ocn">$DIN_LOC_ROOT/share/domains/domain.ocn.ARRM10to60E2r1.220802.nc</file>
<desc>ARRM10to60E2r1 is an Arctic-Region-Refined MPAS ocean grid with 30 km gridcells at -90 deg latitude, 60 km gridcells at -40 deg latitude, 30 km gridcells at the equator, and 10 km gridcells at 90 deg latitude; North Atlantic and North Pacific have different resolution between 0 and 60 deg latitudes:</desc>
</domain>

<domain name="EC30to60E2r2">
<nx>236853</nx>
<ny>1</ny>
Expand Down Expand Up @@ -2785,6 +2837,8 @@
<ny>1</ny>
<file grid="atm|lnd" mask="oARRM60to10">$DIN_LOC_ROOT/share/domains/domain.lnd.arcticx4v1pg2_oARRM60to10.210630.nc</file>
<file grid="ice|ocn" mask="oARRM60to10">$DIN_LOC_ROOT/share/domains/domain.ocn.arcticx4v1pg2_oARRM60to10.210630.nc</file>
<file grid="atm|lnd" mask="ARRM10to60E2r1">$DIN_LOC_ROOT/share/domains/domain.lnd.arcticx4v1pg2_ARRM10to60E2r1.220802.nc</file>
<file grid="ice|ocn" mask="ARRM10to60E2r1">$DIN_LOC_ROOT/share/domains/domain.ocn.arcticx4v1pg2_ARRM10to60E2r1.220802.nc</file>
<desc>1-deg with 1/4-deg over Arctic (version 1) pg2:</desc>
</domain>

Expand Down Expand Up @@ -3032,6 +3086,14 @@
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/oARRM60to10/map_ARRM60to10_to_ne30pg2_mono.200527.nc</map>
</gridmap>

<gridmap atm_grid="ne30np4.pg2" ocn_grid="ARRM10to60E2r1">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_ARRM10to60E2r1_mono.220802.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_ARRM10to60E2r1_bilin.220802.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_ARRM10to60E2r1_bilin.220802.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/ARRM10to60E2r1/map_ARRM10to60E2r1_to_ne30pg2_mono.220802.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/ARRM10to60E2r1/map_ARRM10to60E2r1_to_ne30pg2_mono.220802.nc</map>
</gridmap>

<gridmap atm_grid="ne30np4.pg2" ocn_grid="EC30to60E2r2">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_EC30to60E2r2_mono.201005.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/ne30pg2/map_ne30pg2_to_EC30to60E2r2_bilin.201005.nc</map>
Expand Down Expand Up @@ -3529,6 +3591,14 @@
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/oARRM60to10/map_oARRM60to10_to_arcticx4v1pg2_mono.20210407.nc</map>
</gridmap>

<gridmap atm_grid="ne0np4_arcticx4v1.pg2" ocn_grid="ARRM10to60E2r1">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_ARRM10to60E2r1_mono.220802.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_ARRM10to60E2r1_bilin.220802.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_ARRM10to60E2r1_bilin.220802.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/ARRM10to60E2r1/map_ARRM10to60E2r1_to_arcticx4v1pg2_mono.220802.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/ARRM10to60E2r1/map_ARRM10to60E2r1_to_arcticx4v1pg2_mono.220802.nc</map>
</gridmap>

<gridmap atm_grid="ne0np4_arcticx4v1.pg2" lnd_grid="r0125">
<map name="ATM2LND_FMAPNAME">cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_r0125_mono.20210517.nc</map>
<map name="ATM2LND_SMAPNAME">cpl/gridmaps/arcticx4v1pg2/map_arcticx4v1pg2_to_r0125_mono.20210517.nc</map>
Expand Down Expand Up @@ -3697,6 +3767,14 @@
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/oARRM60to6/map_oARRM60to6_to_T62_aave.180803.nc</map>
</gridmap>

<gridmap atm_grid="T62" ocn_grid="ARRM10to60E2r1">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/T62/map_T62_to_ARRM10to60E2r1_aave.220802.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/T62/map_T62_to_ARRM10to60E2r1_bilin.220802.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/T62/map_T62_to_ARRM10to60E2r1_patch.220802.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/ARRM10to60E2r1/map_ARRM10to60E2r1_to_T62_aave.220802.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/ARRM10to60E2r1/map_ARRM10to60E2r1_to_T62_aave.220802.nc</map>
</gridmap>

<gridmap atm_grid="T62" ocn_grid="EC30to60E2r2">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/T62/map_T62_to_EC30to60E2r2_aave.201005.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/T62/map_T62_to_EC30to60E2r2_bilin.201005.nc</map>
Expand Down Expand Up @@ -3777,6 +3855,14 @@
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/oARRM60to6/map_oARRM60to6_to_TL319_aave.180904.nc</map>
</gridmap>

<gridmap atm_grid="TL319" ocn_grid="ARRM10to60E2r1">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/TL319/map_TL319_to_ARRM10to60E2r1_aave.220802.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/TL319/map_TL319_to_ARRM10to60E2r1_bilin.220802.nc</map>
<map name="ATM2OCN_VMAPNAME">cpl/gridmaps/TL319/map_TL319_to_ARRM10to60E2r1_patch.220802.nc</map>
<map name="OCN2ATM_FMAPNAME">cpl/gridmaps/ARRM10to60E2r1/map_ARRM10to60E2r1_to_TL319_aave.220802.nc</map>
<map name="OCN2ATM_SMAPNAME">cpl/gridmaps/ARRM10to60E2r1/map_ARRM10to60E2r1_to_TL319_aave.220802.nc</map>
</gridmap>

<gridmap atm_grid="TL319" ocn_grid="EC30to60E2r2">
<map name="ATM2OCN_FMAPNAME">cpl/gridmaps/TL319/map_TL319_to_EC30to60E2r2_aave.201005.nc</map>
<map name="ATM2OCN_SMAPNAME">cpl/gridmaps/TL319/map_TL319_to_EC30to60E2r2_bilin.201005.nc</map>
Expand Down Expand Up @@ -4220,6 +4306,11 @@
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_rx1_to_oARRM60to6_smoothed.r150e300.180816.nc</map>
</gridmap>

<gridmap ocn_grid="ARRM10to60E2r1" rof_grid="rx1">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_rx1_to_ARRM10to60E2r1_smoothed.r150e300.220802.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_rx1_to_ARRM10to60E2r1_smoothed.r150e300.220802.nc</map>
</gridmap>

<gridmap ocn_grid="EC30to60E2r2" rof_grid="rx1">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_rx1_to_EC30to60E2r2_smoothed.r150e300.201005.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_rx1_to_EC30to60E2r2_smoothed.r150e300.201005.nc</map>
Expand Down Expand Up @@ -4270,6 +4361,11 @@
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_JRA025_to_oARRM60to6_smoothed.r150e300.181220.nc</map>
</gridmap>

<gridmap ocn_grid="ARRM10to60E2r1" rof_grid="JRA025">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_JRA025_to_ARRM10to60E2r1_smoothed.r150e300.220802.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_JRA025_to_ARRM10to60E2r1_smoothed.r150e300.220802.nc</map>
</gridmap>

<gridmap ocn_grid="EC30to60E2r2" rof_grid="JRA025">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_JRA025_to_EC30to60E2r2_smoothed.r150e300.201005.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_JRA025_to_EC30to60E2r2_smoothed.r150e300.201005.nc</map>
Expand Down Expand Up @@ -4335,11 +4431,21 @@
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r05_to_ARRM60to10_smoothed.r150e300.200413.nc</map>
</gridmap>

<gridmap ocn_grid="ARRM10to60E2r1" rof_grid="r05">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r05_to_ARRM10to60E2r1_smoothed.r150e300.220802.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r05_to_ARRM10to60E2r1_smoothed.r150e300.220802.nc</map>
</gridmap>

<gridmap ocn_grid="oARRM60to10" rof_grid="r0125">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r0125_to_ARRM60to10_smoothed.r50e100.220214.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r0125_to_ARRM60to10_smoothed.r50e100.220214.nc</map>
</gridmap>

<gridmap ocn_grid="ARRM10to60E2r1" rof_grid="r0125">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r0125_to_ARRM10to60E2r1_smoothed.r50e100.220802.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r0125_to_ARRM10to60E2r1_smoothed.r50e100.220802.nc</map>
</gridmap>

<gridmap ocn_grid="EC30to60E2r2" rof_grid="r05">
<map name="ROF2OCN_ICE_RMAPNAME">cpl/cpl6/map_r05_to_EC30to60E2r2_smoothed.r150e300.201005.nc</map>
<map name="ROF2OCN_LIQ_RMAPNAME">cpl/cpl6/map_r05_to_EC30to60E2r2_smoothed.r150e300.201005.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 @@ -1297,7 +1297,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,oQU480,oQU240,oQU240wLI,oQU120,oRRS30to10v3,oRRS30to10v3wLI,360x720cru,NLDASww3a,NLDAS,tx0.1v2">
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">
Land mask description
</entry>

Expand Down
7 changes: 6 additions & 1 deletion components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
<config_dt ocn_grid="oRRS15to5">'00:03:45'</config_dt>
<config_dt ocn_grid="oARRM60to10">'00:10:00'</config_dt>
<config_dt ocn_grid="oARRM60to6">'00:05:00'</config_dt>
<config_dt ocn_grid="ARRM10to60E2r1">'00:10:00'</config_dt>
<config_dt ocn_grid="EC30to60E2r2">'00:30:00'</config_dt>
<config_dt ocn_grid="WC14to60E2r3">'00:10:00'</config_dt>
<config_dt ocn_grid="WCAtl12to45E2r4">'00:10:00'</config_dt>
Expand All @@ -68,6 +69,7 @@
<config_hmix_scaleWithMesh ocn_grid="oRRS15to5">.true.</config_hmix_scaleWithMesh>
<config_hmix_scaleWithMesh ocn_grid="oARRM60to10">.true.</config_hmix_scaleWithMesh>
<config_hmix_scaleWithMesh ocn_grid="oARRM60to6">.true.</config_hmix_scaleWithMesh>
<config_hmix_scaleWithMesh ocn_grid="ARRM10to60E2r1">.true.</config_hmix_scaleWithMesh>
<config_hmix_scaleWithMesh ocn_grid="EC30to60E2r2">.true.</config_hmix_scaleWithMesh>
<config_hmix_scaleWithMesh ocn_grid="WC14to60E2r3">.true.</config_hmix_scaleWithMesh>
<config_hmix_scaleWithMesh ocn_grid="WCAtl12to45E2r4">.true.</config_hmix_scaleWithMesh>
Expand Down Expand Up @@ -115,6 +117,7 @@
<config_mom_del4 ocn_grid="oRRS15to5">1.9e09</config_mom_del4>
<config_mom_del4 ocn_grid="oARRM60to10">1.5e10</config_mom_del4>
<config_mom_del4 ocn_grid="oARRM60to6">3.2e09</config_mom_del4>
<config_mom_del4 ocn_grid="ARRM10to60E2r1">1.5e10</config_mom_del4>
<config_mom_del4 ocn_grid="EC30to60E2r2">1.2e11</config_mom_del4>
<config_mom_del4 ocn_grid="WC14to60E2r3">1.18e10</config_mom_del4>
<config_mom_del4 ocn_grid="WCAtl12to45E2r4">1.18e10</config_mom_del4>
Expand Down Expand Up @@ -145,7 +148,7 @@
<config_Redi_N2_based_taper_enable>.true.</config_Redi_N2_based_taper_enable>
<config_Redi_N2_based_taper_min>0.1</config_Redi_N2_based_taper_min>
<config_Redi_N2_based_taper_limit_term1>.true.</config_Redi_N2_based_taper_limit_term1>
<config_Redi_min_layers_diag_terms>6</config_Redi_min_layers_diag_terms>
<config_Redi_min_layers_diag_terms>15</config_Redi_min_layers_diag_terms>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I undrestand correctly, this is changing Redi for all configurations that have GM on. This needs to only be for ARRM10to60E2r1. I believe this is correct:

<config_Redi_min_layers_diag_terms>6</config_Redi_min_layers_diag_terms>
<config_Redi_min_layers_diag_terms ocn_grid="ARRM10to60E2r1">15</config_Redi_min_layers_diag_terms>

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, that was definitely my mistake commit, I certainly should have included the grid specification. Thanks for the catch!
@milenaveneziani I just want to confirm that we do indeed want this separate setting for this mesh, before I make the change (or just revert the commit)?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, we want it at 15 for this mesh.

<config_Redi_horizontal_taper>'ramp'</config_Redi_horizontal_taper>
<config_Redi_horizontal_ramp_min>20e3</config_Redi_horizontal_ramp_min>
<config_Redi_horizontal_ramp_min ocn_grid="WCAtl12to45E2r4">30e3</config_Redi_horizontal_ramp_min>
Expand Down Expand Up @@ -414,6 +417,7 @@
<config_btr_dt ocn_grid="oRRS15to5">'0000_00:00:11.25'</config_btr_dt>
<config_btr_dt ocn_grid="oARRM60to10">'0000_00:00:24'</config_btr_dt>
<config_btr_dt ocn_grid="oARRM60to6">'0000_00:00:10'</config_btr_dt>
<config_btr_dt ocn_grid="ARRM10to60E2r1">'0000_00:00:24'</config_btr_dt>
<config_btr_dt ocn_grid="EC30to60E2r2">'0000_00:01:00'</config_btr_dt>
<config_btr_dt ocn_grid="WC14to60E2r3">'0000_00:00:15'</config_btr_dt>
<config_btr_dt ocn_grid="WCAtl12to45E2r4">'0000_00:00:15'</config_btr_dt>
Expand Down Expand Up @@ -958,6 +962,7 @@
<config_AM_mocStreamfunction_enable ocn_grid="oRRS15to5">.false.</config_AM_mocStreamfunction_enable>
<config_AM_mocStreamfunction_enable ocn_grid="oARRM60to10">.false.</config_AM_mocStreamfunction_enable>
<config_AM_mocStreamfunction_enable ocn_grid="oARRM60to6">.false.</config_AM_mocStreamfunction_enable>
<config_AM_mocStreamfunction_enable ocn_grid="ARRM10to60E2r1">.true.</config_AM_mocStreamfunction_enable>
<config_AM_mocStreamfunction_enable ocn_grid="EC30to60E2r2">.true.</config_AM_mocStreamfunction_enable>
<config_AM_mocStreamfunction_enable ocn_grid="WC14to60E2r3">.true.</config_AM_mocStreamfunction_enable>
<config_AM_mocStreamfunction_enable ocn_grid="WCAtl12to45E2r4">.true.</config_AM_mocStreamfunction_enable>
Expand Down
11 changes: 11 additions & 0 deletions components/mpas-ocean/cime_config/buildnml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,17 @@ def buildnml(case, caseroot, compname):
logger.warning("WARNING: The specified compset is requesting ocean ICs spunup from a G-case")
logger.warning(" But no file available for this grid.")

elif ocn_grid == 'ARRM10to60E2r1':
decomp_date = '220730'
decomp_prefix = 'mpas-o.graph.info.'
restoring_file = 'sss.PHC3.0_monthlyClimatology.ARRM10to60E2r1.220802.nc'
analysis_mask_file = 'ARRM10to60E2r1_mocBasinsAndTransects220730.nc'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this file should have been given the date it was created. The date stamp on the mocBasinsAndTransects files is a date stamp for the regions used in the masks, rather than the masks themselves. This won't matter in E3SM but it will be a problem if the file to be added todiagnostics was modified in this way. In general, I think it would be better to leave the file with the date stamp created in compass:

ARRM10to60E2r1_mocBasinsAndTransects20210623.nc

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For a little more background, this date is controlled and updated in geometric_features:
https://github.com/MPAS-Dev/geometric_features/blob/master/geometric_features/aggregation/__init__.py#L56-L58

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for pointing this out. I just diffed the file with the 220730 datestamp and the 20210623 one and they are the same, so I must have mved this to match the other datestamps? I shouldn't have done that - I'll fix it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we did go through a couple of mesh iterations between June and July though..

Copy link
Contributor

@xylar xylar Sep 13, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we did go through a couple of mesh iterations between June and July though..

@milenaveneziani, that date stamp is from June 2021, not 2022. It is the date that we added the separate Atlantic and Atlantic+Mediterranean MOC basins to geometric features and has nothing to do with when the file or the mesh itself was created.

ic_date = '220730'
ic_prefix = 'mpaso.ARRM10to60E2r1'
if ocn_ic_mode == 'spunup':
ic_date = '220802'
ic_prefix = 'mpaso.ARRM10to60E2r1.rstFrom1monthG-chrys'

elif ocn_grid == 'EC30to60E2r2':
decomp_date = '200904'
decomp_prefix = 'mpas-o.graph.info.'
Expand Down
Loading