Skip to content

Commit

Permalink
Merge pull request #3123 from ESMCI/jgfouca/branch-for-acme-split-201…
Browse files Browse the repository at this point in the history 
…9-05-28

Jgfouca/branch for acme split 2019 05 28

Change List:

Add first stage of ocean/ice shelf coupling
Bring COMPOSE semi-Lagrangian tracer transport code into HOMME and E3SM (required minor changes to build.py)
Add checkpoint of timing data immediately after initialization
bless_test_results: Be able to handle build-only tests
Test suite: scripts_regression_tests
Test baseline:
Test namelist changes:
Test status: BFB

Fixes [CIME Github issue #]

User interface changes?:

Update gh-pages html (Y/N)?:

Code review: @jedwards4b
  • Loading branch information
@jgfouca
jgfouca authored Jun 3, 2019
2 parents d9dc698 + f7b2282 commit 540d950
Show file tree
Hide file tree
Showing 10 changed files with 1,342 additions and 152 deletions.
108 changes: 108 additions & 0 deletions driver-mct/cime_config/config_component.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1626,6 +1626,42 @@
<desc>glc2lnd state mapping file decomp type</desc>
</entry>

<entry id="GLC2ICE_FMAPNAME">
<type>char</type>
<default_value>idmap_ignore</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>glc2ice flux mapping file - the default value idmap_ignore, if set, will be ignored by buildnml and
will generate a runtime error if in fact a file is required for the given compset</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_ignore</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>glc2ice state mapping file - the default value idmap_ignore, if set, will be ignored by buildnml and
will generate a runtime error if in fact a file is required for the given compset</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="GLC2ICE_RMAPNAME">
<type>char</type>
<default_value>idmap_ignore</default_value>
Expand All @@ -1644,6 +1680,42 @@
<desc>glc2ice runoff mapping file decomp type</desc>
</entry>

<entry id="GLC2OCN_FMAPNAME">
<type>char</type>
<default_value>idmap_ignore</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>glc2ocn flux mapping file - the default value idmap_ignore, if set, will be ignored by buildnml and
will generate a runtime error if in fact a file is required for the given compset</desc>
</entry>

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

<entry id="GLC2OCN_SMAPNAME">
<type>char</type>
<default_value>idmap_ignore</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>glc2ocn state mapping file - the default value idmap_ignore, if set, will be ignored by buildnml and
will generate a runtime error if in fact a file is required for the given compset</desc>
</entry>

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

<entry id="GLC2OCN_LIQ_RMAPNAME">
<type>char</type>
<default_value>idmap_ignore</default_value>
Expand Down Expand Up @@ -1680,6 +1752,42 @@
<desc>glc2ocn runoff mapping file decomp type for ice runoff</desc>
</entry>

<entry id="OCN2GLC_FMAPNAME">
<type>char</type>
<default_value>idmap_ignore</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>ocn2glc flux mapping file - the default value idmap_ignore, if set, will be ignored by buildnml and
will generate a runtime error if in fact a file is required for the given compset</desc>
</entry>

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

<entry id="OCN2GLC_SMAPNAME">
<type>char</type>
<default_value>idmap_ignore</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>ocn2glc state mapping file - the default value idmap_ignore, if set, will be ignored by buildnml and
will generate a runtime error if in fact a file is required for the given compset</desc>
</entry>

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

<entry id="OCN2WAV_SMAPNAME">
<type>char</type>
<default_value>idmap</default_value>
Expand Down
78 changes: 7 additions & 71 deletions driver-mct/cime_config/config_component_e3sm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,11 @@
<default_value>12</default_value>
<group>run_flags</group>
<file>env_run.xml</file>
<desc>timer detail FIXME - add documentation</desc>
<desc>Sets maximum number of run loop timing data checkpoints.
This sets values for tprof_option and tprof_n that determine
the timing output file frequency. If less than one, uses
defaults for tprof_option and tprof_n and also allows them
to be set in user_nl_cpl.</desc>
</entry>

<entry id="DOUT_S_SAVE_INTERIM_RESTART_FILES">
Expand Down Expand Up @@ -352,7 +356,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 +376,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 @@ -722,74 +726,6 @@
compsets.</desc>
</entry>

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

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

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

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

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

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

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

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

<entry id="CCSM_GCOST">
<type>integer</type>
<valid_values></valid_values>
Expand Down
Loading

0 comments on commit 540d950

Please sign in to comment.