Skip to content

Commit

Permalink
Merge pull request #463 from mvertens/feature/cism2mosart
Browse files Browse the repository at this point in the history 
Implementation of glc->ocn coupling via going through mosart
  • Loading branch information
@jedwards4b
jedwards4b committed Jun 24, 2024
2 parents 90f815b + 4dca7c6 commit f960f3e
Show file tree
Hide file tree
Showing 8 changed files with 351 additions and 491 deletions.
56 changes: 0 additions & 56 deletions cime_config/config_component.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1389,14 +1389,6 @@
<desc>rof2lnd flux mapping file</desc>
</entry>

<entry id="ROF2OCN_FMAPNAME">
<type>char</type>
<default_value>idmap</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>rof2ocn flux mapping file</desc>
</entry>

<entry id="ROF2OCN_LIQ_RMAPNAME">
<type>char</type>
<default_value>idmap</default_value>
Expand All @@ -1413,54 +1405,6 @@
<desc>rof2ocn runoff mapping file</desc>
</entry>

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

<entry id="GLC2OCN_LIQ_RMAPNAME">
<type>char</type>
<default_value>idmap</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>glc2ocn runoff mapping file for liquid runoff</desc>
</entry>

<entry id="GLC2OCN_ICE_RMAPNAME">
<type>char</type>
<default_value>idmap</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>glc2ocn runoff mapping file for ice runoff</desc>
</entry>

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

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

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

<entry id="EPS_FRAC">
<type>char</type>
<default_value>1.0e-02</default_value>
Expand Down
84 changes: 0 additions & 84 deletions cime_config/namelist_definition_drv.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2256,54 +2256,6 @@
</values>
</entry>

<entry id="glc2ocn_liq_rmapname" modify_via_xml="GLC2OCN_LIQ_RMAPNAME">
<type>char</type>
<category>mapping</category>
<input_pathname>abs</input_pathname>
<group>MED_attributes</group>
<desc>
glc2ocn runoff mapping file for liquid runoff
</desc>
<values>
<value>$GLC2OCN_LIQ_RMAPNAME</value>
</values>
</entry>
<entry id="glc2ice_rmapname" modify_via_xml="GLC2ICE_RMAPNAME">
<type>char</type>
<category>mapping</category>
<input_pathname>abs</input_pathname>
<group>MED_attributes</group>
<desc>
glc to ice runoff conservative mapping file
</desc>
<values>
<value>$GLC2ICE_RMAPNAME</value>
</values>
</entry>
<entry id="glc2ocn_ice_rmapname" modify_via_xml="GLC2OCN_ICE_RMAPNAME">
<type>char</type>
<category>mapping</category>
<input_pathname>abs</input_pathname>
<group>MED_attributes</group>
<desc>
glc2ocn runoff mapping file for ice runoff
</desc>
<values>
<value>$GLC2OCN_ICE_RMAPNAME</value>
</values>
</entry>
<entry id="rof2ocn_fmapname" modify_via_xml="ROF2OCN_FMAPNAME">
<type>char</type>
<category>mapping</category>
<input_pathname>abs</input_pathname>
<group>MED_attributes</group>
<desc>
runoff to ocn area overlap conservative mapping file
</desc>
<values>
<value>$ROF2OCN_FMAPNAME</value>
</values>
</entry>
<entry id="rof2ocn_liq_rmapname" modify_via_xml="ROF2OCN_LIQ_RMAPNAME">
<type>char</type>
<category>mapping</category>
Expand All @@ -2328,42 +2280,6 @@
<value>$ROF2OCN_ICE_RMAPNAME</value>
</values>
</entry>
<entry id="ocn2wav_smapname" modify_via_xml="OCN2WAV_SMAPNAME">
<type>char</type>
<category>mapping</category>
<input_pathname>abs</input_pathname>
<group>MED_attributes</group>
<desc>
ocn to wav state mapping file for states
</desc>
<values>
<value>$OCN2WAV_SMAPNAME</value>
</values>
</entry>
<entry id="ice2wav_smapname" modify_via_xml="ICE2WAV_SMAPNAME">
<type>char</type>
<category>mapping</category>
<input_pathname>abs</input_pathname>
<group>MED_attributes</group>
<desc>
ice to wav state mapping file for states
</desc>
<values>
<value>$ICE2WAV_SMAPNAME</value>
</values>
</entry>
<entry id="wav2ocn_smapname" modify_via_xml="WAV2OCN_SMAPNAME">
<type>char</type>
<category>mapping</category>
<input_pathname>abs</input_pathname>
<group>MED_attributes</group>
<desc>
wav to ocn state mapping file for states
</desc>
<values>
<value>$WAV2OCN_SMAPNAME</value>
</values>
</entry>

<!-- =========================== -->
<!-- ALLCOMP attributes -->
Expand Down
Loading

0 comments on commit f960f3e

Please sign in to comment.