Skip to content

Commit

Permalink
Add ocean/ice shelf coupling to CIME
Browse files Browse the repository at this point in the history 
This commit introduces infrastructure changes needed for adding coupling
between the ocean and ice shelves in the GLC component.  It is a squash
of work done primarily by Jeremy Fyke between 2015 and 2017, with
updates by Jon Wolfe to make it compatible with changes to E3SM
since then. It is BFB for existing compsets.

This commit introduces the CIME changes, but does not touch the
components.

[BFB] - Bit-For-Bit
  • Loading branch information
@matthewhoffman
Jeremy Fyke authored and matthewhoffman committed Feb 6, 2019
1 parent 71f4e19 commit b24d24f
Show file tree
Hide file tree
Showing 9 changed files with 1,124 additions and 17 deletions.
34 changes: 34 additions & 0 deletions cime/src/drivers/mct/cime_config/config_component_e3sm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -781,6 +781,40 @@
<desc>glc2ocn state mapping file decomp type</desc>
</entry>

<entry id="GLC2ICE_FMAPNAME">
<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
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

0 comments on commit b24d24f

Please sign in to comment.