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

Updates to ARRM10to60E2r1 mesh #26

Merged
merged 6 commits into from
Nov 3, 2022
Merged

Updates to ARRM10to60E2r1 mesh #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1199ea1
Revert "Changing default coupling frequencies for G-cases so uses 15m…
darincomeau Sep 8, 2022
fca31d7
Making change to Redi_min_layers_diag_terms 15 for this mesh only, le…
darincomeau Sep 13, 2022
894d832
Changing name of analysis_mask_file to intended ARRM10to60E2r1_mocBas…
darincomeau Sep 13, 2022
0c8be99
Adding land initial condition for WCYCL1950 compset with ne30pg2 atm
darincomeau Sep 20, 2022
f905086
Adding fsurdat and finidat for 1950 conditions for arcticx4v1 mesh
darincomeau Oct 25, 2022
584e786
Adding mask specification for previous arcticx4v1 finidat
darincomeau Oct 25, 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
9 changes: 7 additions & 2 deletions components/elm/bld/namelist_files/namelist_defaults.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,10 @@ sim_year="1950" glc_nec="0" use_crop=".false.">lnd/clm2/initdata/20210802.ICRUEL
sim_year="1950" glc_nec="0" use_crop=".false.">lnd/clm2/initdata/20210817.ICRUELM-1950.ne30pg2_SOwISC12to60E2r4.elm.r.0051-01-01-00000.nc
</finidat>

<finidat hgrid="ne30np4.pg2" maxpft="17" mask="ARRM10to60E2r1" use_cn=".false." ic_ymd="19500101" more_vertlayers=".false."
sim_year="1950" glc_nec="0" use_crop=".false.">lnd/clm2/initdata/20220908.ICRUELM-1950.ne30pg2_ARRM10to60E2r1.anvil.elm.r.0051-01-01-00000.nc
</finidat>

<!-- HOMME grid ne120 resolution -->

<finidat hgrid="ne120np4" maxpft="17" mask="gx1v6" use_cn=".false." ic_ymd="18500101" more_vertlayers=".false."
Expand Down Expand Up @@ -226,13 +230,14 @@ lnd/clm2/surfdata_map/surfdata_ne0np4_northamericax4v1.pg2_simyr1850_c210112.nc<
lnd/clm2/surfdata_map/surfdata_ne0np4_northamericax4v1.pg2_simyr2010_c210112.nc</fsurdat>

<!-- ne0np4_arcticx4v1.pg2 -->
<finidat hgrid="ne0np4_arcticx4v1.pg2">lnd/clm2/initdata/arcticx4v1pg2_oARRM60to10.ICRUELM.spinup-from-interp.elm.r.0051-01-01-00000.nc</finidat>
<finidat hgrid="ne0np4_arcticx4v1.pg2" mask="oARRM60to10">lnd/clm2/initdata/arcticx4v1pg2_oARRM60to10.ICRUELM.spinup-from-interp.elm.r.0051-01-01-00000.nc</finidat>
<finidat hgrid="ne0np4_arcticx4v1.pg2" mask="ARRM10to60E2r1" sim_year="1950">lnd/clm2/initdata/20221017.ICRUELM-1950.arcticx4v1pg2_ARRM10to60E2r1.anvil.elm.r.0051-01-01-00000.nc</finidat>
<fsurdat hgrid="ne0np4_arcticx4v1.pg2" sim_year="2010" use_crop=".false." >
lnd/clm2/surfdata_map/surfdata_arcticx4v1pg2_simyr2010_c210805.nc</fsurdat>
<fsurdat hgrid="ne0np4_arcticx4v1.pg2" sim_year="2000" use_crop=".false." >
lnd/clm2/surfdata_map/surfdata_arcticx4v1pg2_simyr2000_c210707.nc</fsurdat>
<fsurdat hgrid="ne0np4_arcticx4v1.pg2" sim_year="1950" use_crop=".false." >
lnd/clm2/surfdata_map/surfdata_arcticx4v1pg2_simyr2000_c210707.nc</fsurdat>
lnd/clm2/surfdata_map/surfdata_arcticx4v1pg2_simyr1950_c221017.nc</fsurdat>
<fsurdat hgrid="ne0np4_arcticx4v1.pg2" sim_year="1850" use_crop=".false." >
lnd/clm2/surfdata_map/surfdata_arcticx4v1pg2_simyr1850_c210707.nc</fsurdat>

Expand Down
1 change: 1 addition & 0 deletions 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 @@ -149,6 +149,7 @@
<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 ocn_grid="ARRM10to60E2r1">15</config_Redi_min_layers_diag_terms>
<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
2 changes: 1 addition & 1 deletion components/mpas-ocean/cime_config/buildnml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ def buildnml(case, caseroot, compname):
decomp_date = '220730'
decomp_prefix = 'mpas-o.graph.info.'
restoring_file = 'sss.PHC3.0_monthlyClimatology.ARRM10to60E2r1.220802.nc'
analysis_mask_file = 'ARRM10to60E2r1_mocBasinsAndTransects220730.nc'
analysis_mask_file = 'ARRM10to60E2r1_mocBasinsAndTransects20210623.nc'
ic_date = '220730'
ic_prefix = 'mpaso.ARRM10to60E2r1'
if ocn_ic_mode == 'spunup':
Expand Down
2 changes: 0 additions & 2 deletions driver-mct/cime_config/config_component_e3sm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,6 @@
<value compset="_DATM.*_SLND.*MPAS" grid="oi%oRRS15to5">96</value>
<value compset="_DATM.*_SLND.*MPAS" grid="oi%oARRM60to10">96</value>
<value compset="_DATM.*_SLND.*MPAS" grid="oi%oARRM60to6">96</value>
<value compset="_DATM.*_SLND.*MPAS" grid="oi%ARRM10to60">96</value>
Copy link
Collaborator

Choose a reason for hiding this comment

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

you are removing this one for now because we want to Hailong first, right?

Copy link
Owner Author

Choose a reason for hiding this comment

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

this came in 1199ea1 to change the default timestep back to 30 minutes for G-cases from our discussions with Robert a few weeks ago.

But these leaves in place ATM_NCPL=96 for the arcticx4v1 atm mesh on this branch (but we haven't opened the companion PR into E3SM master yet - and needs discussion as noted).

<value compset="_EAM.*_ELM.*MPASO">48</value>
<value compset="_EAM.*_ELM.*MPASO" grid="a%ne11np4">12</value>
<value compset="_EAM.*_ELM.*MPASO" grid="a%ne120np4">96</value>
Expand Down Expand Up @@ -487,7 +486,6 @@
<value compset="_MPASO" grid="oi%oRRS15to5">96</value>
<value compset="_MPASO" grid="oi%oARRM60to10">48</value>
<value compset="_MPASO" grid="oi%oARRM60to6">48</value>
<value compset="_MPASO" grid="oi%ARRM10to60">48</value>
<value compset="_MPASO" grid="a%ne0np4_arcticx4v1">96</value>

</values>
Expand Down