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

Implementation of glc->ocn coupling via going through mosart #463

Merged
merged 8 commits into from
Jun 24, 2024
Merged

Implementation of glc->ocn coupling via going through mosart #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b3c1aa3
move glc2ocn with glc2rof
May 27, 2024
4a644c0
updates for cism2mosart coupling
May 29, 2024
452962c
bug fix
Jun 3, 2024
5ad8bfa
updates for cism->mosart->ocean routine
Jun 7, 2024
3e45430
more cleanup of mapping file specification
Jun 7, 2024
e643dfe
more cleanup
Jun 14, 2024
5e5c181
add simplification for how glc runoff is sent to mom/blom
Jun 18, 2024
4dca7c6
Merge remote-tracking branch 'origin/main' into feature/cism2mosart
jedwards4b Jun 18, 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
56 changes: 0 additions & 56 deletions cime_config/config_component.xml
View file
Open in desktop
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
Open in desktop
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
Loading