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 MALI data mode #111

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add MALI data mode #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40ba09f
Add MALI data mode
matthewhoffman Oct 3, 2024
06adaf2
Update ocn_glcshelf testmod to start in year 2000
matthewhoffman Oct 31, 2024
627761c
Disable ssh consistency check for ocn_glcshelf testmod
matthewhoffman Oct 31, 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
5 changes: 5 additions & 0 deletions cime_config/allactive/config_compsets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,11 @@
<lname>2000_DATM%JRA-1p5_SLND_MPASSI_MPASO%DATMFORCED_DROF%JRA-1p5_MALI_SWAV</lname>
</compset>

<compset>
<alias>MPAS_DISLISIO_JRA1p5</alias>
<lname>2000_DATM%JRA-1p5_SLND_MPASSI_MPASO%DATMFORCED_DROF%JRA-1p5_MALI%SIADATA_SWAV</lname>
</compset>

<!-- Slab ocean cases -->
<compset>
<alias>E1850C5ELM</alias>
Expand Down
9 changes: 9 additions & 0 deletions components/mpas-albany-landice/bld/build-namelist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,15 @@ if ($MALI_DYNAMIC eq 'TRUE') {
add_default($nl, 'config_velocity_solver', 'mali_use_albany'=>"$MALI_USE_ALBANY");
} else {
add_default($nl, 'config_velocity_solver', 'val'=>"none");
add_default($nl, 'config_thickness_advection', 'val'=>"none");
add_default($nl, 'config_tracer_advection', 'val'=>"none");
add_default($nl, 'config_remove_icebergs', 'val'=>".false.");
add_default($nl, 'config_remove_small_islands', 'val'=>".false.");
add_default($nl, 'config_thermal_solver', 'val'=>"none");
add_default($nl, 'config_basal_mass_bal_float', 'val'=>"none");
add_default($nl, 'config_front_mass_bal_grounded', 'val'=>"none");
add_default($nl, 'config_adaptive_timestep', 'val'=>".false.");
add_default($nl, 'config_dt', 'val'=>"0000-00-01_00:00:00");
}
add_default($nl, 'config_sia_tangent_slope_calculation');
add_default($nl, 'config_flowParamA_calculation');
Expand Down
12 changes: 12 additions & 0 deletions components/mpas-albany-landice/cime_config/buildnml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,18 @@ def buildnml(case, caseroot, compname):

lines.append('</stream>')
lines.append('')
if not mali_dynamic:
# in MALI data mode, read an input stream with ice thickness monthly
lines.append(' <stream name="data-mode-input"')
lines.append(' type="input"')
lines.append(f' filename_template="{din_loc_root}/glc/mpasli/{glc_grid}/{grid_prefix}_datamode.nc"')
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think it would be a good idea to give this file a datestamp. That way, it could at least be updated and it would be clear which version was expected.

lines.append(' reference_time="2000-01-01_00:00:00"')
lines.append(' input_interval="0000-01-00_00:00:00">')
lines.append('')
lines.append(' <var name="thickness"/>')
lines.append('')
lines.append('</stream>')
lines.append('')
lines.append('<!--')
lines.append('All streams below this line are auxiliary streams. They are provided as')
lines.append('groupings of fields that one might be interested in. You can either enable the')
Expand Down
4 changes: 2 additions & 2 deletions components/mpas-albany-landice/cime_config/config_component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@
<valid_values>TRUE,FALSE</valid_values>
<default_value>TRUE</default_value>
<values>
<value compset="_MALI%.*STATIC">FALSE</value>
<value compset="_MALI%.*DATA">FALSE</value>
</values>
<group>case_comp</group>
<file>env_case.xml</file>
<desc>FALSE implies MALI will be run in a static mode </desc>
<desc>FALSE implies MALI will be run in a prescribed data mode </desc>
</entry>

<entry id="GLC_SMB">
Expand Down
15 changes: 5 additions & 10 deletions components/mpas-ocean/cime_config/config_compsets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,11 @@
<lname>2000_DATM%JRA-1p4-2018_SLND_MPASSI%DIB_MPASO%IBDISMFDATMFORCED_DROF%JRA-1p4-2018-AIS0ROF_SGLC_SWAV</lname>
</compset>

<compset>
<alias>GMPAS-JRA1p4-DIB-PISMF-DIS</alias>
<lname>2000_DATM%JRA-1p4-2018_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCED_DROF%JRA-1p4-2018-AIS0ROF_MALI%DATA_SWAV</lname>
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

based on discussion, change to JRA-1p4-2018-AIS0ICE option?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

and switch from 1p4 to 1p5?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Based on Slack discussion, wait for a PR that fixes things so runoff is removed from G-Cases as it is from B-Cases. The, yes, switch to JRA1p5 but do not use any of the -AIS0* options so that MPASO takes care of the zeroing out.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Update note: this PR will be rebased, and compset adjustments made, once E3SM-Project#6693 is merged.

Copy link
Collaborator

Choose a reason for hiding this comment

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

We need not to forget to do the rebase once E3SM-Project#6693 goes in, which I think will be soon.

</compset>

<compset>
<alias>GMPAS-IAF-PISMF</alias>
<lname>2000_DATM%IAF_SLND_MPASSI_MPASO%PISMFDATMFORCED_DROF%IAFAIS45_SGLC_SWAV</lname>
Expand Down Expand Up @@ -182,16 +187,6 @@
<lname>2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBDISMFDATMFORCED_DROF%IAFAIS00_SGLC_SWAV</lname>
</compset>

<compset>
<alias>GMPAS-MALI-DIB-IAF-DISMF</alias>
<lname>2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBDISMFCOREFORCED_DROF%IAFAIS00_MALI%SIASTATIC_SWAV</lname>
</compset>

<compset>
<alias>GMPAS-MALI-DIB-IAF-DISMF</alias>
<lname>2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBDISMFCOREFORCED_DROF%IAFAIS00_MALI%SIASTATIC_SWAV</lname>
</compset>

<compset>
<alias>GMPAS-OECO-IAF</alias>
<lname>2000_DATM%IAF_SLND_MPASSI_MPASO%OECO_DROF%IAF_SGLC_SWAV</lname>
Expand Down
7 changes: 3 additions & 4 deletions components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/ocn_glcshelf/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
./xmlchange DATM_CLMNCEP_YR_START=1958
./xmlchange DATM_CLMNCEP_YR_END=1958
./xmlchange DROF_STRM_YR_START=1958
./xmlchange DROF_STRM_YR_END=1958
./xmlchange DATM_CLMNCEP_YR_ALIGN=2000
./xmlchange DROF_STRM_YR_ALIGN=2000
./xmlchange RUN_STARTDATE="2000-01-01"
1 change: 1 addition & 0 deletions components/mpas-ocean/cime_config/testdefs/testmods_dirs/mpaso/ocn_glcshelf/user_nl_mpaso
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
config_land_ice_flux_mode = 'coupled'
config_check_ssh_consistency = .false.