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

Add first stage of ocean/ice shelf coupling #2726

Merged
merged 41 commits into from
May 21, 2019
Merged

Add first stage of ocean/ice shelf coupling #2726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
b24d24f
Add ocean/ice shelf coupling to CIME
Feb 5, 2019
f080a8d
Add ocean/ice shelf coupling to components
Feb 5, 2019
24f29b9
Update drivers with changes to compile and run
jonbob Feb 6, 2019
fd6df78
Updates to get the LISIO test to run.
jonbob Feb 6, 2019
06abe7c
Cleanup to get LISIO test to run (plus reduce output)
jonbob Feb 7, 2019
c7ffc64
Updates for T62_oEC60to30v3wLI_ais20 grid and GMPAS-MALI-DIB-IAF-ISMF…
jonbob Feb 7, 2019
aaa1e88
Fix value check in BL flux computation
matthewhoffman Feb 7, 2019
3a226c5
Modify scripts to set config_land_ice_flux_mode correctly
jonbob Feb 13, 2019
4eb07fd
Correct MALI import variable for ice-shelf melt
matthewhoffman Feb 20, 2019
dac47c3
Add floating and grounded masks to MALI GLC export
matthewhoffman Feb 20, 2019
227e74a
Add floating mask to ice-shelf melt calculation
matthewhoffman Feb 20, 2019
4d99f36
Correct ice temperature used for melt calculation
matthewhoffman Feb 21, 2019
4092b4e
CIME: Fix grid for ocean state vars in melt calc
matthewhoffman Feb 26, 2019
228fed6
CIME: Calculate T0 before it's used
matthewhoffman Feb 26, 2019
9829eec
Change interface temp. soln formulation to match MPAS-O
matthewhoffman Feb 26, 2019
38fd1fa
Modify ocean freezing temperature salinity dependence
matthewhoffman Feb 26, 2019
4bba0f1
Correct index to pressure variable
matthewhoffman Feb 27, 2019
53259cd
Add x2o direction to tbot and dztbot
matthewhoffman Feb 27, 2019
89bcd14
Update comments in prep_glc_mod
matthewhoffman Feb 27, 2019
541fd99
Add script option to have MALI run in a static mode
jonbob Mar 7, 2019
24bfcf0
Adjustments to MALI static mode in previous commit
matthewhoffman Mar 8, 2019
b592023
Adjust dztbot assignment to be valid on init
matthewhoffman Mar 8, 2019
d0de9a9
Change sign of freshwater flux to ice sheet
matthewhoffman Mar 12, 2019
0f94143
Remove unused variable for g2x_gx
matthewhoffman Mar 27, 2019
4f29a59
Add loop over GLC ensembles for subshelf melt calculation
matthewhoffman Mar 27, 2019
6e0c3e5
Include missing integer assignment
jonbob Mar 27, 2019
bcd0281
Reconcile changes with cime_run_glc_setup_send
matthewhoffman Apr 9, 2019
fdeb032
Remove GLC coupling details from cime_run()
matthewhoffman Apr 15, 2019
312aa4f
Improve logic in cime_run_ocnglc_coupling
matthewhoffman Apr 17, 2019
c1e4d31
Improve logic in cime_run_glc_setup_send
matthewhoffman Apr 17, 2019
284ab38
Remove duplicate call to prep_glc_calculate_subshelf_boundary_fluxes
matthewhoffman Apr 18, 2019
e882a13
Only enable iceshelf fluxes in E3SM
matthewhoffman Apr 18, 2019
6f9fa05
Cleanup in prep_glc_mod.F90
matthewhoffman Apr 18, 2019
2006dea
Replace hard-coded field list with generated list
matthewhoffman Apr 19, 2019
7e3d3ab
Make new OCN/GLC cpl fields only in E3SM
matthewhoffman Apr 19, 2019
3e3e7db
Adjust CPL restart i/o routines to handle new changes
matthewhoffman Apr 24, 2019
b353366
Test with changing logic for ocn-glc coupling
jonbob May 6, 2019
939491e
Minor cleanup to previous commit
matthewhoffman May 8, 2019
4a265bf
Remove no longer-used cime_model variable
matthewhoffman May 14, 2019
f3ed491
Cleanup formatting in compute_melt_fluxes()
matthewhoffman May 14, 2019
3f4fd4c
Add x2g_*_from_lnd lists for use in prep_glc LND routines
matthewhoffman May 16, 2019
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
27 changes: 25 additions & 2 deletions cime/config/e3sm/config_grids.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1201,6 +1201,16 @@
<mask>oQU120</mask>
</model_grid>

<model_grid alias="T62_oEC60to30v3wLI_ais20" compset="MPASO.*_MALI">
<grid name="atm">T62</grid>
<grid name="lnd">T62</grid>
<grid name="ocnice">oEC60to30v3wLI</grid>
<grid name="rof">rx1</grid>
<grid name="glc">mpas.ais20km</grid>
<grid name="wav">null</grid>
<mask>oEC60to30v3wLI</mask>
</model_grid>

<!-- The following grid is only used for ADWAV testing -->
<model_grid alias="ww3a" compset="_WW3|DWAV">
<grid name="wav">ww3a</grid>
Expand Down Expand Up @@ -2873,12 +2883,25 @@
</gridmap>

<gridmap glc_grid="mpas.ais20km" ocn_grid="oQU120">
<map name="GLC2ICE_FMAPNAME">cpl/gridmaps/mpas.ais20km/map_ais20km_to_oQU120_aave.160331.nc</map>
<map name="GLC2ICE_SMAPNAME">cpl/gridmaps/mpas.ais20km/map_ais20km_to_oQU120_nearestdtos.160331.nc</map>
<map name="GLC2OCN_FMAPNAME">cpl/gridmaps/mpas.ais20km/map_ais20km_to_oQU120_aave.160331.nc</map>
<map name="OCN2GLC_FMAPNAME">cpl/gridmaps/oQU120/map_oQU120_to_ais20km_aave.160331.nc</map>
<map name="GLC2OCN_SMAPNAME">cpl/gridmaps/mpas.ais20km/map_ais20km_to_oQU120_nearestdtos.160331.nc</map>
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/mpas.ais20km/map_ais20km_to_oQU120_nearestdtos.160331.nc</map>
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/mpas.ais20km/map_ais20km_to_oQU120_nearestdtos.160331.nc</map>
<map name="OCN2GLC_SMAPNAME">cpl/gridmaps/oQU120/map_oQU120_to_ais20km_nearestdtos.160331.nc</map>
<map name="OCN2GLC_FMAPNAME">cpl/gridmaps/oQU120/map_oQU120_to_ais20km_aave.160331.nc</map>
<map name="OCN2GLC_SMAPNAME">cpl/gridmaps/oQU120/map_oQU120_to_ais20km_neareststod.160331.nc</map>
</gridmap>

<gridmap glc_grid="mpas.ais20km" ocn_grid="oEC60to30v3wLI">
<map name="GLC2ICE_FMAPNAME">cpl/gridmaps/mpas.ais20km/map_ais20km_to_oEC60to30v3wLI_nomask_aave.190207.nc</map>
<map name="GLC2ICE_SMAPNAME">cpl/gridmaps/mpas.ais20km/map_ais20km_to_oEC60to30v3wLI_nomask_nearestdtos.190207.nc</map>
<map name="GLC2OCN_FMAPNAME">cpl/gridmaps/mpas.ais20km/map_ais20km_to_oEC60to30v3wLI_nomask_aave.190207.nc</map>
<map name="GLC2OCN_SMAPNAME">cpl/gridmaps/mpas.ais20km/map_ais20km_to_oEC60to30v3wLI_nomask_nearestdtos.190207.nc</map>
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/mpas.ais20km/map_ais20km_to_oEC60to30v3wLI_nomask_nearestdtos.190207.nc</map>
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/mpas.ais20km/map_ais20km_to_oEC60to30v3wLI_nomask_nearestdtos.190207.nc</map>
<map name="OCN2GLC_FMAPNAME">cpl/gridmaps/oEC60to30v3wLI/map_oEC60to30v3wLI_nomask_to_ais20km_aave.190207.nc</map>
<map name="OCN2GLC_SMAPNAME">cpl/gridmaps/oEC60to30v3wLI/map_oEC60to30v3wLI_nomask_to_ais20km_neareststod.190207.nc</map>
</gridmap>

</gridmaps>
Expand Down
38 changes: 36 additions & 2 deletions cime/src/drivers/mct/cime_config/config_component_e3sm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@
<value compset="_DLND.*_CISM\d">1</value>
<value compset="_DLND.*_MALI">1</value>
<value compset="_SLND.*SOCN.*_MALI">1</value>
<value compset="_DATM.*_SLND.*MPASO.*_MALI">24</value>
<value compset="_DATM.*_SLND.*MPASO.*_MALI">$ATM_NCPL</value>
<value compset="_CAM.*_CLM.*MPASO">48</value>
<value compset="_CAM.*_CLM.*MPASO" grid="a%ne4np4">$ATM_NCPL</value>
<value compset="_CAM.*_CLM.*MPASO" grid="a%ne11np4">12</value>
Expand All @@ -372,7 +372,7 @@
<value compset="_DLND.*_CISM\d">1</value>
<value compset="_DLND.*_MALI">1</value>
<value compset="_SLND.*SOCN.*_MALI">1</value>
<value compset="_DATM.*_SLND.*MPASO.*_MALI">24</value>
<value compset="_DATM.*_SLND.*MPASO.*_MALI">$ATM_NCPL</value>
<value compset="_CAM.*_CLM.*MPASO">$ATM_NCPL</value>
</values>
<group>run_coupling</group>
Expand Down Expand Up @@ -781,6 +781,40 @@
<desc>glc2ocn state mapping file decomp type</desc>
</entry>

<entry id="GLC2ICE_FMAPNAME">
matthewhoffman marked this conversation as resolved.
Show resolved Hide resolved
<type>char</type>
<default_value>idmap</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>glc2ice flux mapping file</desc>
</entry>

<entry id="GLC2ICE_FMAPTYPE">
<type>char</type>
<valid_values>X,Y</valid_values>
<default_value>X</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>glc2ice flux mapping file decomp type</desc>
</entry>

<entry id="GLC2ICE_SMAPNAME">
<type>char</type>
<default_value>idmap</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>glc2ice state mapping file</desc>
</entry>

<entry id="GLC2ICE_SMAPTYPE">
<type>char</type>
<valid_values>X,Y</valid_values>
<default_value>X</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>glc2ice state mapping file decomp type</desc>
</entry>

<entry id="CCSM_GCOST">
<type>integer</type>
<valid_values></valid_values>
Expand Down
180 changes: 180 additions & 0 deletions cime/src/drivers/mct/cime_config/namelist_definition_drv.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3778,6 +3778,66 @@
</values>
</entry>

<entry id="glc2ocn_fmapname" modify_via_xml="GLC2OCN_FMAPNAME">
<type>char</type>
<category>mapping</category>
<input_pathname>abs</input_pathname>
<group>seq_maps</group>
<desc>
glc to ocn flux mapping file for fluxes
</desc>
<values>
<value>$GLC2OCN_FMAPNAME</value>
</values>
</entry>

<entry id="glc2ocn_fmaptype" modify_via_xml="GLC2OCN_FMAPTYPE">
<type>char</type>
<category>mapping</category>
<group>seq_maps</group>
<desc>
The type of mapping desired, either "source" or "destination" mapping.
X is associated with rearrangement of the source grid to the
destination grid and then local mapping. Y is associated with mapping
on the source grid and then rearrangement and sum to the destination
grid.
</desc>
<values>
<value>$GLC2OCN_FMAPTYPE</value>
<value bfbflag="on">X</value>
</values>
</entry>

<entry id="glc2ocn_smapname" modify_via_xml="GLC2OCN_SMAPNAME">
<type>char</type>
<category>mapping</category>
<input_pathname>abs</input_pathname>
<group>seq_maps</group>
<desc>
glc to ocn state mapping file for states
</desc>
<values>
<value>$GLC2OCN_SMAPNAME</value>
</values>
</entry>

<entry id="glc2ocn_smaptype" modify_via_xml="GLC2OCN_SMAPTYPE">
<type>char</type>
<category>mapping</category>
<group>seq_maps</group>
<desc>
The type of mapping desired, either "source" or "destination" mapping.
X is associated with rearrangement of the source grid to the
destination grid and then local mapping. Y is associated with mapping
on the source grid and then rearrangement and sum to the destination
grid.
</desc>
<values>
<value>$GLC2OCN_SMAPTYPE</value>
<value bfbflag="on">X</value>
</values>
</entry>

<entry id="glc2ocn_liq_rmapname" modify_via_xml="GLC2OCN_LIQ_RMAPNAME">
<type>char</type>
<category>mapping</category>
Expand Down Expand Up @@ -3838,6 +3898,66 @@
</values>
</entry>

<entry id="ocn2glc_fmapname" modify_via_xml="OCN2GLC_FMAPNAME">
<type>char</type>
<category>mapping</category>
<input_pathname>abs</input_pathname>
<group>seq_maps</group>
<desc>
ocn to glc flux mapping file for fluxes
</desc>
<values>
<value>$OCN2GLC_FMAPNAME</value>
</values>
</entry>

<entry id="ocn2glc_fmaptype" modify_via_xml="OCN2GLC_FMAPTYPE">
<type>char</type>
<category>mapping</category>
<group>seq_maps</group>
<desc>
The type of mapping desired, either "source" or "destination" mapping.
X is associated with rearrangement of the source grid to the
destination grid and then local mapping. Y is associated with mapping
on the source grid and then rearrangement and sum to the destination
grid.
</desc>
<values>
<value>$OCN2GLC_FMAPTYPE</value>
<value bfbflag="on">X</value>
</values>
</entry>

<entry id="ocn2glc_smapname" modify_via_xml="OCN2GLC_SMAPNAME">
<type>char</type>
<category>mapping</category>
<input_pathname>abs</input_pathname>
<group>seq_maps</group>
<desc>
ocn to glc state mapping file for states
</desc>
<values>
<value>$OCN2GLC_SMAPNAME</value>
</values>
</entry>

<entry id="ocn2glc_smaptype" modify_via_xml="OCN2GLC_SMAPTYPE">
<type>char</type>
<category>mapping</category>
<group>seq_maps</group>
<desc>
The type of mapping desired, either "source" or "destination" mapping.
X is associated with rearrangement of the source grid to the
destination grid and then local mapping. Y is associated with mapping
on the source grid and then rearrangement and sum to the destination
grid.
</desc>
<values>
<value>$OCN2GLC_SMAPTYPE</value>
<value bfbflag="on">X</value>
</values>
</entry>

<entry id="glc2ice_rmapname" modify_via_xml="GLC2ICE_RMAPNAME">
<type>char</type>
<category>mapping</category>
Expand Down Expand Up @@ -4049,6 +4169,66 @@
</values>
</entry>

<entry id="glc2ice_fmapname" modify_via_xml="GLC2ICE_FMAPNAME">
<type>char</type>
<category>mapping</category>
<input_pathname>abs</input_pathname>
<group>seq_maps</group>
<desc>
glc to ice flux mapping file for fluxes
</desc>
<values>
<value>$GLC2ICE_FMAPNAME</value>
</values>
</entry>

<entry id="glc2ice_fmaptype" modify_via_xml="GLC2ICE_FMAPTYPE">
<type>char</type>
<category>mapping</category>
<group>seq_maps</group>
<desc>
The type of mapping desired, either "source" or "destination" mapping.
X is associated with rearrangement of the source grid to the
destination grid and then local mapping. Y is associated with mapping
on the source grid and then rearrangement and sum to the destination
grid.
</desc>
<values>
<value>$GLC2ICE_FMAPTYPE</value>
<value bfbflag="on">X</value>
</values>
</entry>

<entry id="glc2ice_smapname" modify_via_xml="GLC2ICE_SMAPNAME">
<type>char</type>
<category>mapping</category>
<input_pathname>abs</input_pathname>
<group>seq_maps</group>
<desc>
glc to ice state mapping file for states
</desc>
<values>
<value>$GLC2ICE_SMAPNAME</value>
</values>
</entry>

<entry id="glc2ice_smaptype" modify_via_xml="GLC2ICE_SMAPTYPE">
<type>char</type>
<category>mapping</category>
<group>seq_maps</group>
<desc>
The type of mapping desired, either "source" or "destination" mapping.
X is associated with rearrangement of the source grid to the
destination grid and then local mapping. Y is associated with mapping
on the source grid and then rearrangement and sum to the destination
grid.
</desc>
<values>
<value>$GLC2ICE_SMAPTYPE</value>
<value bfbflag="on">X</value>
</values>
</entry>

<entry id="atm2wav_smapname" modify_via_xml="ATM2WAV_SMAPNAME">
<type>char</type>
<category>mapping</category>
Expand Down
Loading